3848 files changed, 37388 insertions, 43764 deletions

diff --git a/Manifest b/Manifest
index 30c3b4bdeb32..919b71f8de7b 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28810 BLAKE2B 4a969cba35084370fd0e89d162e81a4f102cd02e6778d3e1b9ea4fdc1bdd79322ab162b6efda811f75ce62738bd6dad37c96fde3642b3092fbde02237386571c SHA512 783dbf439ec42c15c5e5f08d1f832bf07c8e49f8d157712e784d41fc6462da587852491d8b4c0916945d74b53b2ecd28133bdb530eb786faf41b6fed237cf458
-TIMESTAMP 2018-08-04T07:08:40Z
+MANIFEST Manifest.files.gz 28776 BLAKE2B 71691e73aae38096192f0836579caeb161ae8f73d6159708331444d4d48ee789802177a6dba35a34eccafdbdb8330c013e464a1436ad8b01794120c4aef4ca14 SHA512 495a6278264bf5e959948e3cb5648342ab5d6265153d831c43dd2ccc89fb3da61099fe630cbd812019065773f61332cce289f66fab019c27b843102edf7e35dd
+TIMESTAMP 2018-08-08T18:08:42Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltlUPhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltrMapfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCTKxAApUMLGNgOUz6n4DXudhhjzsVs+LcX51NCJfP6OtrHaW64KNgoor0lJri5
-zEohDxioa+M4dvb9CTOjvh+k0xlqEdfYZ2dt7ucbqfRS4fiW8ysTHNsamZdEJUVx
-DSUyYjzwVQ6ZzLfZ4GJ8EAIfP9c1Q95rR5PVFpQRR+UFq83JtlNPBtCCp0JaC6S3
-oPUff8CwYmlMHQDYl2LJgdYbslUjgJNLr6lRzvz5zQ2CyU5vLaxqazmuqY97MajB
-gSzMsFI3IJtiJ9aC+ftQFQshnhS2Bot3isoVmsLlIGZuVNuOo+djtgPIBaA29Rdr
-vQcaudC4yEYXGgxzbvJgJEDFLElFMbqL7DIJ+oh1ZOOqjyzCPCcN1q/QpUYy7Whr
-wW3uuASk8xmNo+C9J7WDASDA4kUKgeHOYvKQf2t3LNwtuCiW6olhjWacVBLkzYJ3
-ebete0MdedS2ZGMyQ9QbzFJmDd8pOFuswGVTwyGTYl1N80yEsgRn6yofr/eZQ+A5
-oLgwjl8qT9mMbl9xM+a+8KWK5voRS0V0aXKX0fqMMPmN7UvaY6tsSHl1vBY3uONM
-yR2zR7GH+bpjjMB0LrWAkYpqs/9W1bUDUHvP87mNzxgiJYIJYbQMuqtfMFCXGcSG
-VH05B/AUqObpI+ZknDl+MwyOa81X5Skg91q8KOOsfIdX4vvOyHc=
-=Kf5h
+klB7Ig//UJiShh1MWb5Xwr95DWssAVNK1mBKiA1PEalp/ZgJNJvlnamdMU0OJbPf
+viwyhPM4Iixd+NtBXSZTS4IUQ+0/bYzn7UsyYolG5YGIRUQK+upGWubZJUMvSE9a
+31z/2kj0/cMpc2Mk/nz3ntP3eLVB2UWidKnS6vJKtF1rkfATvNqcTNGlOYoBmQ/O
+s+l0KRKNcIYG3S7i+D72gZGMr4lIJckR06MTTYbWmrcIVytaKDp+nS5d7gJWefbh
+E9z8c2Irn983mReGaTD1WWRBQhQ5HfPY8Lz5qr8DVePYwaf/zpnYemedBiuFx+Rh
+rxFoWzF0Yz6BvEpRdf6WhUD8/h5wFuvrUIQTeprLPcpBZWaI43ppGP+VRbag5nmx
+jnglzyObK9H6CHEwlCsn31iShydtGoIiqVxAAEKt+IPFHuGTxvcOcdG87sCCC6RK
+nmlPTrei4nujYAK34Py8UKyFvJP5kzglag48QuXtiQ5ueVL6xXo25EPb67szqP9Q
+NpYIdbe2fEtNUU2NiZ41KoRoI46Brxlzn8OzGBhXdLbPPlL0wn9dxfxk6X82ArfP
+itJ/VOO0xLsAuvlAvkrJbekoXW+bZRmX81QMdYGewjUBRBDKwgqItPqhyEVcDUBO
+Zc62OCi5qTkh9/TywS5YBFwUuKNXLrY2RM4CwXvVY5ajt1EMBOo=
+=VNUV
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index fc9bd589c815..9500c644c0ea 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 585743a3fa68..5e187d4e92b2 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
new file mode 100644
index 000000000000..18b8934bfa0a
--- /dev/null
+++ b/app-admin/ansible-lint/Manifest
@@ -0,0 +1,3 @@
+DIST ansible-lint-3.4.23.tar.gz 36922 BLAKE2B a012155d9608ce0517f152837cc7f5f8330848f3e6b6b8b62b1985c9aae5260d3b8c2e9016f945a30b8433387549a9421970d9f56fc32ff9aac25a71dc150285 SHA512 4b2357327319f2cc2c0863ed74af3c799afa97f6e8e1885f9c621a9b0b4ed4b33c731f4a0e8557bf7d03f4e1680a06e60b8602b48fbb55c55325f1dda31a51e7
+EBUILD ansible-lint-3.4.23.ebuild 822 BLAKE2B f10c85470b7bd0e423f7e407ce4d3a7544950ba9572ed1bd6a120a75c6cd7d2ccdcbe9d5676cb8dde1277e1712eac63ed957964bf97b1e30d015d4775a6ff5bc SHA512 868a0367462ced7d09f3335fb28a2689df05b8cf2a1899314e57ecf09e30446195afe33e1369cf2e523f62a37a539873fd1462c083f8c76392302d4aa8bf1bfc
+MISC metadata.xml 468 BLAKE2B 6c6ebea3538b994b0ed427d005d3d46fa5bf115f25ea4de3b00e9fba3eaf44831ef0b54af5ddc352ad292ac4b6bcbb859583fb34b5bb358bc03ff25d43997215 SHA512 4dd15de2b2d9caf6cfe4518e9e4fcb476838c78c20d4edbeab8d78a602969201d7bee7bce8af1406e5a7e171cb481e7a08c58db599618e66d1c681a1537dfcfc
diff --git a/app-admin/ansible-lint/ansible-lint-3.4.23.ebuild b/app-admin/ansible-lint/ansible-lint-3.4.23.ebuild
new file mode 100644
index 000000000000..25c9f45d9906
--- /dev/null
+++ b/app-admin/ansible-lint/ansible-lint-3.4.23.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P=${P/_/}
+
+DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
+HOMEPAGE="https://github.com/willthames/ansible-lint"
+SRC_URI="https://github.com/willthames/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+S="${WORKDIR}/${MY_P}"
+
+CDEPEND="app-admin/ansible[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? (
+			dev-python/flake8[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		)
+		${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-admin/ansible-lint/metadata.xml b/app-admin/ansible-lint/metadata.xml
new file mode 100644
index 000000000000..c7b18bf539b8
--- /dev/null
+++ b/app-admin/ansible-lint/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">ansible-lint</remote-id>
+    <remote-id type="github">willthames/ansible-lint</remote-id>
+    <bugs-to>https://github.com/willthames/ansible-lint/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 0c7d77c5ab53..879002505af1 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -7,5 +7,5 @@ DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
 EBUILD apache-tools-2.4.27.ebuild 2653 BLAKE2B 00b1b5e96e7eab66981fc339faf6db5e40d05af2d819c92a5faff3ad2f60c566d0235cbf60ded1d5daa79cec7815534b96b53b8e8f00333d1a814058752dd011 SHA512 e23b494555f6685f482fcecc59b5e81147780bf399de740b91bc19de9197a3d6f9d32a701472ba6551a3039214adc2e0bfd4436e0b82edb388f26d4dc88bd110
 EBUILD apache-tools-2.4.33.ebuild 2577 BLAKE2B cb22dea646e2136f767d99f36d0f6fcd341f09ba8a38a278b33980e251b99dc8186d78287c47a698d3d5462089afdb1517191ab2bde3f8d93e1578a8bf7a798d SHA512 2e468db54aeb16e14b6bd65e13cf63ffb43b7428feaa83a6f13f66d6d2da710f40e30613a1a19102ea45ca7d270252196ae6cf98b20bee49ee78e5e55e0b3484
-EBUILD apache-tools-2.4.34.ebuild 2584 BLAKE2B 24044568e974bcf0b3c59adc7dce1e9ba0fa73e17e5b7fad84388730dc25ad6bea4a74de73da5e5e484e3ea8859ec934039583e99aaa04067060715901046b5c SHA512 aac903935e1c36edf0397f7bab0310f57b8eed167e8191d976453841f80eb95808ee40d1abb77aa8a53401135eb61c529b906e9a6555c72cdffdcfeb01769a0f
+EBUILD apache-tools-2.4.34.ebuild 2581 BLAKE2B 802fdc49c2c752ce6cf838c6d454e49aea86e6286de0a12273bb0b2e2af44e1cff5c8cd821a3379a60d1bc600a266c9069441737c7706d347b74ddea51164f1f SHA512 d0df5ae775ad08314275d890bc24ff7174b337ec08d70998d15bf4c9d8beea4540863cf426442733b108c83be9610047a3b61d871528c01dba56cfb37a1a5fa7
 MISC metadata.xml 466 BLAKE2B 06dbc2df528810dc0aa7335271c987c6310ceb7d8b0db3dc74c6727c27d280e499ddd9ee75580dba63e0f33e24ce63ecfa40059a46ebdec80005769608cae82c SHA512 2820a1f104fbdc752196f600def1e0c56eed6025fa3e66b297077be7a6eb735a2009f1a57cc320e2cf0c2d6cebf9db8c338cf2c6cc9c746766ab99a0b49c63fe
diff --git a/app-admin/apache-tools/apache-tools-2.4.34.ebuild b/app-admin/apache-tools/apache-tools-2.4.34.ebuild
index 7a539a1169f8..62b26c78c8fa 100644
--- a/app-admin/apache-tools/apache-tools-2.4.34.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.34.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/dio/Manifest b/app-admin/dio/Manifest
index 7fad798ca5ae..8c31e697af42 100644
--- a/app-admin/dio/Manifest
+++ b/app-admin/dio/Manifest
@@ -1,3 +1,3 @@
 DIST dio-1.5.2.tar.gz 44344 BLAKE2B 8e573cbf2ad1b717ffec09f20f8c7474841bc3e1635af35116d02b37af56ef3b4742e12725134d485f788e7abb595605640e19bd6f84bfd8f14289abf1695089 SHA512 366d2f2d25b8d16439c4a9aaa7cd775ddffb1022980675cdda8e2e4d4de3d3e5dcfa8d0c581b73fcfe4eff66ee8ef682f082c8788f514b7abdf1a2cb2159b9ba
-EBUILD dio-1.5.2.ebuild 549 BLAKE2B 3553d95a1b4f3b4c3b1ee239f063874149b1ddc46ad831908a32304f9a3c300d7eae3b0a793fbca25a9fc4c292e85435b95ae31f1930b3cc44b37b318c6e260d SHA512 4554efe518dc9a795a07751a85950bcc0b6edfa6cc35ce71cd0401ad84d63db832d9864a5f7144f9d28c320008ab06246b2dcaa7afbb37a29d213547e0399709
-MISC metadata.xml 255 BLAKE2B e8c22e505b32d30e59df38afab75c6a8bc0b4149e4f582eba4aa894352150792de4e054e8784a536c5249fdc0724e37b70860252e68d14fcac35ab7b56092c2a SHA512 f6ca4591922970e01ce40e4d88c39745f26dd2abf1c351b29f3d8d8b2c6a624fce4d0fcd18d6acfd1eabe6642cd1028033e61eabca4ce6d19aa58838cde828bf
+EBUILD dio-1.5.2-r1.ebuild 871 BLAKE2B 05332002c8ed739e28b4b902f7404e00a248eca9ed747603e2fff5842a3f773e1076bd31b11b75c6a7cdcc73dba284407695e5d3295d5f7ef0b1faa9f820cec4 SHA512 c65e8d195a6dd8fde56ebb3f9146233b7f06bb987884e311c49d90a572e1c1d49ee62ab6b8de9ef40f241b4ad49bd07ca18381bab404d8c53caaf6cc8fc18067
+MISC metadata.xml 912 BLAKE2B 5fe57b665757cb19dbe7e6efe2202d5cb4e8311fd21c3974a0c42017841330ce03242e5ac656818781cd39cb3ff62c05ed69ee008b8aa0c1809311819e23c588 SHA512 80995a42eba255a8e79ae0ae2596114b2703a433151b3f33d438a002c220194b14905221b9ab2e59185776c331ba22342c04d3ebf5aa8297b1ef988c45621f62
diff --git a/app-admin/dio/dio-1.5.2-r1.ebuild b/app-admin/dio/dio-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..2a0d993e8a0e
--- /dev/null
+++ b/app-admin/dio/dio-1.5.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A device I/O monitoring tool"
+HOMEPAGE="https://github.com/donaldmcintosh/dio"
+SRC_URI="https://github.com/donaldmcintosh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+DOCS=( "README" "../README.md" )
+HTML_DOCS=( "../site/www.diodio.org/." )
+
+src_prepare() {
+	# Include the 'tinfo' lib, if sys-libs/ncurses is compiled with USE="tinfo"
+	if has_version -d 'sys-libs/ncurses[tinfo]'; then
+		sed -e 's/lcurses/& -ltinfo/' -i Makefile || die
+	fi
+
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin dio
+	doman dio.1
+	einstalldocs
+}
diff --git a/app-admin/dio/dio-1.5.2.ebuild b/app-admin/dio/dio-1.5.2.ebuild
deleted file mode 100644
index 6087eb8c5354..000000000000
--- a/app-admin/dio/dio-1.5.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-DESCRIPTION="dio - Device I/O monitoring tool"
-HOMEPAGE="https://github.com/donaldmcintosh/dio"
-SRC_URI="https://github.com/donaldmcintosh/dio/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin dio
-	doman dio.1
-}
diff --git a/app-admin/dio/metadata.xml b/app-admin/dio/metadata.xml
index ebf597f23ef3..021428c4e44c 100644
--- a/app-admin/dio/metadata.xml
+++ b/app-admin/dio/metadata.xml
@@ -1,8 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">donaldmcintosh/dio</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		It samples kernel statistics at the specified time interval
+		and uses them to derive useful realtime and cumulative performance statistics.
+		The output is presented in a standard terminal window using the standard curses library,
+		which contains the output on visible terminal.
+		The approach offers a more intuitive visual presentation of the data.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/donaldmcintosh/dio/issues</bugs-to>
+		<remote-id type="github">donaldmcintosh/dio</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index cb1d14b3104d..e965d1ab626a 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -95,10 +95,8 @@ DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 3892
 DIST github.com-square-go-jose-f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz 278276 BLAKE2B dfb467b318f0a6661c5ae910f32bc5337d9677ff60b55dea4706193b4acb815f7e087debc92cf9347ae54db13f512c4a2dc1cc05ea031201bf119caaffa6c6e7 SHA512 4230ba34fe8f45ed7e4a0f7ffc60781b1b4fbaa6877212a8d5ab5a8b088d0d3151f76868929e270c5ca71769ae366976a25de65716e8c0e6289a4f720055f02f
 DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz 7860 BLAKE2B 947a33bd0363cfa5333e4e41b59c8c758fab173bb9e0eef5560caca74f4321041ca69f6c2c5fe02ab36c8946038866033d8df9b7f9ed36be9f3fb1eff6dad182 SHA512 8b372ceba1a16acc8553c74d4872b042ca352d4128abc1e9f4aeb90f8489b7871d7fa7f97a6c4e8f472779d3a082f00e6d2ea30048a7b1bf4eb07fb544e45613
 DIST github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz 7897 BLAKE2B a2b6f62fea8cb724ebbc9658e37985ed27fd1c395a838b6f8f89bc3e05106cd3e89b86753223bccc50de210461c89b01d8e3095ae1c6dcb6bc9a655c462981f0 SHA512 460b1cbef7d5236b099a67b27e902f9077fd42d6aa3772c13c1c3ab20fca87719a770478a068bf150e1224612fe4e1eadb1ec7cdfa60ca9cc81e3f6de62ee9c4
-DIST helm-2.10.0_rc1.tar.gz 1151238 BLAKE2B a33fa6c547824ae1497e04110e9f3d74b1ab4bb6e7e1b7a598e8756ed76993bf969ae3d066d5d006393ea095e75c06b3ea5d8ef360111a2804bd5ee63b8b1bff SHA512 05b40169c0c0920cdb339a17526f080db25bde095c89415d0229220c0e19fca05e60cbddc7d3f66f5e701c52417d76251266bceb7293327985912510bb03b2b7
 DIST helm-2.10.0_rc2.tar.gz 1158443 BLAKE2B 012d38a7f565a43ba852fbd5b4958d154e818f2acdbcf269894dfad6f097bff89bb847df5fa6624b2a93771058c543c958a8aa46c65f91468d803e48f774eca1 SHA512 ff51c29b048f7a0360f498724153e58406b1accbd01f1dc92d23ea706fe24757990b59e23e2988e7b1d8ce67f31672559a1f2ef1d0e002fedd0b831d9fe77831
 DIST helm-2.9.1.tar.gz 1136941 BLAKE2B 57e319df56d60b1285df99ee6c0213e9700b80aa4117f11ab3e37493d552481875a42acd200d2183c2e587dc13130b9c47cbacee7dd7bfeaaf4dc9bb0a17dcc5 SHA512 c9830ae3de76e219dc4effad749fa6f80d24f47f034bd7150afc5817700947b678db64a0889fe1e3c3c69ed0932933ebf9bb893c065d7d77c2953190ab15b033
-EBUILD helm-2.10.0_rc1.ebuild 8581 BLAKE2B 4398d05cd3dacee15e455549013f383b397b81147ad4e0ab1fe565b977bb3f3973b2aed098603ff7b33ef06efba225efb054178f8ac8e63922d4788da29a8118 SHA512 f9de15ae8b44f1b9ca941c0ed697e76b832c59d05f0a8b10f1c8f99266bd5e79e4253e4223b62fef466f86b040e90404160da7bbccbd37fc2ceeb4472557b3b5
 EBUILD helm-2.10.0_rc2.ebuild 8581 BLAKE2B 93b4f2decf133729f3068d9addfaeec2c361986ad630d702de6798dfd26bae0bb4c57a28e469a4bdd12acd11ab1244d7dbf77c2162cb8b4afeda5500f46602f7 SHA512 8d2e053ed91e35abb2864ab775061c4c5c2e43ad6ab06cdd83be5ba4c36b768a2ddca6f02439fa96624942a606e99489f0514661ce55174080b36c5d73bc39be
 EBUILD helm-2.9.1.ebuild 8410 BLAKE2B 266d13ec9488fbc344e29c577238d5980d10a8c6094cb6f41c6127065ff7b899bc609b530bc0cd87816d71424492c87634848ce26002954a09fe60aa99578e42 SHA512 b21df5a0c6f9a1d13404a128c1466301848216386c74e143a04f1567bac648efaf727d22ac7cdb1a943c8edcdaa3ed3b5cc440c8cd664ddaab803514b4ba44c8
 MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
diff --git a/app-admin/helm/helm-2.10.0_rc1.ebuild b/app-admin/helm/helm-2.10.0_rc1.ebuild
deleted file mode 100644
index dc1a3fec1acb..000000000000
--- a/app-admin/helm/helm-2.10.0_rc1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="k8s.io/helm"
-
-MY_PV=${PV/_rc/-rc.}
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
-"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
-"github.com/Azure/go-ansiterm 19f72df4d05d31cbe1c56bfc8045c96babff6c7e"
-"github.com/Azure/go-autorest d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
-"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
-"github.com/cyphar/filepath-securejoin 06bda8370f45268db985f7af15732444d94ed51c"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
-"github.com/docker/docker 4f3616fb1c112e206b88cb7a9922bf49067a7756"
-"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
-"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
-"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
-"github.com/evanphx/json-patch 94e38aa1586e8a6c8a75770bddf5ff84c48a106b"
-"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
-"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 1de3e0542de65ad8d75452a595886fdd0befb363"
-"github.com/go-openapi/swag f3f9494671f93fcff853e3c6e9e948b3eb71e590"
-"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
-"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
-"github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud 6da026c32e2d622cc242d32984259c77237aefe1"
-"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-"github.com/json-iterator/go 13f86432b882000a51c6e610c620974462691a97"
-"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
-"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
-"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
-"github.com/Masterminds/sprig 6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c"
-"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
-"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
-"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
-"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
-"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
-"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
-"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
-"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
-"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
-"github.com/spf13/cobra f62e98d28ab7ad31d707ba837a966378465c7b57"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
-"golang.org/x/crypto 81e90905daefcd6fd217b62423c0908922eadb30 github.com/golang/crypto"
-"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 43eea11bc92608addb41b8a406b0407495c106f6 github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
-"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/square/go-jose.v2 f8f38de21b4dcd69d0413faf231983f5fd6634b1 github.com/square/go-jose"
-"gopkg.in/yaml.v2 670d4cfef0544295bc27a114dbac37980d83185a github.com/go-yaml/yaml"
-"k8s.io/api 8b7507fac302640dd5f1efbf9643199952cc58db github.com/kubernetes/api"
-"k8s.io/apiextensions-apiserver 898b0eda132e1aeac43a459785144ee4bf9b0a2e github.com/kubernetes/apiextensions-apiserver"
-"k8s.io/apimachinery f6313580a4d36c7c74a3d845dda6e116642c4f90 github.com/kubernetes/apimachinery"
-"k8s.io/apiserver f7914ed3085badf66a1b6f3a5218ada28f7bd084 github.com/kubernetes/apiserver"
-"k8s.io/client-go 23781f4d6632d88e869066eaebb743857aa1ef9b github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 39cb288412c48cb533ba4be5d6c28620b9a0c1b4 github.com/kubernetes/kube-openapi"
-"k8s.io/kubernetes 32ac1c9073b132b8ba18aa830f46b77dcceb0723 github.com/kubernetes/kubernetes"
-"k8s.io/utils aedf551cdb8b0119df3a19c65fde413a13b34997 github.com/kubernetes/utils"
-"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-GIT_COMMIT="aa98e7e3dd2356bce72e8e367e8c87e8085c692b"
-
-ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Package Manager"
-HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
-		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
-		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
-		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
-
-	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
-	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
-	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
-	popd || die
-	bin/${PN} completion bash > ${PN}.bash || die
-	bin/${PN} completion zsh > ${PN}.zsh || die
-}
-
-src_install() {
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dobin bin/${PN} bin/tiller
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index ce5934b1148d..b4a4861825c0 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -9,8 +9,11 @@ AUX logstash.initd-r2 1989 BLAKE2B efa16227a2cf1a42f1f9e27e110dae64c7eb6547e22e8
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
 DIST logstash-5.6.10.tar.gz 104373711 BLAKE2B 759bf003e1799aeaef0a1279b3c7cf5732126ae65e9ca0a3e315cb6f7a1b4e4417fad1fd86328a58be99e04e8053264d873b04cf43cac2b49490bbdc82c8e8b7 SHA512 9ba887da982755efd21b363e9c084660c9b7e6c042e00a8c599f60d6bba5621af7ede43957f6c3d976888f4c13e6ae17cc69afd184f2dcdd41a311972f59a745
 DIST logstash-6.2.4.zip 153969993 BLAKE2B 989f631484be14014b8230e09fa049a0e470078fed938f2df55134a27d5f4f2d8670187126d32c4933b77b496a6ed96e12d180922c2c318c67fb3dbeec5a5a3b SHA512 65f6e5accc4441cb930e5c45723edeea54ba034a25680ca34114296af5a2c456d4152f9b38469475e600fce27a27b0d9c1d206039d12f2ec9cfeb02942a5c189
+DIST logstash-6.3.2.tar.gz 144211416 BLAKE2B 8471fd0a920b4ef06cd775ceaafde33e16e5d1898c89339f4a039262a7a6472d6cb8dd2017db8811d6a827395a5b1e7040d9759c8734de2ccd1fc7e615345813 SHA512 11507b9177aa6cd4172eb825e395571de71bae8b0e39d7f700fe27c7219b22bc2b9a493e39016eead2d54407dc5e5cc20a0c6e4453140d628cadea076453308f
 DIST logstash-oss-6.3.1.tar.gz 143787612 BLAKE2B 2de3b991d27019b1c7df7cfa7152c009f2569e12562106babb56081be2a7ac7d94a967e7c52b58f721c2f70f1e8ec9c2730653ff094cf0dd3a9933486ac13be7 SHA512 959d9d5985e117d23ae12efe248a13ae33f8f3ede320fb3b6872e1c27738b601779f0e2402e7be4a2383cd0f220e50cdfd2d6b160d7f5805b2439cee4d8bd94c
+DIST logstash-oss-6.3.2.tar.gz 144128583 BLAKE2B 99de9d375a06d132844ce63fa5d0e092bb05aedb93ff5e4a278ea75ca2fe68701afa3028af4f9c3e5b3b469e46faf4d6dc62d006e9dac3a9e9528ff94aa2dd47 SHA512 7fa97f0ca070677aaddc73ff900397ce4a45f4b02467917219acb3c414cf0cbf396b481f624d2ebc3f370b2e41120b3b103f6d080a9fafdce98b119eb8d27f5d
 EBUILD logstash-bin-5.6.10.ebuild 2198 BLAKE2B d271b016d5b4318124314f0df5ea9481197ee18c7f20183f731d0026d34356e3df80123174e733b009417984d81ac9f9eccc8c4e53e929a12e28ae28d6b43c3c SHA512 70df6a19cf77a14a9b0f80025cc42d1feb6fe2545dabf70e864b47f34b971d4b6ad1d70e4600eb684e656c2fd5827f98fcd06f319e6a483aab0e49e865e239bb
 EBUILD logstash-bin-6.2.4.ebuild 2219 BLAKE2B 7ddc549eabf27143b5951e0e92777609f5d14b76c80ee2b6f794679ef8af73d4a97e59ab106ee196b1df5ed1a1199427e9218db8efaf67d495c84594647e7aa2 SHA512 3fdf9156fe2d3baecf3a4599890a07e7aa572c08b72d173c79dc415ab7339d6e0c9050c73a4c74da0f6bcd412484f6534aea784bb9028ff661d1a700f0b4b18c
 EBUILD logstash-bin-6.3.1.ebuild 2065 BLAKE2B a5965944d381c1a0dc51578c22010cdb1ac1a877dd8a13f05e82901b54d54f562a5f77f1073ee475e053f75b6005ec7c77d0ac0a239e5013c6a9dc0012ba2288 SHA512 f86afac9ed0982801f794f36696c90773d96a548c6b3b1e5732f02f155fbfd7260261c797c51ccf5b7a27919ef8cdcddb1e17516a5a867a7bf4cc5ea6a0b0583
-MISC metadata.xml 578 BLAKE2B 739149a851fd22460a5cf86deaa74732e44ef44c9edfcba880e7734a8660c92d18df33728939addff8e95241c0475cafed5b0df77d0b9acde609b163f8e7eb0f SHA512 ce9ff07c8fa8edf104692b2736dd7e1a4b2d456dfd2f2cebc2a3dec28d7c11020abf21dad583663266ed5ab26670959bd4650a411524581019e0b27504fba049
+EBUILD logstash-bin-6.3.2.ebuild 2188 BLAKE2B 7256bfb5ecd30e4cc14ff6173e3faf9631c51e8d7f57edd8c415b661ffd9bdcc8e3f793c0acd3320fd7bc4589a992889d215ab16ad26a8ace452a54f0f50f517 SHA512 5390442582c1a9c7a05b0709376fdb8be89cda413f201a25c3e80c74ec72328b9aee554e875293d824349139188ad29585374bb9077fcf4634145d9e18d5bc9d
+MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-6.3.2.ebuild b/app-admin/logstash-bin/logstash-bin-6.3.2.ebuild
new file mode 100644
index 000000000000..acbb17a3c74d
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.3.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="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+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/{pipelines.yml,startup.options} || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	doins "${FILESDIR}/pipelines.yml"
+	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-r2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	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."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT%/}/usr/share/${MY_PN}"
+	elog
+	elog "The default pipeline configuration expects the configuration(s) to be found in:"
+	elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
+}
diff --git a/app-admin/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml
index d4758fc50621..6381ef41d5e7 100644
--- a/app-admin/logstash-bin/metadata.xml
+++ b/app-admin/logstash-bin/metadata.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hydrapolic@gmail.com</email>
-    <name>Tomáš Mózes</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>erkiferenc@gmail.com</email>
-    <name>Ferenc Erki</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">elastic/logstash</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomáš Mózes</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>erkiferenc@gmail.com</email>
+		<name>Ferenc Erki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">elastic/logstash</remote-id>
+	</upstream>
+	<use>
+		<flag name="x-pack">Enable additional features (may need a license)</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index fcfbfaeac147..3e8b8c258206 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -8,8 +8,11 @@ AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad1
 AUX rsyslog.initd-r1 1758 BLAKE2B ff5fb6f9d2d6a5702f5fdacfae8037bbc4015f29a1ce94dfc5f331f64dd43a860dbabc9e4118c9d0d1c8b5bcb4ee3c95cc949ddd7864eaebbeec705f6d5c97d8 SHA512 ecbfad8588796f1600fa7a43dc0ea1a1107c676851f5a8c6f43399308999e9a0559af47675ab529b18a63ccb472ab6e3b80b9d072444854b4618c27db5e79aec
 DIST rsyslog-8.35.0.tar.gz 2590108 BLAKE2B e201c1366b8ab96c070829d51de079212e82216a793eb7622aa91c66e2330981de8be547b1ee7f102ed7d8c8de054d58ba151e95238146a61fba8fe908c5f929 SHA512 3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc
 DIST rsyslog-8.36.0.tar.gz 2639477 BLAKE2B 9c7343d853f79e2955a8999e2871a2a9b008cb3ef75b94e2381a3a0ff3e49445593d852d7de3819851dc0d4c17a91d966ca2fbfd52e8215ebdbaf6b7ccd68bdf SHA512 b0c8689374b5b0fb5ad9675ad8983ce67bd04d34ad07d39cf8f91498fd2fd21a173f1077e5fa1b66a89a9d93ab011fc6345ac1a3be9961f4794fc9e152c32a50
+DIST rsyslog-8.37.0.tar.gz 2697435 BLAKE2B d88a06e8a5da15ed88d0d6c92032f71be10c2b77970e26b8fe5258e116f8f635c2e359408260b8e486401b8d9ea0e234e22070f520d42bb7884923df4f216ee3 SHA512 2989eb7ed3333151e979a720fa0e95e330bda9b40f65009f7969069bcbbeee8f493c6a3189f67bbbc2529d3a2ac14a022d7e8c4f2d0dae42b67d7508d7611fa0
 DIST rsyslog-doc-8.35.0.tar.gz 7427270 BLAKE2B 5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1 SHA512 f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6
 DIST rsyslog-doc-8.36.0.tar.gz 7570338 BLAKE2B 031f94b88fb97e6c8b01d224279138c371a5f54ecc5d7a9298b4ec6351c5d380065877888ab1969386b76b9e715937b7335bee59c3d5b8ddd4910392a58d08cb SHA512 a93f56c9c9464a9ca87f61169c6fcfaa94608f31210eaac77e882e64bf5f514c887765db6bb57e4defafeb2a6e552506f0274c1ed275306efc1656f5520b5efa
+DIST rsyslog-doc-8.37.0.tar.gz 7587722 BLAKE2B 266e5be77e4ca91e3777ee4f2c999986ee7318287546c1fb84ee21f1f4995907fa8caac84ef47cec2665ef29f34151b4b22ed6c35ea1ffe0c4ddff8d05e23136 SHA512 827ac6762ad9257d9499201d5dc3d110c65f11891ab58d36dce568ffa5f8b57fe10505bc2c7b0743dcca319f294ba6418a880b7ca787eb19dcc1f262ba0f3b59
 EBUILD rsyslog-8.35.0-r1.ebuild 11938 BLAKE2B 9275bcf376d28607c381b049e2b152c9f7ed14b32834a9b90cd0c45dc5edfa584bc3f18f754140c30471dac1207dd85f01612ab47ee82dcc09dafb69ba3eab53 SHA512 1d9eb2ad4dd408a69a108dc47d805d677a0151f77dc5485bfdf35202340341188e9449f76112c910f29483542e506cc0871c1e5527ba31e6daf3cf021f830258
 EBUILD rsyslog-8.36.0-r1.ebuild 12113 BLAKE2B bc15f57f63da43c5b3a2d3121bcb8e2ce00c14d8173c53d0912b424c2b2ee3ce936fc4fe75885da4a520615a220625a543f7c3a2e6807fcdf2d118a6a3728a38 SHA512 6fe8a096cbbf06f0748d8545577f9752a92466a33a2785332ba057686ce9b489f78263de65b670e21b163dfb52928b1fdbe0e9a46d29622bf9f05012c154b31d
+EBUILD rsyslog-8.37.0.ebuild 12209 BLAKE2B 7b49e66fb2e432d6542ddfa493b7025440cc4c0d6634439fb92ea3ea48c0e91b1d8e81ea096ba757315bc36773b220133e2a512b4432451d405b966755651c90 SHA512 28185c7dfb8a55a21047c294338a64fade8f49ceab3df592070eacb1940307b466b78597f732d21a33fd3b9fddb9653a772c88b0f35ea92c3827867ef0a91e90
 MISC metadata.xml 3850 BLAKE2B 1de60aef00ce700d8d2c05d93d3237170399c65ddfbd37f86e95dd0ef89c7910335b6fdbfc0e806345bb3dbd52212f0bdab45b57acf31b2241ed7d3bf52a64d4 SHA512 c66217bd3a1dd613d49fca4d42267e276bb4f085b14a452da0484ec508cfd45eb36049006cdb6ad58c7c74d88dd6512e922c8bdf07ac01602fbbaf7606215b82
diff --git a/app-admin/rsyslog/rsyslog-8.37.0.ebuild b/app-admin/rsyslog/rsyslog-8.37.0.ebuild
new file mode 100644
index 000000000000..b4a87abfe6dd
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.37.0.ebuild
@@ -0,0 +1,454 @@
+# Copyright 1999-2018 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,3_7} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+
+	PATCHES=()
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac"
+IUSE+=" snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	grok? ( >=dev-libs/grok-0.9.2 )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( virtual/libmysqlclient:= )
+	normalize? (
+		>=dev-libs/libee-0.4.0
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.14:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug memcheck)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable grok mmgrok)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/spectre-meltdown-checker/Manifest b/app-admin/spectre-meltdown-checker/Manifest
index 419025880741..6ab073b6296b 100644
--- a/app-admin/spectre-meltdown-checker/Manifest
+++ b/app-admin/spectre-meltdown-checker/Manifest
@@ -1,4 +1,6 @@
 DIST spectre-meltdown-checker-0.37.tar.gz 40472 BLAKE2B 93d83605c2d410a176d944cbf7c83549cc70075dbd7ef1f90d4a9710d8fdafd0393c0ad6a9a46eba12f753a3b14d486ba093f9b7fb1dd6c08d17042a94f97b44 SHA512 f621e81a783e8e01caae25d76fae6ab7bd091990cd0a0f93de2e29e1964b6f0952c221c64e4e045f26231f800b0ba1b8152aac71a7348e8577ac6b9bd7e31cf2
+DIST spectre-meltdown-checker-0.38.tar.gz 43243 BLAKE2B 84ec661106415fad3a596fb4ff22ef1083837c0903ad3fef13a5516fe606b5b943c3805bd00a75ad8dd069a9d40da9b969f8d19d03e5d4e9274c2bce10da500c SHA512 d71aafdb8507fc035a728b3179943cb63250cb7527a0bbc2d21d3c8c6a70460b980a9549ba1c9c36705eedd65db943a361eeaafa0acdee5c6d4785b2652dfecb
 EBUILD spectre-meltdown-checker-0.37.ebuild 604 BLAKE2B ba0beb4835deaa3f5fcfb7bc077f0f56763e28b64276e85cb74620c6458c7210b5ad028079d922366afae4e481e931137c5634ca2598efba80a01c03a6ef8b25 SHA512 ec885585c8c9d4867b27448db21b121a01c2c0c8eec887a2911a1bfdb560404230e269dcad15d2873470d41ee8943142cb07bde132eebd94df054dd197051903
-EBUILD spectre-meltdown-checker-9999.ebuild 604 BLAKE2B ba0beb4835deaa3f5fcfb7bc077f0f56763e28b64276e85cb74620c6458c7210b5ad028079d922366afae4e481e931137c5634ca2598efba80a01c03a6ef8b25 SHA512 ec885585c8c9d4867b27448db21b121a01c2c0c8eec887a2911a1bfdb560404230e269dcad15d2873470d41ee8943142cb07bde132eebd94df054dd197051903
+EBUILD spectre-meltdown-checker-0.38.ebuild 609 BLAKE2B 36d1843107f84dd5e36b3f3548f64a6d34675ff83709430b7209ce817c362c7608a538439cec26d20c6507b556e822ea6e57ca9cc1260641092c55ed4b1c8005 SHA512 f1464c0b9ea01606833459688a90621b573c40ec598c39ec1bc4e41e48f8a5264345b82212d9332f09792a6cba1314f8bff2e519f982dbaf0a7b59e3b355dbef
+EBUILD spectre-meltdown-checker-9999.ebuild 609 BLAKE2B 36d1843107f84dd5e36b3f3548f64a6d34675ff83709430b7209ce817c362c7608a538439cec26d20c6507b556e822ea6e57ca9cc1260641092c55ed4b1c8005 SHA512 f1464c0b9ea01606833459688a90621b573c40ec598c39ec1bc4e41e48f8a5264345b82212d9332f09792a6cba1314f8bff2e519f982dbaf0a7b59e3b355dbef
 MISC metadata.xml 461 BLAKE2B ffd3a0e87b161c95e73d98acfb9ce11068ff5698ad095703e48ff7a95bd9c65379bdfa87ed19f6a1c5e10458cb10042f33e986d58741f8667b49409c1d7083ad SHA512 9e59c70f06c412ef1a742d2edbf62ef5e69e3997e8ba713e61a91dfcdb4a399035e60d9ce6fad43a1568cec658f05d33bc3aaa5fd2efc1cf70eb0f5fd98e1dbc
diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.38.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.38.ebuild
new file mode 100644
index 000000000000..efd53926560f
--- /dev/null
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.38.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
+else
+	SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
+HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+src_install() {
+	default
+	newbin spectre-meltdown-checker.sh spectre-meltdown-checker
+}
diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-9999.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-9999.ebuild
index 5deeeceb4a17..efd53926560f 100644
--- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-9999.ebuild
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
 else
 	SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 44535c0a3bbc..6b622b7b27c3 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -3,13 +3,11 @@ AUX sysstat-11.0.4-cron.patch 1609 BLAKE2B b190f9b6e47da5240ced4fed912bdcdb130d8
 AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f49718cc0fb3c70bc681e8cdda29394ea5a75d871c76f658305b26d44d1034d09079f3b6306a4dd466cd0775b5514b2 SHA512 80dd658b06f2e1072a3a58bbe84770170f1cb6c3e2ae0d660713a007b0e9e59c45b710cc1484c94ec466759455ae18a7fbae237b6674ee9ddb43a7a4502cb0d5
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
 DIST sysstat-11.4.0.tar.xz 343968 BLAKE2B e34da8cf0216f66fad3ade0ed40e8ec3b7641f7568ebcce5bc3122f888c90885ece346bf7f4f8e71e92435257ee5c6c0e5a89913c0e22a0ad28fa1018a73ea71 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604
-DIST sysstat-11.6.3.tar.xz 527828 BLAKE2B 4221252589652d949541d8ec8d7057abe90cafaae7b2222538d4fcb95aaa45f3da542539eb0742a910456c8ee134203207fc5e9485b0948a6c581f33eb949c2c SHA512 37a770b4ff26abdb94c8d97fa49b094702e9f5fb12549fd012b9767c7f42ede50ce209085c7ad3b7cd2e208ba1e5bfe9425893f7bb0bbc517aed688300bf9712
 DIST sysstat-11.6.4.tar.xz 528028 BLAKE2B 931a172ce399133a0827f7dc7090719e778e7c89a1383adf93a99c386cd11343de26649355dd3a382deceeffe6c2f1890d3424aae6ae441aaa4a47f046b520f7 SHA512 36affc6749d0eef5760e542dde060c257eea323196f9b83b52cc931825dfa796b48cad37060b9ca20d58fb3909c07b8bd67bc8d09c9c6285c08c4e2e9ca1d308
-DIST sysstat-11.7.3.tar.xz 543556 BLAKE2B f6042021a7c5047727ddbcd38cf6e9f88ca44adaf9f8a9e56cf84c9d9b4d61bef7e07ef910c54fdcc0342c8f9b28e9b114778f57f3ed70d8b950263086426387 SHA512 c752ebba4d25a30147e68d0cb44d93020bb9b44823812c99550f6b34b42fc6f015c28ef0e6609a1e33ae6e4de566ae2d0e8a4711e412a4298baf5721dd15d27f
-DIST sysstat-11.7.4.tar.xz 545176 BLAKE2B 08dec13040fe1df87902dfc67bda0ae7281768a4f426906b94d925f302892857091f279d976020924de665a41c4d73f3b64b48394436639804aab0b28bffce94 SHA512 4dcb05799e82410f2a13b44c2de1f6c7d31f20410e8a9528ac365a059591c04f918ad51c42b73fd06489bbed48a181b290897a91e9837b685cfc51c006aa8a05
+DIST sysstat-11.6.5.tar.xz 527676 BLAKE2B 8473000924514bd089de431c3aa4e042559cac71248555eb97af3a5127d0f4f6c9c13c58ad1cf9254265d2c1c4b68a17b328f883ba80a2bd1a85c5ca7909fe72 SHA512 5e302ad1cd2050c6c391df902babf10a8a37c5458ecccfee173a4f5bce9b0dd7ba0b364e50affee3b38b91ed828e7461cd6f84e249b18d380ba55b655fc0cbe0
+DIST sysstat-12.0.1.tar.xz 602484 BLAKE2B 68f6f54a931f1b502ab065f25cd49c9d631d40689b380b5d535c540416a3c05233dbf151b7d8bec7061fbc8eb6fb61860ed6f5ef0d611314191a2c36601437ca SHA512 d8940dc71592c041f59b2b0bcda7ae2748f0527832e6da7b4722dc91abb0139f1b5c528d50c97b4df0bcb5607b844bed3651183acea738b02f3a8e88809740f9
 EBUILD sysstat-11.4.0.ebuild 1945 BLAKE2B 60e245699e621770f3f8aac3d622063b8e6bdad5135e3408dce587eae8d3b32c6884dc4db78a397b2a7ca0b58a7277fb652b21fad8a6e3c0e008f70eea0c8503 SHA512 25438d8e95dac4789c18215f83c09868ef7bb9886d5abe76f70b5461b65cfa42648c7593d861c0d075f1ec7bde52503d3235f3aea716e9fc9a39dfc5762e269c
-EBUILD sysstat-11.6.3.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
 EBUILD sysstat-11.6.4.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
-EBUILD sysstat-11.7.3.ebuild 1787 BLAKE2B d9235c61d19c41e58a65b61bd3188f085a3e08810cfbf2291067bca879f6465b27a115ed534d3d77c6bbf1e8d03286193a1f77a03e3065f62782e649ab49095a SHA512 2dc9618776ca53b7587094a337530e42e687fe83da4967bb8ed45e5a5da5e8ac6fb5980b4e2769d88e192b102e9f2a20a1fac25caf9dbafe2c71ecd716c14866
-EBUILD sysstat-11.7.4.ebuild 1787 BLAKE2B d9235c61d19c41e58a65b61bd3188f085a3e08810cfbf2291067bca879f6465b27a115ed534d3d77c6bbf1e8d03286193a1f77a03e3065f62782e649ab49095a SHA512 2dc9618776ca53b7587094a337530e42e687fe83da4967bb8ed45e5a5da5e8ac6fb5980b4e2769d88e192b102e9f2a20a1fac25caf9dbafe2c71ecd716c14866
+EBUILD sysstat-11.6.5.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
+EBUILD sysstat-12.0.1.ebuild 1787 BLAKE2B d9235c61d19c41e58a65b61bd3188f085a3e08810cfbf2291067bca879f6465b27a115ed534d3d77c6bbf1e8d03286193a1f77a03e3065f62782e649ab49095a SHA512 2dc9618776ca53b7587094a337530e42e687fe83da4967bb8ed45e5a5da5e8ac6fb5980b4e2769d88e192b102e9f2a20a1fac25caf9dbafe2c71ecd716c14866
 MISC metadata.xml 336 BLAKE2B ba4225003301f291de8d348fcec269a2f7dc8f729a93e3c974a3eb9712f7fe08f59d799e4bf2e936a1224bfa5fa59d4b4b333aeacde9864313c20e1d3a7f4580 SHA512 63adb90aca54ec347aac7feaad3b2ee3c707fc536c0de0e0ee045d4fe2c08e231bdbd4473b9722a747ef1263cb98a067a43cbbbae28aabad71458c16df946bc6
diff --git a/app-admin/sysstat/sysstat-11.6.3.ebuild b/app-admin/sysstat/sysstat-11.6.5.ebuild
index b9b3e8d42883..b9b3e8d42883 100644
--- a/app-admin/sysstat/sysstat-11.6.3.ebuild
+++ b/app-admin/sysstat/sysstat-11.6.5.ebuild
diff --git a/app-admin/sysstat/sysstat-11.7.4.ebuild b/app-admin/sysstat/sysstat-11.7.4.ebuild
deleted file mode 100644
index 0a51edcf4022..000000000000
--- a/app-admin/sysstat/sysstat-11.7.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-	"${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
-		econf \
-			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls) \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
diff --git a/app-admin/sysstat/sysstat-11.7.3.ebuild b/app-admin/sysstat/sysstat-12.0.1.ebuild
index 0a51edcf4022..0a51edcf4022 100644
--- a/app-admin/sysstat/sysstat-11.7.3.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.1.ebuild
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 9a8859143d67..68c55efe50fa 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 8319f7224620..dd416a17227e 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,4 +1,6 @@
 AUX 3.22-packages.match 589 BLAKE2B b53cde8851c08d4f538397d72d5e904b6862a091ca1c6b82c255bd79f91917953b7a87b534ef71488f0a93e18a181f554a5477c606be7a429f7c574a62f8e198 SHA512 b96be2502b2ee56fb234af547a045cfed2c5e8bd7290876db641bb1f895ea6a796e50f2e2e066fc80b42fa58eab740a5519c0f2ad78f2787f55d1077b183ee62
 DIST file-roller-3.24.1.tar.xz 1428216 BLAKE2B 7a74ac56fba36a60ba1f7cc0fb905b92336a349f786963a65ea2442fb078704c6e00b46686334f56cf270c861abe7ca252e0ee39f66349f6a4cc3b769a9e7dde SHA512 bd8750b8ffe3e7d3c74492e2ffdde519e7879d46f16c559d06042bac60c8ee63f492aeeaa66b4aff7c997150f4f2955e02a3b0565edf4bd7641a089ed052f268
+DIST file-roller-3.26.2.tar.xz 1436760 BLAKE2B a563f77dcc8d61e90e4e42fa4f08aded657d677b319b39f4c9fd16670a2309e81f142b7b8528e52db0be3f454efca15ccd7e9e25754a95b45800a9ca02969e12 SHA512 3572446081f931ce7cfd7eccdc9450d798164426a68bc332f9340b7c06b79ce4f1589b817c27322a0c1681d7f2cb8cf93462cde1e3df13ad40789faec1decc9f
 EBUILD file-roller-3.24.1.ebuild 2230 BLAKE2B c0c185067dcd9ddfe7603008161fc8f0dadf5cc533858f6e487ed276cf369c47365fc5d69576d2a8af023aee754f020422a482e47aa8e5e33879c3798d773137 SHA512 23acd0e0fa8385230550b50ffc77b4e7185749840a1b49cedafa1ca9f7f5d8eabdb1d2c9fcd69459baa6465675e9fc7c1bfc6a2cbfe7805351d06589edd6f38e
+EBUILD file-roller-3.26.2.ebuild 2291 BLAKE2B 21dc85a2d9be514e7b1d52b84d04f62912d6a5c7dab426afefe8e18bcfb392db127793aaebda027a9d8d2fe2be04fef1aaabd6d8fae6e861da045b39cc19852b SHA512 fed4e28fdc8c328b519badc13d4beca3cb4c9103fc3dd1262d4175f4414431e777a8a9aff85f48e1d8f6dce3b35303c49e485b5ad1ef05992814fbe63733c690
 MISC metadata.xml 648 BLAKE2B 8fc7347f0812f1b899096670b3ed809dd577e8173f8d7dac8175fbc6eb2939157d1a6100bcc39f15d22e8058e1daba2b4ac7b678baa83f1d24c1f14d77d2e989 SHA512 ea1b782f93ef9397e798d7f6cdd1e650ae95dcad71f439ec518a9e79ebc83a176c9876e85b9930d691e818f5b1efa636f5165d690cfd63b4c7ff9700ba2f956f
diff --git a/app-arch/file-roller/file-roller-3.26.2.ebuild b/app-arch/file-roller/file-roller-3.26.2.ebuild
new file mode 100644
index 000000000000..b7717363afee
--- /dev/null
+++ b/app-arch/file-roller/file-roller-3.26.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 readme.gentoo-r1
+
+DESCRIPTION="Archive manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+IUSE="libnotify nautilus packagekit"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# gdk-pixbuf used extensively in the source
+# cairo used in eggtreemultidnd.c
+# pango used in fr-window
+RDEPEND="
+	>=app-arch/libarchive-3:=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/json-glib-0.14
+	>=x11-libs/gtk+-3.13.2:3
+	sys-apps/file
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	libnotify? ( >=x11-libs/libnotify-0.4.3:= )
+	nautilus? ( >=gnome-base/nautilus-2.22.2 )
+	packagekit? ( app-admin/packagekit-base )
+"
+# libxml2 required for glib-compile-resources
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${PN} is a frontend for several archiving utilities. If you want a
+particular archive format support, see ${HOMEPAGE}
+and install the relevant package. For example:
+7-zip   - app-arch/p7zip
+ace     - app-arch/unace
+arj     - app-arch/arj
+cpio    - app-arch/cpio
+deb     - app-arch/dpkg
+iso     - app-cdr/cdrtools
+jar,zip - app-arch/zip and app-arch/unzip
+lha     - app-arch/lha
+lzop    - app-arch/lzop
+lz4     - app-arch/lz4
+rar     - app-arch/unrar or app-arch/unar
+rpm     - app-arch/rpm
+unstuff - app-arch/stuffit
+zoo     - app-arch/zoo"
+
+src_prepare() {
+	# File providing Gentoo package names for various archivers
+	cp -v "${FILESDIR}"/3.22-packages.match data/packages.match || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --disable-debug because enabling it adds -O0 to CFLAGS
+	gnome2_src_configure \
+		--disable-run-in-place \
+		--disable-static \
+		--disable-debug \
+		--enable-magic \
+		--enable-libarchive \
+		$(use_enable libnotify notification) \
+		$(use_enable nautilus nautilus-actions) \
+		$(use_enable packagekit)
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 2aebb6555882..77bf54f30830 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 20f64f3c95e2..ec43f6c37a2b 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -13,7 +13,9 @@ AUX 9.0.2/bacula-9.0.2-fix-static.patch 3637 BLAKE2B 4119db6091fdaf7d8d103a166ce
 AUX 9.0.2/bacula-9.0.2-lib-search-path.patch 1431 BLAKE2B f04bbf695a926424092dd974994967eefcd48407f2de43b9e94bff25403e66f4a49cde08d667e3b5fc4fb9f8d273a786c3422325db3f589278d16f136d4a9a0c SHA512 3863102d2f8db4158dede306b07297da6550bbad1c77aea49a75de412a7f4630216ef2ae28fc51ffa8d8f9c373510e58982f28e32fdbb142a3551eef7f112b7d
 AUX 9.0.6/bacula-9.0.6-bat-pro.patch 667 BLAKE2B b8987c244025f029a182d6b44f30e0e0a6835b9f6cadb6b43b2b55ea33113e20c20b6a367d965ea12358597e9807c79846e45571b31f9b66dc3ad83265fed4e7 SHA512 d521759cad65ef73fb674cd6b58f9540ef6e86842bcd45ece4730f71a408076b38faea2088bf6f2993fed9a88d727ff2ff8c3e3619e27fcaa1d5afe4506640cf
 AUX 9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch 306 BLAKE2B a6bca03d7e61051046083f1773ce65035f695dd8d5de45d58e0488eb5047580db444cbb52ae5e93068ff60028220a9286da9d1323d141335be31ebfb9c9acb44 SHA512 86a869f10e512eac6aa4500f73ace1cfe3883cc4d176c26d275f6dc51320763cb55c2d139a7a0230c57c40f4996651a0de71788e3a7ef343a4290e56f9585a22
-AUX 9.0.6/bacula-9.0.6-libressl.patch 2318 BLAKE2B 6d918bbf3eb0af17b3d1ccc5fe70788de21aed8823178a36dc04ada1198fef99425bf0af55d86bfff8342ba7df635e05e813548d3469cf51edb1c813836f45c3 SHA512 c6d7a386a89eaeaa3281cfe4bc2d8c48a84762d4a6e01d1f327110efeada0168261d03b3ab1183fffa5456975ff475b12b286f360d7001cf459f0a10be6ba8be
+AUX 9.0.6/bacula-9.0.6-libressl26.patch 2318 BLAKE2B 6d918bbf3eb0af17b3d1ccc5fe70788de21aed8823178a36dc04ada1198fef99425bf0af55d86bfff8342ba7df635e05e813548d3469cf51edb1c813836f45c3 SHA512 c6d7a386a89eaeaa3281cfe4bc2d8c48a84762d4a6e01d1f327110efeada0168261d03b3ab1183fffa5456975ff475b12b286f360d7001cf459f0a10be6ba8be
+AUX 9.0.6/bacula-9.0.6-libressl27.patch 429 BLAKE2B 0342617198722981b1efa335bdd856e0eaa139cc9628520c43c6d8e33f2c312ec536b16821a2e7d704189e341a55e7f1b33508ee28db4482f748f4a0fdf2503e SHA512 527f280d5d4ecbbbb419d535f1c1ef6cbd7c429a6e8e375cd9365eea914fa136b60282d1a00ad4fa1dca58afc3bb915a51bf8e1b888feb52d5ed0b0b308bb208
+AUX 9.0.8/bacula-9.0.8-fix-static.patch 3705 BLAKE2B 5aef2b819608538d6fd360577b873cb1d7da459417fa03c05c007abe322e848429eb1b1d620d194f430233e3a9b72bd909f7ee6288b6f0c45dc0297c6b00f85f SHA512 4453a491c2b5a19e8f1e19e6e44e22032e0e626003bc871417d4e189abc29c0617d5079fd7a40b1ea6e94fd65d99e44098fef69543e036cb426cf87276fd0510
 AUX bacula-dir.confd 629 BLAKE2B 85eb7131fe1735ea3af0075b26c88408a11ce7653b92e27198d6bbfdbe2bf4d4e157eb6685f2cac79a8de1e4d24d9c4eb25f9d64b1b956162718fe09633018c4 SHA512 85ed5317313721a7b3776a257c204e0ac45a5221c6bd0b5886944cbd1e4829fe146e7af52cdc604cbf5e3d8722c955da40cbf989dc9ea7466653c98bf8c7cfdf
 AUX bacula-dir.initd 505 BLAKE2B 385c24291c0a0108baf441d078054f70fd0346dfe4b6de7a236f9c1e7a4416b895c73075509dfcc03d1b58760668ca1fc5415033188f9dcb3acceea7f5e1044a SHA512 de0003d6c873ecf9609a6e1838772a29555b4e5e251369035746ede296f4b0f1c85dcbe8822d526d6a5489ba0921a8566f7f2b963682fddb3560f6f7e817c40a
 AUX bacula-fd.confd 241 BLAKE2B fe41e6376e46e674ef1aa32f02e2dee9721189fb56c4d25c2f49bd6bb0b9c8bcc811cd58db62b9b8bffd80514a24e9d60385a395dfdb93627d473ba7bbf05131 SHA512 0e5a21d8ed3cd39135c8db5b8c59e615161848aaca582851d3599fe0e6ad4f47c04fede13cdc648a2cbdc032de6ca00aa954111bbb2930eb006e7e0984cb882f
@@ -26,7 +28,9 @@ AUX newscripts/bacula-fd.initd 253 BLAKE2B 38b87d2868f7cc0afb3270f81445832bdf876
 AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516cf768a5fec5e043a19d14e7fa67ccfbd6bbbf5da8ee6b718ca7f232565b23216f8ef3adc372681ea4f6bf763f46e SHA512 f4e1252d3e106ebd842cb23c6994cbe29e48e07cff15726479628d1cc5695bd45a0102652203316efcf8a3b3454ad2ca08ee7c6a673880064d15f96c43c395d4
 DIST bacula-5.2.13.tar.gz 4243395 BLAKE2B 5cad5d2675f8a2dd28a76c1a4e4c649d1bf9b031e5e4febfb537a72a0481c2f7c3e80d39b84657238bc147b58174ce544749aed70882f66678edfaa2fb51ac2f SHA512 dfdff353f5b6ed4d85013dc292526706bbd67066f7057a114012172926c819c8df1eb8779166d5a90db3a49a5584f0a8daf7566cc93cf4fa3f1bdda245b55cf0
 DIST bacula-9.0.6.tar.gz 3984215 BLAKE2B 89d0c83ae1ffd2c2677f5882eebc0feac12780a78f9fcf6d30e44981a09f29dd8bd3f0e55ba963a0ed03099117f2d645cf0402cf528fe939d88210ed547ea157 SHA512 a85b8e089951eb9949c9906af45f204a69cd4a7d2e0f29439b74a29ade20c05a49a8c38665189a46c0ad07af0c97380485e10da6aa53dfc47a22934f589f265e
+DIST bacula-9.0.8.tar.gz 4475511 BLAKE2B be321a2a215cc2b127423cf8d103303957c7064ba4453f0da8b82b3c23a38d45df7ee0e434da8a010911976812b23886fcf366d0dee9f1880c0f14fa641c1937 SHA512 4041525f594e23bfb231ea182a680899020347dd26e1d7f6d05c9f97aac8000a1bbeb9acaf2f73b283616fe03caf38fbb335b0e65e6a18e0322ca64da6f98e64
 EBUILD bacula-5.2.13-r6.ebuild 11653 BLAKE2B 440c77c8b85dc4f65ff10f3a7bfc09d471a6f9e344ac3722163b592f48c2af18951fc54541e8c7b3e75cc445a0ea8364729ad0a2e411892989fedfb79a08a182 SHA512 6b6f9a5b04d7e818fbe4f73928f6b00f393b82e0a1d36e0c4a700ec95b5049006d8b73d1c2cd7906d405f15511d63862fbf19e1b42bed484c8e285dc8b29b07e
 EBUILD bacula-9.0.6-r2.ebuild 12450 BLAKE2B 405b703434852e97b72a68392c19078c6f9fd93446fa81b152bc347ad6c8a1acee7fc65909179faab1352429956e3fd5f4153a6c5a9ab509b3ea58406a1447d1 SHA512 6d3f4ba7e0d2a47b52df08a726374ef0febf026b3d3e63e6ff1c22ddc0032988e187c69d0f8ed63057e5af4636935759a8debf840813eaeda9798e6b7127a171
-EBUILD bacula-9.0.6-r3.ebuild 12555 BLAKE2B 970c7dadba73cf531c7d68dc68381b36333f80a3166e7c02fca6533540d67c871914af19a72da7355c5cfc23eace65aa1704e2f7e96a8e4e61bc28d0ac68092c SHA512 883f41666bfcbeb795f11c4a134575aad426fca89599a52e52ef47ba0a67a8296ba15290423c37fe27f2167a6fc34f3fb06277a66ef44c2997f57d20b0ef34c4
+EBUILD bacula-9.0.6-r3.ebuild 12761 BLAKE2B 8a764bcca23d81b9dac25d79ef8ee00d53a648a10b4b2ed617fba4b9d5bffba7a4ce4cf223d470a751c7b293df65ec90f4d495b39ff8d4bfc06b4197522fc3d3 SHA512 abd5f26d664befe85e5950e39138656ce735c6d1ead499f440e7dbeb688dd95692faa1e29c04dbf54e1a762b73116663f692831f103a6494c2156dd14f1cd9ec
+EBUILD bacula-9.0.8.ebuild 12621 BLAKE2B 189e0d891de4a111cc47976633b1077ae92f05fea891c9dd32873c18c5c4097868230c3777cd7792259a1820214d1d4746f7b8a8983f3d6fcc7b0f40b719574e SHA512 a31b61cd032ed878c7edfef39288d06a6631f50099949af3065fe344c73338345e2808d368a5422e44ccdcdbe36b3b71dd44937eb1e80b9fbb41fee5315ffb19
 MISC metadata.xml 626 BLAKE2B 5794ff725aacf865d2f20f402d057e6358a2c68be16f760f1446b2de5292c9582247ab86417131063e181168f003e1d6f5d200ac0dc3d47da24a3bca688dd93c SHA512 69d63f22a63a53daada5561d751f9903932c9a4596c164894a9aa6465a0f4ac90af99548439545fff1cfbcac9a1eb266a91119cbf73cb13edebd16b440613e55
diff --git a/app-backup/bacula/bacula-9.0.6-r3.ebuild b/app-backup/bacula/bacula-9.0.6-r3.ebuild
index f30acaa0b53f..0c4d61e2a766 100644
--- a/app-backup/bacula/bacula-9.0.6-r3.ebuild
+++ b/app-backup/bacula/bacula-9.0.6-r3.ebuild
@@ -169,7 +169,13 @@ src_prepare() {
 	chmod 755 src/qt-console/.libs/bat || die
 
 	# fix wrong handling of libressl version
-	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl.patch
+	# needs separate handling for <libressl-2.7 and >=libressl2.7
+	# (see bug #655520)
+	if has_version "<dev-libs/libressl-2.7"; then
+		eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl27.patch
+	fi
 
 	# fix bundled libtool (bug 466696)
 	# But first move directory with M4 macros out of the way.
diff --git a/app-backup/bacula/bacula-9.0.8.ebuild b/app-backup/bacula/bacula-9.0.8.ebuild
new file mode 100644
index 000000000000..7b76c7626f61
--- /dev/null
+++ b/app-backup/bacula/bacula-9.0.8.ebuild
@@ -0,0 +1,434 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit qmake-utils desktop systemd user libtool
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	dev-libs/gmp:0
+	!bacula-clientonly? (
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( virtual/mysql )
+		sqlite? ( dev-db/sqlite:3 )
+		!bacula-nodir? ( virtual/mta )
+	)
+	qt5? (
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		sys-libs/zlib[static-libs]
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		acl? ( virtual/acl )
+		sys-libs/zlib
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+RDEPEND="${DEPEND}
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+				static? ( bacula-clientonly )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	# create the daemon group and user
+	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
+		enewgroup bacula
+		einfo
+		einfo "The group 'bacula' has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo
+	fi
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+
+	if ! use bacula-clientonly; then
+		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
+			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
+			einfo
+			einfo "The user 'bacula' has been created.  Please see the bacula manual"
+			einfo "for information about running bacula as a non-root user."
+			einfo
+		fi
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# fix wrong handling of libressl version
+	# needs separate handling for <libressl-2.7 and >=libressl2.7
+	# (see bug #655520)
+	if has_version "<dev-libs/libressl-2.7"; then
+		eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl27.patch
+	fi
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+		if use mysql; then
+		    myconf="${myconf} \
+			--disable-batch-insert"
+		else
+		    myconf="${myconf} \
+			--enable-batch-insert"
+		fi
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+	if use bacula-clientonly || use bacula-nodir; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+}
diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl26.patch
index 3df4285c2e2e..3df4285c2e2e 100644
--- a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch
+++ b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl26.patch
diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl27.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl27.patch
new file mode 100644
index 000000000000..b87f4b13f9f8
--- /dev/null
+++ b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl27.patch
@@ -0,0 +1,11 @@
+--- src/lib/crypto.c.orig       2018-02-02 15:34:39.420489000 -0600
++++ src/lib/crypto.c    2018-02-02 15:35:44.000524000 -0600
+@@ -195,7 +195,7 @@
+ IMPLEMENT_ASN1_FUNCTIONS(SignatureData)
+ IMPLEMENT_ASN1_FUNCTIONS(CryptoData)
+
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) )
+ DEFINE_STACK_OF(SignerInfo);
+ DEFINE_STACK_OF(RecipientInfo);
+ #else
diff --git a/app-backup/bacula/files/9.0.8/bacula-9.0.8-fix-static.patch b/app-backup/bacula/files/9.0.8/bacula-9.0.8-fix-static.patch
new file mode 100644
index 000000000000..a2034cefde87
--- /dev/null
+++ b/app-backup/bacula/files/9.0.8/bacula-9.0.8-fix-static.patch
@@ -0,0 +1,63 @@
+--- src/console/Makefile.in.orig	2017-07-25 19:03:05.664760298 +0200
++++ src/console/Makefile.in	2017-07-25 19:05:43.576706091 +0200
+@@ -24,6 +24,7 @@
+ CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@
+ CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
+ JSONOBJS = bbconsjson.o console_conf.o
++ZLIBS=@ZLIBS@
+ 
+ # these are the objects that are changed by the .configure process
+ EXTRAOBJS = @OBJLIST@
+@@ -50,18 +51,18 @@
+ 
+ bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
+-	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+-	      $(OPENSSL_LIBS)
++	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
++	      $(OPENSSL_LIBS) $(LIBS)
+ 
+ bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
+-	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+-	      $(OPENSSL_LIBS)
++	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
++	      $(OPENSSL_LIBS) $(LIBS)
+ 
+ static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
+-	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+-	      $(OPENSSL_LIBS)
++	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
++	      $(OPENSSL_LIBS) $(LIBS)
+ 	strip $@
+ 
+ 
+--- src/filed/Makefile.in.orig	2017-07-25 19:09:19.655852979 +0200
++++ src/filed/Makefile.in	2017-07-25 19:11:39.519558592 +0200
+@@ -69,19 +69,19 @@
+ bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
+ 	@echo "Linking $@ ..."
+ 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
+-	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
+-	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
++	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
++	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ 
+ bfdjson:  Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
+ 	@echo "Linking $@ ..."
+ 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \
+-	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
+-	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
++	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
++	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ 
+ static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
+ 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
+-	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
+-	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
++	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
++	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ 	strip $@
+ 
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 0c745067e722..d392dbbbcd9a 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/kbfs/Manifest b/app-crypt/kbfs/Manifest
index 1af4a762bc39..f0a6957a9d04 100644
--- a/app-crypt/kbfs/Manifest
+++ b/app-crypt/kbfs/Manifest
@@ -5,6 +5,7 @@ DIST kbfs-1.0.48.tar.gz 5639704 BLAKE2B 4d8152c8bf1a72b0493840c6ffa0da35ba6abcb6
 DIST kbfs-2.0.0.tar.gz 5674786 BLAKE2B 65924644babbaf95867792da6a9c1f5c9c517bbe36292c3b5e40afaeb2879b1145d0b6017f3b66e6bc2ec4b858a312ab1d86ff1d8515f99c9004eeb1acaf8caa SHA512 6e51490b52cc5484d940ee057dc9b453a88d44622b1c533dd29e75eed5fa075f33d9cb6ac438401d80aa148d7561c1bc63deece5e75cdc30bb54102f2d00215b
 DIST kbfs-2.1.0.tar.gz 5703221 BLAKE2B 55daa1d8f1efe4a0264477b54c1ea8db74e972b1ecdd536f4ab8042e66117c6854889aeb203fa6fea6f757e928af514520be3732ee07ccc1289ccc9f5d3f27a8 SHA512 04dd058e97c85d5188cc61a56cc4a4468ec1d4d6b2f65cbe0edb88cec2864cef3525e6f48729761a2cc6fa79559794e5a3fd9663cb31dcaaaeff90a32f2a211a
 DIST kbfs-2.3.0.tar.gz 5718571 BLAKE2B 300106465081e91bdd1a74631eff12bdf82a3042ce6c3f532c0b61016291769a8e0f87af0cbc0b34b3d3c95ec054580654e8152bf97a56c0dfe3641b88483d79 SHA512 c7521f9664ec78fc8fd1a6d9f3e86f4680260ed507223c2a6a2694ff686984bfc615ac454da10ff7b01247866ad65a5e719e3fb8db5f0c3044e019ab7a82356f
+DIST kbfs-2.5.0.tar.gz 5788528 BLAKE2B 986d0411bb33dbef781c101beca3b90827f06e4c714795424b6f4fbe2abf628a4cce67699f434e872f7886816213e1cb2467d45ea4e06157ca1f23b433284457 SHA512 a12f3491c3d7dd42b78d24957f3b469837a8e6d682e91dfe6020e74e24374ce95f9de31578579680ee35513637512e84849d598d34b3e8e78f96cf99ac9cd701
 EBUILD kbfs-1.0.36.ebuild 984 BLAKE2B 84ea9e3a3db5917cf000e56f7c4826c9d5210bbb22e157310028421383e308e0e164be7d57e0838694730e1dff645ba89ad991d9beef17eb1bf0c0823ef55e13 SHA512 79cfb2c88f09d7cf0050f25e5c4e8fe9ffdbdafa5e62b6943b8d690eb766cb51d2b657774f0eab9ba561478fd3e22d416b409485f9ba38512247e66b6acf0d00
 EBUILD kbfs-1.0.40.ebuild 952 BLAKE2B 0ad195fc7cfba58e764692d2eff0de4e365ef86e11606552961484e54ffc93f54d522c8a3b0e5900ae5a25ec72cd3ea24d346f7578055d7ac9b82326a2cfc41a SHA512 36c347cfbe3ee81a11916193c7757f5ed71e8253449595c07a73db6b34d576f989a9a1f8605f695b30c27ef9fe89e47e81cd45f2405e65b92eae736a74d44f7b
 EBUILD kbfs-1.0.44-r1.ebuild 1033 BLAKE2B 46055ea689aad784f6f93704f0cb99abde81c367fb4c10a9825da8e83b86422f8cd78f099a1c8ad3da6f44ca4c91090502de7d90e0a6c5cdbe42e99c1a710597 SHA512 6813ae23ea413bd3a1ef5d84b3f0fa642510e98bf08f64ee95d7f7dcc8cf2008f470d7b7af1b1a3d51327949a01824f5e0e44c6e16fb7a91dc526379a8ebe391
@@ -14,5 +15,6 @@ EBUILD kbfs-2.0.0-r1.ebuild 1259 BLAKE2B 2245307f05dfceab185249d48b8ff5db84c5f1f
 EBUILD kbfs-2.0.0.ebuild 1001 BLAKE2B 83bb03c8b7d135e60d353c259effcd1ad6e2d5c8efd305b740961ad7b1921c8e30b37db8306644003df0a8a9d2b2f8f0cb4bbf63f3772f98d8c323681ef8043f SHA512 648be76efdd357dbfe3ed611c58cadd3b9fa30469392f6d3b3352bac961a421960a7d4919c5ea373c0418dd48a71fbe4e92044fb608f9b463b92fbc87a3e17a2
 EBUILD kbfs-2.1.0.ebuild 1259 BLAKE2B 2245307f05dfceab185249d48b8ff5db84c5f1f052bf9068336677f1803ebf312ccfdf5ee3be92696e492b4338ef7a3522a47e5c5077908c6665428db1863c19 SHA512 9f028136347e29dfa3d87406fc7d352a2e4c051536c741063cc83650fc23f643288b5b671891377cf9923ac9f30c927979127a27a83fe9c6340515072621741c
 EBUILD kbfs-2.3.0.ebuild 1259 BLAKE2B 2245307f05dfceab185249d48b8ff5db84c5f1f052bf9068336677f1803ebf312ccfdf5ee3be92696e492b4338ef7a3522a47e5c5077908c6665428db1863c19 SHA512 9f028136347e29dfa3d87406fc7d352a2e4c051536c741063cc83650fc23f643288b5b671891377cf9923ac9f30c927979127a27a83fe9c6340515072621741c
-EBUILD kbfs-9999.ebuild 1143 BLAKE2B 6a1f0b69fc416d0403194c0e77b8652d4d2e1d1104c9eff2bd516aa088aca067e5aaa11ef09eeaca3f721f236fb80b8a436a8fae5c4340f0f0f4b0ca655e9a40 SHA512 17ce0915dff90a653800d8bac496c3afaf38e458ed37a2bfdd7a61173ac698c735eb188810e06a899d3c71950a7dde8b46c8c0b1a966e9877e9d9812539a38f3
+EBUILD kbfs-2.5.0.ebuild 1259 BLAKE2B 2245307f05dfceab185249d48b8ff5db84c5f1f052bf9068336677f1803ebf312ccfdf5ee3be92696e492b4338ef7a3522a47e5c5077908c6665428db1863c19 SHA512 9f028136347e29dfa3d87406fc7d352a2e4c051536c741063cc83650fc23f643288b5b671891377cf9923ac9f30c927979127a27a83fe9c6340515072621741c
+EBUILD kbfs-9999.ebuild 1228 BLAKE2B 940cab18094f74e24dbfe63c77f2a21456b02d0f83ff8922b8c9120a0baf873cfa31686827406bdd8ea53183378fe19e5d8725350b8722fe6ad4c90b94e4f5c4 SHA512 47ccfab006114011ff461d0b305f9a1fe88bd4720cc3f26a4a80c8462b519fab96f7e271637c0fa2aeb3f37ff268cdeb458435e041947998191bc4665218480d
 MISC metadata.xml 482 BLAKE2B ea0f5fe2ae3d3c5cd10020f178e0233fe55a38174c10ccd54c50fcd2104c4a0dbe737b371cc49624fefbc2107b5697ee4c826466a5f14d7c952542edd1134414 SHA512 74eb8d2fb7b19f269dcf5dbc67a5f63cac1589343a069011dfe8492a0bc1d82b526a175b2fad91a00f7fd60e4a77bbf2b7f7dea4537d6ae9221a9e93ca2bdd60
diff --git a/app-crypt/kbfs/kbfs-2.5.0.ebuild b/app-crypt/kbfs/kbfs-2.5.0.ebuild
new file mode 100644
index 000000000000..41a15fe68057
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-2.5.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Keybase Filesystem (KBFS)"
+HOMEPAGE="https://keybase.io/docs/kbfs"
+SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-crypt/gnupg
+	sys-fs/fuse
+	"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/kbfsfuse" \
+		golang-build_src_compile
+	EGO_PN="github.com/keybase/kbfs/kbfsgit/git-remote-keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/git-remote-keybase" \
+		golang-build_src_compile
+	EGO_PN="github.com/keybase/kbfs/redirector" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase-redirector" \
+		golang-build_src_compile
+}
+
+src_test() {
+	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+		golang-build_src_test
+}
+
+src_install() {
+	dobin "${T}/kbfsfuse"
+	dobin "${T}/git-remote-keybase"
+	dobin "${T}/keybase-redirector"
+	systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service"
+}
diff --git a/app-crypt/kbfs/kbfs-9999.ebuild b/app-crypt/kbfs/kbfs-9999.ebuild
index 6c648020c5ec..c90799ed3f94 100644
--- a/app-crypt/kbfs/kbfs-9999.ebuild
+++ b/app-crypt/kbfs/kbfs-9999.ebuild
@@ -38,6 +38,11 @@ src_compile() {
 		golang-build_src_compile
 }
 
+src_test() {
+	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+		golang-build_src_test
+}
+
 src_install() {
 	dobin "${T}/kbfsfuse"
 	dobin "${T}/git-remote-keybase"
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index 14256b24ddf1..f9a571febab4 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -4,6 +4,7 @@ DIST keybase-1.0.48.tar.gz 34026876 BLAKE2B c620a664b47f66932d1b49c22509aac73a6c
 DIST keybase-2.0.0.tar.gz 34340958 BLAKE2B fa9bcf2285a987131e00a5bc8b06ad09fa86f3bf3de87cc4e48669131fcf93e2c515435fc1e9d6663455d16744889131d09b5957fa5f78f9d3ecc91d10667bc1 SHA512 d7b91c9a0ef69442501956ba3a09f40490adf76ef38bf945617793a8238daee68f3fc2be7a5d2118531c2364f5604016ec241226a22bd217dbab3dafbf77fd25
 DIST keybase-2.1.0.tar.gz 34444571 BLAKE2B 834f1001b136461c5665f12530d660e619d93c8b4e4b5f0c96da94af23f0667c778d7ddabc65d0585ac472cd91f89240bc4260b2034bf20c26b4047839570299 SHA512 0d71a22b5f56442fdc03848f831487da097dc817bfcacfb5a8eea1a9a13e87d231619216b6bab61862de71289373977c4c8d345518152137c8804005bf20e3e4
 DIST keybase-2.3.0.tar.gz 34524576 BLAKE2B 5793892b6bcfeafbaebb4a38d35e77d9267a74243da61ecbb7472026b3c500cc6f6cc49dbbec2add65cecae2ce209bb24bc03f2eb393307b82958afeb8824537 SHA512 f2b92ec21fd8cfa182aac7655b836415b902c599f9e3a08a3f84d35c3f3728027a8eef8a06fb8ed4ba77b9a66888f49fd89013304f948c0f0276705f16ca4396
+DIST keybase-2.5.0.tar.gz 35012800 BLAKE2B 46cba22bafbfcf519e658a05db349f047a622f30d6ec03d5e8b3c637e7d3351188c65b0725853c4c62da30ea1d4388d19c9a430a9c4d06b14712daca05c468d2 SHA512 05313c4373ffc8fc41097fabfd13fdbf4d0af789257bbbc4a9ff0500ab3ca9c9d5d50ab62bc38b7328aad3cbf631aa55fcd1a74b5dc73f3d31e76851733d7d5f
 EBUILD keybase-1.0.41-r1.ebuild 1406 BLAKE2B 98696edcda23f847bbae3bafba3746cab2ca20b63b097b9609fbe89f563d23273039cc0851314d28df3367f002392cfd27dbb0a47a6fb2770e6f3618f1761924 SHA512 8b2c29ff8ebc3c942c1d9bcf0a14b45381853ad72593a18f0c92123e2d915c62ab4b92ed61f121c9c23f0397d966423eb2b2fa2636f591f6cf73a5b490b2c1ce
 EBUILD keybase-1.0.41-r2.ebuild 1410 BLAKE2B e5b26e70ba64cec09589f277189035526d3ac4e7125515aaf849b068718108e2307f5c4dccfdbe122695de46ae03865224ed44dd72480882912b71afaa4e3c4d SHA512 e5b394c14fa27db7def0bcfa9c42e0d33a0414a24beb902f0379e9b902ba104d8dc2583ebf0d349849e7390f2f9de82e48f6ebad401bbf6c5c9a23b5b66ae391
 EBUILD keybase-1.0.41.ebuild 959 BLAKE2B f94747768552a47f9ca7f9d786d6933caa3fb8df52e183cea08f953cc5e611e94e16bcf107d086a0c625ae888e907d583cd43af1147da5ab0d46eaafd148fb75 SHA512 6c8f0f09c879583bda20b6a693fee84d7ac8434d01c2e60131bf85ceec27eea91874870543b5c1b26e133ef7afd0e7f185ed582b4d49ff669cfa2cc1e0f76db7
@@ -13,5 +14,6 @@ EBUILD keybase-1.0.48.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dc
 EBUILD keybase-2.0.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
 EBUILD keybase-2.1.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
 EBUILD keybase-2.3.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
+EBUILD keybase-2.5.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
 EBUILD keybase-9999.ebuild 1268 BLAKE2B 7c57de5a44a42066ff20ace9720cbf1dbeb2b900794a94b82be66c4becbbfcc0148cd5038de6bb2f412b1dc86c4b23af336b81748e81fcf5069548c9cd9e26d3 SHA512 7b56be4322b630105f093853cb33afd2377b1df1b9ddb75e44579c64b76918940a0576aee4a39df55b49f0307b08144a3418a8835bb2cdcd0d3b868886ca0e3e
 MISC metadata.xml 465 BLAKE2B a1dcb592edbf2e5a45bd985adea8fa09504f75b17f689f38c415dff3efd0a4c67b3476c8c7568dc2b8351117281c94da4235cb1b9144d1636f04ae3b2055164e SHA512 68da266d0856035ec7f0b2ac5f8746ad6c7afa023ccf2d592be43fbf45f12f1443afdceb075ab57efeeceb97dfcc0a3997ed7177e12ae6291467e97c17e10810
diff --git a/app-crypt/keybase/keybase-2.5.0.ebuild b/app-crypt/keybase/keybase-2.5.0.ebuild
new file mode 100644
index 000000000000..af077ef41e52
--- /dev/null
+++ b/app-crypt/keybase/keybase-2.5.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	~app-crypt/kbfs-${PV}"
+RDEPEND="
+	app-crypt/gnupg"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	ln -vs "client-${PV}" "${P}" || die
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
+		golang-build_src_compile
+}
+
+src_test() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		golang-build_src_test
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dobin "${S}/packaging/linux/run_keybase"
+	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
+	dodir "/opt/keybase"
+	insinto "/opt/keybase"
+	doins "${S}/packaging/linux/crypto_squirrel.txt"
+}
+
+pkg_postinst() {
+	elog "Start/Restart keybase: run_keybase"
+	elog "Run the service:       keybase service"
+	elog "Run the client:        keybase login"
+	ewarn "Note that the user keybasehelper is obsolete and can be removed"
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 5caca7434dfe..851caaac5c31 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/myspell-lv/Manifest b/app-dicts/myspell-lv/Manifest
index 0fc7588c5453..2e1eb5a824a5 100644
--- a/app-dicts/myspell-lv/Manifest
+++ b/app-dicts/myspell-lv/Manifest
@@ -4,4 +4,4 @@ DIST myspell-lv-1.3.0.zip 374356 BLAKE2B 6924d09c4a7f70e840dce48a0d5e7807bd3210a
 EBUILD myspell-lv-1.0.0.ebuild 616 BLAKE2B a1bcb7a31270d5d2d6dddec373906dc9fb692af497cb8e6751a282ee8acb2f1e00eda7e287d78e08d9f5a9e1dbd8e82074099a6746e60df0f1cbba236a38d8bb SHA512 a903091fcca44ab32c489b04d0cadefb4212d4c6d06f2e5de1631269f96f6c9b62d36d1a127a54c2cc80f1e4df179e2f20d5fb860237cdf73c50a2865039b82f
 EBUILD myspell-lv-1.1.0.ebuild 650 BLAKE2B cbb4f8b248a4ece9639d62f113784c1b206eb10edaf3849702923ca63caf7b02cf30e524f769bbe942c279c355463888f3eb8c3b9ce4c16247c2f6664ac3d493 SHA512 15f0e174c44786a11db1d72204321c4e833dc2454483342a6d179e5cd1ccb5155d6fe1008283d88691cbcb1cba027e07c55ad554db17551a428d25bf639211cd
 EBUILD myspell-lv-1.3.0.ebuild 664 BLAKE2B 2f2a801e8020806378d44b6ea5de6c83f14d565a052d55162f559c572b4107c19c71751910bd367d9af918222382866d376f2de5ac2707342338ad38aa3d6465 SHA512 39470a718233c956a0c7c66fe516689f2031d6be27c3f00622ddcaa8cea802d1de81bdae60efc258256d87acb31f3734726cd94ec17f5ad77e5825101c13362d
-MISC metadata.xml 364 BLAKE2B 8b892dc24c5b95700d5e1bb4249ad8c4ad44fc084642456507f43a0f3588ff49ae85c5cf7ff0557f75360cb56278d5817172a0135e03a8193f1fff1166bbab5e SHA512 3f9bc136c05930b5243d428083655a3cd2a6bc344797792e563bfd5e654bd57603271c98fb3b650a247e6b458ec647286fe903525e2e4cb8495fd014c6127ea5
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-dicts/myspell-lv/metadata.xml b/app-dicts/myspell-lv/metadata.xml
index 4e0da686a621..7a38bb900964 100644
--- a/app-dicts/myspell-lv/metadata.xml
+++ b/app-dicts/myspell-lv/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>maris.gis@gmail.com</email>
-		<name>Maris Nartiss</name>
-	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 25495cb28bdf..81728b582cf0 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 40a4dcc2b9f7..f7218f1de4cb 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,3 +1,5 @@
-EBUILD emacs-vcs-26.1.9999.ebuild 12790 BLAKE2B b241bfb349fd889b8f3bd083dcbd2e907e1370ec9b7c4f9662008cf08eea42e330380b744c2fba4cd98210b29fde0e760bdf06256f24ba362a4cca4c68a13d89 SHA512 683d53948f6f9e75c9771866971d601ea5364a8a377b639bc0e753def9a80d9b7259c02e7162a8c4e8c512e8cf7164672c43280b3120d6745df9450e91decdd5
-EBUILD emacs-vcs-27.0.9999.ebuild 12788 BLAKE2B f3620bf7836f4dee2f4b0165cbf42589411d61167292beec6fbce7748eebfd75d2eabd94287a223a7e455bae971ad23a1afeaf75a6c86401edf4fcc9e9e363df SHA512 f1ca9064125f2566472f3f638b835da13153aa3d5bd070c23e415397c331f9db87ebf493828d888d1abb89330bccf8cfcd26fb6ca9c6cb1f81531b8f96118e57
-MISC metadata.xml 2799 BLAKE2B c6b3d7f7c810894102b8a6b39bc2adf79f20b0270832bc7d98795e91dc4a1401f9238223b4b1fc2bb1639fde7a1f6ccc7b68f8d5c53cbe07356f1eecb9859c69 SHA512 b11cf5abf9c71330d81a896a9ab2fc34b63cbc8e9a857220fa4bb96a7fc8a95e0e2b011fc1cf67e304447e596f0d7eb0bc8625f398f89b4536c5198f3618b6da
+DIST emacs-27.0.50_pre20180731.tar.xz 28569892 BLAKE2B 03988ee559f53ce54da2bc610bfb8cb9daab583610de419485c6cd76bd85d990ba18360b5cb12623c6a248471b5846620ce5c7deba03074c0bcdea4dc7db5e22 SHA512 35036de6748b0d63524172c4535676d330b917ca478c36aed227af4a04a82da2b32ed8e7d75e388f7182ebbe476775c48c1234a08eeea18561b43411a20dfb05
+EBUILD emacs-vcs-26.1.9999.ebuild 12806 BLAKE2B 1120c0e98c38878b4ae17f13ed9dc59739ff2e65f2c7d647707895b1aad6fe0e37ad01f73ae9b2a3640384875fbaeea23078f5abfd5201017e5366468c704445 SHA512 3b34d82efc26b6d62b4e167725f2c513d16221bec3f810fece760081bf725459b8c7fd58a512cfdfcbe1a3793f1cac03a900fd048b05e2a7baf6fc857a63427e
+EBUILD emacs-vcs-27.0.50_pre20180731.ebuild 12858 BLAKE2B ff75aee8ebd0943973159aaa459e170e0ee48fecce19255f1a8ee125af295ec99a21e772d40b450e63cc9ce9f00cef12a4fa79a530696bfd9c4a11102ff75204 SHA512 cd11bbc0cd81521de3252148b3dead982cf3135757ddeed2b795c276660151023408984b751dc591a73b8afadb8261c4b9ec42dbbc7e8ef964f2fcd19ae9beaa
+EBUILD emacs-vcs-27.0.9999.ebuild 12858 BLAKE2B ff75aee8ebd0943973159aaa459e170e0ee48fecce19255f1a8ee125af295ec99a21e772d40b450e63cc9ce9f00cef12a4fa79a530696bfd9c4a11102ff75204 SHA512 cd11bbc0cd81521de3252148b3dead982cf3135757ddeed2b795c276660151023408984b751dc591a73b8afadb8261c4b9ec42dbbc7e8ef964f2fcd19ae9beaa
+MISC metadata.xml 2897 BLAKE2B 961b083704d77f5da546371c4b05850c4178c47e1f860147f73f04f065c6d641f78996ba8aa4ea48b88ed5466cc8f262436a16e32e537ee50682e3daa9577430 SHA512 8a9c88474982bc2bb97dc7f55baecd20bc9d7c65a5cfc8051ade7ab950f24214424b8cd2f6990f8a5a3e9a6ad36c10a970beff523a8d467693c06613fb6fc85b
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
index abc0aef998ed..79e76df13478 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
@@ -30,6 +30,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
+RESTRICT="test"
 
 RDEPEND="sys-libs/ncurses:0=
 	>=app-eselect/eselect-emacs-1.16
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild
new file mode 100644
index 000000000000..ee8f5f2ac3c2
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild
@@ -0,0 +1,409 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="master"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+else
+	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
+		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="27"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+REQUIRED_USE="?? ( aqua X )"
+RESTRICT="test"
+
+RDEPEND="sys-libs/ncurses:0=
+	>=app-eselect/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	json? ( dev-libs/jansson )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/gtk+:3
+				x11-libs/libXcomposite
+			)
+			!xwidgets? (
+				gtk3? ( x11-libs/gtk+:3 )
+				!gtk3? ( x11-libs/gtk+:2 )
+			)
+		)
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+BDEPEND="virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+#	pax_kernel? ( sys-apps/attr )
+
+if [[ ${PV##*.} = 9999 ]]; then
+	DEPEND="${DEPEND}
+	sys-apps/texinfo"
+fi
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	eapply_user
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use sh; then
+		replace-flags "-O[1-9]" -O0		#262359
+	elif use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if use X; then
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			if use xwidgets; then
+				myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
+			else
+				myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
+				myconf+=" --without-xwidgets"
+			fi
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --without-x --without-ns"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gpm) \
+		$(use_with json) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+}
+
+src_install () {
+	emake DESTDIR="${D}" NO_BIN_LINK=t install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+		|| die "moving emacs man page failed"
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+	rm -rf "${ED}/usr/$(get_libdir)"
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+	fi
+
+	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+		through the Emacs eselect module, which also redirects man and info
+		pages. Therefore, several Emacs versions can be installed at the
+		same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
+		strongly recommended that you use app-admin/emacs-updater to rebuild
+		all byte-compiled elisp files of the installed Emacs packages."
+	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+		machine would satisfy basic Emacs requirements under X11.
+		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+		for how to enable anti-aliased fonts."
+	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	local infodir=/usr/share/info/${EMACS_SUFFIX} f
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
+		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
+	elif [[ -d "${ED}"${infodir} ]]; then
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
index 542cd77830f4..ee8f5f2ac3c2 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@@ -28,8 +28,9 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="27"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
+RESTRICT="test"
 
 RDEPEND="sys-libs/ncurses:0=
 	>=app-eselect/eselect-emacs-1.16
@@ -39,6 +40,7 @@ RDEPEND="sys-libs/ncurses:0=
 	dbus? ( sys-apps/dbus )
 	gpm? ( sys-libs/gpm )
 	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	json? ( dev-libs/jansson )
 	kerberos? ( virtual/krb5 )
 	lcms? ( media-libs/lcms:2 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
@@ -257,6 +259,7 @@ src_configure() {
 		$(use_with dynamic-loading modules) \
 		$(use_with games gameuser ":gamestat") \
 		$(use_with gpm) \
+		$(use_with json) \
 		$(use_with kerberos) $(use_with kerberos kerberos5) \
 		$(use_with lcms lcms2) \
 		$(use_with libxml2 xml2) \
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index ba7173070349..3562545ef0a4 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -36,6 +36,8 @@
   <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
   <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image
     processing</flag>
+  <flag name="json">Compile with native JSON support using
+    <pkg>dev-libs/jansson</pkg></flag>
   <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
     of the internal Lisp implementations</flag>
   <flag name="mailutils">Retrieve e-mail using <pkg>net-mail/mailutils</pkg>
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 7baf34728482..986795f69ef2 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,5 +1,4 @@
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 BLAKE2B 0106fe8053b4f65f384d451ca85138991a57afaca16b32035585055bb877c039af826859fa58c4660ec80664d3bfb0ee7a757ad76381c150ebcb22cb333a98d6 SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6
-DIST emacs-18.59-patches-10.tar.xz 21496 BLAKE2B bfa0202511a9e41d3278c63f43f174cca4ba95f42675796d85139fc43654ca3b9bc56a8c547029eaae967df66ec1e520d3bcdc67c4d53261fea70def6641574c SHA512 c0255d9d02e047cc2173cebb916677e268d8f5043c9dd08041b78019df208cdd02eb8eb49256acde7a3d5b004a7227ee9a1220d7b1e24580bdb5a5258216fc39
 DIST emacs-18.59-patches-11.tar.xz 22032 BLAKE2B cfdb85aeefa7a71dfd0719de893e9ea3f7118baa0b8c5aa97b3800c1a5743e77d63c35ab1e4afb13c284f5c6dda522d1e2e37f8bfd9bbba052e543af7401565b SHA512 cac3f2efc8b3f18cdf43474453acc406c5b469ecc11955f8216083a4deced887aea4a73221aa36f0bc6b7480788606f969ee1df15a8932ee771fdf790e98c00c
 DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
 DIST emacs-23.4-patches-21.tar.xz 19604 BLAKE2B 97327f2079c496c28122203d233a12199a3c11a8c4efb2107247a4ca4483b898467d73d19d4f0570ec7be2a49dc5f6bd1bc9ee0811f932e7deb6b1c4ca96e362 SHA512 135eda432de64200797456d594f7de811275a7adf792d10a1c3a51ca4bbbbaa3a2c682b9fd577c4d93fbce967ca08d4ac47eb45f031477c3e44c69c14d5d5b48
@@ -10,8 +9,7 @@ DIST emacs-25.3-patches-1.tar.xz 1252 BLAKE2B 33c3c8e32b85f548201d4988d3aaf94e64
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.1-patches-1.tar.xz 1296 BLAKE2B 5e3cef3130b35a362d67f853686625d207e9af29ffb27753b6aa00327e30cc06b3cd7ed339b214b12fb00137654521c21e2252ecd83a79258bb9636406ab032c SHA512 6e4b0bdbf98d5130a6cd41fb0a8c3d641bf0b8d46f150d1f10f2d659e0418c14198d8990df13f3266437bb128f5fc7db8456458f5f547f2c12cc59da4fea3c8e
 DIST emacs-26.1.tar.xz 44258932 BLAKE2B 5b5ea6a506228507af18417c3f94c2d6ea482c25d13ec5e0bee9ec6a65e80c52c870162b4671e80a82f8310784c802924609f2f87d504b1a97617c44d859566f SHA512 537c2cfdd281151b360002419dde6280c313e07a937ed96405c67f754b3401ec5541091a3c0aa6690929bc33dd79e8e0d8844e7a6b014b7798c63cb15de210c2
-EBUILD emacs-18.59-r11.ebuild 4358 BLAKE2B d5db4c011da9c728092eeb75f8708c7ab3729497be75fec58553de3df47a12a54e0845c1a4bc5a07c1080a305d0fdf8033370c0c5692ca3ae7caa617637d8fea SHA512 9637184ba4c9f51da3eef13625b5de4a1af283ada88c2a4f6fe6f03447907ac37e05ae69abbef514bd0024f748f1cc458567f4480e0e23fd4db26905bfa0b4f9
-EBUILD emacs-18.59-r12.ebuild 4413 BLAKE2B 678f7ace348d079a9cacd70370fc8d282e4438e635b112ee1c804386b93e7d6b7bfeb3b94f9b902052e505d17d2d5cc63d733521106166fc3bc0708495889d91 SHA512 fb7571df8fcf115a552289632dacae0d7a61376aead6a84bf208e9050cca24945d4aa5909f614111505ef9e965fa018e8effadcb09433fa742923c40d26433fd
+EBUILD emacs-18.59-r12.ebuild 4412 BLAKE2B e560829c6de369456f7a77ddba9a6047addace03406ca36aa7778473d470484e7a675cd5eceabc491b86a5a7140ecaafdb86fab9db5974d0fd817f4b55d48a85 SHA512 11144b4d09773faf8ea2fe054695b5a045778c0cfdf0314c9eb8b0af34526eac1e0ac6f245955361e99807eadea9e8c0d40411907e14e2845ce2b91f0d404245
 EBUILD emacs-23.4-r17.ebuild 11512 BLAKE2B 1d6b6ccbfaf84d830c9f85aa39df64411efd6aa30cefd8ea37b80108f753fe3c0ff15f3130eb0de876f2e4fe1eb4e261974a33df39c16b376020ccf936160c00 SHA512 787a76e6b7c1a72bf937d158af9b8dd0a68f967102ce7e0326d49be13d4f2ac2aa4c7cacf50eff2ee5dae20a1672fc36b37545c2867b30401530d8a8dfd92c69
 EBUILD emacs-24.5-r5.ebuild 11230 BLAKE2B 5960990a169b448672e032531b3668584712fa03da774556aa145ccb46c7e9c8e4a127d5c9a4ace17db6fd6ab0f1d4e492ba512bc3effe8752e5689ae7ce91ac SHA512 9b95bf5bb6e0061c6fc2cb4031e0b6c0cd585b2a1feb62fa7a39d7ae0553eb6be122cbba9deb72a9f46c38f5f9d9de48cec8c5198f01f8b84ad78ed256350917
 EBUILD emacs-25.3-r4.ebuild 11722 BLAKE2B f41c4824843247675b15c6542936c3f82f72bed50011975ff73d066cd60279b96f3f0309ced4970088976b91afb5d35f3baa81128691e9d89d367862b77e2e62 SHA512 601dc23abf9060f1cfe11445f6a1da0999f8d094a6f2f3757583dd364611410553702333bd2683c6e8f55991572a7b8bf7cb16b55f19d9832d5be2587711c751
diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild b/app-editors/emacs/emacs-18.59-r11.ebuild
deleted file mode 100644
index 91fad29d2a69..000000000000
--- a/app-editors/emacs/emacs-18.59-r11.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic multilib
-
-DESCRIPTION="The extensible self-documenting text editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
-	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-10.tar.xz"
-
-LICENSE="GPL-1+ GPL-2+ BSD" #HPND
-SLOT="18"
-KEYWORDS="amd64 x86"
-IUSE="abi_x86_x32"
-
-RDEPEND=">=app-eselect/eselect-emacs-1.16
-	sys-libs/ncurses:0=
-	amd64? (
-		abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] )
-		!abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] )
-	)"
-#	X? ( x11-libs/libX11[-xcb] )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES="../${P}-linux22x-elf-glibc21.diff ../patch"
-
-src_prepare() {
-	default
-
-	# Do not use the sandbox, or the dumped Emacs will be twice as large
-	sed -i -e 's:\./temacs.*dump:SANDBOX_ON=0 LD_PRELOAD= env &:' \
-		src/ymakefile || die
-}
-
-src_configure() {
-	# autoconf? What's autoconf? We are living in 1992. ;-)
-	local arch
-	case ${ARCH} in
-		amd64)
-			if use abi_x86_x32; then
-				arch=x86-x32
-				multilib_toolchain_setup x32
-			else
-				arch=intel386
-				multilib_toolchain_setup x86
-			fi
-			;;
-		x86) arch=intel386 ;;
-		*) die "Architecture ${ARCH} not yet supported" ;;
-	esac
-	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
-	#use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
-	sed -e "${cmd}" src/config.h-dist >src/config.h || die
-
-	cat <<-END >src/paths.h
-		#define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp"
-		#define PATH_EXEC "/usr/share/emacs/${PV}/etc"
-		#define PATH_LOCK "/var/lib/emacs/lock/"
-		#define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!"
-	END
-
-	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-		-e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
-		src/s-linux.h || die
-
-	# -O3 and -finline-functions cause segmentation faults at run time.
-	# -Wno-implicit will quieten GCC 5; feel free to submit a patch
-	# adding all those missing prototypes.
-	strip-flags
-	filter-flags -finline-functions -fpie
-	append-flags -Wno-implicit
-	append-ldflags $(test-flags -no-pie)	#639562
-	replace-flags -O[3-9] -O2
-}
-
-src_compile() {
-	addpredict /var/lib/emacs/lock
-	emake --jobs=1 \
-		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
-		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	local basedir="/usr/share/emacs/${PV}" i
-
-	dodir ${basedir}
-	dodir /usr/share/man/man1
-	emake --jobs=1 \
-		LIBDIR="${D}"${basedir} \
-		BINDIR="${D}"/usr/bin \
-		MANDIR="${D}"/usr/share/man/man1 \
-		install
-
-	rmdir "${D}"${basedir}/lock || die
-	find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \
-		-o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die
-	fperms -R go-w ${basedir}
-
-	# remove duplicate DOC file
-	rm "${D}"${basedir}/etc/DOC || die
-
-	# move executables to the correct place
-	mv "${D}"/usr/bin/emacs{,-${SLOT}} || die
-	for i in etags ctags emacsclient; do
-		mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die
-		rm "${D}"${basedir}/etc/${i} || die
-	done
-
-	dodir /usr/libexec/emacs/${PV}
-	for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \
-		yow env server
-	do
-		mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
-		dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
-	done
-	for i in test-distrib make-docfile; do
-		rm "${D}"${basedir}/etc/${i} || die
-	done
-
-	# move man page
-	mv "${D}"/usr/share/man/man1/emacs{,-${SLOT}}.1 || die
-
-	# move Info files
-	dodir /usr/share/info
-	mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
-	dosym ../../info/emacs-${SLOT} "${basedir}"/info
-	docompress -x /usr/share/info
-
-	# move Info dir to avoid collisions with the dir file generated by portage
-	mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
-	touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
-
-	dodir /var/lib/emacs
-	diropts -m0777
-	keepdir /var/lib/emacs/lock
-
-	dodoc README PROBLEMS
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d "${D}"/usr/share/info ]]; then
-		mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-18.59-r12.ebuild b/app-editors/emacs/emacs-18.59-r12.ebuild
index 11c2da983f3d..17824bc34455 100644
--- a/app-editors/emacs/emacs-18.59-r12.ebuild
+++ b/app-editors/emacs/emacs-18.59-r12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
 
 LICENSE="GPL-1+ GPL-2+ BSD HPND"
 SLOT="18"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="abi_x86_x32 X"
 
 RDEPEND=">=app-eselect/eselect-emacs-1.16
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index fa9bf8791a19..ebec070cddf7 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,3 +1,5 @@
 DIST gedit-3.22.1.tar.xz 2948048 BLAKE2B aa23b261bc0a463febf5affbd0dca647df8d1db9553356f145784b1ebed43ed15dfede12f62b3fcb6f00aac59e2d3a84c31627be32000830523a805d46d2e4ab SHA512 7251732f353b1d9dab0fe447fe90b2259df34ff0694d8731ce3be531c21ac82ab6e7f4a07090aeef364640154f4ba6103539a253bc7942952dcf1e331418f0eb
+DIST gedit-3.28.1.tar.xz 3149684 BLAKE2B 6afedcc5de0bd249af3d0fd02339acc2d993aae083dcbfda9212745ab810b81cdb9da655273cb7ccc556644c29d69429d3587fcc9e1faf7aa1c2cee57af09a4b SHA512 f5931ac562cb5005a83eec43048b718ef431e6006b72470fea54ad0e94bd64940ebdec160ee0459ceb5adb235ab111711a2f9fbdc74104d2edd8f287d7474815
 EBUILD gedit-3.22.1.ebuild 2310 BLAKE2B d792c14afb2d9d87950afe72f2a0887564a7c6a6d6d7fb553ade64f4cde9e841a03bf2157fefb2e26923ae07da12b3527a65142bc6318b1781d1388dc12bbce2 SHA512 5ecdcb8f259361b27743fc29052e0c0a751367f46c6688a31f66942013aca448afd4113d41f7cf923b82bed61fa226e44943aef3dc795fbe3fced74d70663d78
+EBUILD gedit-3.28.1.ebuild 2312 BLAKE2B af989eaa7428b7c1da28c18cb15f71a5431fc238882caa12f84a4f383b7c6d154a230a1b13a6d9a0ea00a679c6d803a7d65bb0360cb7ba92276b13906f1f8c64 SHA512 bb1cd8ba0572b2d066ffe6935e6dc3b6f868e0c8ab2972773b6269a35b3f6c5ba9635eded9b5f3894d358236443e6460a7e093e59bd5d9693d9b41a8b6802664
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/gedit-3.28.1.ebuild b/app-editors/gedit/gedit-3.28.1.ebuild
new file mode 100644
index 000000000000..e9119e64f700
--- /dev/null
+++ b/app-editors/gedit/gedit-3.28.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python3_{4,5,6} )
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 multilib python-single-r1 vala virtualx
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+introspection +python spell vala"
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# X libs are not needed for OSX (aqua)
+COMMON_DEPEND="
+	>=dev-libs/libxml2-2.5.0:2
+	>=dev-libs/glib-2.44:2[dbus]
+	>=x11-libs/gtk+-3.22.0:3[introspection?]
+	>=x11-libs/gtksourceview-3.22.0:3.0[introspection?]
+	>=dev-libs/libpeas-1.14.1[gtk]
+
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+
+	x11-libs/libX11
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
+		dev-libs/libpeas[python,${PYTHON_USEDEP}] )
+	spell? ( >=app-text/gspell-0.2.5:0= )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	${vala_depend}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.50.1
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+# yelp-tools, gnome-common needed to eautoreconf
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+
+	gnome2_src_configure \
+		--disable-deprecations \
+		--disable-updater \
+		--enable-gvfs-metadata \
+		$(use_enable introspection) \
+		$(use_enable spell) \
+		$(use_enable python) \
+		$(use_enable vala)
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
+}
+
+src_install() {
+	local args=()
+	# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
+	use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" )
+
+	gnome2_src_install "${args[@]}"
+}
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 3996c22777be..214fbf6f0757 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,3 +1,5 @@
 DIST okteta-0.25.1.tar.xz 951952 BLAKE2B 180cb7426b85cc8598f774d50556fe26d95d11e7c8b5be542a38fd4fa1c0479b401e6be59e7ca86eabba805c2a5d2ea2d818960cb218d173fd87db23f9c5525f SHA512 67e594ee1674176cbf506ca1191ced748bf6aec268d57211e052552f9673c359ccb3fefd403b5cf63e04f63a4fd3b42b0d21ef8eefcbac999081d58505df2174
+DIST okteta-0.25.2.tar.xz 954124 BLAKE2B b880001d6351479accb2f5f2e00a2574337695642bf9082b030d1a56e828fa4cc8e4cf00c6781e12328a20fde004cddaad057b0dbce2fb34a243e24df48ee878 SHA512 78f905479dc5070754b53d8fb7374d162a64479303092ce3f391953a01332946d98151f181a6c9363c68dad7098b58909b4db53724fac9aa848606f9ff3b6511
 EBUILD okteta-0.25.1.ebuild 1603 BLAKE2B 0c64e8a1b0aa5e485fd86cf5a4f9b341b57e81f052f432373a3c3b3b32bba5c135d49c0e27b1de5a5fb2a120cb9d5bc1f283a12a398312aea0d96717fab31d5f SHA512 0b247aed642351f80e4b718c28e6ca7d231399a03fed884905014a7e001d1fc7213c5fc3b04233382cbdad6c1878796198ffaaad9b70975a198bb94bb58cf169
+EBUILD okteta-0.25.2.ebuild 1605 BLAKE2B 7c5a9e81733f75e9cd2ef29ce31a6c17cec9d8c49d90beeecb6407f73843b3a1a0009306dfd4e2e7d0d7620ccc1adbcbf6a1748a9e53b5858a7983c9c4617736 SHA512 82c9fc2dba9978f4671ab98d3b981377b94f5bb71c30050ff2a40e66852eda4f9fb2498289cbb402b0d2ad2d372c3d23d030c632a29cde25ae577588478782c7
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.25.2.ebuild b/app-editors/okteta/okteta-0.25.2.ebuild
new file mode 100644
index 000000000000..89727e9e83b1
--- /dev/null
+++ b/app-editors/okteta/okteta-0.25.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://www.kde.org/applications/utilities/okteta
+https://utils.kde.org/projects/okteta"
+IUSE="crypt designer"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript 'scripttools')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	crypt? ( app-crypt/qca:2[qt5(+)] )
+	designer? ( $(add_qt_dep designer) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOMIT_EXAMPLES=ON
+		$(cmake-utils_use_find_package crypt Qca-qt5)
+		-DBUILD_DESIGNERPLUGIN=$(usex designer)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index fa7be5b31104..588fc5265f99 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 6f9187f6cec2..21e5396c4e39 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,5 +1,5 @@
-DIST buildah-1.1.tar.gz 4253820 BLAKE2B ae30a677a2f569d87da0ab85732078912598cf25f7b22ad25540f5d89797983a8549eef1bc8d151d4e0be078b97e024df145bb882bdd8443becb07774bfb5875 SHA512 9957590d7413436195307746682496616fd2350b832242f33fb4cb07c1144addae445eeff062f403d26a68329f1153468489032bc9bbcf870839c760a720ef95
 DIST buildah-1.2.tar.gz 4403310 BLAKE2B df3a1d12a41e9d585d3191103140fc232a2c247283996f394bd151f61615057b15d934e165be47794465c30217c32b3e6b53fbf4d2ef5a2f3349840dadad8171 SHA512 0aac0a80c3c50f0171199e549c0321ce1a756ca838dd9d92b0b0d58bd6b4e212390642c8a4a2aea794616292058624ab0c8707d2ea0cdcbcc555b387df611dc2
-EBUILD buildah-1.1.ebuild 1388 BLAKE2B 8dd9609a8d7c8e2f132e7f0d07b311c05fb0a364cd9c63d3f68c065e40bfe4776c3b1650463064ff96b40dc64ebaec9c87c6ed346705f371925822b2d097a7db SHA512 fb2c0381296021c4e4e60649532413b154c2a5e28fcc91fa3998e8be1e845d0c5f215bb17b0397441df63fd5bfea7d72b9f281ec891cf11b1bd309b2e52d8bcb
+DIST buildah-1.3.tar.gz 4486873 BLAKE2B 35fb62626d2466495da47579cf4ab23603797ef42a9308245fa97c87a91fcb978f4d02724ce79c2b4ac620d9868ca8974e4701ba6a96ccf739e5ccb4e6d9693a SHA512 c8e161254495cb652caf9a54a051155008e41575487d26aacd38355f0a447ae0e8973b33a978e6a2d5a6c8105400d49dae46878c5f3631ab51aa3556d5033ccd
 EBUILD buildah-1.2.ebuild 1407 BLAKE2B b57e8bf75b9db19b56b8a9f4bda2cf0c9347a2919b41c22194b17a88880ea98b7e3e75f00bdc4bea61b314ad90d511c64732fe7dd0f37409b9cc727a394f2ca3 SHA512 3a69febb77c2a22d93e5bf868db42b498b5d464e73182916f4754fabe7e55f91033cfc302c025ac45519f559f48f32524daad04e0ee89ded3b964d6481035f90
+EBUILD buildah-1.3.ebuild 1418 BLAKE2B ade5ca1b6c9a5d3d2d8ef4f5c7335b5826f9ad671593b064bdf2b297b546a10b6139c2a937817acf820c3a5f67d610d50f8bfe5d48a8f41fece8c9b2e6e2b716 SHA512 7638b2557ca122a566026e2fb7d7050d13d16c6623bb958edb1895b08e02c32cd9754760bae3c7d8a31f1a611e27cece6038a6000b796bd48101790d1f6671d7
 MISC metadata.xml 433 BLAKE2B 5b06389433033a1cf28f5fcae5dd41f4ebe0582d9537e8e163fad82046a66477a6ac3ed26ea63e60ea392919afcd3f0f45ae8ddabefd3a518707d5adff04e9d6 SHA512 3ab67ceda6ca0c8bd10f8868172d9686c8eeaa856760453be1c3ba907abb734ba37f5e9885547a16f69c67aa8d96e576de1ddf3208c08f4d44c2d90b081c74a6
diff --git a/app-emulation/buildah/buildah-1.1.ebuild b/app-emulation/buildah/buildah-1.1.ebuild
deleted file mode 100644
index 3be0b76e6b5f..000000000000
--- a/app-emulation/buildah/buildah-1.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/projectatomic/buildah"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="fbf46d3"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-RDEPEND="app-crypt/gpgme:=
-	app-emulation/skopeo
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-fs/lvm2:=
-	sys-libs/libseccomp:=
-	selinux? ( sys-libs/libselinux:= )"
-DEPEND="${RDEPEND}"
-RESTRICT="test"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -e 's|^\(GIT_COMMIT := \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
-	[[ -f ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		ostree_tag.sh || die; }
-
-	[[ -f selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		selinux_tag.sh || die; }
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" emake all
-}
-
-src_install() {
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	doman docs/*.1
-	dodoc -r docs/tutorials
-	dobin ${PN} imgtype
-	dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.3.ebuild b/app-emulation/buildah/buildah-1.3.ebuild
new file mode 100644
index 000000000000..2a0a4173a777
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit bash-completion-r1 golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/projectatomic/buildah"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ostree selinux"
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="be87762"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RDEPEND="app-crypt/gpgme:=
+	app-emulation/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+REQUIRED_USE="!selinux? ( !ostree )"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+	sed -e 's|^\(GIT_COMMIT := \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
+
+	[[ -f ostree_tag.sh ]] || die
+	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
+		ostree_tag.sh || die; }
+
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" emake all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin ${PN} imgtype
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}" emake test-unit
+}
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index fa83fd403c2a..1ac07d727089 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,12 +1,16 @@
 AUX lxc-2.0.5-omit-sysconfig.patch 259 BLAKE2B 977e151fbb8c9d98e89aaa5ee0426e64ab4286b4440af1582086a0ced8c6568efb470ccf68786da6ea52c82d1f4e81feac45bec411febc04fc31d108f05ccde2 SHA512 0aed9aca687accc6df79e97f48ab333043256e8ae68c8643f2b2452cc8013191238867d64ec71f7d399c59a43d3ba698b35d965090c5cb149b4f41302432e6e7
 AUX lxc-2.0.6-bash-completion.patch 919 BLAKE2B a364398ad6fe44213ba1097e961813d4cbc71efbaf25f90a44201dc95151b7676dbe1c086b3a34fb38ffb9ef2a5ebb25f9885e809c11ec1b1e9a6516f48a3ae1 SHA512 caa90c8bad2a79b4e42b781f00d6f2a7be37fc5c5301592b026c88db2652c90871be940c86a9156f03bc186f76cf2068a2d3084e9abc7a5896ea081885085d41
 AUX lxc-2.1.1-cgroups-enable-container-without-CAP_SYS_ADMIN.patch 5145 BLAKE2B 5e4c73811b6f912cc721606603ba69b225655c343eb51ecec7110e8bc477ddd08704aa4b892203cfe539c441cc7437959606e0a196ec26e313859253d088c007 SHA512 49494eb1a7d21c3755a5301cc3bec75832588ba9bd598f0d40be90b84426332567c6b525ca089b77a92629b953b89f42a2e4ed2834e5a125e6079a35e1a17a04
+AUX lxc-2.1.1-cve-2018-6556.patch 3994 BLAKE2B 791b80852408df5f325465a6ceea5bf7986641da4c988db1f61bebabe656554aa5032186f4e5409093c14b9c9fb3ee3d7bf06e338c5f4c19cb4e2eb9d8d1db36 SHA512 fcce5387cc1d67fcb035073a5295e15570b114d202f4b077363a5059813a28b7165b5ea3e32beb4b1be8d45613bc5d7d8223ed2ebff45d5e95b5fd1e87dbd490
 AUX lxc-2.1.1-fix-cgroup2-detection.patch 856 BLAKE2B e877e8a968d059c2034a2b5c23946241a6b45172f893e313bff30a7f798e3b1440e5a1e8ee277816308fb509901b52584a44021a156a91671e299964dd69b1bd SHA512 eb0fc8dee5a59d1641e8b3024bf79be2273aa15131fd7eaee98d80585c39ddb93d8d9cfe98c7f866ab2461fe8c6c7e3c038ec1a1263a6f9b02ed323a267b87f2
 AUX lxc-3.0.0-bash-completion.patch 915 BLAKE2B 8bb879e391cec349d211b47d321c64ea091c8475ac9a8c4adfb45918c044f6c49d9b9bce546082907d696f697baf0870893c4427abeafa496db89f99190cd091 SHA512 2f3728fcf5e88eecc1ae05bf038ef83baa375194c5bef0d0ef68feaf4d8092cdd8efef6b3c27207c4abd28b085f087af517242c65747b47d0a8fa840f6b9d279
+AUX lxc-3.0.1-cve-2018-6556.patch 3481 BLAKE2B 2ee1d488f7be81d97908d83d84346c5800b2d3f5ef395fb97c60263134b6e7e5048be7020e296e9d45b2ca17b0d8d0d911d0e3e1b08fe02866f506743f13270d SHA512 0cfc93c4f1a989e6c8d29c232aa8569649dd0797419f58c5e83b9febf851ed7b605a552a0b521e1c57de0179a08ee9e6ee8243130758867901fd5b26533425ca
 AUX lxc.initd.7 3468 BLAKE2B 37b0d044594f1c66631f991315e49c4ceea4640bf6c459e6bba713fb76ef9a8ee1fcbc49da68bd0f1e2929cf9904e0113a3b321166f7c3d360fcebeab6665e5a SHA512 c5841cff7d8b58d4283a26719e8a5db1be2c4add0f31065393b863b6626460180d91632106bc50cde4d3e74ae46a57d581fa1f01140dfa95522aba12277f9eaa
 AUX lxc_at.service.4 265 BLAKE2B 4454528e69a5c986c23c0c4ccc10ebe03a0650e47cd30208355d2f4a70a4cb46392473eccddd736988f1b72954948876601aaf99977d8e6014a7c774a416160f SHA512 d61e7103e90e6ffb3202533e7d7555d8c02b943f06ec6c0d673713c1c0ede58641312c65d6dd6a15907c1171522e6148c2313d7b11acbd85d59fe65758cd52b3
 DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69 SHA512 2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
 DIST lxc-3.0.1.tar.gz 1239920 BLAKE2B 7be668c11d7211540fe7e2fb6318d38eac0d8d493914f4705d097fca4c004a8d2191609d02bd9e1d9204c3c0b9ea937084d3f9050fc841f6d777768067af3d19 SHA512 f51b0844f61f64d4efc530454eae1fa499f7f1b908bd3b40d7031e7f311a402893a7504bddbc53f2ef9da2b3154d1b047fc4d876b99f0d487d7c79de64eea505
+EBUILD lxc-2.1.1-r1.ebuild 6818 BLAKE2B e885b3a11de8a131433bec83b1d47b8c2277fd575d2d8bbf475bbb6ad5b1b520fbe204f61034816a96eef2734b5986d1bdaf9f39c2c61f4d1e47597c49eaf90c SHA512 15d46b88c5163ed35d25e404696350d0ef4906c4b264f5c1e9987a2f98a24b68c8187222a39a041a7de622621ae3dc5a9e6b58ab24754e57a70e2e1374f8c840
 EBUILD lxc-2.1.1.ebuild 6763 BLAKE2B a4d6e09451ebb728147e1ebeca98292422472040eea4a7664e8659d2d00774933b16e264b2af3a0ad6a90750586369a02cc6149959bb3a218a528f4f8f0aa773 SHA512 e5838b9a63d096284905d3f000c268a6c398835c2054c2d0bb92e3e6ed2d0b3aaeb2a417d2c04b8182ced7447a47fa9e1340e89f92d0fd6dd48238544684a727
+EBUILD lxc-3.0.1-r1.ebuild 5191 BLAKE2B 9f459a526990f82180248e70c618479b12bd2f0ebbed6531d380a379256f214511b1213e1627a4fc813d36d38a05b4f44894f14ce9d7fef2da1fd0f5d1db9b51 SHA512 3e32d03eb7bf76be38b9fba3b2b0645273c497d9053ff91167908675d133b7e55ab80f7f8bb6a58ecefb1c9b002ef8727b63af56cd2c478a6dea2e8dd9c4f033
 EBUILD lxc-3.0.1.ebuild 5136 BLAKE2B 3e439cf609c87cbd2d88e0d9c646b64998f072a7cc2c04b0e5f5537d0297d9f0d66ff39e184d03a8828fec5f32ea959b76bb5b4c9471d546102bceee46577329 SHA512 1f02404f7d8ad22bb7517d0ed25987ce1ef73034736f6a1d2f7ff2b804d1be8ae712545575725736a9ac4019e316629b43bed0e21ebe60e5ed094334840c67fa
 MISC metadata.xml 670 BLAKE2B 1318dc9a17178a46375589bcc92685e1a49146cd7384e36d996e675875a55c8402e2a037546dadd2ce1399557b77366f03179d8ef51cdbe106e9b27c3f3dbff9 SHA512 c1d3d15e52953b8dcd280c90d73467258cdf41d6f6505f231c0c031f40b0a467147798651bb327b498dd4ac694783441896584941a0c05d34e45af8dc9c6db70
diff --git a/app-emulation/lxc/files/lxc-2.1.1-cve-2018-6556.patch b/app-emulation/lxc/files/lxc-2.1.1-cve-2018-6556.patch
new file mode 100644
index 000000000000..bad1e274527e
--- /dev/null
+++ b/app-emulation/lxc/files/lxc-2.1.1-cve-2018-6556.patch
@@ -0,0 +1,118 @@
+From d183654ec1a2cd1149bdb92601ccb7246bddb14e Mon Sep 17 00:00:00 2001
+From: Christian Brauner <christian.brauner@ubuntu.com>
+Date: Wed, 25 Jul 2018 19:56:54 +0200
+Subject: [PATCH] CVE 2018-6556: verify netns fd in lxc-user-nic
+
+Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
+---
+ src/lxc/lxc_user_nic.c | 35 ++++++++++++++++++++++++++++++++---
+ src/lxc/utils.c        | 12 ++++++++++++
+ src/lxc/utils.h        |  5 +++++
+ 3 files changed, 49 insertions(+), 3 deletions(-)
+
+ADDENDUM from vdupras@gentoo.org: Original patch from Christian didn't
+include LXC_PROC_PID_FD_LEN define, but referenced it. This resulted in
+code that doesn't compile. I fetched the definition from the stable-3.0
+branch and included it to this patch. Also, this diff is regenerated
+from lxc-2.1.1 tag instead of stable-2.0 branch.
+
+diff --git a/src/lxc/lxc_user_nic.c b/src/lxc/lxc_user_nic.c
+index 6f550f0d..09a342ac 100644
+--- a/src/lxc/lxc_user_nic.c
++++ b/src/lxc/lxc_user_nic.c
+@@ -1124,12 +1124,41 @@ int main(int argc, char *argv[])
+ 			exit(EXIT_FAILURE);
+ 		}
+ 	} else if (request == LXC_USERNIC_DELETE) {
+-		netns_fd = open(args.pid, O_RDONLY);
++		char opath[LXC_PROC_PID_FD_LEN];
++
++		/* Open the path with O_PATH which will not trigger an actual
++		 * open(). Don't report an errno to the caller to not leak
++		 * information whether the path exists or not.
++		 * When stracing setuid is stripped so this is not a concern
++		 * either.
++		 */
++		netns_fd = open(args.pid, O_PATH | O_CLOEXEC);
+ 		if (netns_fd < 0) {
+-			usernic_error("Could not open \"%s\": %s\n", args.pid,
+-				      strerror(errno));
++			usernic_error("Failed to open \"%s\"\n", args.pid);
+ 			exit(EXIT_FAILURE);
+ 		}
++
++		if (!fhas_fs_type(netns_fd, NSFS_MAGIC)) {
++			usernic_error("Path \"%s\" does not refer to a network namespace path\n", args.pid);
++			close(netns_fd);
++			exit(EXIT_FAILURE);
++		}
++
++		ret = snprintf(opath, sizeof(opath), "/proc/self/fd/%d", netns_fd);
++		if (ret < 0 || (size_t)ret >= sizeof(opath)) {
++			close(netns_fd);
++			exit(EXIT_FAILURE);
++		}
++
++		/* Now get an fd that we can use in setns() calls. */
++		ret = open(opath, O_RDONLY | O_CLOEXEC);
++		if (ret < 0) {
++			usernic_error("Failed to open \"%s\": %s\n", args.pid, strerror(errno));
++			close(netns_fd);
++			exit(EXIT_FAILURE);
++		}
++		close(netns_fd);
++		netns_fd = ret;
+ 	}
+ 
+ 	if (!create_db_dir(LXC_USERNIC_DB)) {
+diff --git a/src/lxc/utils.c b/src/lxc/utils.c
+index e6a44a51..c2a08a9d 100644
+--- a/src/lxc/utils.c
++++ b/src/lxc/utils.c
+@@ -2380,6 +2380,18 @@ bool has_fs_type(const char *path, fs_type_magic magic_val)
+ 	return has_type;
+ }
+ 
++bool fhas_fs_type(int fd, fs_type_magic magic_val)
++{
++	int ret;
++	struct statfs sb;
++
++	ret = fstatfs(fd, &sb);
++	if (ret < 0)
++		return false;
++
++	return is_fs_type(&sb, magic_val);
++}
++
+ bool lxc_nic_exists(char *nic)
+ {
+ #define __LXC_SYS_CLASS_NET_LEN 15 + IFNAMSIZ + 1
+diff --git a/src/lxc/utils.h b/src/lxc/utils.h
+index e83ed49e..06ec74d7 100644
+--- a/src/lxc/utils.h
++++ b/src/lxc/utils.h
+@@ -46,11 +46,16 @@
+ #define __S_ISTYPE(mode, mask) (((mode)&S_IFMT) == (mask))
+ #endif
+ 
++#ifndef NSFS_MAGIC
++#define NSFS_MAGIC 0x6e736673
++#endif
++
+ /* Useful macros */
+ /* Maximum number for 64 bit integer is a string with 21 digits: 2^64 - 1 = 21 */
+ #define LXC_NUMSTRLEN64 21
+ #define LXC_LINELEN 4096
+ #define LXC_IDMAPLEN 4096
++#define LXC_PROC_PID_FD_LEN (6 + LXC_NUMSTRLEN64 + 4 + LXC_NUMSTRLEN64 + 1)
+ 
+ /* returns 1 on success, 0 if there were any failures */
+ extern int lxc_rmdir_onedev(char *path, const char *exclude);
+@@ -402,6 +407,7 @@ extern void *must_realloc(void *orig, size_t sz);
+ /* __typeof__ should be safe to use with all compilers. */
+ typedef __typeof__(((struct statfs *)NULL)->f_type) fs_type_magic;
+ extern bool has_fs_type(const char *path, fs_type_magic magic_val);
++extern bool fhas_fs_type(int fd, fs_type_magic magic_val);
+ extern bool is_fs_type(const struct statfs *fs, fs_type_magic magic_val);
+ extern bool lxc_nic_exists(char *nic);
diff --git a/app-emulation/lxc/files/lxc-3.0.1-cve-2018-6556.patch b/app-emulation/lxc/files/lxc-3.0.1-cve-2018-6556.patch
new file mode 100644
index 000000000000..198e835e6c59
--- /dev/null
+++ b/app-emulation/lxc/files/lxc-3.0.1-cve-2018-6556.patch
@@ -0,0 +1,110 @@
+From f2314625c5702cfd25974929599fa439bdac8bdf Mon Sep 17 00:00:00 2001
+From: Christian Brauner <christian.brauner@ubuntu.com>
+Date: Wed, 25 Jul 2018 19:56:54 +0200
+Subject: [PATCH] CVE 2018-6556: verify netns fd in lxc-user-nic
+
+Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
+---
+ src/lxc/cmd/lxc_user_nic.c | 35 ++++++++++++++++++++++++++++++++---
+ src/lxc/utils.c            | 12 ++++++++++++
+ src/lxc/utils.h            |  5 +++++
+ 3 files changed, 49 insertions(+), 3 deletions(-)
+
+diff --git a/src/lxc/cmd/lxc_user_nic.c b/src/lxc/cmd/lxc_user_nic.c
+index ec9cd97e..c5beb6c8 100644
+--- a/src/lxc/cmd/lxc_user_nic.c
++++ b/src/lxc/cmd/lxc_user_nic.c
+@@ -1179,12 +1179,41 @@ int main(int argc, char *argv[])
+ 			exit(EXIT_FAILURE);
+ 		}
+ 	} else if (request == LXC_USERNIC_DELETE) {
+-		netns_fd = open(args.pid, O_RDONLY);
++		char opath[LXC_PROC_PID_FD_LEN];
++
++		/* Open the path with O_PATH which will not trigger an actual
++		 * open(). Don't report an errno to the caller to not leak
++		 * information whether the path exists or not.
++		 * When stracing setuid is stripped so this is not a concern
++		 * either.
++		 */
++		netns_fd = open(args.pid, O_PATH | O_CLOEXEC);
+ 		if (netns_fd < 0) {
+-			usernic_error("Could not open \"%s\": %s\n", args.pid,
+-				      strerror(errno));
++			usernic_error("Failed to open \"%s\"\n", args.pid);
++			exit(EXIT_FAILURE);
++		}
++
++		if (!fhas_fs_type(netns_fd, NSFS_MAGIC)) {
++			usernic_error("Path \"%s\" does not refer to a network namespace path\n", args.pid);
++			close(netns_fd);
++			exit(EXIT_FAILURE);
++		}
++
++		ret = snprintf(opath, sizeof(opath), "/proc/self/fd/%d", netns_fd);
++		if (ret < 0 || (size_t)ret >= sizeof(opath)) {
++			close(netns_fd);
++			exit(EXIT_FAILURE);
++		}
++
++		/* Now get an fd that we can use in setns() calls. */
++		ret = open(opath, O_RDONLY | O_CLOEXEC);
++		if (ret < 0) {
++			usernic_error("Failed to open \"%s\": %s\n", args.pid, strerror(errno));
++			close(netns_fd);
+ 			exit(EXIT_FAILURE);
+ 		}
++		close(netns_fd);
++		netns_fd = ret;
+ 	}
+ 
+ 	if (!create_db_dir(LXC_USERNIC_DB)) {
+diff --git a/src/lxc/utils.c b/src/lxc/utils.c
+index 26f1b058..69d362dc 100644
+--- a/src/lxc/utils.c
++++ b/src/lxc/utils.c
+@@ -2548,6 +2548,18 @@ bool has_fs_type(const char *path, fs_type_magic magic_val)
+ 	return has_type;
+ }
+ 
++bool fhas_fs_type(int fd, fs_type_magic magic_val)
++{
++	int ret;
++	struct statfs sb;
++
++	ret = fstatfs(fd, &sb);
++	if (ret < 0)
++		return false;
++
++	return is_fs_type(&sb, magic_val);
++}
++
+ bool lxc_nic_exists(char *nic)
+ {
+ #define __LXC_SYS_CLASS_NET_LEN 15 + IFNAMSIZ + 1
+diff --git a/src/lxc/utils.h b/src/lxc/utils.h
+index 7d672b77..fedc395b 100644
+--- a/src/lxc/utils.h
++++ b/src/lxc/utils.h
+@@ -95,6 +95,10 @@
+ #define CGROUP2_SUPER_MAGIC 0x63677270
+ #endif
+ 
++#ifndef NSFS_MAGIC
++#define NSFS_MAGIC 0x6e736673
++#endif
++
+ /* Useful macros */
+ /* Maximum number for 64 bit integer is a string with 21 digits: 2^64 - 1 = 21 */
+ #define LXC_NUMSTRLEN64 21
+@@ -581,6 +585,7 @@ extern void *must_realloc(void *orig, size_t sz);
+ /* __typeof__ should be safe to use with all compilers. */
+ typedef __typeof__(((struct statfs *)NULL)->f_type) fs_type_magic;
+ extern bool has_fs_type(const char *path, fs_type_magic magic_val);
++extern bool fhas_fs_type(int fd, fs_type_magic magic_val);
+ extern bool is_fs_type(const struct statfs *fs, fs_type_magic magic_val);
+ extern bool lxc_nic_exists(char *nic);
+ extern int lxc_make_tmpfile(char *template, bool rm);
+-- 
+2.17.1
+
diff --git a/app-emulation/lxc/lxc-2.1.1-r1.ebuild b/app-emulation/lxc/lxc-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..921619a1f75e
--- /dev/null
+++ b/app-emulation/lxc/lxc-2.1.1-r1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools bash-completion-r1 distutils-r1 linux-info versionator flag-o-matic systemd readme.gentoo-r1
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/"
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
+
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="cgmanager examples lua python seccomp selinux"
+
+RDEPEND="
+	net-libs/gnutls
+	sys-libs/libcap
+	cgmanager? ( app-admin/cgmanager )
+	lua? ( >=dev-lang/lua-5.1:= )
+	python? ( ${PYTHON_DEPS} )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-sgml-utils
+	>=sys-kernel/linux-headers-3.2"
+
+RDEPEND="${RDEPEND}
+	sys-apps/util-linux
+	app-misc/pax-utils
+	virtual/awk"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+	~CPUSETS ~CGROUP_CPUACCT
+	~CGROUP_SCHED
+
+	~NAMESPACES
+	~IPC_NS ~USER_NS ~PID_NS
+
+	~NETLINK_DIAG ~PACKET_DIAG
+	~INET_UDP_DIAG ~INET_TCP_DIAG
+	~UNIX_DIAG ~CHECKPOINT_RESTORE
+
+	~CGROUP_FREEZER
+	~UTS_NS ~NET_NS
+	~VETH ~MACVLAN
+
+	~POSIX_MQUEUE
+	~!NETPRIO_CGROUP
+
+	~!GRKERNSEC_CHROOT_MOUNT
+	~!GRKERNSEC_CHROOT_DOUBLE
+	~!GRKERNSEC_CHROOT_PIVOT
+	~!GRKERNSEC_CHROOT_CHMOD
+	~!GRKERNSEC_CHROOT_CAPS
+	~!GRKERNSEC_PROC
+	~!GRKERNSEC_SYSFS_RESTRICT
+"
+
+ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for pts inside container"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
+
+ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
+
+ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) networking"
+
+ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG:  needed for lxc-checkpoint"
+ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG:  needed for lxc-checkpoint"
+ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG:  needed for lxc-checkpoint"
+ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG:  needed for lxc-checkpoint"
+ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG:  needed for lxc-checkpoint"
+ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE:  needed for lxc-checkpoint"
+
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
+
+ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC:  this GRSEC feature is incompatible with unprivileged containers"
+ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT:  this GRSEC feature is incompatible with unprivileged containers"
+
+DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-2.0.6-bash-completion.patch
+	#558854
+	eapply "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch
+	eapply "${FILESDIR}"/${PN}-2.1.1-fix-cgroup2-detection.patch
+	eapply "${FILESDIR}"/${PN}-2.1.1-cgroups-enable-container-without-CAP_SYS_ADMIN.patch
+	eapply "${FILESDIR}"/${PN}-2.1.1-cve-2018-6556.patch
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	if use python; then
+		#541932
+		python_setup "python3*"
+		export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}"
+	fi
+
+	# I am not sure about the --with-rootfs-path
+	# /var/lib/lxc is probably more appropriate than
+	# /usr/lib/lxc.
+	# Note by holgersson: Why is apparmor disabled?
+
+	# --enable-doc is for manpages which is why we don't link it to a "doc"
+	# USE flag. We always want man pages.
+	econf \
+		--localstatedir=/var \
+		--bindir=/usr/bin \
+		--sbindir=/usr/bin \
+		--with-config-path=/var/lib/lxc	\
+		--with-rootfs-path=/var/lib/lxc/rootfs \
+		--with-distro=gentoo \
+		--with-runtime-path=/run \
+		--disable-apparmor \
+		--disable-werror \
+		--enable-doc \
+		$(use_enable cgmanager) \
+		$(use_enable examples) \
+		$(use_enable lua) \
+		$(use_enable python) \
+		$(use_enable seccomp) \
+		$(use_enable selinux)
+}
+
+python_compile() {
+	distutils-r1_python_compile build_ext -I.. -L../lxc/.libs --no-pkg-config
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd "${S}/src/python-${PN}" > /dev/null
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
+	# start-ephemeral is no longer a command but removing it here
+	# generates QA warnings (still in upstream completion script)
+	bashcomp_alias ${PN}-start \
+		${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
+
+	if use python; then
+		pushd "${S}/src/python-lxc" > /dev/null
+		# Unset DOCS. This has been handled by the default target
+		unset DOCS
+		distutils-r1_src_install
+		popd > /dev/null
+	fi
+
+	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
+
+	find "${D}" -name '*.la' -delete
+
+	# Gentoo-specific additions!
+	newinitd "${FILESDIR}/${PN}.initd.7" ${PN}
+
+	# Remember to compare our systemd unit file with the upstream one
+	# config/init/systemd/lxc.service.in
+	systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
+
+	DOC_CONTENTS="
+	Starting from version ${PN}-1.1.0-r3, the default lxc path has been
+	moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc
+	please add the following to your /etc/lxc/lxc.conf
+
+	  lxc.lxcpath = /etc/lxc
+
+	For openrc, there is an init script provided with the package.
+	You _should_ only need to symlink /etc/init.d/lxc to
+	/etc/init.d/lxc.configname to start the container defined in
+	/etc/lxc/configname.conf.
+
+	Correspondingly, for systemd a service file lxc@.service is installed.
+	Enable and start lxc@configname in order to start the container defined
+	in /etc/lxc/configname.conf.
+
+	If you want checkpoint/restore functionality, please install criu
+	(sys-process/criu)."
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/lxc/lxc-3.0.1-r1.ebuild b/app-emulation/lxc/lxc-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..bf2c75e44b88
--- /dev/null
+++ b/app-emulation/lxc/lxc-3.0.1-r1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic systemd readme.gentoo-r1 pam
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/"
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
+
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="examples pam python seccomp selinux +templates"
+
+RDEPEND="
+	net-libs/gnutls
+	sys-libs/libcap
+	pam? ( virtual/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )"
+
+DEPEND="${RDEPEND}
+	>=app-text/docbook-sgml-utils-0.6.14-r2
+	>=sys-kernel/linux-headers-3.2"
+
+RDEPEND="${RDEPEND}
+	sys-apps/util-linux
+	app-misc/pax-utils
+	virtual/awk"
+
+PDEPEND="templates? ( app-emulation/lxc-templates )
+	python? ( dev-python/python3-lxc )"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+	~CPUSETS ~CGROUP_CPUACCT
+	~CGROUP_SCHED
+
+	~NAMESPACES
+	~IPC_NS ~USER_NS ~PID_NS
+
+	~CGROUP_FREEZER
+	~UTS_NS ~NET_NS
+	~VETH ~MACVLAN
+
+	~POSIX_MQUEUE
+	~!NETPRIO_CGROUP
+
+	~!GRKERNSEC_CHROOT_MOUNT
+	~!GRKERNSEC_CHROOT_DOUBLE
+	~!GRKERNSEC_CHROOT_PIVOT
+	~!GRKERNSEC_CHROOT_CHMOD
+	~!GRKERNSEC_CHROOT_CAPS
+	~!GRKERNSEC_PROC
+	~!GRKERNSEC_SYSFS_RESTRICT
+"
+
+ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for pts inside container"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
+
+ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
+
+ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) networking"
+
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
+
+ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC:  this GRSEC feature is incompatible with unprivileged containers"
+ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT:  this GRSEC feature is incompatible with unprivileged containers"
+
+DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
+
+pkg_setup() {
+	kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+	#558854
+	eapply "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch
+	eapply "${FILESDIR}"/${PN}-3.0.1-cve-2018-6556.patch
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# I am not sure about the --with-rootfs-path
+	# /var/lib/lxc is probably more appropriate than
+	# /usr/lib/lxc.
+	# Note by holgersson: Why is apparmor disabled?
+
+	# --enable-doc is for manpages which is why we don't link it to a "doc"
+	# USE flag. We always want man pages.
+	econf \
+		--localstatedir=/var \
+		--bindir=/usr/bin \
+		--sbindir=/usr/bin \
+		--with-config-path=/var/lib/lxc	\
+		--with-rootfs-path=/var/lib/lxc/rootfs \
+		--with-distro=gentoo \
+		--with-runtime-path=/run \
+		--disable-apparmor \
+		--disable-werror \
+		--enable-doc \
+		$(use_enable examples) \
+		$(use_enable pam) \
+		$(use_with pam pamdir $(getpam_mod_dir)) \
+		$(use_enable seccomp) \
+		$(use_enable selinux)
+}
+
+src_install() {
+	default
+
+	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
+	bashcomp_alias ${PN}-start \
+		${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
+
+	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
+	rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
+
+	find "${D}" -name '*.la' -delete
+
+	# Gentoo-specific additions!
+	newinitd "${FILESDIR}/${PN}.initd.7" ${PN}
+
+	# Remember to compare our systemd unit file with the upstream one
+	# config/init/systemd/lxc.service.in
+	systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
+
+	DOC_CONTENTS="
+	For openrc, there is an init script provided with the package.
+	You _should_ only need to symlink /etc/init.d/lxc to
+	/etc/init.d/lxc.configname to start the container defined in
+	/etc/lxc/configname.conf.
+
+	Correspondingly, for systemd a service file lxc@.service is installed.
+	Enable and start lxc@configname in order to start the container defined
+	in /etc/lxc/configname.conf.
+
+	If you want checkpoint/restore functionality, please install criu
+	(sys-process/criu)."
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/reg/Manifest b/app-emulation/reg/Manifest
index ae60d2fb68cc..0f3530bdf452 100644
--- a/app-emulation/reg/Manifest
+++ b/app-emulation/reg/Manifest
@@ -1,6 +1,8 @@
+AUX reg-0.15.4-listen-addr.patch 1519 BLAKE2B f25399e776125d433cfbc15b4e48167b7606e1c2e23604d3e68fe1e262b4c1304f12d7e3b9f3cb17de77a485a4be483f17dc3627ba7a19b350e2752ed2c23e68 SHA512 d1d3303ccdf272d8526184a5be1f28107762681cf796a568ff01249b0ff6dc5c9c5c9d6a9f47bb244cdadd42f3b24e9b21fbe3d6cdc8bc410a681d4b606f48d8
 AUX reg.confd 68 BLAKE2B 90fbc7677653b2e1389a0a0dd4c06f8a108fc70f6ae8d53fb94a5ef4669296679cf0f15bf985594837b0d455206f1b928df8a65596e81c0c717c5908c1987b0c SHA512 c0e7e68e8fd09cd46af3a01dc3507ef55dc25016b00e425e673734c864f05c63fcf3dc10b7ca987f166b33cfbfea62ca6c3458b73e28d3683d5bc81cbda84c4e
 AUX reg.initd 595 BLAKE2B 36a5fd61c46810c1924c86c00392348e0907501f896114c3c523daebfd110e5ea292d4087fc4a41ba91ccd952c1c6b27fe1b1db60364575352a9eb9e4b207258 SHA512 96919a0d2f29631c4296bcf8adfb78d63f5d732ed350491f7df14f45744c945559110454a0c24726962da7519dd790a37a6c6a2e0d3586599dc7231743fbe03a
 DIST reg-0.15.4.tar.gz 4052737 BLAKE2B 34bc68d3cb161bbea02bfc0ed142cb764f2db64610ac7b2b92130cfc838cfa4fde4794da9fd2d38a9bb73e994cf386ac9f50beaa4435b88cf034a4f4d0b648cc SHA512 d5948b095c310c2697a2f7b80a342af6949e4cb66c521cdb370a6fbead7424d729057fe71952291ee1ed82717cd7bb29141f6a2f85c946e33fd96da1c17912dd
 EBUILD reg-0.15.4-r1.ebuild 1060 BLAKE2B 769a395dd1cfa2cbcdd691dc66a2e94f8b9efbbf24347dd9ebf56da7a6a705d6e057efaac9a227d9e22e52b679dda38ef3bbebab31c8f33b0989d5cd43f13e8b SHA512 8fc065165a355d2a8cdccd05b94fd49bf0513878f668a0123379adabe5b37a2b5e337bccd9906667ebce2f116837c1eca6923acbc57e017d9bb588e5ab40807d
+EBUILD reg-0.15.4-r2.ebuild 1179 BLAKE2B afce38e0d6c9bc23af77eb7b995f0514b9b8d02d08c5f7c6a139b7643bcb3aad420d61a62deadb318e9ed0dca0d00e71407f4af914a435fbf75db1c6b0cf22d9 SHA512 18640a5b6fb4bb170dfa2ae7d6b9824e5bae12861cb8c699f31beb8bf8e183244840dfd4807d1703383fdd934e0dd621e2e24c55b95345f96724d08828166fa0
 EBUILD reg-0.15.4.ebuild 836 BLAKE2B 5f6e3dcef97cdf67fbcc9d07b02ee66a611396fb98831f192e25e5af90fd8c01b9c15f4462008eae7f87174111a1e1f6902237380d7ffe49d151e5525698e0f3 SHA512 6e63c4018a663d0b65a35ea71cefc7dd4d62e3e16c2bc4c79cf38c25a5a2c9f07345f70f3267a356d46214a3092373651692d337798be8facca2b52f028c3405
 MISC metadata.xml 326 BLAKE2B 82f2440e792104c0c9e1afe4d95b9972efc7b233524637e32f11c2b5746aba7990d88f01a542e25f7a5c9c52aac0c5c1e25bc5703d3e855ea8e8ef4ffe87929c SHA512 9fea1224db7eb9316eff5bd89ebf748cbf35160516b33a9c9a3a07d1db6a2fa64dafcf8623a24af09429f7b76cc94ee02a39145162d0b039cb9d0137bc51a20e
diff --git a/app-emulation/reg/files/reg-0.15.4-listen-addr.patch b/app-emulation/reg/files/reg-0.15.4-listen-addr.patch
new file mode 100644
index 000000000000..21f2759e5b8c
--- /dev/null
+++ b/app-emulation/reg/files/reg-0.15.4-listen-addr.patch
@@ -0,0 +1,47 @@
+From b3c826e2e48108d832cbe9fc3b630e7ff207915a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
+Date: Wed, 18 Jul 2018 19:47:12 +0200
+Subject: [PATCH] server: Allow to restrict listen address (#115)
+
+e.g. limit to listen on localhost only
+---
+ server.go | 12 +++++++-----
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/server.go b/server.go
+index 8866efed..a7cc2048 100644
+--- a/server.go
++++ b/server.go
+@@ -35,6 +35,7 @@ func (cmd *serverCommand) Register(fs *flag.FlagSet) {
+ 
+ 	fs.StringVar(&cmd.cert, "cert", "", "path to ssl cert")
+ 	fs.StringVar(&cmd.key, "key", "", "path to ssl key")
++	fs.StringVar(&cmd.listenAddress, "listen-address", "", "address to listen on")
+ 	fs.StringVar(&cmd.port, "port", "8080", "port for server to run on")
+ 	fs.StringVar(&cmd.assetPath, "asset-path", "", "Path to assets and templates")
+ 
+@@ -48,10 +49,11 @@ type serverCommand struct {
+ 
+ 	generateAndExit bool
+ 
+-	cert      string
+-	key       string
+-	port      string
+-	assetPath string
++	cert          string
++	key           string
++	listenAddress string
++	port          string
++	assetPath     string
+ }
+ 
+ func (cmd *serverCommand) Run(ctx context.Context, args []string) error {
+@@ -180,7 +182,7 @@ func (cmd *serverCommand) Run(ctx context.Context, args []string) error {
+ 
+ 	// Set up the server.
+ 	server := &http.Server{
+-		Addr:    ":" + cmd.port,
++		Addr:    cmd.listenAddress + ":" + cmd.port,
+ 		Handler: mux,
+ 	}
+ 	logrus.Infof("Starting server on port %q", cmd.port)
diff --git a/app-emulation/reg/reg-0.15.4-r2.ebuild b/app-emulation/reg/reg-0.15.4-r2.ebuild
new file mode 100644
index 000000000000..1bebb08c1e9d
--- /dev/null
+++ b/app-emulation/reg/reg-0.15.4-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot user
+
+EGO_PN="github.com/genuinetools/reg"
+GIT_COMMIT="8c930c585418564a4ce472fbbfccb8c5741c2520"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Docker registry v2 command line client"
+HOMEPAGE="https://github.com/genuinetools/reg"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${P}-listen-addr.patch )
+
+pkg_setup() {
+	enewgroup reg
+	enewuser reg -1 -1 /var/lib/reg reg
+}
+
+src_prepare() {
+	pushd src/${EGO_PN} || die
+	default
+	popd || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc src/${EGO_PN}/README.md
+	insinto /var/lib/${PN}
+	doins -r src/${EGO_PN}/server/*
+	newinitd "${FILESDIR}"/reg.initd reg
+	newconfd "${FILESDIR}"/reg.confd reg
+
+	keepdir /var/log/reg
+	fowners -R reg:reg /var/log/reg /var/lib/reg/static
+}
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index 8449262ec0e5..b03e8c4f61ff 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -3,7 +3,7 @@ AUX spice-0.13.3-reds-Avoid-buffer-overflows-handling-monitor-configu.patch 1902
 AUX spice-0.13.3-reds-Avoid-integer-overflows-handling-monitor-config.patch 1022 BLAKE2B eff6063372af35b926663393afc022a4e0b875c22402136ed41be394951958789a2c8de26e8791664cbef1c8bee7e9344f8fe7f39563e7b14567f9ebff2b0fa8 SHA512 4f815f091c0eec1ccfaa3438390087d4b7390e3ea84e353e42638a850e0faa552077af443719f2015ce36375ac2ac400721677462a2739ecf05fdf8c2e778b41
 AUX spice-0.13.3-reds-Disconnect-when-receiving-overly-big-ClientMoni.patch 2988 BLAKE2B 99bca01b78b4acb875085628613f47a8c07c87061b77a50fdb4abc45770aa75a88bc75310e3a8a558d303861f17480b6362751f4073a54c5909aaca8c11422ef SHA512 ee15a37c45527869415d301968857f47a4536462bcea6fb5608862fa7019b2eeba36d08563b74feb7a96bc565dd6fe09349c736c4677d43c1f13fc95f1c42c06
 AUX spice-0.13.3-skip_faulty_lz4_check.patch 566 BLAKE2B 4775395c0e39e8c930078365ac2b05c21d30698b4cd472e56eb77fcde3f83894f3649c066824ad424dd0178200e17a8cd207046552dfebd3944de88e96d406e9 SHA512 aa16b86446f42a08c5d76927090e6b01817308520b34affcdd28a9e89d70d344f5ce47d1600c5cc564ecdf428cbfe8cf456ce8d3ccf4e686bd0cfb2f9fe5fe33
-AUX spice-0.14.0-libressl_fix.patch 488 BLAKE2B ab316ba0e5ca7299304dae229216291f0c2e80720f16dd0bd3de825b311b57cea3dd52b1afa029e5c246abe4244c30deda55f40262085ed2290799748cdb27d2 SHA512 80d809aa7cb92cb5b51a00c1d92f3160110ceefedf6fbebdc77726dec99f253fa9c308b5e5356620ea5b426c14857ad87d8aa861913b22c5b1eecb6df1ce922e
+AUX spice-0.14.0-libressl_fix.patch 530 BLAKE2B 136e0b87931d487a018cdf0be4acfc0b05d474eb2e1a0583e05f9184ac6aa3b3a5dc58537ed167b13655b9180f06ba489c7805caa95d39a1af1fff410000e675 SHA512 f29f0a47edb2552b0908d0ceea7546efa90ad572217ce9184da031507be9f65a83ef39684dc3d8610bea4993a8f26ed78bce17781c893a4fca1cbdf9ba5140e3
 AUX spice-0.14.0-openssl1.1_fix.patch 614 BLAKE2B fb7b39e73d37bc6ab27035c7d7a742fa648afb62777bcbd9dbdd7480b5b5461da6147b4f3368e04aaf04f8ef5780aeab1e7679f4fcf7aa1005df7d28a4fca7a1 SHA512 1b0b83b7222af0f60bdb5a3469881a4e84f8df824d2741710da04b8bdec95e691f97137f2ee67ad71065918b329285d215aa086d5f46dc83b18334eb17ef6dc8
 DIST spice-0.13.3.tar.bz2 1322505 BLAKE2B 56f9cd34bb48fdcf750230242b27567db713ef749649d4b780a82d0d4ec5d326b19540c9bb4f36c164d40a692eb0368c39e05ee8dba319dd8461a0315e5a9a17 SHA512 63496fbd3df0fd453052cef8e1fb00a3a28f0105610676fdc4a58043cbc6da571ae4407701af2b817e410d05ce727d60d5ee0c93c8897231e25229897c51d95a
 DIST spice-0.14.0.tar.bz2 1330195 BLAKE2B 08f93e8ddeb79adb4feac0557a854cc41fd096a9dfefc0baaca176803c2a03ef9286c4f61a135d62ad22e3ac3f4bb31ffd1614c8ddeaec7ae8c01eca34da1750 SHA512 84532146aa628ca6ca459a82afb89d6391892e063668fd4a68023c92cee7ca868b6c82e31dd9886819b76ea745ebdae0d0030e1f608d8f58f51c00f0b09bae1f
diff --git a/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch b/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch
index 2f77fa5a0006..1dfce9480e9c 100644
--- a/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch
+++ b/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch
@@ -7,7 +7,7 @@ index a9ed650..27aa5d3 100644
  #include <gio/gio.h>
  
 -#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
  static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
  {
      return M_ASN1_STRING_data(asn1);
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index da497a91d764..75ead6e5d2c7 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-qtgraphicssystem/Manifest b/app-eselect/eselect-qtgraphicssystem/Manifest
deleted file mode 100644
index 5f893e03476e..000000000000
--- a/app-eselect/eselect-qtgraphicssystem/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST eselect-qtgraphicssystem-1.1.1.tar.bz2 1621 BLAKE2B 1c58c8241e80d3897d059a1cf7aa1a1339d6d71255a8ff93df4517295f7f0d93aa5b90b9b15577b6e16e24d733cfa10285a5eab02e43b881f3c5ba54a802fc48 SHA512 9c8b5c1d40094b74401de2b0ae74ff2421f3fdd0bf51e5e4c06717064dfee9c03ed9a2ce913b7e8f54c6ad0b5ec11f392cb7fe7fa26822b1370b3e15d5389a66
-EBUILD eselect-qtgraphicssystem-1.1.1.ebuild 646 BLAKE2B c9eb7634464756fb08b0a52f7f14f1b4edc5985e90cb59c58fc2e0ce7e46c422cbd8b5ef781f3a4d4e491edda2eaadbdefc9f2b8d175045efb55f64ff5b5d5fc SHA512 0ba22095486c1c4817c944bca83e08eef2932a0c5acce447012f910194fea305b0d7fea4f3a4f9b2764e5bfcc3934e7da6e0d83e69f10f58decaaaacd7794f6a
-MISC metadata.xml 353 BLAKE2B a76028795c7773871b791adfb13d2082f7bd78980fbcb01ba83ed0adcc169c586c8eefea93967b848d52999d2e9266d50f6e11845550d63019d03941e862a8cc SHA512 720a84adfabb1d6e8ea192d54cc1e68211ea1818326df5cc320247003fa5b9eefa4ef164006d0a6d2e18c6eb416280e13dbdbcfd3b2b240d46b5ddf1733146f5
diff --git a/app-eselect/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild b/app-eselect/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild
deleted file mode 100644
index b82a885ed5b9..000000000000
--- a/app-eselect/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Utility to change the active Qt Graphics System"
-HOMEPAGE="https://github.com/gentoo/eselect-qtgraphicssystem"
-SRC_URI="https://dev.gentoo.org/~wired/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-admin/eselect-1.2.4"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins qtgraphicssystem.eselect
-}
diff --git a/app-eselect/eselect-qtgraphicssystem/metadata.xml b/app-eselect/eselect-qtgraphicssystem/metadata.xml
deleted file mode 100644
index ed30fbaf34d7..000000000000
--- a/app-eselect/eselect-qtgraphicssystem/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>qt@gentoo.org</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">gentoo/eselect-qtgraphicssystem</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 299a3d1d8dfb..cbbb2c614cc9 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/volatility/Manifest b/app-forensics/volatility/Manifest
index f85aec16619f..d0068685b4d4 100644
--- a/app-forensics/volatility/Manifest
+++ b/app-forensics/volatility/Manifest
@@ -1,5 +1,6 @@
 DIST volatility-2.4.1.tar.gz 2407119 BLAKE2B 25f04208b412aa5ccd8b54b89f9eb6e75b5ef46ee735bfbf711d356b35dac4be8cc6bf167abd70119e8a7cc3c316eae843539c7eb0a422adb8a1c2fc9a505019 SHA512 cc2db2a17b071a21852bab967c9615df0fce369dac35ffbca8754bc789e218a86fc88bd2042203174308e620e281a24debc7b0a8bacd516a404a9170ea522596
 DIST volatility-2.6.zip 4179806 BLAKE2B 0943551aff2e66769df0e9a8f8fbf01deae12ec8a035d0f549fa4a809f7b6ecb967af93755ae9aede4a43e9638737097275460377d61de413115c74cca4d76af SHA512 1c0b86f270188ba48a6a0ff1d7ad70bde500d0f720d7e1b9d76b6b9498368ae3eb29c5b1c7e7dd76ec9480b83b1e484b4130b4ced7458e4e03ca61fe7d13220f
-EBUILD volatility-2.4.1.ebuild 824 BLAKE2B b0196240e7de7b844d14c8b4d8856250d52bedb51eb342a90ffd887010d0985b0d73671abb1704fa180de1794c9e09e189c4c2cd39a057f36e1fb82c950bf0ac SHA512 1f07c5c05f43e996bcdda35149cd3459946fca3d3bf30d6c4cd16a40044122b2504d52567000e7a3ba5f024a3b872133b1a1e7f0a0130942693077d937eab35f
-EBUILD volatility-2.6.ebuild 851 BLAKE2B de95a11783fb26d73d87cd621b05946b34d5cf7c78d019c7da42b63c6244148f143a2846fcd8feb18d25608d2cc339b441e8889a061cd9b88b6cd40806c84300 SHA512 6029f7da48b31b80d6b7667b28fdd5f0a5fe4c2f490f52edcc66ff297931439fe2287c5819c904c88a0a27f1e0c99e6c7b619cd6164a1d0ff54b7ee2dcebb0da
+EBUILD volatility-2.4.1.ebuild 826 BLAKE2B 6a14bb9675c8b10709c4c0d31f354c9ad8e4d4be764687f19583f21131a30c6d3e28787ec602f5628786590fe4dd8a0a991a35b134d429fbeec2c137235ba61a SHA512 91c43810655fb75d836c54e38c405ff455354556f414fd9f500575414eb949d2a942d82b0c0f22e18bdb308212921525ceb798a3b838cc6985491280f217334f
+EBUILD volatility-2.6-r1.ebuild 908 BLAKE2B c1f6785d6cf2b6461aaee764c32c76a912f364716a2d1a173a665525af74c91c8c2655435d3cb853f79661c533f86e63afec646100f4fbb835cd297bf46dd30a SHA512 249c39cc1ed3969c85f37f1a919dcd8a010b196dfda9669e6256bce021e183dfc6e95b618b6ba5498b134ff5344ea88eff7212553b089dab6b89472d3d0c5956
+EBUILD volatility-2.6.ebuild 853 BLAKE2B 85582bdde2858b80bfde2d6c0a853b615f30d3ed692838fdb2d9247c4c5874c4e71b21104d8cf256c31256fa8712bc1f3301a0443aef92e6455ec4b755f30963 SHA512 cea0d445e87e7553dff01f30799b4f0c714cdcee6f7fb271828d9a5a525a4280afa8732218cf86a10d83bf94182e9f773ae8d001120b573ac91f3c8cb2aadd6c
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/app-forensics/volatility/volatility-2.4.1.ebuild b/app-forensics/volatility/volatility-2.4.1.ebuild
index c8a3f592e56d..5e8485be14ac 100644
--- a/app-forensics/volatility/volatility-2.4.1.ebuild
+++ b/app-forensics/volatility/volatility-2.4.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=5
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Framework for analyzing volatile memory"
-HOMEPAGE="http://www.volatilityfoundation.org/"
+HOMEPAGE="https://www.volatilityfoundation.org/"
 #2.4.1 not on mirrors yet
-#SRC_URI="http://downloads.volatilityfoundation.org/releases/${PV}/${P}.tar.gz"
+#SRC_URI="https://downloads.volatilityfoundation.org/releases/${PV}/${P}.tar.gz"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/app-forensics/volatility/volatility-2.6-r1.ebuild b/app-forensics/volatility/volatility-2.6-r1.ebuild
new file mode 100644
index 000000000000..c490119d38c7
--- /dev/null
+++ b/app-forensics/volatility/volatility-2.6-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Framework for analyzing volatile memory"
+HOMEPAGE="https://www.volatilityfoundation.org/"
+SRC_URI="https://downloads.volatilityfoundation.org/releases/${PV}/${P}.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}-master
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=dev-libs/distorm64-3[${PYTHON_USEDEP}]
+	dev-libs/libpcre
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)"
+
+src_install() {
+	distutils-r1_src_install
+	mkdir "${D}/usr/share/${PN}" || die
+	mv "${D}/usr/contrib/plugins" "${D}/usr/share/${PN}/" || die
+	rmdir --ignore-fail-on-non-empty "${D}/usr/contrib" || die
+	mv "${D}/usr/tools" "${D}/usr/share/${PN}/" || die
+	dosym vol.py /usr/bin/volatility
+}
diff --git a/app-forensics/volatility/volatility-2.6.ebuild b/app-forensics/volatility/volatility-2.6.ebuild
index 74668be64645..fa24d21da652 100644
--- a/app-forensics/volatility/volatility-2.6.ebuild
+++ b/app-forensics/volatility/volatility-2.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
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Framework for analyzing volatile memory"
-HOMEPAGE="http://www.volatilityfoundation.org/"
-SRC_URI="http://downloads.volatilityfoundation.org/releases/${PV}/${P}.zip"
+HOMEPAGE="https://www.volatilityfoundation.org/"
+SRC_URI="https://downloads.volatilityfoundation.org/releases/${PV}/${P}.zip"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index ddfa9f0a4f7b..b55ec6e53254 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-qt/Manifest b/app-i18n/ibus-qt/Manifest
deleted file mode 100644
index 7362ac7d8c59..000000000000
--- a/app-i18n/ibus-qt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ibus-qt-doc.patch 215 BLAKE2B 9895e1c72fac56052c6d7ef1bbf9702f5e89f4f9ef0afcb1682e41c51978aa1e8ff904039de0f1540177c44c071ef8e31791ce1312cba2b653e3df76797211cf SHA512 c6c46e8eb23bd9d6b21587f7f976a4bfc8f750e9135c8297224edf8ccfa3e97779144bcba661f4aa5a76226f59c1fc59da9e565a4b0b6d4285ac66f8ba0919c9
-DIST ibus-qt-1.3.3.tar.gz 141523 BLAKE2B 641ec53005ccb3b14646986bb0df4b091b88bcd4a181c82050d596f1840361d49451fcc1382d3fab1f54e463c9b0426b4f8bfd86b8f53224cb9c04dd298d5c87 SHA512 825a32fec51f10f466efd4255743a12ae98af63bacd07d5dc04e18fab6b830501b04491146c1f8bc92edd93dbf8eaeb68cf71062ffdbf25c2970d807b655c80a
-EBUILD ibus-qt-1.3.3.ebuild 989 BLAKE2B 9da6ca6e68818ad018b81ea5d831f0f22c11905c9c73764a4f0e29fd48aed35bdbc8acdd91f57c9a301f8b2f67dbf28e54c8b4077cb69da58d2843bd5db2a103 SHA512 af46f25f1e6ec3b0142bd88d53371541ba90404f6017fd64c9bd2e97f3f22f322c3e4f241675ca244ddd5f7282304b49977f9505a42653fecec5c6796089fd76
-MISC metadata.xml 427 BLAKE2B 9156e686bc1365dd3762c7550a07957a8b0320437c45a409e0127fb952bbc4c3cc0524437880cde421ff3e69fb232ddf16a65d2058da49c83f19fd1b74354372 SHA512 d8b71cd16b59609569170069a1cfd27bb09f5f6dce812e57550602fc5afc51eec23b9f646fe29145b0bdf3ae258868d4aead053444c290684696f344308a36ec
diff --git a/app-i18n/ibus-qt/files/ibus-qt-doc.patch b/app-i18n/ibus-qt/files/ibus-qt-doc.patch
deleted file mode 100644
index dbc1e9251369..000000000000
--- a/app-i18n/ibus-qt/files/ibus-qt-doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -77,7 +77,7 @@
- pkg_check_modules(IBUS REQUIRED ibus-1.0>=1.3.7)
- 
- # check doxygen
--find_package(Doxygen REQUIRED)
-+find_package(Doxygen)
- 
- # =====
- # Define variables
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
deleted file mode 100644
index 0ed171d32907..000000000000
--- a/app-i18n/ibus-qt/ibus-qt-1.3.3.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"
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Qt IBus library and Qt input method plugin"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="app-i18n/ibus
-	dev-libs/icu:=
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	sys-apps/dbus
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}"/${PN}-doc.patch )
-
-src_configure() {
-	append-cxxflags -std=c++14
-
-	local mycmakeargs=(
-		-DLIBDIR=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		emake -C "${BUILD_DIR}" docs
-	fi
-}
-
-src_install() {
-	if use doc; then
-		HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/app-i18n/ibus-qt/metadata.xml b/app-i18n/ibus-qt/metadata.xml
deleted file mode 100644
index 4346ded0668a..000000000000
--- a/app-i18n/ibus-qt/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <longdescription lang="en">
-    The Qt client for IBus. It provides a Qt immodule.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">ibus/ibus-qt</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index c6650d90b9fe..9cce5b734554 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,9 +1,7 @@
 DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81
 DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
-DIST ibus-1.5.17.tar.gz 2522960 BLAKE2B a0d19eaae809549d678b42394e76107b8869232c90932bfaa5072621598e83db0569084e931c51c15b7179d9d8e0a2ce144b726229dae81a009665a5de87afc4 SHA512 8a7e4fabbcb2096e647b1fb7487c92882bd320a4d777f2765817378abec2e60cafd63364c881fefc2805ff2baa6b28b15ee0710587662a3e65eeb60ead19496c
 DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
-EBUILD ibus-1.5.12.ebuild 3695 BLAKE2B b22d441277f55324c4d5ecc6d592f3057900a46e0f4bed4ccc90c14ec10890fa26bab18c5ded5649f9bb83c3485899bcea8e9d0fc80410e55199ad97b51f2009 SHA512 2593129b58c41301ea94f7b7761cc40e13f3b6458230478067d6a0a1c6a23ad8aa5f225d4203259ad54eb38d87b3bbac1a029a4de5282aee82147891b3c2b394
-EBUILD ibus-1.5.16.ebuild 3976 BLAKE2B 6bede6434d30b0fe6f07bb5f447b783dd0ac4a999d34afced1dd37039e949d1da06d3eadd1e08180bafdba274253d188099c3dd4747389a5f1fcc1009fbe3b04 SHA512 706833bf159c29c8045f686f2a11a4daa1672ab69c5925bc70952b3bacad641a61175c6898bec036fb7eb26b3d8b9fbf520ed2e9e5fcf32bac228992e6506e97
-EBUILD ibus-1.5.17.ebuild 4015 BLAKE2B 5112e3ca412d252307a5eb924ec66a69d60cef61aac7d9768fe9941a57eca109e89fb5a2c65abbec4a11bbc2d637cac627faba86f448245ead64ea7dfb3543df SHA512 3b3a1e0ab69c28c86ff92d6a5cbe4bed0b8b9c97e33b1e6fe776e091ae93b2bf451475c5e89f771042b2b42cd567d078c7823870f1986d3df7478776a7b498ca
-EBUILD ibus-1.5.18.ebuild 4277 BLAKE2B c2b16db2256a7503a631e336d83c8c719250808cc559e47a19c9a4cb5afd4dd7475398876275f0fcbd5c9625b3da9c5b1fb96c2f6d11dfc5fcdcdd7b1db854f9 SHA512 c6aee07fb6fcf380fe73b3c07bccd7d584865218652339bc6f347c09452e1fb8f4e89c62f6fc886d7dd8b931f59abe3da28ae72b610ea2be21ea8f8175c05b11
+EBUILD ibus-1.5.12.ebuild 3725 BLAKE2B d851008dd04bc0131c13cc79056061cd4a9d6484e3b29a1d87a8e6f149c9f5fe22a46171a4e4df7229309e1e1bf63c6da7ac69eb41f8c11347835ef25f92d0ef SHA512 5a04b1bcc9687e567cadf7429d01c80911200031359854c630856e47573885a28e2548c2fb91e5ffd8cbce3da85a519b790aa2b2feb948eb98f55ceed0f0127b
+EBUILD ibus-1.5.16.ebuild 4006 BLAKE2B 46b44039cae41cd693372b94586fc17a9b2678895b84f5177aead172f62ae7f50ff7b331b4aecce697a303024ba7ad587c2ffd26e0ce0f789cfb6eb456471908 SHA512 7861b4ea5f207e6d3c014687e07af74a4a34afefaa79abf718815a3e4a92981f2e3f62d17b872eea8de5813cfd9200c4b30c60aa121d6443e643d59bed6ca5b2
+EBUILD ibus-1.5.18.ebuild 4271 BLAKE2B 08c1e5ac33927c935922c070dea574d2ac5650c6ec0e89fce32e2007ea0b0407929b1e460f95beca0d755295a37016c583677c0894ac98e0277cb974c2b35509 SHA512 26d0ecd660cd1a0059f3d3b166e34a34606f23116e12c972b3cd5f7757e8812f597f2d28b5d5ed5e1e8f0ad01c68ae3b8b7175ebe4ef7a0fb574cae674ea778b
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index a8413c59fff3..b3d6a397f2ce 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.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"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -19,7 +19,6 @@ REQUIRED_USE="gtk2? ( gtk )
 	libnotify? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
-		gtk
 		introspection
 	)
 	test? ( gtk )
@@ -87,6 +86,7 @@ src_prepare() {
 
 	default
 	eautoreconf
+	xdg_environment_reset
 }
 
 src_configure() {
@@ -123,7 +123,7 @@ src_test() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 
 	if use python; then
 		python_install() {
diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index 4dcb90a62639..b84815cfa142 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -21,7 +21,6 @@ REQUIRED_USE="emoji? ( gtk )
 	libnotify? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
-		gtk
 		introspection
 	)
 	test? ( gtk )
@@ -98,6 +97,7 @@ src_prepare() {
 
 	default
 	eautoreconf
+	xdg_environment_reset
 }
 
 src_configure() {
@@ -139,7 +139,7 @@ src_test() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 
 	if use python; then
 		python_install() {
diff --git a/app-i18n/ibus/ibus-1.5.17.ebuild b/app-i18n/ibus/ibus-1.5.17.ebuild
deleted file mode 100644
index 10bd3f700de7..000000000000
--- a/app-i18n/ibus/ibus-1.5.17.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2018 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} )
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx xdg-utils
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
-REQUIRED_USE="emoji? ( gtk )
-	gtk2? ( gtk )
-	kde? ( gtk )
-	libnotify? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		gtk
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gconf? ( gnome-base/gconf:2 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
-	libnotify? ( x11-libs/libnotify )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala
-	fi
-	if ! use kde; then
-		touch ui/gtk3/panel.vala
-	fi
-	if ! use libnotify; then
-		touch ui/gtk3/panel.vala
-	fi
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i \
-		-e "/^py2_compile/,/^$/d" \
-		-e "/^install-data-hook/,/^$/d" \
-		bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable emoji emoji-dict) \
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable kde appindicator) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 077b31aa412a..d32b42660caf 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -22,7 +22,6 @@ REQUIRED_USE="emoji? ( gtk )
 	libnotify? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
-		gtk
 		introspection
 	)
 	test? ( gtk )
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index 4f58cb427e03..df0e9310fade 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -1,7 +1,9 @@
 DIST poedit-2.0.6.tar.gz 2511777 BLAKE2B f28e8940310e80ee15fc70f10492e061097f88b62938f8a85194170fd107100c739dbfd1c1cf12516e6fe3d2a9b282986a4368615cf8fcb2ac889075fe64cc6b SHA512 e7beceeb4cd9e4e0269666d634e48622f175a7788219288ba6349a5b15f8360a929018480372e3eecb664d7d2e3093d6788640651696323d6dda0f0780aa5cd2
 DIST poedit-2.0.7.tar.gz 2558220 BLAKE2B e4a958e516a5c4b56331b6f9f37d9fa627072a4a161f17b9e809df86af7ab86130c704b9f41d081a86dbc2dc3b24acf62615e843b73f78874c42730bd46f9b55 SHA512 7b8b41b5f55252b1845c452edbdad56dc841c507c4fb7a24267bd2af8490610f5f3eb72f31ed4d062fdaef939ef4ecd9c30ddc85a5dad3a792ac5857567dac71
 DIST poedit-2.0.9.tar.gz 2567156 BLAKE2B 29e616256a19430cb3efd3db5d6c2cc450155009e30ee056f6be712bac9e631e5aa20b0758262e9fbe00937eedf6ac777cd8e7407a3060f04503e3fa4d9cd6d0 SHA512 9981339ae0c3f11f972ed2f25e0c96e5c0cc0210771cc44d163e219c32eb951fa4180c8a03acdd7f0232a5e4b535f3202dda703b57ccfb02773eb24e6a1eb02d
+DIST poedit-2.1.1.tar.gz 2722379 BLAKE2B 3e5102ab9b2b6b6701abd3f44dab846d6989e5abdbcadf924cf7032d725fa1b405425cefa37eb0230d3de68ea0c60ec05e7bfe84f906cdec0230d8c1284f5779 SHA512 0b5e13c3e59c9bde78b95b45aa8765c16c03d12ca9fbabe4448e409ff4cd627676d1b77c011c75a54dc0e10acda23ceb49ca063e76a29154344dc5fdb9e5f8a8
 EBUILD poedit-2.0.6.ebuild 1273 BLAKE2B 9f2a627317290fb4ac7acb8b80f29297ec20c2a8c31b8f38bf995f461e7518bc767d49fed66c5953d2dbe4ffbe5dd1c981189601aaed8516ce7059aa372f9f7c SHA512 97cbb993e0b2583277d2ba88accf36e4bcf4b113d95b87140d80b3c07b705a0f38eb85721b81e1aced2b27e24ec6905308a916d3caa6b2ab7ad494957adcc0a5
 EBUILD poedit-2.0.7.ebuild 1278 BLAKE2B 345e579a3447a333c4633cee6f1742f64082549aeef84dcbcb32407e219a7edd68aeef53d883ae6269a464b6e6a41cd124d6403fce8645c7f95c44a55da34ada SHA512 c1b7cddd4c5051e142bf1e663cf4df22543f16168ab4413fcba9a56ec9c1ef5ec507d462dd46e773bd92d89e1a9c51ebe0d9ed536cc4b111cfd6314f67993e84
-EBUILD poedit-2.0.9.ebuild 1367 BLAKE2B 3f950048558ad4e6278992fefa9c92c62a66738910685983f9d0558b67283021d96ab836b41276e4c4e1af8b1a4ba37e1af51540ca395e61d9848c64df520cd7 SHA512 99a1ca30977f737d58cc3ca7b0b4561ab464bb989b2ec166dee7e9948d1d74b83e24cdb3cf68e11ce09c1c975aec7a39a11370f3c45ba5aed04e46889db0d58f
+EBUILD poedit-2.0.9.ebuild 1366 BLAKE2B 10a8cdf19541aa51f48eb897ac97de93f5621c11b46d016e71e19b27e090e841ed6d48b46786eaace52869cef2fcdaa7ac8b58365e5eb6354fe7120f0060f0f7 SHA512 25ec435d0d14169165c88ef494d5c26e93025669ad9c8c2d9672d3bf16e063c645b68f5041fc0d938c9c9fb252794e03d7d06290847f27b10622eadd1fc69deb
+EBUILD poedit-2.1.1.ebuild 1396 BLAKE2B 0d06059500fde6a51bde8921f34f92d8831183eb9171639be4baa4324578bf121db69f04e093c2c841328c5aee5f50144873a33f9f52c28fa1bc755caa450350 SHA512 ac7960ebf68c7d0e795c7c805745122c3cfa84a8c348e2024892dc5f52d3103585cbed94a644fda1ad6691e69a2429ab8b9dbf75859fd92bd9cd31b463f654c9
 MISC metadata.xml 611 BLAKE2B 7eda7aaa83b70b383879068c765a142c5e18bb79865a88c325c0a4ab8aa7f6ca00b197030f7a73baa4bbcb87dbb14097dd218d30dd6475705552500d6d0fb4f7 SHA512 96dfc2db0caf0915cca3997cff6fc021a3c196f4b7a5b9f2007c6284d9dfecfc66c1d5e0f44928a98810f6a23a7d5c6fc9db2ee3b24ce7ff7b9cb42afafd5f2f
diff --git a/app-i18n/poedit/poedit-2.0.9.ebuild b/app-i18n/poedit/poedit-2.0.9.ebuild
index d048d558b434..a05878652aae 100644
--- a/app-i18n/poedit/poedit-2.0.9.ebuild
+++ b/app-i18n/poedit/poedit-2.0.9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="GUI gettext translations editor"
 HOMEPAGE="https://poedit.net"
 SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
 
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/app-i18n/poedit/poedit-2.1.1.ebuild b/app-i18n/poedit/poedit-2.1.1.ebuild
new file mode 100644
index 000000000000..2f30b7de1dc4
--- /dev/null
+++ b/app-i18n/poedit/poedit-2.1.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="af an ar az be be@latin bg bs ca ckb co cs da de el en_GB es et eu fa fi fr ga gl he hr hu hy id is it ja ka kab kk ko lt lv ms nb nl oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv tg th tr uk uz vi zh_CN zh_TW"
+WX_GTK_VER=3.0-gtk3
+
+inherit gnome2-utils l10n wxwidgets xdg
+
+DESCRIPTION="GUI gettext translations editor"
+HOMEPAGE="https://poedit.net"
+SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	app-text/gtkspell:3
+	x11-libs/gtk+:3
+	>=dev-cpp/lucene++-3.0.5
+	>=dev-libs/pugixml-1.9
+	dev-libs/boost:=[nls]
+	dev-libs/icu:=
+	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
+		rm "locales/${1}.mo" || die
+	}
+
+	l10n_find_plocales_changes 'locales' '' '.mo'
+	l10n_for_each_disabled_locale_do my_rm_loc
+
+	setup-wxwidgets
+	xdg_src_prepare
+}
+
+src_configure() {
+	# CLD2 and C++ Rest are not available in Gentoo
+	local myeconfargs=(
+		--without-cld2
+		--without-cpprest
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/qimhangul/Manifest b/app-i18n/qimhangul/Manifest
deleted file mode 100644
index cdec7698ae1a..000000000000
--- a/app-i18n/qimhangul/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qimhangul-0.2.0.tar.gz 336566 BLAKE2B ecc5f2cd5f2f2815590e80e38c2e3f022c2a3fad6be8bee36abcc7284c5dc621be8987459576e05d962d74c7e3abe3df60dca73fe6c3468e82153fc47549a1ee SHA512 0871dddf48211841be36facde39cd215c247a5b89c1167baadd33b839eff084b7c39185804e1e62a7acc001178b56751d4f0301e327e1e0709b4340b7a003d0e
-EBUILD qimhangul-0.2.0.ebuild 385 BLAKE2B 27979f7759b484fd8dd44a77939c60426c5a2659c1d1027f57cb5f02b76bae600f578da126b0172f23ba9d7e2506a39f6167c4da941286c2750198ee9a209e81 SHA512 d578c43c201eaf8e892578b6d1a57d337ed651479a147ae97ac3d0f45d8b9eb8dc8a122994df4e78a57e38b302f7710539ed826761876729d8493a737756ce80
-MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/qimhangul/metadata.xml b/app-i18n/qimhangul/metadata.xml
deleted file mode 100644
index c921b96adf6c..000000000000
--- a/app-i18n/qimhangul/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-i18n/qimhangul/qimhangul-0.2.0.ebuild b/app-i18n/qimhangul/qimhangul-0.2.0.ebuild
deleted file mode 100644
index 44a23c251b42..000000000000
--- a/app-i18n/qimhangul/qimhangul-0.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="a qt-based imhangul"
-HOMEPAGE="https://code.google.com/p/qimhangul/"
-SRC_URI="https://qimhangul.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=">=app-i18n/libhangul-0.0.12
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
diff --git a/app-i18n/sunpinyin-data/Manifest b/app-i18n/sunpinyin-data/Manifest
index 46562c393ffc..cfc1550cdd29 100644
--- a/app-i18n/sunpinyin-data/Manifest
+++ b/app-i18n/sunpinyin-data/Manifest
@@ -1,7 +1,7 @@
-AUX SLM-inst.mk 1847 BLAKE2B aab982dc7c1f93db8c4ac9b77b793fbe4304ab70d62d3c18741e87c91dc6fd876e0f9a8f346b1e621f7ce11669eb335dcd9082894130f4d7b0c1c4c5812df588 SHA512 fcbc2e7f18d02dc7ae13ceb9926018d8e83ff955eacae69d664842a84cc4aac2c6f9070e1a33ca6b9b68b4d3ca3ef1ec2e8863f82a8eea1183e7b02d5b665470
-DIST dict.utf8-20120830.tar.bz2 652472 BLAKE2B bd31553027e25261e2d69a4f1a82d2c1f18b424f16f1b62a817151892b0d012be7cf1f2b7f7fbbfda98dbc40c21186eaccdca2453d139f0e50aaf3d793d64671 SHA512 4400bc2a54cbf828e1d34f8240d8915a29171d6def125fecf4aa13b442dc2442d9ea591e4451cf030d22d974fbdba09adde4112c08acae9ae023823311ae8535
 DIST dict.utf8-20130220.tar.bz2 652859 BLAKE2B 9e0cdefc0db519b0e12dd2cb2621ef500e0ed5a0ff9a0eea76d6f64eac1cdb455f2d3c8a806fe7aa8c50cbc369c0ef6d937fdf01fecbc349773b12375bb419f3 SHA512 d58ec106959a7713e452df2fe2fa5a5f66e82bd67eeeee8740cd3eeedf30af8d14a90dae224ed2931dffd85b0327c704927409bde0247452d79cf40c5bc7cff8
+DIST dict.utf8-20131214.tar.bz2 674512 BLAKE2B b5e1756b52e8b4fd7839d4a72004b7ddc789986899cc626341f13b702ee1e0b54780c992b2988289bdbe7ff979f3243efc1b5a5e04a0529b9a3f6b327a49faef SHA512 adaf52a27c6afdeb950912845f3fcb7a6799f997d50a2892ceecf76ed13e3644407338d734832c2ce4b09bce11fec4731774f1eb2dd4c30bea5490555915bd5b
+DIST lm_sc.3gm.arpa-20140820.tar.bz2 36623028 BLAKE2B 9456c51dbba59e5d20a1bdd9b06f0ef863c77eb7651287b45f143e6919aedf46ea81ca4da5c037c4b9775c19e68849720cb0e1b3db4cc9dd8df84832ac2eba6a SHA512 ea3ede62eb993c4d21ca7cf339635f4686493a0cefd57df4a31f00a001e67502a13ff9612ff667b941b82b47de00be9f3c9689677d04195a7ef8716bac087519
 DIST lm_sc.t3g.arpa-20121025.tar.bz2 36262281 BLAKE2B 55d8820228986f9a7b3d567ebca7bf37079e3d05f9b062814116702957e4447c5283ac9034b6a9171a9696df01398bb29ea55a2a1ded3a952e48f14a697d8698 SHA512 3159dd3700382cfa617ba025ce542660580f3057e0dd6bbb92947902495db08e4454c1d09d01a55c90653444513d125dd034e944b060a9d8e009c3633b106d97
-EBUILD sunpinyin-data-20121025.ebuild 910 BLAKE2B dbf1f2e6a9f4b3a8dc3497eaa3dc0f29f0d47c65231c5cab27ae896d4cd981acacdd5f03ba8765cb13cd05aa0e72b330205f97cc4f4aa11c9c2a042437666738 SHA512 6fcf7bc0d142f966c42c0ea54627d677649db74b1c93e6630ab708438cf22a29f33cd8d4f88fe154c6712d647880deaf5a5cac197ebea2376b810b36a9df8d7c
-EBUILD sunpinyin-data-20130220.ebuild 906 BLAKE2B 705fa18d72412168875820721be68a59f59ff63fca0759cb6fc8cc35c5ea263e44b862f8ec03a5f4c1810f5563a5f01831629ca156460c0daaf328c0c60c4a34 SHA512 8786ad78957d1e23896af0c68d83a1a1eab158b59a60a158be32a88942e453178e626fa74f0464b61f6dc504c5c9ff428c8b35f0b5a2a86f77671197da23b4b8
-MISC metadata.xml 323 BLAKE2B cb36295be070944db054e52bd199f502dd1136e35d27e7eb9a0caac66798393c12d19fa9b7a421c9e3561023474a01d0788da1a333b34f15fc576862272955ee SHA512 b91630bdda4510f930c9b114a77859e6350c16cfd41c8b585895d4f40a9d8d7ce4a02dd6f46be41ecc7ba6ad2ce6846b143d1745ac9e1385821e403419df9a39
+EBUILD sunpinyin-data-20130220.ebuild 984 BLAKE2B fdce14f8c0249901c821f913a793273dfd6c1be537656323ec28b428bec3758e45f065b89e5b62bd2066ab204410c81f61d5fdceb7bd51aebef32d54747926d4 SHA512 b58d6e341b56027aebe84fc5144a3b1da3c83feeabf4392a4c39e77f88b8a9d4c1ae7ec0075d822ac24be031c13cc72b5be530a1678fcf87b87ba4fb79b2d559
+EBUILD sunpinyin-data-20140820.ebuild 1021 BLAKE2B 29fe8b3174cb786e2f3bd169440031b126f00bc21b86cd943cc7f31cca730fbaaa3751e74bb035ea0cad2fda8ee86f27b4af9f2ad0b5ed51f90dfb0bf57bc913 SHA512 fe35e205be1a079abf43b8b3e4b793e7fc3207d95498a32dd9fbe95e87fcf3e4ffed08501f7e26dd5f1a25b4cf4326352f1968844391a0e93dc89a622c812087
+MISC metadata.xml 328 BLAKE2B fe394bf1f33b3b39d476a8e8a0ce7a58c071646be7455b102c5b298ae22afc9e2b6a2571e3ca52024f46d7675a6568313dde549576d17d117e1feb01a6559e78 SHA512 43f6f1fc7c0a311ae6e0d5712e570a43a3530173231f054eb939a36f7c4bc117e026678a837dd11b3fd10945d7a476a38f2d10f55501884bb53a29895fab9e01
diff --git a/app-i18n/sunpinyin-data/files/SLM-inst.mk b/app-i18n/sunpinyin-data/files/SLM-inst.mk
deleted file mode 100644
index 9216a941ad1c..000000000000
--- a/app-i18n/sunpinyin-data/files/SLM-inst.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/make -f
-# -*- mode: makefile; indent-tabs-mode: t -*- vim:noet:ts=4
-# Sample Makefile for lexicon generation and installation.
-
-# Little endian platforms: alpha amd64 arm hurd-i386 i386 ia64 mipsel sh3 sh4
-# Big endian platforms: hppa m68k mips powerpc ppc64 sparc s390
-ifndef ENDIANNESS
-	ENDIANNESS = le
-endif
-
-DICT_FILE = dict.utf8
-
-SLM_TARGET = lm_sc
-TSLM2_TEXT_FILE = ${SLM_TARGET}.t2g.arpa
-TSLM2_ORIG_FILE = ${SLM_TARGET}.t2g.orig
-TSLM2_DIST_FILE = ${SLM_TARGET}.t2g
-TSLM3_TEXT_FILE = ${SLM_TARGET}.t3g.arpa
-TSLM3_ORIG_FILE = ${SLM_TARGET}.t3g.orig
-TSLM3_DIST_FILE = ${SLM_TARGET}.t3g
-
-PYTRIE_FILE = pydict_sc.bin
-PYTRIE_LOG_FILE = pydict_sc.log
-
-SYSTEM_DATA_DIR = ${DESTDIR}/usr/share/sunpinyin
-
-all: slm3_dist
-install: slm3_install
-
-tslm2_orig: ${TSLM2_ORIG_FILE}
-${TSLM2_ORIG_FILE}: ${DICT_FILE} ${TSLM2_TEXT_FILE}
-	tslmpack ${TSLM2_TEXT_FILE} ${DICT_FILE} $@
-
-tslm2_dist: ${TSLM2_DIST_FILE}
-${TSLM2_DIST_FILE}: ${TSLM2_ORIG_FILE}
-	tslmendian -e ${ENDIANNESS} -i $^ -o $@
-
-lexicon2: ${DICT_FILE} ${TSLM2_ORIG_FILE}
-	genpyt -e ${ENDIANNESS} -i ${DICT_FILE} -s ${TSLM2_ORIG_FILE} \
-		-l ${PYTRIE_LOG_FILE} -o ${PYTRIE_FILE}
-
-tslm3_orig: ${TSLM3_ORIG_FILE}
-${TSLM3_ORIG_FILE}: ${DICT_FILE} ${TSLM3_TEXT_FILE}
-	tslmpack ${TSLM3_TEXT_FILE} ${DICT_FILE} $@
-
-tslm3_dist: ${TSLM3_DIST_FILE}
-${TSLM3_DIST_FILE}: ${TSLM3_ORIG_FILE}
-	tslmendian -e ${ENDIANNESS} -i $^ -o $@
-
-lexicon3: ${DICT_FILE} ${TSLM3_ORIG_FILE}
-	genpyt -e ${ENDIANNESS} -i ${DICT_FILE} -s ${TSLM3_ORIG_FILE} \
-		-l ${PYTRIE_LOG_FILE} -o ${PYTRIE_FILE}
-
-slm2_dist: ${TSLM2_DIST_FILE} lexicon2
-slm2_install: ${TSLM2_DIST_FILE} ${PYTRIE_FILE}
-	install -d ${SYSTEM_DATA_DIR}
-	install -Dm644 $^ ${SYSTEM_DATA_DIR}
-
-slm3_dist: ${TSLM3_DIST_FILE} lexicon3
-slm3_install: ${TSLM3_DIST_FILE} ${PYTRIE_FILE}
-	install -d ${SYSTEM_DATA_DIR}
-	install -Dm644 $^ ${SYSTEM_DATA_DIR}
-
diff --git a/app-i18n/sunpinyin-data/metadata.xml b/app-i18n/sunpinyin-data/metadata.xml
index 11bbcd490ca1..3ce0e2257d3e 100644
--- a/app-i18n/sunpinyin-data/metadata.xml
+++ b/app-i18n/sunpinyin-data/metadata.xml
@@ -6,6 +6,6 @@
     <name>Cjk</name>
   </maintainer>
   <upstream>
-    <remote-id type="google-code">sunpinyin</remote-id>
+    <remote-id type="github">sunpinyin/open-gram</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild
deleted file mode 100644
index fa390bb7a465..000000000000
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DICT_VERSION="20120830"
-LM_VERSION="${PV}"
-
-DESCRIPTION="Data sets for Sunpinyin"
-HOMEPAGE="https://open-gram.googlecode.com/"
-SRC_URI="https://open-gram.googlecode.com/files/dict.utf8-${DICT_VERSION}.tar.bz2
-	https://open-gram.googlecode.com/files/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=app-i18n/sunpinyin-2.0.4_pre20130108"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	default
-	mkdir "${S}" || die
-	mv "${WORKDIR}"/dict.utf8 "${S}" || die
-	mv "${WORKDIR}"/lm_sc.t3g.arpa "${S}" || die
-	cp "${FILESDIR}"/SLM-inst.mk "${S}"/Makefile || die
-}
-
-src_compile() {
-	# we don't have any big-endian architectures keyworded yet, so hardcode
-	emake ENDIANNESS=le
-}
-
-src_install() {
-	emake ENDIANNESS=le DESTDIR="${D}" install
-}
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
index 9b450e30a2e9..81a424941c72 100644
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
@@ -1,37 +1,44 @@
-# 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"
 
 DICT_VERSION="${PV}"
 LM_VERSION="20121025"
 
 DESCRIPTION="Data sets for Sunpinyin"
-HOMEPAGE="https://open-gram.googlecode.com/"
-SRC_URI="https://open-gram.googlecode.com/files/dict.utf8-${DICT_VERSION}.tar.bz2
-	https://open-gram.googlecode.com/files/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2"
+HOMEPAGE="https://github.com/sunpinyin/open-gram"
+SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2
+	mirror://sourceforge/open-gram/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-DEPEND=">=app-i18n/sunpinyin-2.0.4_pre20130108"
-RDEPEND="${DEPEND}"
+DEPEND="=app-i18n/sunpinyin-2.0.4*"
 
 src_unpack() {
 	default
 	mkdir "${S}" || die
 	mv "${WORKDIR}"/dict.utf8 "${S}" || die
 	mv "${WORKDIR}"/lm_sc.t3g.arpa "${S}" || die
-	cp "${FILESDIR}"/SLM-inst.mk "${S}"/Makefile || die
 }
 
 src_compile() {
-	# we don't have any big-endian architectures keyworded yet, so hardcode
-	emake ENDIANNESS=le
+	# lm_sc.t3g
+	echoit tslmpack lm_sc.t3g.arpa dict.utf8 lm_sc.t3g.orig
+	echoit tslmendian -i lm_sc.t3g.orig -o lm_sc.t3g
+	# lexicon3
+	echoit genpyt -i dict.utf8 -s lm_sc.t3g.orig -l pydict_sc.log -o pydict_sc.bin
+}
+
+echoit() {
+	echo "${@}"
+	"${@}"
 }
 
 src_install() {
-	emake ENDIANNESS=le DESTDIR="${D}" install
+	insinto /usr/share/${PN/-data}
+	doins lm_sc.t3g pydict_sc.bin
 }
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
new file mode 100644
index 000000000000..c35487a14eac
--- /dev/null
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DICT_VERSION="20131214"
+LM_VERSION="${PV}"
+
+DESCRIPTION="Data sets for Sunpinyin"
+HOMEPAGE="https://github.com/sunpinyin/open-gram"
+SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2
+	mirror://sourceforge/open-gram/lm_sc.3gm.arpa-${LM_VERSION}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="=app-i18n/sunpinyin-3*"
+
+src_unpack() {
+	default
+	mkdir "${S}" || die
+	mv "${WORKDIR}"/dict.utf8 "${S}" || die
+	mv "${WORKDIR}"/lm_sc.3gm.arpa "${S}" || die
+}
+
+src_compile() {
+	# lm_sc.t3g
+	echoit slmpack lm_sc.3gm.arpa dict.utf8 lm_sc.3gm
+	echoit slmthread lm_sc.3gm lm_sc.t3g.orig
+	echoit tslmendian -i lm_sc.t3g.orig -o lm_sc.t3g
+	# lexicon3
+	echoit genpyt -i dict.utf8 -s lm_sc.t3g.orig -l pydict_sc.log -o pydict_sc.bin
+}
+
+echoit() {
+	echo "${@}"
+	"${@}"
+}
+
+src_install() {
+	insinto /usr/share/${PN/-data}
+	doins lm_sc.t3g pydict_sc.bin
+}
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index aa88043cc401..8b071569e419 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -1,11 +1,13 @@
-AUX sunpinyin-2.0.3-force-switch.patch 1046 BLAKE2B 786ff56100b308cbcd0bc7bb4a16d7e5691e0dae5778639f9b3d04f4eae531b44164262256443b62e191f72a4aa85a039c08cc0608b97796f76e7ae0f074f45c SHA512 abae0d760ecb93c6317483f3b14ee21670f1a42799ffc15a5dcfcf7f0838f0809731953bf6377a52a9647ace8172025bff5049859ac55db989d9f61904fa38ae
+AUX sunpinyin-2.0.3-force-switch.patch 979 BLAKE2B 9274064e2966330c461f062316256e9d905217d5fbfd2dfd55cd881a5021fc5de747689709f58284f7674f78fabc81b7a8c635cac984e10be7832788eca7c4c7 SHA512 0782895b4a718f218f447fba66253ff38916dacf3168d6ff47e8186e39cdc968c467e74431105a8795cb04176309d5ce333e712a3aab2840094bbdd169853b3e
 AUX sunpinyin-2.0.3-gcc-4.7.patch 1275 BLAKE2B 9dc9fbc1b63f59fcdd853a8c99e9bfbf021540672729991cab67ea67b82e9d530963b33a34ce378af7309d9b749e0a831b6d1cd0393f3a7c182ca29d9411b27c SHA512 48d7e5ab52395467f3b282b73bb3ca5b2cd27c76ac1b454c0e248a9cfb13d8d628fbdf93b82a57404109d288c46d70456bb4aaf4f2899e3dd6e047140cdfc7c0
-AUX sunpinyin-2.0.4-pod2man.patch 469 BLAKE2B 5fab9d9a4cdb88189dfe0b8146f42effa9a48df8ce98e510a85c2cd55b92260803fb2350d921fa2a7e2a49e61ffbe82d2873397426c29ace1a50ba5c1d2c25b5 SHA512 1cc36f21dd11c802365fd770e7eefb324a3200e6570d7b585179778c8385dc694b214ad1339ac266f0adfa9d1f1ebca87b7847544069e25cfb563b0cb5bd8172
-AUX sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch 1010 BLAKE2B 3d34ca402e1504880e1abea8e2afc5fd5e342762020c450300ce01301f60d2c8cc527fdecb420eadf682fc1e086fef15b085518618c3803195d3afe4fd147d98 SHA512 8aaba439c49fac48c9523471bdbbac52feb594f61da6e3ba3747e3e6a08498817f06a8af8bcaa35d6b25ce0d31af3faac24faa57e15e3cae446f37dac5a30337
+AUX sunpinyin-2.0.4-gcc-6.patch 959 BLAKE2B 72e027a928bd9f684dbecc7ce50074df6d915b9e699de661853012961454bce48008bff50fd2de135ef828f08e84647b624bd844b9baafb2e929480171a44f63 SHA512 7093542613a2c15c6e1dc7e500bc38f65061d927d3f89f281973f401f19f0e151f0ef438c2a1c21d102bd56b23c81d206b6a524d77b04ae4e0b79f0b97691b96
+AUX sunpinyin-2.0.4-pod2man.patch 406 BLAKE2B debbbd0c004625c3e9dc73e07876774d12d3514757ea1d5a8ad9a978868f85175d0fa92e0e46541e00c208498b7bae9ac7257491de50f6d0829616c68decbcd5 SHA512 7a0b48e4b0270b1c60844b91df42dd8f59460c9a5725c5492fd4886b77d8e993dbe2c8efc464da271d51d19d17c3c94573c57c0dd7f28414336138212911e387
 DIST dict.utf8.tar.bz2 1598995 BLAKE2B 4cb990b6bbb440218c6af695369bdccf97b820da9aa10d118043a7bda1c602e53d0c63c4a460db2c64530e69ac1d98619e1a2efa2113a292063b422fc1b3d32c SHA512 04ec55e4af4b58d29b1141a824b5c3de5dbaaab0133d88e477d9183db738fc63543b4004bf071e611c6ea0d4b4c161b73849a64ab75f4df5bb5116d7f52d8e34
 DIST lm_sc.t3g.arpa.tar.bz2 25098718 BLAKE2B a7cd87d4e786a7dfe854b33c5c70019075ec99b02fd6cb33f91f89babdd2b255b6d157fff30c22b5372e74908483b814cc9698fd84caa3e56c61e76a59dbea04 SHA512 1e5e577c92df2f230b6b5962298ef7c215f6069b53e8e2dd4c5ad3eb54f999fc239b0924b4ab031af59c3194da15d6317ea2860f158e805b5cf0126666eaad98
 DIST sunpinyin-2.0.3.tar.gz 169394 BLAKE2B d93472c0c208da2a7aab99b1d514fa01acf67e69bdddc2c0e15f40af7a2abaf8860f8e792c2bd286bd1ec3a24124b0284d28295115c8dff1051f5df3c2314bb7 SHA512 25f1fc4b8f550663861f2c7426832924676f83e1f201689fde51b04ca78704b46dbbf2b92736234d5e1a729ba1bb23bd1f3a0394f6b8b54cb0df57b9bb7ece1d
 DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2
-EBUILD sunpinyin-2.0.3-r2.ebuild 1608 BLAKE2B cd4e7cbbb893e1dc9867e9c0d88628a2264ec60759550409e6c8437224495124749b3efeeb75c7ca5177bafff2121655376b3f7087e00f59b99c19e3b61cf5b6 SHA512 e4e06b77ac463074ea01211e754e7a3a90e4c0d7026b7bb321d18f79105d7bfca635e5a82e06f956ceb0b4d8febe5a1497cbbc8ec48ef2c994f1b00d90f66a57
-EBUILD sunpinyin-2.0.4_pre20130108-r1.ebuild 1057 BLAKE2B 0bd5fe2b7ac7af8b635bd45c3a28c7f79f8a4212830b939501c9c94dc67972ce3b6333beb937e57c2886aba33cd8ad86b916a26d1ea1c7d4881846c97d597e3f SHA512 594ea06940263db5afa0cb87631074417a05999863b0d64793b6567732bf4ebf37b8c7f02c14ab3f91e18755f7b6bebce325d1d0578c191d5f70d2af75ca5a36
+DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
+EBUILD sunpinyin-2.0.3-r2.ebuild 1627 BLAKE2B e6868f2e9f3ca8bd1947d2eccf40e221afeab10046f493e6ed674a7e0ebe75994c8d801edecbab9529d21322068ac888fe36c6dc816e270e8b6684d1b9fb5997 SHA512 84ef99fd67b79b2bc0bc9ea8a8e2e110465a5b0103096364f142e98539262d42594c427761f2e0ce82761e4a3b9f49a331200891fe3f2641ccc1482739e4f4f9
+EBUILD sunpinyin-2.0.4_pre20130108-r2.ebuild 969 BLAKE2B 3a4fed1810722b8d0f74282add5b5298c120b373c083fab1f1289285435915a12be3b8cfd3c44514c5f0d085231ffe933d5fab0ba3a2522d1422b71447bb0da8 SHA512 588f5bf39e30b91ecea1550c28c6ab2fca113fbbcc999f12ebaa335abccb214d4d2f4f6d28dbbdf728561b6ccecd9177f518134b0d39dd9c36a19428cab70ebf
+EBUILD sunpinyin-3.0.0_rc1.ebuild 918 BLAKE2B e5220cd1829a49aa2155ab92e5b9c2ea82ca281bff4743935f24b2072a8237f064905f979feccca99007d653877728430108c45793286eeb41d3668832b39859 SHA512 065897821edeed4dece2aff5061f7d97fcf634a544a7d1d6cf614b4215e05808459c7940953e8ae6f0319f3803d36630cb520b2b97da1284289e5d447da9a3e3
 MISC metadata.xml 328 BLAKE2B 61db20b9475140020b99ef82cc8949db01b996bbe043b4aa68bd7bd6cb67c56286ce0e00c8dd1a039798b23a8921621260286231f1d87a079ef13a4a764b8049 SHA512 c67333df77b03f92845334d6b738c172cc2e1935b5df4cad2d7bc983c08cda59f1427588ab8d054cd40b7fdc52c0adcb516d74c7de4bb320f85979a6a3297628
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch
index f2f6b389ba09..de85e82c1d5e 100644
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch
@@ -1,5 +1,3 @@
-diff --git a/SConstruct b/SConstruct
-index 68cd365..9bb6ebc 100644
 --- a/SConstruct
 +++ b/SConstruct
 @@ -180,12 +180,6 @@ libdir = env['LIBDIR']
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch
new file mode 100644
index 000000000000..0bceb38318b3
--- /dev/null
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/553796
+
+Author: Peter Levine <plevine457@gmail.com>
+
+--- a/src/slm/tslmpack/common.h
++++ b/src/slm/tslmpack/common.h
+@@ -53,10 +53,10 @@
+ typedef std::map<float, int> RealIndexMap;  // map real values to their indices
+ typedef std::map<std::string, unsigned int> TLexicon; // map word to wid
+ 
+-#define EffectivePr(a)  (float((usingLogPr) ? ((a) / log(2.0)) : (-log2((a)))))
+-#define OriginalPr(b)   (float((usingLogPr) ? ((b) * log(2.0)) : (exp2(-(b)))))
+-#define EffectiveBow(a) (float((usingLogPr) ? (exp(-(a))) : ((a))))
+-#define OriginalBow(b)  (float((usingLogPr) ? (-log((b))) : ((b))))
++#define EffectivePr(a)  (float((usingLogPr) ? ((a) / logf(2.0f)) : (-log2f((a)))))
++#define OriginalPr(b)   (float((usingLogPr) ? ((b) * logf(2.0f)) : (exp2f(-(b)))))
++#define EffectiveBow(a) (float((usingLogPr) ? (expf(-(a))) : ((a))))
++#define OriginalBow(b)  (float((usingLogPr) ? (-logf((b))) : ((b))))
+ 
+ #endif //_SLM_PACK_COMMON_H
+ 
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch
index 54831df21220..36e69d2deda3 100644
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch
@@ -1,9 +1,8 @@
-From: Guo Yixuan <culu.gyx@gmail.com>
-Bug: https://code.google.com/archive/p/sunpinyin/issues/327
-Gentoo-Bug: 553796
+https://bugs.debian.org/790287
+https://code.google.com/p/sunpinyin/issues/detail?id=327
+
+Author: Guo Yixuan <culu.gyx@gmail.com>
 
-diff --git a/man/SConscript b/man/SConscript
-index f3ebd03..e1551eb 100644
 --- a/man/SConscript
 +++ b/man/SConscript
 @@ -1,7 +1,7 @@
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch
deleted file mode 100644
index 77fe2831c7d8..000000000000
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- sunpinyin-2.0.4_pre20130108/src/slm/tslmpack/common.h.old	2016-09-20 02:54:15.046257131 -0400
-+++ sunpinyin-2.0.4_pre20130108/src/slm/tslmpack/common.h	2016-09-20 02:55:48.041124978 -0400
-@@ -53,10 +53,10 @@
- typedef std::map<float, int> RealIndexMap;  // map real values to their indices
- typedef std::map<std::string, unsigned int> TLexicon; // map word to wid
- 
--#define EffectivePr(a)  (float((usingLogPr) ? ((a) / log(2.0)) : (-log2((a)))))
--#define OriginalPr(b)   (float((usingLogPr) ? ((b) * log(2.0)) : (exp2(-(b)))))
--#define EffectiveBow(a) (float((usingLogPr) ? (exp(-(a))) : ((a))))
--#define OriginalBow(b)  (float((usingLogPr) ? (-log((b))) : ((b))))
-+#define EffectivePr(a)  (float((usingLogPr) ? ((a) / logf(2.0f)) : (-log2f((a)))))
-+#define OriginalPr(b)   (float((usingLogPr) ? ((b) * logf(2.0f)) : (exp2f(-(b)))))
-+#define EffectiveBow(a) (float((usingLogPr) ? (expf(-(a))) : ((a))))
-+#define OriginalBow(b)  (float((usingLogPr) ? (-logf((b))) : ((b))))
- 
- #endif //_SLM_PACK_COMMON_H
- 
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
index 8ef0101da1e5..c79fd710b993 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
 
-inherit scons-utils toolchain-funcs
+inherit python-any-r1 scons-utils toolchain-funcs
 
-DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME"
-HOMEPAGE="https://sunpinyin.googlecode.com"
+DESCRIPTION="A Statistical Language Model based Chinese input method library"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
 SRC_URI="${HOMEPAGE}/files/${P}.tar.gz
 		https://open-gram.googlecode.com/files/dict.utf8.tar.bz2
 		https://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2"
@@ -18,35 +19,34 @@ IUSE=""
 
 RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}
-		virtual/pkgconfig"
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-force-switch.patch
+	"${FILESDIR}"/${P}-gcc-4.7.patch
+)
 
 src_unpack() {
-	unpack "${P}.tar.gz"
-	ln -s "${DISTDIR}/dict.utf8.tar.bz2" "${S}/raw/" || die "dict file not found"
-	ln -s "${DISTDIR}/lm_sc.t3g.arpa.tar.bz2" "${S}/raw/" || die "dict file not found"
+	unpack ${P}.tar.gz
+	ln -s "${DISTDIR}"/dict.utf8.tar.bz2 "${S}"/raw/ || die "dict file not found"
+	ln -s "${DISTDIR}"/lm_sc.t3g.arpa.tar.bz2 "${S}"/raw/ || die "dict file not found"
 }
 
 src_prepare() {
-	eapply "${FILESDIR}/${P}-force-switch.patch"
-	eapply "${FILESDIR}/${P}-gcc-4.7.patch"
 	default
-}
-
-src_configure() {
 	tc-export CXX
-	myesconsargs=(
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--libdatadir="${EPREFIX}"/usr/lib
-	)
 }
 
 src_compile() {
-	escons || die
+	escons \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--libdatadir="${EPREFIX}"/usr/lib
 }
 
 src_install() {
-	escons --install-sandbox="${ED}" install || die
+	escons --install-sandbox="${D}" install
 }
 
 pkg_postinst() {
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
deleted file mode 100644
index 84ef8dcc2cb4..000000000000
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib python-any-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="A Statistical Language Model based Chinese input method library"
-HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0/3"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-PDEPEND="app-i18n/sunpinyin-data"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.4-pod2man.patch
-	epatch "${FILESDIR}"/${P}-gcc6-use-float.patch
-	epatch_user
-}
-
-src_configure() {
-	tc-export CXX
-	myesconsargs=(
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-	)
-}
-
-src_compile() {
-	escons
-}
-
-src_install() {
-	escons --install-sandbox="${D}" install
-	rm -rf "${D}"/usr/share/doc/${PN} || die
-	dodoc doc/{README,SLM-inst.mk,SLM-train.mk}
-}
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild
new file mode 100644
index 000000000000..34f908fd9808
--- /dev/null
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild
@@ -0,0 +1,46 @@
+# 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 scons-utils toolchain-funcs
+
+DESCRIPTION="A Statistical Language Model based Chinese input method library"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0/3"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+PDEPEND="<=app-i18n/sunpinyin-data-20130220"
+
+PATCHES=(
+	"${FILESDIR}"/${P/_pre*}-gcc-6.patch
+	"${FILESDIR}"/${P/_pre*}-pod2man.patch
+)
+
+src_prepare() {
+	sed -i "/^docdir/s/${PN}/${PF}/" SConstruct
+
+	default
+	tc-export CXX
+}
+
+src_compile() {
+	escons \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	escons --install-sandbox="${D}" install
+}
diff --git a/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild b/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild
new file mode 100644
index 000000000000..386c1694c1a2
--- /dev/null
+++ b/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild
@@ -0,0 +1,41 @@
+# 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 scons-utils toolchain-funcs vcs-snapshot
+
+DESCRIPTION="A Statistical Language Model based Chinese input method library"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0/3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+PDEPEND=">=app-i18n/sunpinyin-data-20140820"
+
+src_prepare() {
+	sed -i "/^docdir/s/${PN}/${PF}/" SConstruct
+
+	default
+	tc-export CXX
+}
+
+src_compile() {
+	escons \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	escons --install-sandbox="${D}" install
+}
diff --git a/app-i18n/tagainijisho/Manifest b/app-i18n/tagainijisho/Manifest
index 1c1312af0ca7..ecde08600287 100644
--- a/app-i18n/tagainijisho/Manifest
+++ b/app-i18n/tagainijisho/Manifest
@@ -1,10 +1,7 @@
-AUX tagainijisho-1.0.3-sqlite.patch 425 BLAKE2B 0d14c8619933ca9218ccae185c21d57453b95ec96d7ce7fcd64b0596fd6746df8f9f5d98429c799a9e5a00795875ca7ea0d029b0a888969681f13a2ba0800498 SHA512 aca8593bc860f3bb640134e49898106414ff57b1cd6a39be5371151ed32e8bdb45a0747535f5f0d4710367919cf329fc2c308df38731b3c94be16f4992d7d174
 DIST JMdict-2018-06-12.gz 18306650 BLAKE2B 3ddb29bf631567717085912b1fa21c701e6183c94907f64121daedf358303df09a754bcdf51f24f0d7c95bf1bfe4ea13779f5e3532bd19a3f99a33751259a893 SHA512 cd8e0a737ccd1ccbe7c53ab0affb5d4ca068656966c75f0abbc184ffcdc69d8a1dbe0f096a16f0b59ecaed40371a29e566ee5076a7e80e3f51796e32798bed3e
 DIST kanjidic2-2018-06-12.xml.gz 1482391 BLAKE2B c6f1d18f17b2107937fe07b77d6aa297d156d9c250cdc480000aeb7f8c9cd27a94e2cce1df80e4612d1bcadc94d92d5d013cfc8d923c5ceaba9ed5b0a692ae78 SHA512 700aba18e18ab271dbc583f1a1cc16dd7209e4aa48417201f0b51723d35f5aedcff299ed1503cb743151abce37c94c0facbab09dd0a46126131bb54f2004aa23
 DIST kanjivg-20160426.xml.gz 3587660 BLAKE2B c85291f3671f0980186e8deb296cfa743322df438d6f09fd69a4f5a30c3db6f097d6ff0a817b88c5c9a2c8d4a40c90b31c0a54cb71d681849b557ee364707c48 SHA512 1d35a8cc5d4947f6bedfc71a2f08e2d1fda832d7a02588c00953e1746812b0e51d4d1c39dff49999b4f65ec850788359f6e0d1465f0e688b1bf753c4c67b3c54
-DIST tagainijisho-1.0.3.tar.gz 24816175 BLAKE2B fbe9e671675b2a938aa13aaae87af7f076f4f20c6024d90fa70f2c86f5e1964998d83047b69473e4f9a43e46eacde6b61bc6620b5cfb13c1b4d12a3b1317a280 SHA512 3afd75cc27e8701d93df54a2244b83090770cc80ac20ab8fb843d2ab925ab575f73d731a2ce736179fb7361af68e94694ec91f813d186c87e730368c41535c53
 DIST tagainijisho-1.2.0_pre20180610092832.tar.gz 3634107 BLAKE2B f5cb75f45fced30c64f615147c3eb7e4d473e81dd734517710bcfdf390d1a34a1780196b6dbbb7a6d297df0bb8d73933d09a76eb6b8dd13d1c0759c562e81695 SHA512 3b17ff6972e3cfd35f4f9e8c575153a4c2021a66a238f631616452a16a151d604106586d438cdc574211bff54118d89e492f9460da4b25fef88a2354b0bd8555
-EBUILD tagainijisho-1.0.3-r1.ebuild 1751 BLAKE2B 98b42350d471ef3f42ee092b6a2952e6eda8347efb229447666a00bbc0f195e1d366de08857864d4e7df18558a7202abfcffcb16b7f59ba20bbba3124eb908bf SHA512 2d664fc8ab217d57fabde412368b368fd02b1e04918fe3aa7d6f348035bc29583956c07d295549b32b1d0abc60cdd572b16efa74e0184e9f6861cf40ea584161
 EBUILD tagainijisho-1.2.0_pre20180610092832.ebuild 6180 BLAKE2B ac53048f5508366e943275fdf19ce7dfc7e5ccc4d228608d57828098911a5219ac89b0f4f5450cfba87dadd06fcde209438834e4264286b257cf98dba6e26bad SHA512 8ed6439eae16cea8e714fe8a5de659286414bbaffccc6b3c9a0c79d33a36534039b6a56a5e8fa936556a9264c2e4b164841ced3c3805f21da82928621198baab
 EBUILD tagainijisho-9999.ebuild 6109 BLAKE2B 0d10127700103382266b6606877e92de3205bac43a795a93bb30ed1c4d89c9f6bf2612a51e4e3bf3d92e611f3b1d1959c56cf2f5f34214220a80eb21fe72a5c6 SHA512 55c11b49c483b7654539a5627e44ee65111569be3fdc45c10f0db4600e09c0eef02c2f800337449f77a53b1c51ce01790d3c18b41945499d518b4f5a28883d32
 MISC metadata.xml 1133 BLAKE2B 863fcd0cbb85b715cf7666210c74a9e88423b0e982b3e05b4333036b607e4d2cf73b35dc6b8f5e549a35a6d8e2cc107f110f3500762d49065bd1ed2097dd6338 SHA512 cde2818f44f02091ac994ca049a25b90519b62b669b7923a52043df23a0de7f3e1f657d3080e574048556dbacd5521995addd35267ec9d1357360f473222cef7
diff --git a/app-i18n/tagainijisho/files/tagainijisho-1.0.3-sqlite.patch b/app-i18n/tagainijisho/files/tagainijisho-1.0.3-sqlite.patch
deleted file mode 100644
index bf1d443395b6..000000000000
--- a/app-i18n/tagainijisho/files/tagainijisho-1.0.3-sqlite.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/Gnurou/tagainijisho/issues/163
-
---- src/sqlite/sqlite3ext.cc
-+++ src/sqlite/sqlite3ext.cc
-@@ -118,6 +118,10 @@
- 	sqlite3_stmt *pStmt;
- 	const char *zSql = "SELECT fts3_tokenizer(?, ?)";
- 
-+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
-+	sqlite3_db_config(db, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
-+#endif
-+
- 	rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
- 	if( rc!=SQLITE_OK ){
- 		return rc;
diff --git a/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild b/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild
deleted file mode 100644
index b89dc7ed279b..000000000000
--- a/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Open-source Japanese dictionary and kanji lookup tool"
-HOMEPAGE="https://www.tagaini.net/"
-SRC_URI="https://github.com/Gnurou/tagainijisho/releases/download/${PV}/${P}.tar.gz"
-LICENSE="GPL-3+ public-domain"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	>=dev-db/sqlite-3.11:3"
-RDEPEND="${DEPEND}"
-
-pkg_langs=( ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr vi )
-IUSE+=" ${pkg_langs[@]/#/l10n_}"
-
-PATCHES=( "${FILESDIR}"/${P}-sqlite.patch )
-
-src_configure() {
-	# GUI linguae
-	# en is not optional, and build fails if none other then en is set, so adding ja as non-optional too
-	# linguae undeclared in IUSE will trigger an error, which is a handy check
-	local lang use_lang
-	for lang in i18n/*.ts; do
-		lang=${lang#i18n/tagainijisho_}
-		lang=${lang%.ts}
-		case ${lang} in
-			fa_IR|fi_FI) use_lang=${lang%%_*} ;; # use generic tags instead
-			*) use_lang=${lang} ;;
-		esac
-		if [[ ${lang} != en && ${lang} != ja ]] && ! use l10n_${use_lang}; then
-			rm i18n/tagainijisho_${lang}.ts || die
-		fi
-	done
-
-	# Dictionary linguae
-	# en is not optional here either, but nothing special needs to be done
-	# here too, linguae undeclared in IUSE will trigger an error
-	local cmake_langs
-	for lang in $(sed -e 's/;/ /g' -ne '/set(DICT_LANG ".*")/s/.*"\(.*\)".*/\1/p' CMakeLists.txt); do
-		if use l10n_${lang}; then
-			cmake_langs+=";${lang}"
-		fi
-	done
-	mycmakeargs=( -DDICT_LANG="${cmake_langs};" )
-
-	cmake-utils_src_configure
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index fd105b9c79f0..c063e5a85878 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -12,5 +12,5 @@ DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 78623c015cafafa1fbaf32542535de1f0207f8452
 DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
 EBUILD uim-1.8.6-r1.ebuild 5052 BLAKE2B 67f7e600a86a2f74ee49def7684bed41182946a6f0591892ef3b79609a5ae0002514ea941eeae6dca13ce93627fce28efbf1c9fb84f3fec805d301a347309edc SHA512 521d6bb0c8e40cf4a8b2a8c7ecbf650bbb24d6143ecfb4fa2e6ab3b0aa1df2d6e243345bb6bee9412c3fd5af8cfe20b88a05fb4ab3e048406ac3f674ac587aab
 EBUILD uim-1.8.6-r2.ebuild 5157 BLAKE2B 87909b8657beb68f9148b937ccdbaf97cc515d556fd7bbd97b9c5e08a202d7e3f1b835a0d1394dba7d98236642cf3eb94199ae764f45435cb769961d0b537672 SHA512 405dc2308abd24708c3b4fb68e866b83300a48909d5b60c1c21127235e2a7d69e984fda7e4131774de3c86da1c442cac36010569bf9d573ea89a79ee298522b0
-EBUILD uim-1.8.8.ebuild 5330 BLAKE2B 49c5eacb304c025502ef1ff2348de4fc270809f8855db29d6fc209a9a9797073f7d2c8f34bd113f1a59b361cdd5e59e1e78a41de864fc04e7286f4b10aeefd36 SHA512 a470b4e4907072dbc98a9b0d0505e895ad7c1ecc665b030fe5b9ba0131412ecabd3472fe8fdb86a92f50afb5f28d76f23351bad99daa9fb68bcd2e9aa3caf9cd
+EBUILD uim-1.8.8.ebuild 5465 BLAKE2B 698873dbcb9bb0a4ff2088a5a03031feecddc8d5959d18be447ee4ff1da3f7178006818260046a84672d4453a689a062a3e4dc2a0b3efc353ebdd8b65987181a SHA512 3866ce1524a5730e334abde0151cfe2b9a8a70f226d3901a5d8d421e88efe644ee49081b3ee7c8638c13dc77c3d3027ad3ae3cda5c54b3a7872f3d84dda4e2a5
 MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
index fc0e9ef744ea..ca02176189d4 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit autotools elisp-common gnome2-utils
+inherit autotools elisp-common flag-o-matic gnome2-utils
 
 DESCRIPTION="A multilingual input method framework"
 HOMEPAGE="https://github.com/uim/uim"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 x86"
 IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
 RESTRICT="test"
 REQUIRED_USE="gtk? ( X )
@@ -95,6 +95,8 @@ src_prepare() {
 	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
 	# fix build with >=dev-scheme/chicken-4, bug #656852
 	touch scm/json-parser-expanded.scm
+	# fix build with "-march=pentium4 -O2", bug #661806
+	use x86 && append-cflags $(test-flags-CC -fno-inline-small-functions)
 
 	eautoreconf
 }
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index ba9b94eebf65..49d1e576dbc8 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index ef5613da20f9..fa0e1cde01ed 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -1,7 +1,9 @@
 AUX ddcutil-0.8.6-remove-pedantic-cflag.patch 3848 BLAKE2B f02ad02606aaef927823b7e50c319e4c4cc9a1a31836f3674ce5c7b140a5852fc62d1103c3ae2bb366f75176140c892ebb8381c3675ea3454493c8d2dcf7db17 SHA512 4f946476545a8af53a71d024d2765b26fbb871e04905c62e280ec4855bd1ebe2b0093660e3d9e384a106b512f783ca58cd0de78d40ffba1dae283026dd60bb9a
 DIST ddcutil-0.8.4.tar.gz 558405 BLAKE2B 4bb93d6b9b28a17ef182c1f39e3b6351070c5541fd8eefccde2a6d771e28a8c656abe1e00a58ee935290cba79af09b1c2d6b611532827455b5ec83532bbb46c4 SHA512 e7bf78295a008607ef520e055873acc0bac6d94b850a6ea1f7d4a4ea9e080d23b4b7d82e5725a220ff120ab1523aa320265ba22671982625c10088521c72a14c
 DIST ddcutil-0.8.6.tar.gz 613272 BLAKE2B ce7072a819c5a2aa125ae8f6d5550cf0a516714f0635672015a0c24c9e525d34139c903ce7791955e0b30b8d4c66e94453eed60f8d8d024caccb49204d6fb853 SHA512 4ec473a37dc135700f4ce06634e6aa303199f4d743fba02c04ca509d0c31d45f59da7c6cd9818efc1fd8bc20dae518c5656fc8a38e9f00057677b1e997434fb0
+DIST ddcutil-0.9.1.tar.gz 656853 BLAKE2B e4f11253176587cb5ee3c9647a01ab04d5a92ce4ca7a4098378318fc069e635e43c3716ace316498f64ceaaa00aa90db3b5f409b74b8d7089a7c25254c0e360d SHA512 b2d5866606a4bc081d89180e910822f2a2a653a2782e3df582536ddc86c7d3dc02309dbb41f8d566f6ebdc5d82d3aa11792a04c28b3d83552b024dfd59891fda
 EBUILD ddcutil-0.8.4.ebuild 2948 BLAKE2B 17189cad5f87ec5f58dfbf9ff4b65edb2acc61a21b5ed7189d48a1e97794e2b2fe4f9493a91e01295200d5a5afb124d2a7bdd6f3eb4ff3d3cc474347a3bad833 SHA512 1a557b9d80cbb683ada7621876be9ad6b5f72d7227a28f292811d4c6460aba95a107dd58e9952d2c139255b1b530c04d5e4f7f09175b7871a0bd3ac593cacfb5
 EBUILD ddcutil-0.8.6-r1.ebuild 2729 BLAKE2B 0fd422fd07caeb03c144e31767ed77e707a6f25c63872e06030d12715bde8d39d9425d2e4fe5f2e5a97aad073b9d8e445f97d60e18c80d52e4aae7fb8399812e SHA512 e3dc3ff5d24f50147670e36cc68aa6ee96e2d79329a023ff7c6624b3de090018812f0a4e25cb39f5200eb7a420e3906afa6fe089d505dcd08806c1d75fbfe03a
 EBUILD ddcutil-0.8.6.ebuild 2671 BLAKE2B 7d1b0e7df93a63bb795c03a985950e1da7f16f36db76bdb2602d31fd014a3016956cf6bccfe98ef48eefc321ab62ed24b6bf26f2d6cac92198486f4819ed486e SHA512 1d0837c24c04c25b64bc4b9da0a528b65ad8a04adce135507d11b26dc8183e9be0e66243de3338298a613527e8e6e581e648f2f0783788d943e160e170db1404
+EBUILD ddcutil-0.9.1.ebuild 2676 BLAKE2B 59a29bfa251d9417453cf0eef4906cd02e9aaa16d7c86023f817c993e77c4f0cad7edafb8ad8f1c1de611105bf8ab8c8084c0ee94796fb8fe92296111f6d313e SHA512 2b8c4bcc1f3af3899df66181c23099374af5b25650b27707e1437db1c8ed69c887e857313a0a7aec8b1190a00f213d366ef1467fffcd8f9e7f6e100de0332679
 MISC metadata.xml 1293 BLAKE2B 185066701c363efd3520b07a9ea0cd70f94f0adfc10ea4d3cc624904c6bd66ea925bac4ccb53afa22bb7bb24b843e019fcf62e11a26c934ef16729a50f2a7117 SHA512 cb5e342c412ab146f28e75944a47d91b73b7148234c2f25966fe24993c595bff47c5e5b87bec82e07401b41338837d5425ca32f02cfee4df20d176954abb66d3
diff --git a/app-misc/ddcutil/ddcutil-0.9.1.ebuild b/app-misc/ddcutil/ddcutil-0.9.1.ebuild
new file mode 100644
index 000000000000..4a1c2ddb93cf
--- /dev/null
+++ b/app-misc/ddcutil/ddcutil-0.9.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic linux-info udev user
+
+DESCRIPTION="Program for querying and changing monitor settings"
+HOMEPAGE="http://www.ddcutil.com/"
+SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
+REQUIRED_USE="drm? ( X )"
+
+RDEPEND="dev-libs/glib:2
+	sys-apps/i2c-tools
+	virtual/udev
+	drm? ( x11-libs/libdrm )
+	usb-monitor? (
+		dev-libs/hidapi
+		virtual/libusb:1
+		sys-apps/usbutils
+	)
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libX11
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	# This program needs /dev/ic2-* devices to communicate with the monitor.
+	CONFIG_CHECK="~I2C_CHARDEV"
+	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
+	if use usb-monitor; then
+		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
+		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
+		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
+	fi
+
+	# Now do the actual checks setup above
+	check_extra_config
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Bug 607818.
+	replace-flags -O3 -O2
+
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable usb-monitor usb)
+		$(use_enable X x11)
+		--enable-lib
+		--disable-cffi
+		--disable-cython
+		--disable-swig
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	if use user-permissions; then
+		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
+		if use usb-monitor; then
+			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use user-permissions; then
+		enewgroup i2c
+		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
+		einfo "users to the i2c group: usermod -aG i2c user"
+		einfo "Restart the computer or reload the i2c-dev module to activate"
+		einfo "the new udev rule."
+		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
+
+		if use usb-monitor; then
+			enewgroup video
+			einfo "To allow non-root users access to USB monitors, add those users"
+			einfo "to the video group: usermod -aG video user"
+			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
+			einfo "the monitor to activate the new udev rule."
+			einfo "For more information read: http://www.ddcutil.com/usb/"
+		fi
+
+		udev_reload
+	fi
+
+	if use video_cards_nvidia; then
+		ewarn "Please read the following webpage on proper usage with the nVidia "
+		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
+	fi
+}
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 96c2fdea335b..c7f58e49f115 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -13,9 +13,12 @@ AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
 DIST elasticsearch-5.6.10.tar.gz 33796721 BLAKE2B 4e9d1d910a70acf32ca63cec811b711f692f3cf32dcec084a07f92d281eed07c067740bb5c5447055a6d0b6126e55a635edcd08c105dc59985db72bcd031a8a5 SHA512 17bd5710cfc3efa455428a79c74e63aacc9b9481d59a0b0df07ad4e4c25ef32dd41b3dbbde464a2801363b6d428a23eb52cc935640ce86bbc4d8a01dca8a1585
 DIST elasticsearch-6.2.4.tar.gz 29056810 BLAKE2B 121be27ac1db4fa6bbe285161b3f2b2dd889859b50f46b57b68ed43514568c4aa9629b5ca32edcc2328a6e7245256d64901c8acc8b2dd91337f8ca97b87c46e1 SHA512 9e6c0de8ed0d9e27fdd18ef7bada376af5a8680bb7a4f4d805926da456b349cee731ba90328b5eda5f0e62fa3f00f34646bf1c2b6c662d055f4be338d0690941
+DIST elasticsearch-6.3.2.tar.gz 91452574 BLAKE2B c422990fabad70e6e77e8f59f6fb9e9bf5a84eb7e6b8b67dfd91f53e474b1b501b3a1d5ea8f54f0793631504f194a116e816eb3558782b67c8dadecbc2711ee5 SHA512 954cd1e16a5f2e0b0efaeb7e6b19c708d1588d30814a31defb09037c3b90f78c5e9dbd1ca9af9c700d517145a4279bacc1d8ce7cc6894fbe7bf71eec9ed3110d
 DIST elasticsearch-oss-6.3.1.tar.gz 29417012 BLAKE2B 356665cde2f12ae5813d95302398f5fced07c53d25e6e1dc7ad41c8dc8ad42cd3d5bd4ffa6cab24af8088c29800f6ec59a483710272b756af2f76b5967d4b932 SHA512 3df0f7f35e150198f7ff660cf4d90fbd1c2ca587287c6340d427f968711b6390123bfafd09a744c9bdf328d57423bcb75f6e4701ce14a7257388611abea62545
+DIST elasticsearch-oss-6.3.2.tar.gz 29418577 BLAKE2B 152640dc01a10f44ba43f87f68361cc0dd5e1cf54d0ff92377f3acd1a12a247f002ffe2d003cc53760e891278249c10b1d6d4eb978b0bb1c1ebf8879a2cfcb9a SHA512 3c51a860414f7e55900b1d9a350bdbc3e673c8445e316454c2480315b4b9fc08df58090c6281cecc3ae63d12d78d6bd58e228b3371aa325db799ce18758a21f4
 EBUILD elasticsearch-5.6.10.ebuild 1689 BLAKE2B 7520b1676de4ded7fbb3691cca543c3a5c6de99cfa1ffff09e40ba55991d086f7004c372387e932213bbf5dbab42952266f4da9cbaf051c1795089c420949dbf SHA512 36d5128d2779abddd535e0918bbe4569c3d1414dbfc43e57fc037ca3056aabf73dbfd43b58811c5a4d0bc3d0e3edbf093ca458add2b90b87b62cb22416552fb0
 EBUILD elasticsearch-6.2.4.ebuild 1747 BLAKE2B 2e8ad76bb75a927499cb73a89ede57629db4426ee267a0721e65e8893cdff2799830f7cd136b7e82185effdac60ab8f0d9314edc0179fe2261066514f3c60519 SHA512 e7be527f28b482278376316dd3d6bc969e4d70a8d95a067ac1932f5be0dcffaaaa47064e463bb043665725f73d9605cd150128660ed923de7094f3eeb8af5a3c
 EBUILD elasticsearch-6.3.1-r1.ebuild 2106 BLAKE2B fab4c1d557642ef3cb4728e297a5e95e0752272a19180d5febb7d2a4b5a3174533840d37e9aaa43cb931f278ff25e93d8dcdc200b03c2bbcc94b7e61608def1b SHA512 315019c24210c3f28f3e8359c5a2cabc2f3efa005ebf3e812b0539ad1a4b6af81ffa47d79ec7a76b26766f65babbd944d55556004b8f4d95c2027d4179c5a2e2
 EBUILD elasticsearch-6.3.1-r2.ebuild 2106 BLAKE2B 45e4525eca1113cc02438b0b2f5b6a40223357aa46382bcf90ffaa3944ed13dc7f2d5d21b044793946fa86d838ba81319020c15e6379a23083ef74d5b09afd00 SHA512 f7e94b4d03dfbbc7975051eda8579412d4d0db883b5e35904304260f0ac7de285e1c66408f4b291cabe7cab4401d94c2974ef710122d4aae77134380fd076ce9
-MISC metadata.xml 493 BLAKE2B 8149c45c1eb86d156ec0a32f016e8eed79d8e8fb7b6f0294ad606eebe9c63208e3d450796cdfc123fb7b2b2bcd10ff0cf23f2b6d2a99c177cb1e795965984892 SHA512 ce03769abc314d3bf561ff5820a8c8582196e9e6755e1e695dcf1224afbc04b609fdec7a1499d2d7a3aa0a350ad9fea94e0e3b46eff7c3c6150a524edd28d399
+EBUILD elasticsearch-6.3.2.ebuild 2603 BLAKE2B 329924c83731282a8054c4c5965f30fa6c2748b4558044fa7b1407ef406dbc02a02735274ec942c20830396e2eec9e614b7406028623e03bab570e42bba522ca SHA512 9435e7af52a42bbe8626330dce0c2b80a827d697a8fae96edceba3a9665472775e71e23cee099b931bf17dc65eddce2fbee68e36823d1796bc7187169153db55
+MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-6.3.2.ebuild b/app-misc/elasticsearch/elasticsearch-6.3.2.ebuild
new file mode 100644
index 000000000000..e022c71854fc
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-6.3.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz )"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="virtual/jre:1.8"
+
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+
+	rm bin/*.{bat,exe} LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+
+	if use x-pack; then
+		rm bin/x-pack/*.bat || die
+		rm -r modules/x-pack/x-pack-ml/platform/{darwin,windows}-x86_64 || die
+	fi
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	if use x-pack; then
+		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/* || die
+	fi
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.5" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/elasticsearch/metadata.xml b/app-misc/elasticsearch/metadata.xml
index 2d9963a03f57..56857d7ba312 100644
--- a/app-misc/elasticsearch/metadata.xml
+++ b/app-misc/elasticsearch/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hydrapolic@gmail.com</email>
-    <name>Tomáš Mózes</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>erkiferenc@gmail.com</email>
-    <name>Ferenc Erki</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomáš Mózes</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>erkiferenc@gmail.com</email>
+		<name>Ferenc Erki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="x-pack">Enable additional features (may need a license)</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-misc/go-jira/Manifest b/app-misc/go-jira/Manifest
index f6fb261a0b50..f23e4ab0d0e4 100644
--- a/app-misc/go-jira/Manifest
+++ b/app-misc/go-jira/Manifest
@@ -1,5 +1,7 @@
 DIST go-jira-1.0.17.tar.gz 1382832 BLAKE2B 17cada8407b5136ec3b84d9f43c67cb25a893bdfeae7309bc15eb479954ba3ce7df4bc1248782a0bd1874b08b48a68a8e69a1651960c10d6260b22c63a0a8147 SHA512 8abbe6233413d12495399446adbb02d6a37aedf2a2b1a860c403b6e210f5e1f44fa01dfe937d86241486cb4a56c52530eff1c582d59f5ddde4b466a6908fd020
 DIST go-jira-1.0.19.tar.gz 1292750 BLAKE2B 2377b5d677878e83d764d65fe3ef9c3388aa5999004adce956549b327e00554142f7fc82c724593652fd5b5a2d23e161b926bb3c34285f971df0bdac90c94a0a SHA512 42fb89f0886df19eac6cc7098da1e03a0e091876777de896a1b035b6f9d0cb5b546b8fb4c8d4469450da11e2a52b158256f959a63fc57ffeb4541cf792bf3b0f
+DIST go-jira-1.0.20.tar.gz 1292990 BLAKE2B 788dada892809df730988193e50bd1033b2efe4398cf1374c7c2a08c197e10215aa83feeb2b0573a04c7de72badf83089cd45da85d0e60a31d0fbf41615debae SHA512 f07e1fa6e24fa29a50e348490b0ebf6f3dfa1c1bcbc8420320f3c87b3fac74e6ff1d9acb8936fefb25debed2411508689f832eb19ce09f1c39657942c092220e
 EBUILD go-jira-1.0.17.ebuild 704 BLAKE2B 1aa8dad2ff3972debb356ae656cf97669dadecc9b502f7b59f679463e22f22b14965cf72e838ef8040be61b1ed78e6372653806ca6a0e6733c98c0b682b97e40 SHA512 66a7667d8e4939bd30e7f7ca9afbfbcf715a3582e8bb6ac60e4b27cb014e6f51ebbf755726345833ca9e734e42d461bf45f5f75ca93b1046ac8bb8dfbf9bc454
 EBUILD go-jira-1.0.19.ebuild 686 BLAKE2B ab33305d1c3a5d86616dbe74f431e787a2f9580ae778467fd98c9f5f70b3054182036611d19d843137919b44f1662606b2811e53a263789a6d86d5210c7f81d4 SHA512 93c12cbaf1c43389ca3e96adcb78f63bdcc9057adf66b75d01841b9420f72d83b663e4e306997dbe1aae5306f786a0f7dd060591297ddc7a0a0c0ba6cd6f0b98
+EBUILD go-jira-1.0.20.ebuild 686 BLAKE2B ab33305d1c3a5d86616dbe74f431e787a2f9580ae778467fd98c9f5f70b3054182036611d19d843137919b44f1662606b2811e53a263789a6d86d5210c7f81d4 SHA512 93c12cbaf1c43389ca3e96adcb78f63bdcc9057adf66b75d01841b9420f72d83b663e4e306997dbe1aae5306f786a0f7dd060591297ddc7a0a0c0ba6cd6f0b98
 MISC metadata.xml 336 BLAKE2B e4bdd5129c1bc5e5a26f4ae70fa1528c9a5ee2811fa5df2e5876ea3f1044afa3327a3b9897b199b2f18b451bae57da965371f8184196b299a036843bce3ed494 SHA512 37e0c43ce89345c1e0136e8e1f162abd77def9f295ddd8abc3b49f638847a1c08c41cb1055415aeb5a3ce5d1eab37b9ca2654764255ea6ccf9d76adc0a5f8009
diff --git a/app-misc/go-jira/go-jira-1.0.20.ebuild b/app-misc/go-jira/go-jira-1.0.20.ebuild
new file mode 100644
index 000000000000..513090c2a8f9
--- /dev/null
+++ b/app-misc/go-jira/go-jira-1.0.20.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="gopkg.in/Netflix-Skunkworks/go-jira.v1"
+
+inherit golang-build golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="A simple JIRA commandline client in Go"
+HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira"
+SRC_URI="https://github.com/Netflix-Skunkworks/go-jira/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${WORKDIR}/${P}" go build -v -o jira  cmd/jira/main.go || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/jira
+	dodoc src/${EGO_PN}/{CHANGELOG,README}.md
+}
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 4b7222198460..d20949a10394 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -21,6 +21,6 @@ AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a3
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
 DIST lirc-0.9.0.tar.bz2 857286 BLAKE2B 034c7b8492dd42301bb6d40da8c6c95f714b925ee50e7396290231684024dc3fe3bb64987db92d2a4e4d56203436007e68222bbf9a775bb9d29bbefcc4a7c1e4 SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431
-EBUILD lirc-0.10.1.ebuild 3739 BLAKE2B 7370130d197f6243429cd1395dfdf2bbd6ebcd5afb14cb2234fc84769925618c12e5193553f6d425732b3419f23c851ccccd37029bbfc5393d49be875d5c9175 SHA512 95dc993ba6e9b3abf3f58c9a76e5831659fa5fc9c01e457f7e1cbb24eb4ef28f91714e191e7050cf54a6a1803e68cf2a7c440eee498d948c2fc001296f30cbf7
+EBUILD lirc-0.10.1.ebuild 3739 BLAKE2B ff2d1eead965be48fe83dc2392e2e088301262f474007669d3e203c5982c19a0d42f2d11ce8942a3174426097cfcda0cacea49f2945222b5a48c0b45e03a5b56 SHA512 fe0990d214f50844fdc744eb3dbc5257231e14e3febc43eaedc3edff5359e9d9889d22a45355c755f4aa69976c8e4359e8d9c08f0735731e8734b812a8f087e5
 EBUILD lirc-0.9.0-r6.ebuild 13250 BLAKE2B 81ca3c71e46089a8f3a1b412d53e60096f14c0825f8f4c7daf9fee9387e3eced4dda10c8e5dc4550a9e0eb1347b1db40972a3a2397154dce2a8e1d2ed8b99977 SHA512 0d620d93bccf35721830420a7e367b45c1b6a71891843db12fe4c96b0d1228de6367969545eeb0f0416833f195ed933eafef69d5d38a0a46a1f0ddc32829240b
 MISC metadata.xml 1175 BLAKE2B 1bcfd5d3fed6ee42c3e53168cc40fd930e6b92bf52bc787c43439f053e1fb97bf841d71ec58ce3fae56187c77cac767613107e74a90f8871dcfe3f33e4ff293f SHA512 c1d6ff9a423c0ea5d52410d5dfa2cd9dd94b61109494c629706dc74c228032e19e6504884c50694450624d6c05f437eaaebaee0ab626f7004fc7377331fa847c
diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
index 9b775a2c3457..9862841d250e 100644
--- a/app-misc/lirc/lirc-0.10.1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
 
 REQUIRED_USE="
@@ -70,7 +70,7 @@ RDEPEND="
 MAKEOPTS+=" -j1"
 
 pkg_setup() {
-	use uinput && CONFIG_CHECK="INPUT_UINPUT"
+	use uinput && CONFIG_CHECK="~INPUT_UINPUT"
 	python-single-r1_pkg_setup
 	linux-info_pkg_setup
 }
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 0bc47c35d210..d43e4b0209fc 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 0297c62c640a..bd8eca9fe460 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -335,6 +335,175 @@ DIST LibreOffice_6.0.5.2_Linux_x86_rpm_langpack_xh.tar.gz 295504 BLAKE2B 29d713a
 DIST LibreOffice_6.0.5.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 798866 BLAKE2B c6c6fee66de231610467f5c8ffed55068b2f497f78719b9500842e05d568afee0d55707921e05cc8eeb1040209b4cb87f47748ff3ceabf218d09c690243f70ba SHA512 f93d16b46a826d7ed258bc5b65765f48014bc80eae466cf498369562c3d73700adb20fccbc1d9113093b1a40e8ecd2442dddb2e92b727c87fa211265b677a9b1
 DIST LibreOffice_6.0.5.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 796771 BLAKE2B 5318c33faba8191ba52493283858902f02f1addbe62322840bc2fd3fa15bce9068ab31cdab077edeba840ae1e9b641ce00c5fc8f54d02fe74cb2b1ac0d94a2e9 SHA512 6d6492fb9a7edd3fbd669d57f9b1b407958a38e9b482a394b619761c34db4ff8f8acee608c0d8bddeec0b2545e3fc7801cfe732c04e0d6e283565e03b1a55325
 DIST LibreOffice_6.0.5.2_Linux_x86_rpm_langpack_zu.tar.gz 326194 BLAKE2B 00fa9c5e1af6851a58a47af3f1b85c1b6e47b19e673a1e556d2574bc22354b05a120e0e0a5e2174368397930bf9e4f21dde44723052974625f6e837ea0296630 SHA512 6ec3ab78016ccd9910c25d57c19e2dcf2801eb04b66c3bf988037fba000a87733f38aecb7ccd1aa2dece33735cddfb94e2c23fd216845aae4bb18e25dddf3f0d
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_am.tar.gz 7989353 BLAKE2B fe3bbdd2d08ea660a7d674cc6451f4fd19b472c5219709f0ee1558d35a1ff054dc190205efd88c57186f03c46801c6d0e47f218de9eab684c8061eaa7aade0ad SHA512 7baf9ae08ef566b370c75137f415a47418f97f080d5a5a853dad2aba7d7c81a3b467db8369906a6c7726d51764d11f07b1242e780b93329e1c4422c2ce2c32fd
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ast.tar.gz 7905213 BLAKE2B 8a8821b58813d6da1dadaa4744856b9101eed43cd36a8207091bbff5bd709605715e2a2c898c6dc384afef914d01c3159064247fef69142c20373f313a588e49 SHA512 991cc9a4bd19bdce00f6e7aa1efbe133163b1bea3a3d99952fe1c2f6eabd76990a6c0f11a8d636d60499811818ec6ad52a5391b39db728d752f72b97301c3627
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bg.tar.gz 8463619 BLAKE2B 2db6842597a841fce78ef9ce2ffbf1cd2f5c1588ff1763f46510c2f851d4c1eb0070116e57fa442362e48e7c44bca2f54a40ad0f20659a69c8f6274bc66d1350 SHA512 75633005eb0a4c36dfb40955bed01dcc22727897d6380df50076f3aba19502fe23cc24d6135c4283f4510890687f2df0ef3b0ef88b6f8c4a8b6284dbb9c2a918
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bn-IN.tar.gz 9145137 BLAKE2B 510821c858c66ae43e21d4935bc0b837f95f24a5c96ee73aa4d1368ffd6ed535b298f7186c63748d0e2a1a22faa7257c939f760f666c987badb7fbd003e06a78 SHA512 92a03680447ec8a16e9566643597ca3e9d8f64ae5a2c8dfc698d3092fe0051300d9b9aaf69c593010fe871f6f1a3f737849424867ecf8d79d01063f192cb37ff
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bn.tar.gz 9144936 BLAKE2B febcd5c68da7c8be506f0b83b6dcec615f2c8c53e3bf1b2482519dfb34503d787af3dd2347c3c25f6056e805ff96a4d625daf327131dcf763596fc9326584eb5 SHA512 9d648bcd6d1474f1538c9ccd0b58268c954b44eeaa3fd285c52f549c73833470d407c68181fddca4749b700fc05667845b87e9a8db325502ada2a0f35872455e
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bo.tar.gz 8891211 BLAKE2B b46df155674373678eb584d022e550757149017f7615de0f621ce00158fc9269bf3760e25d38680eeada2a994b8c17191c0caba56c0b6828a2cb9a7d2d1cfa70 SHA512 38b8f4854c6aa349107b0241d23e286c406a6e0342cfc67c9f64563273edf6a06a5fb72e183ee92990a916bb087824130921b1e34dcfa83f25ac9fc01954fad7
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bs.tar.gz 7210982 BLAKE2B c21e781a38e3bf7767b65071a844b5900b13571edd8aaa0f596eefe63ab1e6b00d8e2964058e5b2e9d25b4cfd4bfa93d88c643d1e672e57ebf268e4935df6c37 SHA512 7fe02988fdcc84f9905979d82e8c129f3b18ed7a2a1ad928dc5e18e7481af673e91ab3ab253ad155ab9c4ac7497e96659d4b98926f5dbed8e60465f3a26a555a
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz 8091972 BLAKE2B d8c7152e56551099eca9ab04558d8acefe49520f4edf5d6a5a564b5385152ced9ceb51d127b5ab106c23595f85fdfb6f630a534ff543f5ab8af52ce1fbd53fd7 SHA512 da3230a89593eccb3220eff91de2f4012c6ab456da00533a0b91f80a0d4527bdf398cff93a9ebbe354b522bb6ce348605c212f136144261beddaf22502125b0d
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ca.tar.gz 8095378 BLAKE2B 565ced8b6b7e35130c161ef7e4e15446ea815792e2765cf70c33b420dc7f376ba9526aa9e5b95290ca1ef1b4bdb82c9c52a965c33ecc32f238a8aec5dcb1faa3 SHA512 3c087743272b47598cb36a1da48e36acb9017f865a506528249b409f912d34a82d4882731b6ed975a162bb50712b2fa07cd06520354b5bb5cf89eccc806fed19
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_cs.tar.gz 7798302 BLAKE2B c5d7c45c1b090e1172a5173b245f29d4dfd689e3d9d42a46da18e075c3d5ed7fec1fc622fef66c1c12aeb1721326ef1214304635865fdc0705aeee4dc897e4b3 SHA512 86b50cee12a372b9c58f9608a0c9984c2d5946e03f3f93d6d6bb18f9a8789d27f55e105d9131fd5f328b9ca77b4a9ada2b4c3389479b73486be3f339a4180758
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_da.tar.gz 7725637 BLAKE2B 5f2af156f0e7d2b16a0f5c21d4e9187c267b92d433e53e64c22af3ed80609f9fce12b5888503ed0b16e761fec760e4ab31bef38c06289691b81ef4ecefdb78e2 SHA512 22fc308475c842d4b2f1eb45f7f8a3f4578f18b8e176f8308307c88a5ebe7bc8c51729e5a4b25f600aa6c2c8b3f05b93b325f9ce5cb9278d617c1556f758a286
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_de.tar.gz 8227750 BLAKE2B 646da5476682b4aaef486ffa1db9efbbad95423f3c3d145004dc9fe2a2c5567e914e3833c6b9bd2ab3f0784b1716958f9a477f8c27cd098a5ca6e856e1c0e56d SHA512 209e4a08b6317e96ecde529f4a5611db901fd3559df5fafba076c6eb96317098bcd9af4ec48d063d517e4d34a6ed09d0ded45d8534b5dd4e33baedf743e08bc1
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_dz.tar.gz 10264716 BLAKE2B 155441ed9fe240d2cbc137ed6e94493446063b1e2a22ae6fd6c7a7f92888b4f8bc33523073cd520b45bcdc55af6d0bdaf12e9abd7303f15cc376fa28028ffe0f SHA512 616804fd16181ac460a2b06f397f97c9cce4d62cdc7aa5c036d6fb1818f3d8fe75bc18d45618014adf9bf8395d71cc9a9b6050e597a56b8b13a3cfa3e343a45a
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_el.tar.gz 9114949 BLAKE2B 9591b9e5a6f38edb2d89f59343d645f5adcecc40876c85237c6062bda941836586d459916ff934e2d0afc62d1b556f9b560db6bb32236a4f88cd2e8ecddd7dcd SHA512 5532f0b56af0057cde0587083a6442928fa28338c3cc34a0822a850597e2ea00799cca0c8f164e17153607708c2e3a5c9f8fadc71b42f3fa3b5df5406f9cd3d7
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_en-GB.tar.gz 6554655 BLAKE2B 093719b4e9e269a9c42782984c00aad4c56a455599cbffef378f4a316fa9258e54fd60649960e0a1cae85e5f3814693b315368e605cff4bfd41a26b8ac0500d9 SHA512 daa67bb00f25905f6a542a74a21e4508e311edeabda655d8eeaacef2e4c3ee45027229b674cb8a6b0ec59e839131bf8318c1978572e8f95d16421965dd94345f
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_en-US.tar.gz 6590466 BLAKE2B a79a89c7efde76af12ec387873585e260a79ea9dd6421a5a68951891501aac2afa4ba591891df4afbc4937c27873e3edc334cea23d17074872d271201c457677 SHA512 9708943964ca2a2574528fb4ec2a38a8bda121a4781151aa8f88f462ef9c61bb0d0dfd4462643ca8680d67374f92d3e1d766cc1bc23b16562a4fcd8628659966
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_en-ZA.tar.gz 6533248 BLAKE2B fe6b6387a19ebe8e06859391dec3b4837af4bda648fa3a1d1ac87176a5aca9222f7c5c2398ba8e179a46cbe4d8907f3d5af5c525654b838804d06a24931662a8 SHA512 67ba052b157e1393750955bed5730033dc80afd20d8e66e945fec9a8a8d8167d1582ac22dc5d02439bfa4b2878595dcc2fa2d4e57d1d2dc8ef69b6680db9139b
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_eo.tar.gz 7157533 BLAKE2B a987cad58dcd7ce4cb543e53cb6cc4ab5ae90e207a5fc4b962e64822cd039979e7dccd5626fc4bcdb87c107ae4f47753c26241c039ef0ebf577bc321000fde2e SHA512 17d7ea0443fe5d1e643229ed303bce62db0e6d20e524f72286708787fb9f0c5852e93a4cfb0eec2871119907bbe41275bc4a6edd69018fbe2cd25679d54bc9d9
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_es.tar.gz 8142338 BLAKE2B 6706c25a3c9cab11fac41ecc5f33dca47279ebf0c38de0c6f699a0c27152793f1302551da1b67a3309086b5861a7861c632a05eb2615c27a5d7fce9237e6459e SHA512 ad1b2ddbb7d37c17257639511c75f2606504bcb2a46b4db5987c3cd10dfc7cbe7cce8cb0015a924003dd398caa5d9d17fe3cf84c5a8d1938031f63fe73f995ef
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_et.tar.gz 7655182 BLAKE2B 5b106423ab01da3d29100490b3da17c30bf07f342a753a70a90971698e4c7a4534defa052ad9237abcc104c52a03ed6d3ce6ae5579eefed9f1aa83c79d6bdabd SHA512 cf3f4dfae3e0dbd2110aa5cf86f44c014723bfdbdbe4dadeecb0ee03571c7db46e0d396dad7afb1ca912b78dbe0959b4a61f7f6d77b7713756900e9544ab11e7
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_eu.tar.gz 7717335 BLAKE2B e22e21440b1babf72a7ad2891292621426f33ae77b525bb09d08684a20edbc605103b95e89021e4bbd3a8cf014fe9081ce0b55baf2c772326e4492bc19c3692f SHA512 23746cd19d2f19bd779ac33ddb7af657618ac739c08d1280c4a65f958491062054796657c75f71bdc255c29fd41eeab0dd6f56c8522dc2f0800520d161afcf61
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_fi.tar.gz 7893116 BLAKE2B 4c31516ebb8016ce47b5d7b3a217920a0c8f54f34a07cb99926032f17b3d34d5cc57ca7df8e3ca6de4121021b9bfc707becef10b27f0bc8fc59c044326f20759 SHA512 e949c021b0555d988c93f47becee429d646b85d1c8ca818fe37d7d419d643bd4677576165c3d9230a65e08a3586725d4cb51223084690b0a120c6a07204f66e2
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_fr.tar.gz 8324050 BLAKE2B c08db0283bfc3e99433cf1aa8ee8e54052f44de4cec81e9b367f3b4545d621e7eefc31132cd22bdad323de68d1939545715b732950be20b28264746a14f6ad65 SHA512 c44102f0aec372a0c6282b9210c06d2de26b284a4f6afb13fb26b46ebf1a11a0134bbaea2219bd93352d52efc649dee9abaac0cef031ecfe4001f593986d3640
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_gl.tar.gz 7808280 BLAKE2B 796af00925d67478c5c4037b573b73485b6cc39d617cbf22b048e2ae79b9dad4f07d8debd34c84050817bee2fbd7801fd62a762dee25b63ace537b8bb200df3a SHA512 2ad6a6e00f2006e2c85d00453a0b3ccec030ea31990e917323280287d69f6b740435fac97b79ffc7557a4380d7b129f885d9b156ab5a33c1ef6c6adb9606ce68
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_gu.tar.gz 6750678 BLAKE2B ff077ec05f418795ba73ab1c7254fc02e37c2847d7958a229bb67c9dc31e3c77d76391b178955e97e32225f12f3fadba7d0bdd309a6311aa1c8bc2bedf792c5d SHA512 5ac214822d72490e9d380247db20c3c12853cfae00dd242a2f541319ed2c2fa434025b430c43dc715d3c35d5e66d1eed5bee6df77eb24e807e07b572c451b5d9
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_he.tar.gz 6365034 BLAKE2B 6ed2c6dc40480c133b6635a24908335606348dc19790de96f393f438e2aa463498e4c1802901fd770ef87f83777e455643291c70787aa49093718d453ed2f56c SHA512 cfb6424e00734d94cc012d9ea04dee26274e8fd8586092a7fa4486b3c73c1be6bcfe5c4847dc84bcf0b4f26bb4721a5226aa0f777268000cdc03d80a525d58de
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_hi.tar.gz 7397534 BLAKE2B b3654d1cffb49eb55ae24f5b18eba8005aee8430b4f3337025b3d0350af77e28386acd9a55d2348b12731d1ab19effdc7261515bd318afc0cf0cbb4b1b196259 SHA512 2c9ee0f4d96903aac40a8c9bd15717376529a8289531c751211da886df1a53fd04f8320c77648c04d664a64bb5da50ed56a64fdbebedc9878bca3a02a8de6e81
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_hr.tar.gz 6903498 BLAKE2B 8ddc9fd59e68d41eeb6ad3eeb3355bb2afe94e6f3fa38cbaafb6f2215b4190fbab6430329ada869b58391e97e9f12b4e458299f5855b8cc0fd1b04caa2c0c3f2 SHA512 5b8dbc61b2a659aa9abe547daa9fee838b86f65ed36c869557b8e3ae687a98353d5ca48f5de418ec6be7d0627c313bc0908908b60ecd621ba20a10b6b7f4940a
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_hu.tar.gz 8220510 BLAKE2B f2c5e50cb18a9d25a42dd2f37125fd1e7ffd503905fbdf82a76d383b7d4df449a1a634583c2b4368edd38b597f3f7aa9dcd6e9e0b7a3530e910c35098731da4e SHA512 2e25bbc13eb394a4e9f15b30a6d5a523e0f081a83805ec8e0c6b3720bf7944f3705bae518d47292aaae54e185f3b04f3059e6aa268196d6f6d43a3a533be48e2
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_id.tar.gz 6967285 BLAKE2B bb62f78b40f3b6ad6baba5af51688c7d17667b3e71fe27ff01fc75be6d29332e1c316bcaff6ec78ec336b73f79480da3b90e8e276023d9713a1f620e7b826e86 SHA512 07f87761bcfe1e3f01625b3728c87ab4aba72f28dff1ca678c3edaea1f00dd5291404358b236cf770c75ace3725e902942e76e577ce7af546cbb0cb76e6164fa
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_is.tar.gz 7030623 BLAKE2B 6d75d3fe022a8229a20778992bfb65fde56d58b4a1e8c177555d7abe39b8a5e4a9669f6e841c8f9660b04520a8cb73727b89b78ed13b20f1fe9a3537260e3afa SHA512 0c1884d06c54635022a80a3a6b1b634c21fa1371bebdd5a3fefbde7e7897e4d119ba7a18826d9239a6cb1e558a4bdcdb760fe6af1423bb00bea8295301f64513
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_it.tar.gz 8076045 BLAKE2B d022f779e7ad89040d4aa8ac2a4f91ab885b51b1ac1eb69de0e1461274b0e356f96c734a02f0b0736971bb3a05ec0b304ec791c476a683e07c7c3d0645732474 SHA512 33ed9ec8fe861d18591a70f6b4f52ac29e5f26de74bc75b751943399ec4ddbdad8c77dda38d19356c9c3456c6e2af446c22c6ffdce058c9ed6a3a68125d3be67
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ja.tar.gz 13165768 BLAKE2B 68ec94fbada3d47ace924fdb076b16476ec5e59cdcb03d4f85d424680286fe449ac0936df1d70fe697083bcef52f232ca06b814e2320a8e0a0bfcadac3c7d906 SHA512 67acef6d1f57a309a6051545048a2f0d02c0de0ee246958a62ff900f2c1a37699c91ba3d4600d5541064b22df3910cef8bde45ad08051d02f330e5d70549f63c
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ka.tar.gz 7192929 BLAKE2B 0f1cb6b59f713341baddbdad0e53ec713f5c1188e020d4c62ac4cf0d42b70b8bda121a11f764abfdb2a6f6ae8f801047c2f59e6155b4a7ffca7b4a0af466d057 SHA512 5dad98dbbb319c49480030f4cbde15db16547ede0666f69336121ed902065eba4c8351105ccf238518621643316006ff1827893ff0e3647fc1cfc136d791a748
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_km.tar.gz 10328952 BLAKE2B 3e8c5329772f276e95f8fa62927c0a2161e311a8bbef87fa33b9c94fe2d9435c979c03bbdfe54c171aceccb97b4b1e570fe568150f1d61f3916c856be59f71ff SHA512 a3ae2ab529d3d751c03cb068f75154372985baf1d328b3319d97e0564202121e0818dbae60779c87668c4e0955e5cdb56b2f3305b9bd36056deb43546253e0d4
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ko.tar.gz 9437886 BLAKE2B a2c5b5fecc099ac7fe07ce6b9018480cd4d36407b38e36818e285992a56af9ba285e6a7b81e87e60d3fa4e7364ef3fc3184c1063f81309ad5fc26366963eb481 SHA512 14a02a5aee51c2bf0489a7e6b59e9e6d9df57279a0e247ac132c6433521f4c95789a1ea9b11c7ac168f55143af10ae2bfec1af388c8bee1fef7d90e64081b607
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_mk.tar.gz 7412186 BLAKE2B 609d35ebad289a2c9293f34194e62f716e6d0160e5eb132fbcf11d672fbde5a1584872f3d6704ce6c8dfad240e47bcb9c7e53cea932c2d1bae45e18b3e84bf4a SHA512 af7c4b6d853a7bb3907665ac8c7575872438de6f0e8d9e87638d59e695b687e5f19c6efcb4025c2a6670c9c2446bae93fdade21510b9ceac642e6812e69c29f0
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_nb.tar.gz 7765920 BLAKE2B 27d57d4de5894c3e719eac61b925d47fefab8dc37d38b8f401287b1fbac14c3a9df71701625376bb58559b73f34fa54f76efb84f9e1b960ed41f1675551009fd SHA512 858b7ed130fe0c91c0b0b0c827640776e0b85fb042a81904414b149588793e30c4e85e195e0cab17e970854758377d8e4717f7c711066d90606246863c402848
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ne.tar.gz 9777882 BLAKE2B 28666f66e45c66b33d0d8b1ded0629f18dad0b893cd2a5aa05904962636dd7a7d3c96189640bd1c95fd1b021abd6ea8eb3d3dd68baba2344d2d8f0ffb13da731 SHA512 26721d12ab55f6c1c11bf6c78d8b1bc0821940c8b9ecdb351811faf5241ba5853030a72c6c3568c0da86702fbe6ff31b6711d69d58c51228afa6c76bc4e14305
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_nl.tar.gz 7878230 BLAKE2B 0f5c8f351d9724664f136e3409df853f3f4dc28b128618abf419a89c0f4193d0e1bd6096878ac7506fc32b6fc8a53f61e132a1a1bc46b307ab496abb8df4664c SHA512 f9958d54b601769ac7765b4b32b98968d04514d54267d33cb4aec363d872d23dde62fc1f24dfa8b756428381b1f1a1f61c62dbc456778c3f41fd8b0082c05f40
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_nn.tar.gz 7755865 BLAKE2B 4aa733aa6b52dd6c143ae45ec92a9271acf7e369a883c8eb3441a81b074f48fa281b82d89b87dc4c1bce1b1de4d28664673e4ea035feb0923faec65a7025f7d3 SHA512 d5f0fa71267dae7bc5d923d2e49c06d3a4cf6fee03fbea8b373d68358261f360becc6f01ed23d02b637d6d81dc91e231c2cb84eb845e15749dcd5dae0518094b
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_om.tar.gz 8063667 BLAKE2B fe8fd37d548aab72f3c5d75eca77b9bb677a1682d7185fed5ba35dbbff54bcc7e6d7b3e6eed45e7cfe42d1a0e02235a2208a04e4f935aebda362c8021fc10121 SHA512 77892d5e4c0c3408afd2f582448744f57808e89f74aa9a54b23f030ba3b2a810d16c9eaf6a0e6a6c06a9461fbf863ae6e2c0e4c3b49ac3ff88dca900c5e14d0e
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_pl.tar.gz 8230760 BLAKE2B 54523819614d64b72999449e9c15c5a4ce92c1d43bbd81b8e6f0668c606d7c51f2e298657629692aa4806cbe4449afbb436e50d427638de7847be30d34605b53 SHA512 33ca006187335d8413ce1e7b1f405d82fe3e8444a6d1ce4362a7e1f877a825e3254f134af813f2e9051d3538949d329ca5f47503b510556921cdae8d78ae5af7
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_pt-BR.tar.gz 7889788 BLAKE2B a05f662a56605d8a7dd530a5962d8dbffc4b22859a2133ae56874868aa39d069f0b71f7d5317188effda35a96ce3186fa3b3e490fe9d650b60a087806738781b SHA512 9f69e37ca3326dcb69ecd6153dfb195f38fb0195795fdf692f78165eb43d7f8e74c53086a79aa7143f57284695c1e2eed36abd7df0f458d4eae178a795d249be
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_pt.tar.gz 7863826 BLAKE2B 810bc01e5cacf5e91cdee9af34bfe492ad485c084e18f3c729aff414cd24fefe807090e2b064a4f1a4e950b10eee774ee86782263a648dfb6c2bac2a8c8e8e90 SHA512 d65827bbeacf00449fe9a1e6c23d5267d4fdd5f8e1f76a39c7dfc891c81ec0d539204b6929b1c36bd2c8dac0a29df56eb1c19bac6ad7b61b519ed8145b68ef33
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ru.tar.gz 8503376 BLAKE2B 47162fd72eaa0327536f5756eb9c84a117d28fb7483e8df2831fef7676130993a4935e94787bc87abecee24dcb34ee4b12c04fd909d19a3c72758f4d0150a615 SHA512 ceb4fb745f3b30afcb01d5da160985ec6645795a2b666e187bb0f57e8adc716af594ccc7f2b06209d42437fdf9018f180f197174e94ae77b9e995417cb3d009c
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_si.tar.gz 7284113 BLAKE2B 71b7095e0152cd6eacafccfc75c4cc0d664e0b7aabe1a7fbcd5c8bd97f3474b3738aa55e00e485b607501a4b8a2c758b4a90f8cce9569a6cc77843e268580bf3 SHA512 90f247b36170989a2658b3f54238c7d79588cebb216099718d660115d2d9a74c0df5ce985080c0ed5b595d38cf0008bfd0ff1521d82baad6534cc25015fc44cb
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_sk.tar.gz 7586076 BLAKE2B 83a8bb0db13561802cb88878fafdf5b77ba4a565fc08c361f2cef4a0d249ad44a0c4b6fe5af4addf469e59c87f07b77f625e2a1ecda057ab2be2e314a90fb31d SHA512 f2e059c2fc6cca7b37b85eeef7821887c0e762e3e5549f1309ef60887edd38e0454f518267c85ed5e8a0b08ec2e09d80016d52a92613890368c62b01bec0a96c
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_sl.tar.gz 7898364 BLAKE2B 347d1943f5b44ce42de4499b2e9e18231a2500bf3add2951ac6bf10899ca646e433daf7b2f8a52cdae24c0b107341ddaf931f49fe1dccb2f1fc3e2375aac1b1d SHA512 1514bd0d8bdf32836d39093f8479ef4b32e3166fb489395c9d8920e7dc83ba713890fa1f39d8871d85a20abe31a2953307a1616360a361455799078b8d42f4fa
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_sq.tar.gz 6942542 BLAKE2B 96a4e6ef2bbfe3a94630573b9572c40b0034c25052ec01df03b02cf74508970a88ad44f677cc541d5bab8da9e9b409ae06ed93d8daedf6e0e68d62a62f867278 SHA512 bc7936779a5b4b8196fcd0b6e34f938e789331852f64c2fb59798c1ec2342e8a0d66539a08e74820b9845014455c810d1b344beb850182269dbd94afcbf5e388
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_sv.tar.gz 7823949 BLAKE2B 412729d70b8cef514cdcd17c8b1b0b04973621ad790e531c68da6f91c2c49b5786577d49def8c55d12d1ac6cd4d8df7fbeb83c5116baad4822cff011b8729537 SHA512 76c1c019e1a50041b9c3090bbfae72685ea69d45652e29be450d2817d6f840840254d737d7e205bc6234434e81f62df9e3d36d20ec88df9afeb2f753a8ebc22f
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_tg.tar.gz 7245585 BLAKE2B 1a4d4d2e72c12473ff5a0f0f172c8b8fd6381332049c4f11472da2ed557296adc18df4daa3cb6311138c9be6657a621427c20ebff454ec6bbac16d064d9ca2d9 SHA512 865683a8cd5d922bf9c45ec8cf968cc4b87c7309072facf06fc8acec903c989de5bf07ade8abdb0311ca42652ce4cf272051995ac4343407a8ab3237c7e8d0a5
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_tr.tar.gz 8038086 BLAKE2B 6cbe0be5b1f069975ce2c98fb87ad71d5476bb33cd7547db4b66c8f9d19d36fa871a88aeefc1593bd15fb67300ea3d44925b4d8771b44d0c3a0036e74dfec522 SHA512 50b8acb20b449f79084cef96a2f002afc0b82dd6274f98239ec39e6e6f437d31ebe3a4419de56562da39b6b4034ac2314ab27b036c76d35daee3f510d345a656
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ug.tar.gz 6935083 BLAKE2B e02da139bc2930b1055710e367eb720ad17162d30e2e3632956c016615922e3bca7ac0da7018dbfa06ae9eb966bb523c942306952908a13d73b0c62790ee2503 SHA512 df358bddacf349381be69cbc07e2b012f81d5815ea45fbba32fc2df15c487b7cf241950e54d34273b5c9551911205c629076a839af3c2a7306802a04105846f4
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_uk.tar.gz 7973811 BLAKE2B c1dc396e924f3566617dde879a81f23bf87e0017384c3f5116aa189867dc0789e86a62c7cc002dac112f3da924df0233be55de15381cc0909e2601ce1eafac1e SHA512 800e0a9d29d50f9a88fe12d47c5e458a6b2513f810b0c75a5445c0f425c23c4dd095d62653b43553d58e8f4e804a6c6855d5fdafc05f69a846590ab66fdcd659
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_vi.tar.gz 8185983 BLAKE2B eb6fc8e3a08c9f7840ec3bc9dd4dcc1282fd225dc022bc332f2317f54201f4120a1edab26a5092f1bb3bcbde3b886e54e918ff5b5909aa426034e961afbf232c SHA512 e1fe052c4ad6421cf9e6606a5e34ff3bc861a9ec473ea394e5bdf2e269215a301ebcc6ffac9f39eed4b753998add32491e2e8660c42ce8361b667f4978775fdb
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_zh-CN.tar.gz 10798398 BLAKE2B ce03d986a06549ba7947de423b2063765ec8152ec0f9813c9e474c896283786019cbf18eaf7cd58ffa312b4b2b981bc8cc3ceca05b5a876108fa523d163a354e SHA512 590ccb256d50b67bf2a305b779459bc69c840623d4dfd1a1885ee30ab63de65fa496dfbb4a6e66e4381770e7a816515316c74140ee438cc20a7608ff36a5bcee
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_zh-TW.tar.gz 10720040 BLAKE2B 05387a8f920e6ce147aa04c539e7195d5989a7aa6aa01636ad869c8cc492b055fe5c76255f95597531ca3da3100820fa6e6ba87ef51db4b558c160035f65a126 SHA512 12bde9fd132af1fdfde4fe466467f3e41a71fa657c79db1d8b09eb767f3794d31c9e274805b2dcd9f55d7f4f68e63d174d2f1a7d10d9b1f71d20a11ea03c14f8
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_af.tar.gz 1011805 BLAKE2B 208cd786e53a6e4c06b4e7ae98ecc2804e86f13b8189616920e565105499865be51257da27f2b0bdd627893caa419ac305dd7366d028822ebd87e179c91590be SHA512 67d5d6dc83e68484a7668f37e6f0a66cbe1151b5e62a1f444107f158640bcde0d9f1ba9d356214064c3b6460651444d2f2d955aa36beb97e42292e746618c34c
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_am.tar.gz 753758 BLAKE2B f82a4b4559d7dd9eef6c5ff7f83312ecee62531c182bf55b5dd5cf6c51163543a6535a8e1883b1bc7c66fbd343c98e0fc4f0528e3d0acf48fd7703a363224598 SHA512 bb198d9b8da99a34f34b2be382a36657fad441fea2d642cd15ad466abe375a3bb0a347e3ccde2b6581c12b72a1b96b3c54c26884940c94b85284263741a2bb00
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ar.tar.gz 2423158 BLAKE2B 07c4150d835abfb61ce6d7bed623cc56246e610fa80d99919ae7e342224868048f5d866e31e83cbf4bdcab62376e6b9d0a2c0181f9daafc67cc2336c7f0f3533 SHA512 39f9bbb46413819182f261ebb6b3810fefe6e87500835db6127e6880436b8acdf19751bed57314d16d4d8fe8e77573ecb214a9738f2bbc618ec148f2d10f0866
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_as.tar.gz 541944 BLAKE2B 77de697baaac51023999fb51ad1242ed966e7faa1b70a825899f5f2fb7efc2b27db58ccab27ecfbc08462d138dd6b4299ac42528aa494e5fc892256daa284c64 SHA512 71074cec6c516ff2a62b5b4bfd524ac5ed64553e67c6d6766a9dc76e2718a1a12c4aab053f867b674b3b84c4c8e15a142f9c2c67f99bcfdfd62b0500ecff0223
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ast.tar.gz 449532 BLAKE2B 03102fbde27757713b986df790f69346b258df5dc8bab1328e096a9e289ad304c8a01fc4c28a6da677cc4fc762af6706e4fa2cb51ce66764743a7b3d3f80b12b SHA512 6d06ee7803b4b5c614eae3fd41c989a177cf2fb189e8a43023f098910edce75f8ef15b2c9dea2debb150cbc338601efafd703b6fdc849be91c0702fbac61a5ed
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_be.tar.gz 1074804 BLAKE2B 817db6a67c5dff9f34eafaebe439afafb61f59eff5e119d9b16a9e30929808111a4b0092440e6d044b66d5371b79a97fe59e3fc3a96fe519bba9b039ed0abf5b SHA512 948ad74ba9af7e124c9ab4be2fa90ea836e5da6d1e222b0af72ba11c819bebe941045a6c55511d17cb4a3247ce111fe8828b45a93c79011fa6f61cc2709b18d8
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_bg.tar.gz 2203791 BLAKE2B af305202b2b07e1982fea6214752023231af6da708029044a5db1d3e03db503907bd4398736c013456ac8ab381caa6590de33f033534f4e7f6cad64e838a8fc2 SHA512 1c7219df9588421e745b6c524fb4adb529970879bfb82eb9bc063f6df7f9a5c52012e763c80cc735d6569307b80fb7d6aba7d9c89e79b1709e339c36a35da86e
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_bn-IN.tar.gz 630320 BLAKE2B 15586933880e985b45e465e0a73044543a0008619136d9af536e8357dbf54ea26b6719d7bee24de0f690126f978e5d1b434e07addd8cc435205789e9ceddd839 SHA512 f442fae573f4aa35ef65128dc417cc010cf9ce9a3f6f6b8f8a8237a804bbb46ca42736be1d0d503b66ed8eb4c567b25ce9606143bb649b58860b88fab478783d
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_bn.tar.gz 795218 BLAKE2B 25b3555b4aad61858af4b900328d734157fc5be4e7a2739ab6c68f84fbe73201923280081beeed36e5382aea66c703561f6e110bd2401c791793cc33c081b3a8 SHA512 800613a0ea52721b5deaa234f3f339d025b0255598b0d259e2bdceed27cb2026147aa69ce535fa59f9bbed4eb17ef93655b03e826e3f6e9565ebb46a691acebf
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_bo.tar.gz 386165 BLAKE2B afbc58562cc79072d7f664357d442ea939f6017d632e85d829f3b40a90bdee375ad9c50e379e74a22ea4dfe1b822adb549d908b24f3d509cad5bbeac07b8e178 SHA512 44cf155af3e9dbdd130068f8b8690232eff7aac7798d4db4666ceab78fb41315332cc7fa093a99a3dab376ec1d58335ac6c611c1d5bbc47cd411357964fb0ccb
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_br.tar.gz 1866095 BLAKE2B d46672664370290e035a345eef4b3d0731d54592057e3ab8803f5cb7d1f8bdea91231b7a399312ac8ce7955075e5f816a4673ff338a2a9279ef71959efef8d51 SHA512 d4550779d8844897f2791ee3cb3fcf796d88c817a427d90fda1050c82851f1f54e973a69657aff1863f2073c7f71fddc92981bc75dee8bc160e838ac2ff106e5
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_brx.tar.gz 342244 BLAKE2B b680b5151a3d6fbe2d2c598c1695fc839ddae1e85ec328314cf01ff86ea1289cb232050741cbfe7aab9ccee817d7d9f992706d061c850a60be984d4f845dd581 SHA512 dcee8a0f214a57f9f2a0470a10422fc55abbd99c971769b43480c9fb7731e4d3c5eba6db7f23c9a2064d6566fadbacffd071baaa14b04f3645adb733ea027611
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_bs.tar.gz 646686 BLAKE2B 6e2e9133c8876938cbc949f16d8354cb3f7571bc5f85ad3674401fb7c4c396f0dbe4deb253e20a193201dd8ecaaf4b229d1431ced73b4ee8a37197d839f3d1e3 SHA512 8e7458094639d91a88aae130f3d54835718d03c4dd4f14adf05180cd6686730606fa35582f3c63651837721d7381a419d5366f1c0680542c3bd55f24481c027b
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1992274 BLAKE2B 2382c36014eaf97950f119706ba15acbba9a7e2b5f8f049a228ef242d1618d9c67e7f749097b290f94281e6484be5b9b6200280094d6ad37ee19951e286907d0 SHA512 fa14e0dfe35a72482a717a46a5e05e99ddb7a34f566ecf91b3b2518f912b707e5bdcbde1de5930b14dd39f20856eb7f54036b9f89fd5377dbed577ae584766ca
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ca.tar.gz 2007095 BLAKE2B fcd4bf46fa3fcc1fb598b2732a6e8cf357861c1b3fd0c86366413eeaca542b18c8ee6226f01318ed885c43fa12314c273e6143fea3adbd7232964f12a063362c SHA512 5ed8518363af178e320b09ea4ab4e01d1825b10b7f1b0456a00628ede146046ca1b85e24cd9797e34b7e39308a93c7bc4cfd1b083802fbbe216802a9e7bb9df3
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_cs.tar.gz 3173281 BLAKE2B cc1f0e978f1e075309ae355bc672266ccdda626de1452b73d2274c98f12c7fee5cf8d2f053dd00159c98cde2e3ad28319e94df34a2f7fc061586d1706b699cbc SHA512 9112472ece2d1608e247c550f4e1e30c4d0aa1b78895a60ae94e0ab0c5e1f4f21f9eaaa462b484bb31c89166b175b3a57c6d98820c50baf53861d8e204ccd3a0
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_cy.tar.gz 712604 BLAKE2B 1d84c4d9d2b2a978bf0fc8b701618ee80d6bdb46a80b20481f3629c25a966713b3bee6769d6018a8624b2f156e4ed695b067bcb741b7714ebe7f75d4b27b6de4 SHA512 8f18ee1e183804352abbf4211290a07b6009f94b52383190ee581742dfac77ba1896b5613741189df47589f2c92db886c68bb0cb5a0dbfe0e4fe76d05c9f0384
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_da.tar.gz 2616554 BLAKE2B f16d945862bb4832bc57b398318fe0bfce2ea5136d4d75db869ed3e18b757886caa3d0a231ff0b2a64f9aa788fa8962f3443f44a4f58371256899fa44fceb81f SHA512 00d8faced7d8c19e0f5db067c20d752f83b970832e40a59c75841b287920b4bcf6267663ff5092eb6ca9a1a3f23f3f889de6a3551474ee822e17cf571aaa77ec
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_de.tar.gz 21744436 BLAKE2B 66468d25890a35df4982f810a44e14d5e07255bd1aeff22b6fc889230537300cadbac51b8ae37c4477d754fe9ab87010d48975dd218bd2be4a5c565f13e04162 SHA512 2777164f6726ee11ec3bf55f58e00f8206c6d9c3e85d65335fd7a719eab15f4254c6aded3cd7ab8717ac8aaa9f734067a08190643f684e0fdaa9fccad073dae4
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_dgo.tar.gz 448457 BLAKE2B 967c0b38027981ac47cbcf7a6e348c9aeacbfc4d1eaa547343dc2bc1ab1a8bfdf85a676273ecf2357b67a2b5f4c818094ad219a7f5430e9f93f88387c5b306cb SHA512 f976f6582a71c1497979d8ba14bed02bfd4f3a980fa9dbbf72ae6ba05502fbcbf0e833963710b9d206fe15912e0eb66314a06e3a36bcb5383cb2715d0de43f76
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_dz.tar.gz 373670 BLAKE2B c52b7dd2047aac91ceb4feb5458ccdb2e9295d2afe4e6e3f34909af7aab7e55534fb51bbbdc4a8938aaac685cb530d3e1a01baf4d2be96205327e9a5d0bda05f SHA512 f5d3592115dcc1d3d671f745390fb210a4b5245c854e66924d98977574048fffaa0a78f10c67b8686018099a618db4117823c44974654a712f2ecc3ef9d645d8
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_el.tar.gz 2814298 BLAKE2B 3bab00395e2d5c6e66ffb84feaef0055c5a38e91651fdf8045eb02c4ad924ce034ac0824bef7ab3ff97347042ca4193f38492ac3dc5e4acc96d4a7b82cbf6d5c SHA512 992e2d0c7e91932b170dae0827ad334635cd7e8a2c07f549814648778aff40aa1b32dd33c91f187e20cdd6dd2185618786b0d24486b4087c25169a3657c7bdac
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_en-GB.tar.gz 7231123 BLAKE2B 739da7dc236b480b5124709eea9f32ab5dbff409f43cd5861013a105ad76c3f26ecf23ab698c2af1848cf7880250739e3263a47b3114c436d0abfae5387c1ad2 SHA512 6a9d59098420916b8011507ba682b1ac64788264a8e3786812de712dced498abed60d4f7d56cafe031b0a077cb9bd48389e740bf295c0d955113c41e9b7e85f9
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_en-ZA.tar.gz 6836520 BLAKE2B 9e0b456d0599ac5b5543881777890bd94cf371446a37a7ec845f85e8aa76519fc1a371a848ff88e14499926a1a7cbb2bc6a40b486a1bac2154830b10b6549b7c SHA512 09c5e4d76c60399c4a3651c19e601bcedc1e44c4945415ec88934306512085cfb2316f78b1b181a8d1476afd5952a45f4ed76590665e8b3af2a1c5d8f4dd56f7
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_eo.tar.gz 709851 BLAKE2B 91f86032289c302efc8341b2e8d2798afe498b2964dd95de5681794a01f77cbf886a7a625ccb48962a7f93e814f386e4441fb605befe720b83c8d5fffa910830 SHA512 2723bc0837d1d54f65cc1316c3ea9488f3d52418ba3f5b040c6d2401e3b9fd15a8920a5eb393fe9ce359972a41d2fa00c0d1d615453d1676ed1805bc12d61526
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_es.tar.gz 2209350 BLAKE2B fa0c11bb092146b17688372e265ded6819b3b4ef44731be43076b1dbf00b445e4f2da97f0fbd146260d784d2357d7dd06699c8db70aa40c8e54184cd22311045 SHA512 e3e55f206e07742b26fd0fd4ca319332a04e295ce97e7c4703475b046e7ff24cb908e4b7f668a5caec37c451cf659877b3e1f6f7024d10d5bae36c071efe0cc2
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_et.tar.gz 1622237 BLAKE2B 9fd9520d751c1022f56863d219784faffd16dcb598eda8eef6bbcb9b6d75235b75b993fc81f7602b783ca72d6facaa8577c74a29cd58019ae6b0d8578bb45533 SHA512 803d7773250338b4f9d42d05ba328ed65557c21651f8e81e7bf5ab9675f2bc56a9482baa6ef23d4aeda4cd321bb7c651fd311b1108e11a92db7dbf6471bc3290
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_eu.tar.gz 717809 BLAKE2B a54f1868ad81599eaae850e6aba026d99840c8575f2cd62156ae6e07c4fd3368a15fe260dcff869c9bdb2023f942ed744a2ef8ef52b63546279a2b27b0cc522a SHA512 139c8f1df14b09e474cb0768023571e8f65bdd6c7bb0e80b6ab63d9fda43bc064a84244620ba301b1eb379f78ef5160b79bf3dc99274a27b8376ed6438730a47
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_fa.tar.gz 334388 BLAKE2B ea0e4acd3146df0ccd6697d7c31a126a52769dd622214180bb10c22bc0f01ef494403f2d2b807e28d3e61d1a35e2f3279f36109e4b1cbaa22a032c2b88008d02 SHA512 78cdfef211aaf428227102d55603a3b93f7e6e4413461fa2ffb5fa72686d5fa93acfcdd3d395d3bcc5c8db072147f4242d7e5b2deff2881e19de18572cb982f4
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_fi.tar.gz 723100 BLAKE2B 75c77134508bb8320316343a00ae80bcdc129dd866fe79100a74f9ccf01177e43c6e93ff1a36eba7418f80b80833da3905070691af11b3086702480459eeed2e SHA512 5160dd7d67de2db370bcc5c4de12eaf3c869b5133bed30692fe2cd62f0cd8106eda3abe9467ed7a77f54228362bd3bf2ddb85e6996a3c83d433a3e735ac6617f
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_fr.tar.gz 3020764 BLAKE2B 6c463b3c8419240c5447867273ad0002ca84b402c1d88a109c7924e513e37ac0150426c7056690dff3050d948fc8f6c0f9e3b788a91767efd50207e70f8b7699 SHA512 0f883542ea84412f2125093c29af81549fcd41e2aac2bbe98b8302ab14f5109f7be991db178594794d5c0ccaa924a8d5a6df7cf635c5cb0daf2786a0969c668d
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ga.tar.gz 732690 BLAKE2B f1a0ee5f5a8ed6ecb8811e93dbc65e7abd57c63926d40c0be444f593c48884391c8339c1b81d7cc367d37468bd4dc1021fb4a6fe5a09937fa21164fd41c110dd SHA512 bf60d2415285067708e4339ce38bae8c49e54fa8338d2b77c281e96ffc26c60273beac0b2b11481b0c4ddd719d77cf4baef97c67e297ec43085352a1aaf65de9
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_gd.tar.gz 1769856 BLAKE2B de758b4d2eba09204990543ffd7fbb25152f010fd05a5b7d5f0b285da608bad13ea274087b9fae3e8951348f5a7c4c93b4d1ff138dd0b77abd88ae4116135a73 SHA512 b55c2977337236a1aaa0a51766c98bf61a63c7fa05ab1ae27925fd9c31314f6f48a6ccbe2519eb37107b9a58a83ea22443685635d3e7129222c443b4a973a597
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_gl.tar.gz 1282271 BLAKE2B bc23005c537b34324d14dfb0a74a0ee49f0d8a7d601057f727efda3f0d13cc53141572a9135fbe4e51c23503befb115d0819d3dbfc6aeee94a03299f82faa4aa SHA512 f94e32ea732dac2fad3958a20b781614bb52e85266eacd54ddd3e26f1260ee7b3b608e9e9e42e2b56349ca043ca9f8285123445e7e343706982678a01e60533a
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_gu.tar.gz 1240823 BLAKE2B eb18d3cca6e4871bfd5e04e0725e262058ae3d149d69e4ee94770c50690bc6e30a5407a8eafd2bcbf4088400217c4619a183c529dc4dba6d0c53b51a56a98ae1 SHA512 715672305dcf57d533929536a90dfa1a7b7196eb9f6c9ca53f89f7e693d24fc06a0e64c470e0069edf018cbac35e7770a4d30488029da9ee9c93b26aa2f6f527
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_gug.tar.gz 520594 BLAKE2B 1dac3e3765c958ccf6b10cd394dc7ade4e1396dc2a0343242373f35a8a8698249f97f12a1ac11f8b6f17f8f2b509b9ec26c4d58800ada6ddf05625cd826bb9af SHA512 b8a9e46198dcf306a7ac4a5ef5999e0a343421f50032045eceba3947d1141d61de20c70aec505800d53645128439e763eb27d621800c0630419354310137408b
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_he.tar.gz 1634046 BLAKE2B eeb3676fdb62ff40e007073925f34e684d5a8f790c6471d47ae281a8a5146e975e53362c02a2563d5d77ac5c18063e06beb4f49955dc9e1988daf7b70cc44422 SHA512 c76485bdac75a3701821c88b0d4441c900e36cd62e6fee9fedcbddf8a6e6da1b7a78f8211521861490d95f92b4a3f8d1070094e5153dc674e851392946e81945
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_hi.tar.gz 579141 BLAKE2B 44ba676867d3fb73a2114aaf141283efcf1a544a1178d51347e2180f57048fce3f205208bae5f37e1e42f4ea9abf0cc37a0c132acfd3ecdd42decc8bb459b41d SHA512 20573a80416b9abd80c68d2976cf7882e5dc721327b29e57b1527e8159ce5440b44c2638896ebfda63e33067e622b13249f360c12971ee823a2229f67576ca59
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_hr.tar.gz 968488 BLAKE2B 47f66c08d450e1fc5ab0f4aff35dc7a65320d5e71d53498d09589493b7dedd5f07edf3e86962ef0fc9f30be6953ee959ea1715e470464617b9dd376a291c9c06 SHA512 f84144285d7165a7911a1979817a790bc00ec942677529ad9ae26a608a55af8c5078e81c529940de3d04b14e24e8e5ec46ed5e92710887db0ab2e24b75c308e2
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_hu.tar.gz 2998335 BLAKE2B 42539e2ae1c457f93c8c8d20782b55c4c87e2d5ad64dee0d70429d0a564f019ca922f035cf98241228a35ca442c68b6822700c5e37efbe81f108d68774ccd870 SHA512 519adae733f0da87a9ddbbb3109ca0cbbb049ac6aef4ea090d999d0c8c206a4d37288a428b12dca1b747df1c4f3e0a7c66281ca94bc1df6e4e39184025e46420
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_id.tar.gz 693103 BLAKE2B cfa396d86fc8d8568d457a58b0b2048c98da3acc9435980d6620e1441806c018353633f021ab4bf57c837ca67db0cea263b9c6312935c1adb6ce85abfc68f85b SHA512 6357d7cf743217730560e550cd71d6e2227b74fbd2701c2dcb120328ea70969a1a7b594a323f7ec64037a8bee7f46607aa1c388457d142974a6b50dd7ac1c9f9
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_is.tar.gz 1506856 BLAKE2B 909d8a20d8c0dc213eb2e4f34fd93458321e1ab79cf507150c1ec2f684bdbe5bea00b8c9563cf14613b1f24f4f38be04ab15cb765db0643f80f70755ca37c43d SHA512 83ac17b93815bcbe97affa379f5279f21f9d14ad40a029f494aa349c2e8b77670cb133b529630a08976e4a0947ac808eb396171b0cfc2cef357d4fb2ffc0ca9e
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_it.tar.gz 2057135 BLAKE2B 48a7eda8955d188241ee9c9e98abbdd6e27f681b78f394a8b4754546491078e284bfd24f00ea83e89fa27746b745cfdf4b3bc04bb7e5c27b527d1b34f860e4c1 SHA512 f0c15dd70460271feae8535abcf8342e470a10450106781eb49a09bc2bc3cbf0a253a0f37997eceb5a4de024528f3148b62649db6fa45886ec47cf3b7e4a99f5
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ja.tar.gz 807160 BLAKE2B eb567beaf404522282201395d28acabf17805385f224b429c134c6f612667e803af25949ed945d560cae9bf796dc5864b59e9768e5a18efe8819726c5c4feded SHA512 781c0d5213e865e62da18f5f2893fed2c073d860217fbcae8c1f7ca22782d3905fb0c8fb8e407923d373475d9fbb3315e29175cd3c88cf3fd9c7ad4927684448
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ka.tar.gz 366298 BLAKE2B 0ca42a96ca54887855a7663b1a4d5332d1a74800411e7315aa021268586c4a08f8d62ba92257e810b6c49a78cb0066540b9a4e897d93c9a8691305ec73a11ed4 SHA512 e857c8d8896d09cc5bb3c9cbcb4fd3a3b4a3b08e52c9764ef2a942d8f503f3128636e899187c62f6893ee19576b6fc78d84935c6ba2bf379acf4dc558da69347
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_kk.tar.gz 771021 BLAKE2B 823d6e3fe0d943410dd0462015d5a688c97b880c2487aaf95b43b06ed8f5caa08cf7444a1d4db0c8f45a9466f454dc06ddb2a2cf7ce9cd96dd54a5753bab6f63 SHA512 720bf746b74bfe5b70ffe11eecaf475a283dbb659b0dbec3b9444846d59d39e5a9df43d9a608c219407feb221cfe2ceccb52d97e20bde4a510780f740a986046
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_km.tar.gz 696115 BLAKE2B 99e9e494a45e8769eb74c62bfe8e23794c039de3242b2d7abe3d78300f7021f8146dd8502e9ca29d54469561a03a5967e0ea291c7ba5dbb4e3d137d339c84189 SHA512 0466ea653f3f16b099fb00234c75afaf10f9457c9a23af444153eb7dd4719d53efe88538e390d4e1f92e9703f05be0e23cc81ee82e817f709843d04dfa7cb062
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 339771 BLAKE2B 1d1d0b88c248b67da0247844ffb144a20074905b29c72881b4db0f04a3f2ed05d1f8af9829385c9dedda1cf13f05ffe12be408095c042fcdf6eeefefb444a949 SHA512 b65e643d16aeb9c31f189b0f5c91923a9ddbf313b39bf946cbbf731370fa09ab712fc48751169f859fdea1527052219f4b61c415bac68b1200706f7ac2a7310b
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_kn.tar.gz 594415 BLAKE2B 4edc027e328da88e87646231a3ed624667c28c9f46ddb7e83b92698d44ae4bc4f45639864ca871ca2fdfc2ff1e71a15d58c7df97ea240cfa9bfc58f786dbec1b SHA512 30b7efe1267b183857196fc2421d9994d813c8e2d133b1cdc7a237da128136166dee18aa2e70ffaefb4df9d98d5ce72d823377f4ac90bffda89e997160f0f38a
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ko.tar.gz 808273 BLAKE2B 77bf0670e76ddea6cd26d16f65279ed373f83cdc94a61960630909e929b2ca33ffdcd6399f6a701509da568a9ce671cc41ec427374c7f082f82275d6104106bf SHA512 19884c061870331ab32b07262cc632906b3a769ca6bb215393b4b074a83e0c3be0ab0ea86751550631bc394c3fe1a0c9e6269305584b5be97cdb19edc3d0e8f9
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_kok.tar.gz 419493 BLAKE2B 30b6ad410090446acd0fb2023cf3edf36a27136929aea87be29fed61745fe7780e160189a833d983165eb45ef015d2802c47f63d6b0259204b67b0fc8938f901 SHA512 908bb4c9c462e784c439620af0c0cf90dcdfdda78a29f3fdfd136c5abf2c77f81df1e66212d10676b427ca473834b299af02852f57e2c8a27fa1fb380df70153
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ks.tar.gz 334220 BLAKE2B 62156fa40102ac70769ae8d78425f0ba11797f7626a816ce24b5c22d495171b4894a6341f6c03c9a7b5b9537446ab753dbe314bee3701aeaa5939e84d8499561 SHA512 7e190cc5c4c4338daf3184dbb77698a52da47f277f1a62b74a5ae9fda13cb42811ab15e5ade5410cf94ee1f3866ffc9be0fbddc013942ea1646d07f7f42fbf91
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_lb.tar.gz 144998 BLAKE2B 043a242bf95156a479292579a654e557a71ec56e74045b6c84996c3f53f17babd93069fe472a2ff2ecceb590264b1b1eebbcabf09ae8461be98dc6f7bbae6469 SHA512 c23e0d9878842d41622d3ebabcd8e5678ad00fb27c84a0ecb9896dfecd54e884f383b3374622edb6667525c17a76cedf2818f5664889fd678a0ebeef9f4a9c4d
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_lo.tar.gz 368775 BLAKE2B b704cfb40e2098ad84d2dca0f796461eac3d12bde919f5b29c56363b4bedb9668d26c71107bd7976040c5a6d5d9b80065a9c9ccd147d883b04f42686ba687c04 SHA512 02615af0b371a17e79ec0dfe34f6bf941679cdce6dbd46223173eff33247421b4f6f0d61434f7a0526a8aa052ef644bdef83ac27eb89a11b12f3796cf9af7c6d
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_lt.tar.gz 1027401 BLAKE2B c5a5871815fac0f3226b6694564982db6f6201abc5cdd637fb05f4cb0bbcd1150faecf81344104a3b88a9ccdac118cd4f3265ffe95ea8d9bcf55f09ebee6ae6a SHA512 ef782e9707662b36f50153f9908ce783aed7c6b2b6e253a597580aabaac6ed0d60b5217416d1fdf4efd9339090947b1c4692102d139b76200025f6dd10f1e58c
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_lv.tar.gz 1480495 BLAKE2B c0d2d696fa857dc82f98f0c15958bde050d98a98e571e9e4cb8903763bbde7f076823b17f2cf6d7f2e95570d2910793c677cd5cd0a5e47a2d55d15d92ace50a9 SHA512 2b5da45bdbe32017cf6ad417bba6eb3f928a12285c10111cc6e37aa8af836db906c1b361b8a45a82bc6c800be8f127a91731ed36b0fbf4abf67284516473876c
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_mai.tar.gz 336788 BLAKE2B 7696eb697fe9cd0325de56fb04c60ec84beb8cb1495511af0870f9df84fb655ab365c73ae41362ba041f64cfde4956ead1e07399e14d104a34d0e2b578f28d56 SHA512 c38b58331fb6dadaabf7cd95b550ad346c486d21ad932d9ab62cd9e2f1a4a9d7151a6101f0ca8be19d0adac090bbcc48ad2e156f83c20e2ac4efdcd6c7526b25
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_mk.tar.gz 389703 BLAKE2B f5c3e87d3251086141fc814e7ac14af6e14c86e0f547a380407b7004870cfbff7feb3e195b2e8362aaf3aa85e43c353e5f250ae307a0e8aa3a49116ffc76066c SHA512 b8096c7d195a2e45cef983273bdae9d38dc0f89f1258c4a9ed235ea3e1b93d49aab31ed2374af11261f90190642abf47eed82d185766127d2895827632a21cba
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ml.tar.gz 556015 BLAKE2B 0833ffa7d111328a9de697cdafb021936b70bfd9574c33a8c4e3585676c5744c734f8e8b36e008d6dbc837731b6b873daef8206e4fb8e97c6f3efef2f375e5a2 SHA512 d6e35fcffd8bb517ae75184dfffb68289ea1b7c2b09e5724ac70c49451e54f53e55313a537263e5d6726212650c7c5c4b53ead943bad863e4aa86d483aa7db85
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_mn.tar.gz 518378 BLAKE2B 849585e1c9d26a770d937fee65ceac026c3986e4b80c39edacb7ec0674ddcc26927862158da984a282f237d52db2d4ac97038b53c74dcbd70f966dc0ae1045c1 SHA512 62fd079592ef34c0a7d4c90787f363abed65b7ee84bbbe24a99043e06e12fa55bb0780731f4ee7accb5ab062d0af51351809aa8d975f38930e1c767b1da551ef
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_mni.tar.gz 410223 BLAKE2B fbb209155fe02bfc43ca3951a34b2365d8cd4e53fb4b35a360113711dc6454717738c06d81f614508dd4101b8473c2bf106d0dd1344534dd77f4bcb5b84fbee3 SHA512 9957bca78707ff0a817e797fe823760dfd5699091c6264f369e2fd77b0e0d6487bcf1169cf79b0e07c5cc9985f760c0d169d727ed52fdb8193843283738f7dc7
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_mr.tar.gz 590649 BLAKE2B ac9786fec314798fa4c1390ce3a325ba0e1cfffa26296a862b590e108f8260d5e1470be021f5e181b5065173fd96843fa3dc8ec0d78b4ac74fb89f04ae30d2ab SHA512 27072933f586da7c27f1bb6437c0d696d7587a8bec296304e31a785b6c0f325d1065cfaaa4e79f93c43788e8df92fa30c857469fbe7ced9ca716081adf9e3bde
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_my.tar.gz 472577 BLAKE2B 6e752a1c13e5cc1be4853d129955a62da49904a7fc25f57ab30fc99a0c533ca94245b9b366d8390e9aea2bce13b82fc91c41c83b602dc0137ca390c11663afe3 SHA512 b677790a5757f00a62459c0b314f2f063ff7ecaa90ad2b828818cf1f0ea2ba2db9231a71fc6e878a5294985ea63644e4a24dd124e8e9c9e7903e04e060689832
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_nb.tar.gz 3711917 BLAKE2B 71e9b7b5830bd11e0671635944bf67c93a32e1ca3818542ea3447253d371d3bdda0929138d475d809a36d8853cbae3be27c78832630b9a69bc474de23693076b SHA512 75214fa5e28c919b18d6de7ad9763343f8541aac6644f2c6092f9ad146ce8939c2a76595396e0c9fabcd7c5e106b6dffddde28dfe59b1ec3118f90b84a3597b7
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ne.tar.gz 859426 BLAKE2B 8365e4d499c02e09f55822c6f217bddd774072f53990772fe7c128feb90529b80316d2d187c13fcc4f2dcb13b1f1dadf12cbfbf1ca4d10b812eefd8b4e8bdcd2 SHA512 cfc2604e1e618fca3cc8a9b6eac04b4855317a04fa945c6fff4e3c2cac4024780c1f5842c2f46274187499586202374aaa9e4ce0c1c0afbfe2af581e4c4d268a
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_nl.tar.gz 1512824 BLAKE2B 51cceeec8c80283131d55119aa5a78dcf883227f42f0b34015f2bf017c27fe1b956534fdc9860f22013e34dbee919e94990db2781d39951a591c7e9a31374cc2 SHA512 1d6067fb44b1156113fb0899d6320ba0aecdf7f13cb9b03545970ae1667bd6decbacb0100cc42f6c4bdd9fe196f35740e568347bd9c266b262355bd4ab734419
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_nn.tar.gz 3712081 BLAKE2B 13b8474c29db468068edd44d767a832ff2efe7f1ca2b1f9b8a2ac1e52ce83376e8d3b4019ef6f0dd9b0e961d9380a9d7b14441101fc7dcdd87b756cf7535658d SHA512 b6af8827ebae34c930c544bfd474ce58949c0788cc720a476d7e74677c6ee77f698697ae7fe2944c8a33e8bcb18bd665f69645b2cafc65b17d91cd3d5c863aa5
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_nr.tar.gz 282005 BLAKE2B 5fef268c260adf47c540e9608caa62d94887a78e880b688c73e59756e28b91e26bb53d855e879028fe882225bcc22a40db9aa3a0c5e5cd1e3726c7a067213409 SHA512 796e02ef5dd1010b7a944fae5844f18e860ad595007b78f21d3bad22a6fa5ee1b0bc6b3fe794d4451bd45967a3a9aae38bcec50fe84ef7552a0defbd593c420c
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_nso.tar.gz 327629 BLAKE2B 3271ad9873795ab5f533b6ccccb4690370f72bfe6b7352d9dbc9f7b68840f78242aef8337d2a5eae143edd090f0418a34f4d376313743e53d1462f8554615931 SHA512 6bd25b21ab50618345fc3e6fcdde76bc12a04aa077adf44e8d44b0951674c836bc8e17c3dfc61662dd260a7ca15f791f1b04340ddf7f219d0d054a56734d0d1a
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_oc.tar.gz 885015 BLAKE2B 7330676b9129e7c5a0dbed249cf9fedc72860268efd08f0345ee530ade26edbf3d73a81cb0a35bc812738600240b2963b291a5c73f1dea46d0d16ad92ea4a1a9 SHA512 c7f526c6c6b56894c4996343fc8cadcaccc2d741e9e4561b3a221ff7cb9accee78db1b9e099ae94651aeb90574b0c7e0ed8a903291e74eefc15d91348f45fec1
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_om.tar.gz 377331 BLAKE2B 4a456b4cd29e64cf7e5baa8c42aa3e4d851372c59ae2636d85a7daf06c532841c0add04e5e7cc9852e67dd80fbc12fe43e2174e696dcdca15b126802f45900e8 SHA512 69a6999662a671379dc9fcd4e2cff4da4c61bb711dd68793615c1154f47028f9eb52dd9346d495237ee8267790e0eb2c6d6a4b7e0d5c59a400febcee0188410c
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_or.tar.gz 612622 BLAKE2B b7ffb2c618d19ff69140ec6b4f85e6cb970746df5aef1a5d37a4c52ea5944bf7473a9a7118aa5cd4bb4b5822328492991892798eae4444363b5d8d63b1d29cb2 SHA512 9cfdd87e66fccbd66742805c2443015ca6764edd197a2c697da271c7432811db5e4b1a1e07f6f3a90912f1ec6cae8973ce0aa9b9a67e8b10225b20ebbc801c0a
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_pa-IN.tar.gz 482164 BLAKE2B 8ace5e3a9aabe96a2d49ecfd1e0b8783b0fa7197b84a875f9359396601d02f40cff081e29fd90512161e05dd35437e05f61d4ee1fad2a8b96eb564cb1504753d SHA512 e851e1e9b237877809e73d2e529457d9ac6642749f385a0db5f74a25c7b3bf72a7948a6b20c72520c606b78f9bb0ff49d83183bce617c098f6aefca8d7b08935
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_pl.tar.gz 3071754 BLAKE2B 3fb73122ea1a5b1e6deb683ea05b0c2de1eabc584c808c28718b76459e31ed503d71fbe4262d7690b5d08905f7b72a524f3264dffa9f32e7451ba354511499ab SHA512 11f791b630520273a44672bf4bb64b54339661addacf9d0529e74d79485ecc794a11dd462c9a903c05407d28c4730ec12c79b042731fa32db178865bb753992c
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_pt-BR.tar.gz 2804244 BLAKE2B ff2b8b58d308017069c2c676eecadcdbead4cc041e17702401d0cf6a7f0ed5fc50a6c80b5d88cc7b97ec2887bfc08ad70be5cedcc2e3d6080af3278b59012032 SHA512 1297ac6cc67e1363021ae0a5ce2ab0037438e8995bcc1a4ccc2fc7864fd0d2fe5d695baaf4dc4467c50e96141e9a5d8933359dc2ee8377f920007b95270a2404
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_pt.tar.gz 2360140 BLAKE2B 406dd88c5bd3982fd4b0bf7013f5aa1958e28d769e817f22e5a3eeb3097edeaed4b1798d080d443224c143a2345a975af6e90b59c5ea3fbdda67e9e84199ba69 SHA512 a4dbecbd094cd5c147e1d838684a1f4326b4de0b509a458fc560455fe0291dd26c641c4515c4b1d50b81cfedd530c13939b6e48f318cc834053df73dbb7558b7
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ro.tar.gz 2545648 BLAKE2B dc1fb2f38f79814b5c92ab74f342aead5034df2606a9a9fa3998ee93f7e6cfac625c1918f11640490cb59e9ebdf6d774c6fe6e1727c7e276218bc41daf971af7 SHA512 43bb1ca8a86a562c0294f3f50900b7a9ae0a822519bbe4d742b5a5df06dbcaaec66d2ce2881db04ea5be87aa82cd8a6ce4557b700c8cf00ae0ba4cf2e0a75138
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ru.tar.gz 1886125 BLAKE2B 80d3e3aa6b0df3d76053cbb71ea26da21aaaf9728d2487f31fba2f74dc9d49e5e6559cabde48523d31c687d28507a74891dcdf8c57847a53c0f17cb0a6863a05 SHA512 d80f14926025edce11fc5ad15f509d22823e600788d8837e0619acb235e596eec224240274dc0b76036a0fb60f96d07ea01b0522c4ffb1ade038ec75b427ef8f
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_rw.tar.gz 348453 BLAKE2B 89869437e7378ebd52138b77611a971921d089933755c3de92bf6a4828c332d1a82c5002077bdabb143b411b4f64bee311b616d4c217648dc410b702ba210dce SHA512 9d8effff6fa7879e800d5c983045994b583bc4cdd07f4990ee62993b0a3e7523dcd199b11aea0ced5e66bc9e58aa5bac52d690cee578f1f52222789de8e91130
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sa-IN.tar.gz 459235 BLAKE2B f07149be39835587c18fec3304d83f00d8b43bd0577d760f5062b9039f2c2220abee19435b0bcb02df3c7a841249fdbe87338618c6103274d65f916244a7c4f4 SHA512 cbd4b799c5b4821eb959c483b12ca3e17ac739991928d6ce66016026a0ad6b129363de8610cc13410abd59e09626e128daf7bf6036b15cd5ffa6714c5939efeb
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sat.tar.gz 533994 BLAKE2B be637a064463323c0c7f1d980a4db394bf31ed95bf6ceedbd0dcfdc394dfda9778d2241ba1dd4ad748e558bb90124b3053dd284ba158af54ae2fba7a81dc2139 SHA512 f6253665f3a8c9d82fe69922fdec3afd582b9d789f3b8224be16bbd8658465505ee26d36e42420abdf9cc9db52071256880fbaf0d64888b6472598c9f5b3cdee
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sd.tar.gz 444817 BLAKE2B 2c0a88fe6622efdf6a5485d07d28bf2c59a1697c4e890ad85a2c635bd751aeba412888b4bec312e2af99ee5f1a98089267c0fdc35d22d3d472539617f88a97a8 SHA512 2e444e1f10a0928c9d62bb23059ca280dd360df3bbf41f5707d6367ac049b6f8997a539a81bc14f741288158db36833be4be4bffae1bda007416a765daf06663
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_si.tar.gz 746600 BLAKE2B 1c8dd9cd9e15b18a9fbfb9ba8a56165ad3f1ded0bf69baa69f8bc510a5343c9de85673e9e83a9b563da106b7eca616c58db56fd0edf62e7b5cc53bb56204e19a SHA512 89f15483a54ecaa1da1ab2f4f5c0ca37f9e2c8b83692cbc76b410eeaca90d7eb237e42452353fdf9edb84d372c8f32f141929b006c37d89f16d64d96b3bd9353
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sid.tar.gz 460187 BLAKE2B a4009c81a6cfe8655bc248a8fde50d678b3a9974aa38ad7dadb5f1b667823b476d4664cf814cbe4d93de58d6d921b2533ff386abd6f4151d62c3a27f74636cca SHA512 de7a838da2246b2253c57deda58639c2d54176c70fa7f1788114da3e4aec7437475c64d8eef800af4a0a45479ee52b40018d8dd1e9965b3596827d118f4362f9
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sk.tar.gz 2005093 BLAKE2B 3de81d084c77c43168d710d119a830eb5f97690641309f2e2c7c6682f43c5bbc16722b84f3fa76af37c8edd6de800587b1b42b38a7dfd931abe770c700fefda8 SHA512 a73c2655667981b974abaa70d7158f32e1ec6ab59562597466665ba5f8b985f13d7bc6188f878857091db784b5190eb08236b259aa8e032abff5c5dfca813e70
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sl.tar.gz 2405823 BLAKE2B 0bebfc1dbe0e79d353b76c3ac9c08ccea4ffb2ad6c806f464b5bcb03ebf75cb2462231386b17566afff76bc2a5b3603d1835de622d168bf44a97531160ebded5 SHA512 b85072fd9413e91c149117be595f849a376e634eea831f4b8a8aa3f4be2f743b0721669d89470bb95ed68e502fb5dba7777716ae16dba9fa2234cf9748e616c6
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sq.tar.gz 1173542 BLAKE2B e2bd406fc6137a2210b252299997b1801833c95636410aa41b1b8a1b923fbbb308f13994817c73202d126a84473ce42531b6d2141aa13e3d4276a1732c92c579 SHA512 7fa4006094d81921092fd616dcbaaf45851e14a8794a42e2a3ebd66a44232a0cc3cda7c9e13cfdf26d6b5c8d506226ba8f43d3c582b78a6e08428cf5dee9e14c
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1461992 BLAKE2B dacab9226664d6b1c9b892836a31827efcb3d2262a64730e9344fc1e6796a36aeb715e1e89ffb497cd7046b59860cdbc6c4944ebfd2609a1a38fb23a5238d878 SHA512 64965c9b5071b60fbda011ff798a4cd3dc43947494a0cb98386402d201f1db396df80a4526776cee56ab4061a713fd8eb604f59da18a93e439ec155238d60a8a
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sr.tar.gz 1480782 BLAKE2B a5e949f9270227e752b88181b97b87d7b13a2c816b3af189ab50ccb75a573a4d71422c64bd92f2b08c8f29145e1683d3ed94b350bc56517a633c071695c3fcd2 SHA512 b4c8db448dec13781d28b02a383ba81028882bfe9247ba7e525aa444add68074251df7af06def57167d440a3244fd0389307643721f72ea78da496964c2f1934
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ss.tar.gz 291028 BLAKE2B 702702ed9f0d7608b36d812bc16cc6b48e526018e10d9cda0678d102b9b8bd746b71c50d186ee5c2520ca3185960adb51ca206643a466283a7b1b8bc0ed82265 SHA512 6a646185dc7d4e6e4999c0d8bfe4db695e06042edd0a581cae49c776c1f5d6381abe59d00e4b228b13dd2bd1a144132eb19b6d1ac346ba4247ace8fe96689dfc
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_st.tar.gz 283763 BLAKE2B dd6a305b0b9a33456210c28a97409aeff46a84a55c2aadf9e4343bb4a86c507bd7ec51edcd1123f390d739a908ee1f3617f9ca2f3854b220627b8ac212a51856 SHA512 593b3c1ba1bb25595a0308675ded62c7de7691ee5038817a45859603d052caf8230eb8f164386ab16ef93890b905153611cb7472e883c67270bf05f08c66da5e
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sv.tar.gz 2554569 BLAKE2B 4619ff293f961302720d5d5aa63937eb79dfe692c35a7909b64900e4edeeb5619074b9f7d29873ce4947e3a670cd1691eeae6f681caffbcc4fee8e0c77f0d1ec SHA512 512c875e2395216d7b4d1974ed87d9af26feea0ca6ae26cd53647122ea646b4be50178eee1040fe8508374ef9ef854564551bc547ec9b1a134ea5195251ff047
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz 324170 BLAKE2B 0b85c46608ca49235d1eea62aee904be12e6d9266f009921972f070fd7857f56b06145391e7f4fbf2d032e8f5126aaeb68ef4a34c14854a81fba931f5f4cd966 SHA512 01753c8ff02bd2445c9b1982c1686bfd2fb8ee9ce2c0c63cf73b7b292725784f85c48e177f5ce31c2b295c3f833f5f9882b9a19bd73f9621afea36ae9d761e0d
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ta.tar.gz 698262 BLAKE2B 0cdd4f474c6fbf4708a383945c22f3fe6658ce67c40d186cee12940602689a6cf7047046367e5d9c0a887b9ce345fe7dc014baf8ca9cd1b43099309d7a515f26 SHA512 2fbff3a4dbc7fb00a0b6d148b27563e19e48ca71bc1ce500c124aed1e957217aad147e6b30c229b4f5a3915292a4f1d7720a2143580e213d22a44745ef6cc6b6
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_te.tar.gz 1098875 BLAKE2B 613a462a52653eb3681e00bb2a3e5fab32551577fbe1aa860e54ed8451661619e4fbdc6c7350e65cce3db927253e69037a6e9a07d8f120621a6cccc8ca05fce1 SHA512 0309902a350bff03492e48c73c930a4d40b561011eef449148c0dbda47b264f881dc62403863d4025bc4ed94cdb44014f6326e7a95c79e540c57ac026bef5aa6
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_tg.tar.gz 363371 BLAKE2B 2050648b1213486d76945de04dc0d655d1e4bb469593ded605935a38ab8eabf81d7a3756b6fe84e78de3f9daba7c7de6c7bc8ea70b86becdff0534e7a146e719 SHA512 4e63d3d13d15adee6f885531b634ec6717aa92add6ee479de8c0b48adf42a86afafa94467069b4d7ddb558b6affba211004572262211f95d7a35fb47be281678
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_th.tar.gz 631924 BLAKE2B 4999bc217822661a021ebdb9db19b4c3d6a0e785aecb9e4aca2392bd9b320979981e988c1c6e31fc6b8b028fbe1f21ba69b1520a3fc7bd16c006028fdbfd421b SHA512 39b69368ccecf667a4a1a913b3380a89fb6989da45462b50914d83c1a8c9a6d1ebcf4454bfb30e7cccec623a5732115490e0645f4c986f026d513ac4b9ac726b
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_tn.tar.gz 264006 BLAKE2B 439d842ee5b8a644c5f1f3ed382789f92169e6787f6fb3a9a02dfb279da31c57eec7c3720180981b255849f2f0a0384bc3b8c1bbeb9a48c5e6709f1e4830184e SHA512 8c48010f874d197d6962b39c48dd6d37682e110382565d50cecb83c7e5ee436ce40ea82aaaf3cac9e6271fcd30ef541445394c3c4fdf30403176c82a4e595414
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_tr.tar.gz 763192 BLAKE2B 8a5065f5e6caffb89d237c27a781cf860e1ca3d69d4871b9fc6577242c3d556e868af209a85380659335fa72847b055c2b11cc5af1377769b1c1a6beb03a5297 SHA512 2559fa1ad8082a2fd21f460c6ab54a0b555c6a05e867ee576be4e3e696fbe84b02b722eee56ded09142609dbd0935e32c258ab48b647145e841d87aa119ce6d3
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ts.tar.gz 282509 BLAKE2B a3cea2ea5d3adc27c5b530b2fd8224b48d1ebd4c1001af36e9be8b9bf41f6c3feb2504897de0a1732680eb0fa8af0c5e6ea0957104c8bf9ef0cf520a06500ad3 SHA512 1be71ff3766398b019d081f03f46c5ee53a3fe3359f82451043f269f19763782d6b9a581f9c8d5672f7b1f9748e05240c26a372e81be6f7e25ffd9b67ca70bd3
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_tt.tar.gz 185039 BLAKE2B a083037456a759d0a6dd4a7e32d0adb1ebf410c875e240beeb1b30030cbb050c8a8be068f24686a6a8c9068547335aa7547d603f44cc0464e79a5f0220107406 SHA512 c29f46f1579a698151133e0b6c4fbba2eb6f81856b4e77512e0d7dabfe23368d32a281fe9933e51992e2f286c5aacabc609a7dc6d57005a8337bba6d84153a86
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ug.tar.gz 558405 BLAKE2B 0d7a7c40db1f2eb52c805d44e45bf23b76b4fb26623f201c9399df05732a5120bb3bf6188ac66dd82e6eb43993221f97c56443fbff19fa6dfb03e0c61db784de SHA512 3ae6f95c98a94512047b6e24f752515e79acb34ba50bdd1cdb9369dc0a4f861252a870e260477d43b0c4d7cbf83f1c3e56b0da4d30a72f2b2b3696c94aeccb82
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_uk.tar.gz 1608251 BLAKE2B de2c99d6a9c7802e7f324481595164ff238f78936de428ba476841eb8cba1fba0b9510bfc5cd4db9b6a346b846eb7afd5efff2b687d6263a31c25a3e9898bdc0 SHA512 880570041be40c42d90b5697b2a7b379b72b80a57c9d4504e8f310a777691e478b3e0d5ddcbb2c8f44720fb1e1ab96d97e08c97a22cffaa7e4dda5c06d1dc865
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_uz.tar.gz 319820 BLAKE2B 5acbc7bdb2687b815e7663d709604f004909f7342f66a7ed38e299ce364e71b6b12e1e08d5dfa04ddd3fa3d09fef188af1120c944f40992c273bfe943710cbca SHA512 b90dd90eedf9dc5f0853dde1934ad7242e62282d8133abf799f61eafa2c37d7912e897572e0d9323eff8f2ec1f11bb95b3055b79d3521843e4f12a5d3bd75089
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ve.tar.gz 286663 BLAKE2B b0ac8daf069aa0f5e904e67666ad6b941fa1a751f6e205a1367d55e0898dd22cee873ac99e8cf0a2c3903a0b6ec45ec87a92409a92ffec946835a703f5c895dd SHA512 84ba52cfdd7e8401d71ae405f3e1e586477ed57f4aadd0fed3f51a9f65016d754e713825cea26a6d8f8e8247ce31c75ea3686e7c9bf1aecd379f1bfc905025d9
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_vi.tar.gz 472796 BLAKE2B 0933451ad666670c8a676ad7a9c46a8f854fff52c19fbe0f4ddc6a18752165788416c5c0cb1459b5472df09c6eb23c1bdf2de3a2977bd8455973e5d64cc3c202 SHA512 7ddea2dc95cc31a48709f3f5f861ba301bdd6a7cfefc430bc61de5e29273cf5ddb943b9841a33aa8d518e2fb2717c7ce4e340af5a9dc7829a748e2425772221a
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_xh.tar.gz 294874 BLAKE2B 99fc8733a404846a417be97ff90ca952f1692106449906a86bc762a14953155d0215390de193a49df78f68eabbe62585850837bf32628572aa65314753ce6d1d SHA512 fc5fc19a63d85d02cf9613cf2275c543f41e88bab864ecc467ca40b6f6fdedb47446c33921bc732c9d95233fd203da6f8aeca905d77cb202f5b1594cda8239e9
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 798382 BLAKE2B ca5fe6e41a37d34395c40c117ebd3f43c0dc20727098d32cc152ba6c56d21a621d1fc921bce8beb1082008bfca2f933b02a80a6197cf5d19b7817f8409f2d5b2 SHA512 9d4867a1dcf8e31587013999c252b7ea1c3fd30bff208161f004b6cf7fb4cfc5290801f45e7fc96c74669f915091ee844cb8cc595b16a27268b6b61ea5ade081
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 795342 BLAKE2B c26ed443724488f1071a75f174317e890a4bd9fecefa012329fec9ba40b4cfb8c7ea161b5925328e0ec5f714571031e92a3ede601ebb570373e250908809350c SHA512 acf12d76d8e4ba5257e35ef002241e656ff6be04eea2664603559ad31870cf95f52d7649388f67e828582403e2ed78251dd8917b690ba3ea176459c99bc81e0b
+DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_zu.tar.gz 326220 BLAKE2B 3860aebbd0d2b3a494e8790149816ddf7b3a3a097d8874e5e14df4d602bf3bd384755b5d4814444906e1673cdd2775d5dd51a4442f4cbe616967ae3e319dd865 SHA512 c4dadf35e9bd29b0a43bbd94191630966435ec943dbe984f268550b25af8ea1884b0c5136ac673ab58d7a8a44a82c340cf297c031616200e3706f7d9b4000fe1
 EBUILD libreoffice-l10n-6.0.3.2.ebuild 3365 BLAKE2B ac42e9f05e88133d0adb56e0c8e7288ea1d79c19a2359c8afa51620615f49d0921337242903ca134a8760030ed5a3c7a2171561dbcd6e7b3f04e58951825c165 SHA512 e7c0f037d6e9ffaa42d286fbebefdffe0f21d3f6937bb7d2b55cef9ef7e4c2557dc4b6f30bf9411740f3fabf4063b7b1dd5714148c5f2698419247448f2d95ea
 EBUILD libreoffice-l10n-6.0.5.2.ebuild 3325 BLAKE2B 9300825c46c619c23d03948033f247792337133829a2c335b62bae0e804e9e9c849b9906a3bacb9f0aa1a448615e8c105bda398d41791f343df8982864416992 SHA512 feed2226ac09e367fd5a97353ae70b4ff0fc0b1d318f9d2cd462ccd90ceb03d29025c5f746381c9c2cf68dd23cd28ea244eee82a497bdc5de71bf048bf06f6aa
+EBUILD libreoffice-l10n-6.0.6.2.ebuild 3325 BLAKE2B 9300825c46c619c23d03948033f247792337133829a2c335b62bae0e804e9e9c849b9906a3bacb9f0aa1a448615e8c105bda398d41791f343df8982864416992 SHA512 feed2226ac09e367fd5a97353ae70b4ff0fc0b1d318f9d2cd462ccd90ceb03d29025c5f746381c9c2cf68dd23cd28ea244eee82a497bdc5de71bf048bf06f6aa
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.0.6.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.0.6.2.ebuild
new file mode 100644
index 000000000000..0a893cd1d293
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.0.6.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rpm eapi7-ver
+
+MY_PV=$(ver_cut 1-3)
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="https://www.libreoffice.org"
+BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm"
+BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp"
+
+#
+# when changing the language lists, please be careful to preserve the spaces (bug 491728)
+#
+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
+LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
+
+for lang in ${LANGUAGES_HELP}; do
+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"
+	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
+done
+for lang in ${LANGUAGES}; do
+	if [[ ${lang%:*} != en ]]; then
+		langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"
+		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
+	fi
+	IUSE+=" l10n_${lang%:*}"
+done
+unset lang helppack langpack
+
+RDEPEND+="app-text/hunspell"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	local lang dir rpmdir
+
+	# First remove dictionaries, we want to use system ones.
+	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
+
+	for lang in ${LANGUAGES}; do
+		# break away if not enabled
+		use l10n_${lang%:*} || continue
+
+		dir=${lang#*:}
+
+		# for english we provide just helppack, as translation is always there
+		if [[ ${lang%:*} != en ]]; then
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+	done
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/
+	# Condition required for people that do not install anything eg no l10n
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
+		doins -r "${dir}"/*
+	fi
+	# remove extensions that are in the l10n for some weird reason
+	rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
+		die "Failed to remove extensions"
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index dcc11b847bdb..6b621e19f3a5 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -17,11 +17,14 @@ DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c5
 DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
 DIST libreoffice-6.0.5.2-patchset-02.tar.xz 43072 BLAKE2B bcd6406b06bef83ac26e227bc77fed76b67e11f0150a23015e8c83c7092b8efd6f35ec8bbac12bbfda6c597ebaa1782391a624b10a7af0bface6b480b6603802 SHA512 fe764e02cff85a064f8b25e34b3f3558a9fc65051da154e94654c2322e8f50487a97b699a6ab886ec9db00d31a8ca544aaf0b93794e03d17fbbe90b83b44124d
 DIST libreoffice-6.0.5.2.tar.xz 204795724 BLAKE2B d027e83dc5f3908af25975354f8d0ef9a4a9a4fb601dada54d04cdc5bc6d0a0dbedda89ac0cf5bbe88da29382431bddfd331e56b63b88e9f5a23b9299c65b61a SHA512 796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684
+DIST libreoffice-6.0.6.2.tar.xz 205022916 BLAKE2B 715d24c7bbfe4d570011f5090cf647421f68e73fb76047ec0fb973ec0bfb30be3ec1d521bdd92369e23abaa444e7afd3e070ff613486e8f85b9ca76d9496fd0e SHA512 8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
 DIST libreoffice-help-6.0.5.2.tar.xz 2972956 BLAKE2B cfe585fb690bc0a348b67aae1330daa61a0a08acc580fad147853d84c9496d0ad4c4b14598492d4aba9af4afe7fa65bff0161a77b1c0cae9089d50e2a542e0c1 SHA512 975c547e59280e08e554bc658642660fc17e5785b45254b40f969f4b42088d5a350dec72ae6b6f1aa60d7bc95bd9d2c2134f6b395ee86e6f9f5af09f52cc50e1
+DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5 SHA512 89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13
 EBUILD libreoffice-6.0.3.2.ebuild 16953 BLAKE2B 9b17913bb18d607ac0141226e54199b1d48c5f88a66d9ba8a6bb40459e35c1301a57c0b111a23f12e03daba9e9e6b850e874d64e4d2a37bba809dbff24201eb8 SHA512 acd68e679413031897fe17a27b1da7c688522ca4e773174be5ab1595c588b62e0969f72fa758f1548d9adce54cca151ecd5edfee1193dcf568ec5fc4b8265a22
 EBUILD libreoffice-6.0.5.2-r1.ebuild 16814 BLAKE2B 3f06b68e3d8dd43a549ca4358ce012f426f8ca5081df83035c187ccc29b14a6b6151e12ccc2a739dc5cb08583397bbc1dcfbd04c1366fe6ce5c6dc8a4bdfe4c9 SHA512 b95abbb02660b8d341fcecbc8e40beedf741b8d95e8817b8016e8bc94230e34c0d7e928d8df50dc45e4c164d28b03baa5954ac7275e816c3fa9ba906da61fc00
+EBUILD libreoffice-6.0.6.2.ebuild 16752 BLAKE2B 85f7fea29bc3777cde350956ad73d064f3ef924996d9d1aaad608827d9b034fb5e0295e34d2e00d3004f78e1d70ea0161e77c347a2097f829dc063c933bbbf04 SHA512 43d1d010b55d33eb73897a8ace7f11ee062770f18c7c8961a9aa3e73b5d40bf5f5087115f47a70b3bc4a69f215603a4bcc58ff6d175edaa040d6089ed827e27d
 EBUILD libreoffice-6.0.9999.ebuild 16752 BLAKE2B 85f7fea29bc3777cde350956ad73d064f3ef924996d9d1aaad608827d9b034fb5e0295e34d2e00d3004f78e1d70ea0161e77c347a2097f829dc063c933bbbf04 SHA512 43d1d010b55d33eb73897a8ace7f11ee062770f18c7c8961a9aa3e73b5d40bf5f5087115f47a70b3bc4a69f215603a4bcc58ff6d175edaa040d6089ed827e27d
 EBUILD libreoffice-6.1.9999.ebuild 16533 BLAKE2B ac11c68340706f89e7e25dee5fb2e6ad2f1301c20ebc7883892fa78ba997225c48121ba4882eb2dc12399281dea013c024e6fd713ef84ee04da82069ee2aab4d SHA512 a370fafd44229c2df400754b53f261f3fc3388adf96bf8b2c1d6e408e7fe8a695487921e78621311f87506732841569c0e63161ae4f4d8ed8af4b95f941f5be7
 EBUILD libreoffice-9999.ebuild 16533 BLAKE2B ac11c68340706f89e7e25dee5fb2e6ad2f1301c20ebc7883892fa78ba997225c48121ba4882eb2dc12399281dea013c024e6fd713ef84ee04da82069ee2aab4d SHA512 a370fafd44229c2df400754b53f261f3fc3388adf96bf8b2c1d6e408e7fe8a695487921e78621311f87506732841569c0e63161ae4f4d8ed8af4b95f941f5be7
diff --git a/app-office/libreoffice/libreoffice-6.0.6.2.ebuild b/app-office/libreoffice/libreoffice-6.0.6.2.ebuild
new file mode 100644
index 000000000000..7fa72b5977b8
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.0.6.2.ebuild
@@ -0,0 +1,568 @@
+# 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} )
+PYTHON_REQ_USE="threads,xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+PATCHSET="${PN}-6.0.5.2-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
+gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	kde? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	dev-lang/perl
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	>=dev-libs/liborcus-0.13.3
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.24[nss]
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	net-libs/neon
+	net-misc/curl
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( dev-libs/dbus-glib )
+	eds? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	gtk2? (
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.24:2
+		x11-libs/pango
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtwidgets:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mysql? ( dev-db/mysql-connector-c++ )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!app-office/openoffice
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	media-fonts/libertine
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-1.6 )
+	kde? ( kde-frameworks/breeze-icons:* )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-1.2.3:1=
+	media-libs/glm
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/ucpp
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.6
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? (
+		app-crypt/gnupg
+		dev-util/cppunit
+		media-fonts/dejavu
+	)
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
+
+	# TODO: upstream
+	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+	"${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
+
+	# gtk3-kde5 vcl plugin backported from master
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+	CHECKREQS_MEMORY="512M"
+	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		CHECKREQS_DISK_BUILD="22G"
+	else
+		CHECKREQS_DISK_BUILD="6G"
+	fi
+	check-reqs_$1
+}
+
+pkg_pretend() {
+	use java || \
+		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+	fi
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+	xdg_environment_reset
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${MY_PV} = *9999* ]]; then
+		local base_uri branch mypv
+		base_uri="https://anongit.freedesktop.org/git"
+		branch="master"
+		mypv=${MY_PV/.9999}
+		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+		git-r3_checkout "${base_uri}/${PN}/core"
+
+		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+	fi
+}
+
+src_prepare() {
+	default
+
+	# sandbox violations on many systems, we don't need it. Bug #646406
+	sed -i \
+		-e "/KF5_CONFIG/s/kf5-config/no/" \
+		configure.ac || die "Failed to disable kf5-config"
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die
+	fi
+
+	# Don't list pdfimport support in desktop when built with none, bug # 605464
+	if ! use pdfimport; then
+		sed -i \
+			-e ":MimeType: s:application/pdf;::" \
+			-e ":Keywords: s:pdf;::" \
+			sysui/desktop/menus/draw.desktop || die
+	fi
+}
+
+src_configure() {
+	# Set up Google API keys, see https://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_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use kde; then
+		export QT_SELECT=5 # bug 639620 needs proper fix though
+		export QT5DIR="$(qt5_get_bindir)/../"
+		export MOC5="$(qt5_get_bindir)/moc"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	# --disable-pdfium: not yet packaged
+	local myeconfargs=(
+		--with-system-dicts
+		--with-system-epoxy
+		--with-system-headers
+		--with-system-jars
+		--with-system-libs
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-neon
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-ccache
+		--disable-dependency-tracking
+		--disable-epm
+		--disable-fetch-external
+		--disable-gstreamer-0-10
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--disable-report-builder
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+		--with-build-version="Gentoo official package"
+		--enable-extension-integration
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-tar="${DISTDIR}"
+		--with-lang=""
+		--with-parallelism=$(makeopts_jobs)
+		--with-system-ucpp
+		--with-tls=nss
+		--with-vendor="Gentoo Foundation"
+		--with-x
+		--without-fonts
+		--without-myspell-dicts
+		--without-help
+		--with-helppack-integration
+		--with-system-gpgmepp
+		--without-system-sane
+		$(use_enable bluetooth sdremote-bluetooth)
+		$(use_enable coinmp)
+		$(use_enable cups)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable eds evolution2)
+		$(use_enable firebird firebird-sdbc)
+		$(use_enable gstreamer gstreamer-1-0)
+		$(use_enable gtk gtk3)
+		$(use_enable gtk2 gtk)
+		$(use_enable kde gtk3-kde5)
+		$(use_enable kde qt5)
+		$(use_enable mysql ext-mariadb-connector)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(use_enable vlc)
+		$(use_with coinmp system-coinmp)
+		$(use_with googledrive gdrive-client-id ${google_default_client_id})
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+		$(use_with java)
+		$(use_with mysql system-mysql-cppconn)
+		$(use_with odk doxygen)
+	)
+
+	if use eds || use gtk; then
+		myeconfargs+=( --enable-dconf --enable-gio )
+	else
+		myeconfargs+=( --disable-dconf --disable-gio )
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+		else
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		myeconfargs+=(
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		)
+
+		use libreoffice_extensions_scripting-beanshell && \
+			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+		use libreoffice_extensions_scripting-javascript && \
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+	fi
+
+	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=helpcontent2/source/media/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# bug 593514
+	if use gtk; then
+		dosym libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index eebad61b3fde..82ef9c9598a1 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index db1b947458f9..46056185a67a 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -3,8 +3,8 @@ DIST gentoolkit-0.4.0.tar.gz 3215377 BLAKE2B 404f81e2f5bce5da4df122156bc76d22549
 DIST gentoolkit-0.4.1.tar.gz 3214527 BLAKE2B 1c6be826a099ba4d18ac8fa0bb38808cbf30ee1d93d26c26965d7fa332e6a87f8eee475126f56d68e2a1c0ff04f258f79f5684551b2fe5947d8ac6f6ff3e7079 SHA512 52b665e19dd8b871f4238d05d40a071d69ef114f36b589c29f46686b1439997e72f58896bb4f330ab256af6000a9559426c78cae08640e54b74db343b3b22945
 DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c51e2f74020e0fa2f1f4441c203c03a1269c8c55e1461c5780ebfb8234d364837073d582a52a99f2d40c92e6b77a7f0 SHA512 3a9eac2fd214bcfe39380193cb2118edcd759dbf3eb165e7240525ce1047aa984f1d1f1d3a15324218d9be1f0a1ec960ae08a63191392f1bb3422277a52697ff
 EBUILD gentoolkit-0.3.3.ebuild 2187 BLAKE2B 21cfa614cef616b3f6326cde3fb52d1cf0a21a0b1e1201d27ac358c3fda79d08cfa4857ecfcf0b5f70c3d152855cab59f131a14d1e6327299d74b23f3085819e SHA512 76d206fb0c32e075cd4fef87ff8c4497f1f566b8ee5de07bbc5608f32c42777308619d13fb179081726920a59480010e9b53c4bf178f4e335017bcbe0cd35885
-EBUILD gentoolkit-0.4.0.ebuild 2164 BLAKE2B 7a4d91380523e5355a68e4320907375e49b69acd3f48a549a46576277da776c5be47113828f757affe0439b6803a2a0ebef7c7f6a7c4438f1800584e4439d321 SHA512 aa0fe594f28562a24ee73cb2eae52f1797758ec4c80d0db24f52de3f81aac7a64de5f59b6b273ce4f84d88a88b058f0f880b5498fc118e4b2f4572c459b99fca
-EBUILD gentoolkit-0.4.1.ebuild 2180 BLAKE2B f141489aaf43bf65d686166a4fc66f1acb58c16d4eab35566d323077ad8730b413f11beed94af79f03f30b1daf7bf6954d2b0ef791504c7f47c3c90e222e506c SHA512 92016e7cab3aa9c2a2fcdc42d9958f47a1bb41da5c88664128aeb0c9a86fa00ff79c99cb100be03f056df23a506e2e52b6b4068b828885ee08173a4ef4404726
-EBUILD gentoolkit-0.4.2-r1.ebuild 2212 BLAKE2B d91339dd6d7597224d43e82d402f91ed77b0e63b9cec8fc7591ed410c7296a6fa6b788fd76f33bf7146b5870badd31741f59e0c31a91d3d256629e4d4b3a7a1e SHA512 99b9a3f959145bdcc73490232d8a01aed2c6d0bd5d2ef6ae8f99efa536492208e660dc6da90d5f95eb110436197ff8cc6ffcaec8c8d7c42c205b392aeb20c2ab
+EBUILD gentoolkit-0.4.0.ebuild 2331 BLAKE2B e594f565ba0a7182665a191e8c39ec7acf107e784dba7da9df454922c13ad08265723ba7cbac310a9231fdba53292d41e6773f6b861255dd27b8ad3cb44e9b39 SHA512 745b8ced23a8fae9020e397b13ba5f8927a8e7d9fb52e19d6bf87b889e60ad808e46d810b4b9c03ad6030bea57987a973a797315417de013de6601d25a6fde18
+EBUILD gentoolkit-0.4.1.ebuild 2347 BLAKE2B 1087067cfd1684731970ddd2826341f43a7a9bfc4df8a918cbea41c930806957f349b25d901dbc3e841a5a32c69771af822dccf5d42beae014ddb9e25c8b204d SHA512 9b99a5f31dd05d2eed5ce6f842b17214f9ff9c43a7eb54ea4c40aa6b5e9acab0c7005f67c7d1c105048cae2ad892b2316fd37313a2f501ca93a24c5417087e60
+EBUILD gentoolkit-0.4.2-r1.ebuild 2379 BLAKE2B f23fe2cb372d5f02cbc71ce55962bf303f4267fd97c3ff9fe42fb38f74a01191aab6159c9e0cf5b1955fc8ec347adbc86fc65bb09c67c9f36274c09a7f77930d SHA512 fe17b9c389c5c13275651de5ffe23c07634bd4b6d809f167347264668ff7ce2eb673b4fb11d9ffaa0b1b357c675a24539133b2ffb767747c564c84950975c383
 EBUILD gentoolkit-9999.ebuild 2038 BLAKE2B b73ca2d3af0a6d7adf65e489cceb6bd4ff29c61e2e657dd28c0ab17e3050cc1031d0db237ff9467dc80f3c463ad0c1f3efdd9ec5d13f35ca0983a435c61329d0 SHA512 d0110f470a871858b3ffad3617714db71b1b015c72fc9f3c39921f3c4b6ab80192c1b060f2de3fdc673a8a8ccca7b5be92a43fb52b5dfe664d832ae093bec7f2
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
index 23bc999bd73b..47665d99a84f 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.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"
@@ -35,16 +35,24 @@ python_install_all() {
 	distutils-r1_python_install_all
 }
 
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
+		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
+	fi
+}
+
 pkg_postinst() {
 	# Create cache directory for revdep-rebuild
 	mkdir -p -m 0755 "${EROOT%/}"/var/cache
 	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
 
-	einfo "Starting with this version, ebump, ekeyword and imlate are now"
-	einfo "part of the gentoolkit package."
-	einfo "The gentoolkit-dev package is now deprecated in favor of a single"
-	einfo "gentoolkit package.   The remaining tools from gentoolkit-dev"
-	einfo "are now obsolete/unused with the git based tree."
+	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
+		elog "Starting with this version, ebump, ekeyword and imlate are now"
+		elog "part of the gentoolkit package."
+		elog "The gentoolkit-dev package is now deprecated in favor of a single"
+		elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
+		elog "are now obsolete/unused with the git based tree."
+	fi
 
 	# Only show the elog information on a new install
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild
index ed5581daa990..6722fbcda234 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.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"
@@ -35,16 +35,24 @@ python_install_all() {
 	distutils-r1_python_install_all
 }
 
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
+		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
+	fi
+}
+
 pkg_postinst() {
 	# Create cache directory for revdep-rebuild
 	mkdir -p -m 0755 "${EROOT%/}"/var/cache
 	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
 
-	einfo "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
-	einfo "part of the gentoolkit package."
-	einfo "The gentoolkit-dev package is now deprecated in favor of a single"
-	einfo "gentoolkit package.   The remaining tools from gentoolkit-dev"
-	einfo "are now obsolete/unused with the git based tree."
+	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
+		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
+		elog "part of the gentoolkit package."
+		elog "The gentoolkit-dev package is now deprecated in favor of a single"
+		elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
+		elog "are now obsolete/unused with the git based tree."
+	fi
 
 	# Only show the elog information on a new install
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
index 8d1838ed8c35..3ef6b39ef078 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
@@ -39,16 +39,24 @@ python_install_all() {
 	distutils-r1_python_install_all
 }
 
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
+		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
+	fi
+}
+
 pkg_postinst() {
 	# Create cache directory for revdep-rebuild
 	mkdir -p -m 0755 "${EROOT%/}"/var/cache
 	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
 
-	einfo "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
-	einfo "part of the gentoolkit package."
-	einfo "The gentoolkit-dev package is now deprecated in favor of a single"
-	einfo "gentoolkit package.   The remaining tools from gentoolkit-dev"
-	einfo "are now obsolete/unused with the git based tree."
+	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
+		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
+		elog "part of the gentoolkit package."
+		elog "The gentoolkit-dev package is now deprecated in favor of a single"
+		elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
+		elog "are now obsolete/unused with the git based tree."
+	fi
 
 	# Only show the elog information on a new install
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index dfc78f655c28..38107a69501e 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -2,9 +2,11 @@ DIST portpeek-2.1.21.tar.gz 12624 BLAKE2B fbf70d10799e4264832644a04b197816aa5824
 DIST portpeek-2.1.24.tar.gz 12736 BLAKE2B 5d4d30e3c7d853e2a3be7e094ad7a40861300ee2f1582dd35d352f91354bcff504dcb8b53830a5b13dd31accf64095a0b2e3836147663d2505016acc381369f2 SHA512 fa702483c6182685242a26401ba1b058f276ff6fd18839fd7f566d48cb62c2cb78029789089267cbacc1b435f1aa815c0df51ace06afa71f242298511fa79d7a
 DIST portpeek-2.1.25.tar.gz 12864 BLAKE2B 1b0522b1d6beee25451f461c8601923666712470493f278378c8d314b48e3070d6a8853579d3636bee86cb59d3ed3a42cb1695a25d41a256b78220b8c99a4c79 SHA512 9d40ad387d252bb42a66e27de00c63f2f4725a794da7bb35fc5519ab5342e309c823090005336b22add81e4e043b0fa4f97ecdb86bb20bf595fd4188bda437f9
 DIST portpeek-2.1.26.tar.gz 13004 BLAKE2B 1de44e9cc3f097154c5374c2619367d20bba62c69acb7ef4b7efcab17a60d0918c98f6d1fd2ec149379f2408f4a932d3389ff19c720c9a63e4dc197021d4e2f8 SHA512 0bf139381629118cc216c1fb21e65d9a317eaa0f1a200f8032f6050dea12940ab6bfc440a0001e2f26d74a21698d8de14001309342c202ae9837923d703b7ad3
+DIST portpeek-2.1.27.tar.gz 13000 BLAKE2B a134d7c9a99dc4bfd8cbd56343a6d049c215eadde745f1db6af234c5b561f916f2bf3393a8a01ae44ea4a74bd501b46abdd150cd1403d5254d70c12ad7d7545f SHA512 aeaf47cd5701531c0488709ac63cf38faacec73dafbc96502c34cf279051679242f63bb452fcf14c1b739d08821981e59af3734f4795905d7af31dcaa95f26d2
 EBUILD portpeek-2.1.21.ebuild 692 BLAKE2B 30e2e87dfe6088945b51c93d67a69798503266774b094517cd29d8a408f7bfb27716dad8026a01b10e88e15ff1e91b5ecc14034b87d24346f3e8dd8122f525fa SHA512 02c5df14a945e8703ae9f99ee7d61083dd6b125ff5bc7d12c9f09cb0c8006335696de9113a8d490ce6460bd59d5b91f71af50119efb943e62b5d6ad196149045
 EBUILD portpeek-2.1.24.ebuild 694 BLAKE2B 78f2e828f1f25bf4a430a050faaa9795a3328e35839bb57090c397a16966317a19f6e38df261f20ee5bad64e28b97efa574cd2147df993a69ec7190652337675 SHA512 2de0c56eade803cfde62c396d3347a4a3242ad36c10d5dcd4895d3c7fe2b20c62fb9c8272e6558c6b7a64b25301575a9416a5e1dc788002825f3f9a8c3c5ce6b
 EBUILD portpeek-2.1.25.ebuild 694 BLAKE2B 7ce31d63bec751641bf74868e04df23064b72f7ffae9ba11a30b89b64e7c28588fbf39669407aa55732c9dac196044cf398f65f42134e44318367ba6a712a8ff SHA512 464d37757a6f770369b445fab9588e948590e7929d5528255ccece45941e79cbecbe6bf88c8d4dcdd9f31d7065393a183e49e64ebde501c8b84340be6a5b886a
 EBUILD portpeek-2.1.26-r1.ebuild 760 BLAKE2B 45bd0d4a777b5292470c21fce5017589299f47d942484a6ea97845500552441b0327634a346cfea528026713011150f79353dee190cacccaf51a1dd655461f92 SHA512 51de071c4ebbf5439c0aaaf73a0e147be438291a32065e12373acd43e52c220696748f32a5b11986c98e522a1287df66cf41ed25f40c81320be0df18087075a9
 EBUILD portpeek-2.1.26.ebuild 716 BLAKE2B 8786aa84b88d7ee02c6147070683cfd373f24c4a89d911d9ae947e17844a96db62a258dc80ec8534ab5ae08e0582c4f4b70cce84aa830fc2e4f403b042d01985 SHA512 533afba3d15de73b3a9dcb01037ecef85934cb135e339b9d1e6a3ebac9ecc6d4998e116c75278ee389ec802f47b578411950637a4a87d3f651861082ab732cef
+EBUILD portpeek-2.1.27.ebuild 760 BLAKE2B 45bd0d4a777b5292470c21fce5017589299f47d942484a6ea97845500552441b0327634a346cfea528026713011150f79353dee190cacccaf51a1dd655461f92 SHA512 51de071c4ebbf5439c0aaaf73a0e147be438291a32065e12373acd43e52c220696748f32a5b11986c98e522a1287df66cf41ed25f40c81320be0df18087075a9
 MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
diff --git a/app-portage/portpeek/portpeek-2.1.27.ebuild b/app-portage/portpeek/portpeek-2.1.27.ebuild
new file mode 100644
index 000000000000..cacbd8405782
--- /dev/null
+++ b/app-portage/portpeek/portpeek-2.1.27.ebuild
@@ -0,0 +1,32 @@
+# 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,7} )
+
+inherit python-r1
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
+SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.4.0
+	|| (
+		>=sys-apps/portage-2.3.19-r1[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index daf92c85038c..b124bd0b733b 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -4,9 +4,9 @@ DIST repoman-2.3.0.tar.bz2 75285 BLAKE2B 980fadf2247869358f76f6708117b8a9591763e
 DIST repoman-2.3.10.tar.bz2 87545 BLAKE2B 67e1e514eebd50516aeaea2708ebe4c9d69cbf61add5fa19a31681f085a6dd8c39695cb63d9b4cd23caa955c85669148fce3c31c08b913e31839ff186e3b3ecc SHA512 498ce493661eb5939a5f1345337e11a84e97fc11a0556f2660bd8900f0cb0f6340a401e5728c4557248dd54bcdc0a7d2c72dbb23eea3acb35e053d7359c0e535
 DIST repoman-2.3.6.tar.bz2 78961 BLAKE2B c11953ced4d6bcd5e6e6a5b2dacb8802446f3acfd1842854b33fa8c0a64fa636a0b278b4fd3010b7070a7e2f00ae841ea331925ca20175e7c7e571082195d3d1 SHA512 490078d4621073e448d037373617911093bc4c3262961c4da00f201f880069c0b70c019abd86c15954ff0c547b0ea49434ee97cd972c2baff82f7cfed1a987b3
 DIST repoman-2.3.9.tar.bz2 86432 BLAKE2B 8b60e9ee2705e8fe5d6ab569120f96ca452327c70b95a3b2fff291d4e5c6e446a5bbfa9256b5b0ed18a4e54662bb1b60f4a1e80a8a0c07d276a42fe756ec30e2 SHA512 7b492db9b46f8ebb681ec7dec6dee4a40ce5f95809d505e8b74058c391d16dacdb0171befad64f0281c0168316fcc9d7ec09c7b37742b87b890593ac610329a7
-EBUILD repoman-2.3.0-r1.ebuild 2512 BLAKE2B b46e14ed46d556e731a348c8dc212ca42d20b0703edfe6322bb9475c1e46cd69ced238b9a567f9b441433a2a2a3ad9c04dddce646427f5ea71d80dcbb8865c1c SHA512 a80325ec9455f6210eaf2af3fee60035dc2dfab7f153fc345e1c034b67238b6de94754493768336ed0b9126ad32dec7ca711ca1200f879dad726e64aa9237da0
-EBUILD repoman-2.3.10.ebuild 1907 BLAKE2B 6981cb9e5dbc8361d1bb628ef2c467ffb500ca15df0e7e7a4a06f1a73a77e8e4c17cb15dcc332c4818701c2a852e2e4c37bd78fca9b7ee8773366e1ec26f0774 SHA512 5034424677fb28e8c91742af1a42f4f32238d1c8663d10e13e17c4fe75642a141ff185479dc7aeb4ee6c7efaa0e539c24be596d92740278f8e02d7bc15d5d33e
-EBUILD repoman-2.3.6.ebuild 1852 BLAKE2B 778490890dd38fa7ff51d7de8e3ab122a9e58a02515bea423a097d883706bfdbd3bef081c6091e6a671d7e0a26f2ee8cd9b4f2a0f226329cc164fb02f7bb5f96 SHA512 e4df9e66171dcc2ab07a9f3cecaa26a8d8185e0ff4e2291bd134ae83a797c66698804b7c0f1a3557571835b540b2c174133efa12bc2cfc4451130ac29b3dd617
-EBUILD repoman-2.3.9.ebuild 2113 BLAKE2B 477165a48ea4c5df4553b1d4e582ddf0b6dfbd283ac17ea8042034f6af05e677d3ba105a2191b8faf3665be8a70fdb0c67f49c1dacc93ad9b396b7efa8c8cfee SHA512 2cddc8d1d4a9fccfdc5a67f1507979611a5559d612de8dd2a6b13e0064b7e2f8860feedcd866a1877bbf5ccfcc407988710631360e42b865ba184c7aee891152
-EBUILD repoman-9999.ebuild 1938 BLAKE2B 0ebfd6719f84df6c853bb105916c2f87870cba21743e592d3b5238cb39b20ef3603c63e1b5c0ad139ae4c209c5b725c78f13ebfb8a0967562c64352f33b94697 SHA512 fb7be6bf01a098341d75ae9206aa5a4560fc55839b706ed6dd3117f184a863eab4949c9de074265a18d83f1c97023544d4c97ba924347b285c5453325ca7a525
+EBUILD repoman-2.3.0-r1.ebuild 2503 BLAKE2B 3c6b8981076ccbaa0c270c4a5a5e60382892d9793b47b163ac40ad965be32106e508cd9f8c020fe28c67778d36b8cf35653bef11c159d8fe7a663186a5cfdec0 SHA512 b79135e052cf2b1106e3ebda0dfd63b37f1fe5d2869b0a97149180f1e64f21f4543e4a1f0478531019e46d602232f15c13f49d9f5e51a07c97865223ae8b866d
+EBUILD repoman-2.3.10.ebuild 1951 BLAKE2B 90b61a810f30e25d9e384594c5fd5e271252eac20ba021868ff09425630e002019d4c2939f6b006e633b90801ef88b16d4bde29cd82489981c94cdb518a82bba SHA512 d4b9fceb58969306f0d3f1ccf609316ca1f7aed2d79998857514224599207fb5e064909fb51b40f13c8a038fb15814ea8e7457521391ff8c782ec2badb191b9f
+EBUILD repoman-2.3.6.ebuild 1843 BLAKE2B 7423ea5e4fe5e895912bf383fc4e319c08abd5ea0995c497baef8bb8291516691e92124156681d860c3963966db8ecba48efb364de8256860b9c09aa1ef72bbb SHA512 d8dda4aaf8518c40bf2fc6dda958fd6218cd604a4102f9d1aff9c9b7ed0cdd6314dad10a11ab5e38ce455cebb12eaa20d99e21dd3ae2495182411a6f7abe7acd
+EBUILD repoman-2.3.9.ebuild 2157 BLAKE2B 6f0b2173f946f3fcf5ff944535d1e5e7aa7586ddb92e0d850b83d341f21efedecb57a338aa71ed0ee19f4b079a446ff9e44e2b67c869a9064898f06e530cdeb1 SHA512 f17abe00b8b8c29d030b288e489d88f90104bf0adc424e927c326507ff289eafd8567e3b5bd5041b8e12beb0b90366263d4601c22d202d658c0f1c26ca724a38
+EBUILD repoman-9999.ebuild 1982 BLAKE2B 2da48849d7f710be3930ae5882f420d25e9e9aa07a5d94cb77e658b0914cfe94ec2b3bcb174bfbb8a9739a55732f4fea02ca85afe8516dcdaf89627bdefcf0be SHA512 e9ee663fd2019db232df7cba9b0842f654f64c7b83dacd991a9844c1736651ff74ce2096979035ca2b29e6e9ddbbf01891c35206b77bb4ca0f077c7354e65f6e
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.0-r1.ebuild b/app-portage/repoman/repoman-2.3.0-r1.ebuild
index b2fb3350b5f8..0cfe176939b0 100644
--- a/app-portage/repoman/repoman-2.3.0-r1.ebuild
+++ b/app-portage/repoman/repoman-2.3.0-r1.ebuild
@@ -82,13 +82,13 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
+	elog ""
+	elog "This release of repoman is from the new portage/repoman split"
+	elog "release code base."
+	elog "This new repoman code base is still being developed.  So its API's"
+	elog "are not to be considered stable and are subject to change."
+	elog "The code released has been tested and considered ready for use."
+	elog "This however does not guarantee it to be completely bug free."
+	elog "Please report any bugs you may encounter."
+	elog ""
 }
diff --git a/app-portage/repoman/repoman-2.3.10.ebuild b/app-portage/repoman/repoman-2.3.10.ebuild
index 962b98e55dd3..e071382f3c3a 100644
--- a/app-portage/repoman/repoman-2.3.10.ebuild
+++ b/app-portage/repoman/repoman-2.3.10.ebuild
@@ -49,13 +49,15 @@ python_install() {
 }
 
 pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
+	if [[ -z {REPLACING_VERSIONS} ]]; then
+		elog ""
+		elog "This release of repoman is from the new portage/repoman split"
+		elog "release code base."
+		elog "This new repoman code base is still being developed.  So its API's"
+		elog "are not to be considered stable and are subject to change."
+		elog "The code released has been tested and considered ready for use."
+		elog "This however does not guarantee it to be completely bug free."
+		elog "Please report any bugs you may encounter."
+		elog ""
+	fi
 }
diff --git a/app-portage/repoman/repoman-2.3.6.ebuild b/app-portage/repoman/repoman-2.3.6.ebuild
index 8c7504b338c7..dc60ecf6859d 100644
--- a/app-portage/repoman/repoman-2.3.6.ebuild
+++ b/app-portage/repoman/repoman-2.3.6.ebuild
@@ -48,13 +48,13 @@ python_install() {
 }
 
 pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
+	elog ""
+	elog "This release of repoman is from the new portage/repoman split"
+	elog "release code base."
+	elog "This new repoman code base is still being developed.  So its API's"
+	elog "are not to be considered stable and are subject to change."
+	elog "The code released has been tested and considered ready for use."
+	elog "This however does not guarantee it to be completely bug free."
+	elog "Please report any bugs you may encounter."
+	elog ""
 }
diff --git a/app-portage/repoman/repoman-2.3.9.ebuild b/app-portage/repoman/repoman-2.3.9.ebuild
index cd3bc0292adb..c6113c7c5f07 100644
--- a/app-portage/repoman/repoman-2.3.9.ebuild
+++ b/app-portage/repoman/repoman-2.3.9.ebuild
@@ -55,13 +55,15 @@ python_install() {
 }
 
 pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
+	if [[ -z {REPLACING_VERSIONS} ]]; then
+		elog ""
+		elog "This release of repoman is from the new portage/repoman split"
+		elog "release code base."
+		elog "This new repoman code base is still being developed.  So its API's"
+		elog "are not to be considered stable and are subject to change."
+		elog "The code released has been tested and considered ready for use."
+		elog "This however does not guarantee it to be completely bug free."
+		elog "Please report any bugs you may encounter."
+		elog ""
+	fi
 }
diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
index 1e421127be26..8063252c048e 100644
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@@ -49,13 +49,15 @@ python_install() {
 }
 
 pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
+	if [[ -z {REPLACING_VERSIONS} ]]; then
+		elog ""
+		elog "This release of repoman is from the new portage/repoman split"
+		elog "release code base."
+		elog "This new repoman code base is still being developed.  So its API's"
+		elog "are not to be considered stable and are subject to change."
+		elog "The code released has been tested and considered ready for use."
+		elog "This however does not guarantee it to be completely bug free."
+		elog "Please report any bugs you may encounter."
+		elog ""
+	fi
 }
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 752ea41c5af7..f9c4ae97e42d 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 13c739c926f1..e6ecb8793efd 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -5,6 +5,7 @@ DIST dvisvgm-2.3.4.tar.gz 2896641 BLAKE2B af434a418b5ebbb9acaccc4626b6278f3d0c76
 DIST dvisvgm-2.3.5.tar.gz 2897194 BLAKE2B 7661d6f5ac097a6dc62cf873dee84ec47b55e4a87ec07597170d309ac4d8d06fa19e0e14dab3a6273f022c71112a00af4c0bf167e37687037f0c23d1ea74f20b SHA512 fcfbb8e53233383a61c0662951dc914d157eb64c89eb30f54afc36069d3ca6a347dae7e64febafee1ba9ea8d90b278da9cbe36b70169df48f12c42c077cd1038
 DIST dvisvgm-2.4.2.tar.gz 2918538 BLAKE2B 373e2e6a017189dc130cc40f9abfd4601a1764400858860104e764757e93758a7d12c6b8125d684ba7a9d4bb21fe2820007852ea2e46f57cd3fe7d61d2a4d63b SHA512 9c2dbf088244898ce86a177d81cbf67bbae2df8703dce686016e2b455f6eea516751e84521f8097b82bd6a9e5b294043e3ee38cd470ff6ac1633a976828b99fc
 DIST dvisvgm-2.4.tar.gz 2850942 BLAKE2B c1cdb4aed954bcb5704b83deba087403f366f0139b053b599029d103bd85306e58c7bffb1228d3ace02fd3be91eff002e6d1e45105bb8ccaa85945ba7bbf5210 SHA512 84f51fa8cbf0a32efe667321102b1705c613cc697d86d00df2e044cd97b1f390e1552af7da2891792ccef634507bbc6922f92f194f5acb7d05a48e268e708396
+DIST dvisvgm-2.5.tar.gz 2911331 BLAKE2B b9ee90f5e34784d690f6a9a80dd1cdc4ce516f1e50722a93a0ea6e03da4f60f1bb983fa8abd8e670b2719afbf3197e6483a5c401fa1d668f79569d6a21701be2 SHA512 a722abb94c93ed8f7a6a91730639b7471b37c8c215297efe2ee071ff31829911c49253f17ccbb01dcea578ff55f2b179d85a0d9d32f65ed34ab18455e844578e
 EBUILD dvisvgm-1.10.ebuild 1090 BLAKE2B b4c79de3986a2fba7881da8c2434f1678d7b367f8b13dea7bf7421dcf68f6250681562754100a081b42c9b7d9d3d02cbadc8e7658faf26b29b6c9d2c2a317843 SHA512 d8e598f3c9b47aa88aa5aa2ec38abdb543fdcf46b48be9fa7b967be3fbba15bb1fd995498f0e6743b54c802ee7c8149eb5ea0cfc5415fe3c3371c5b2f0180ccc
 EBUILD dvisvgm-2.1.3.ebuild 1144 BLAKE2B 905c8dd91653845c82e4ab1065eb69961b5a3fb4d0e0cd61f0174f9185d5cc376ede38becab539a8a60182a1f94fcfa871b1598ce269144fe133ec23a498b9b9 SHA512 d6e0f9fba9b8636e126ebf30c7eca4c14a9e31cb3e5e7bbc220a2f49c91e293e5cdaf23321be066dd38204e8abfa06d45a08577a78da589b28f1fccaf8fd8bea
 EBUILD dvisvgm-2.3.3.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
@@ -12,4 +13,5 @@ EBUILD dvisvgm-2.3.4.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d0
 EBUILD dvisvgm-2.3.5.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
 EBUILD dvisvgm-2.4.2.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
 EBUILD dvisvgm-2.4.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
+EBUILD dvisvgm-2.5.ebuild 1193 BLAKE2B d9d376aa401bdcc304bc13f98e771874fddbf18473809bbbc8e07d4a9b48e6671893d60c263478b82d22efa86bb06c6d171fb879b0e523c62abb5bf954e2e822 SHA512 8ef4c5a5e14bb31041609d5de80be500baf1b74c983b3db1da74076ef78322b272b35dbfac469e211c907375d1e086d52b861af590c07010d0442c53eefada9b
 MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-2.5.ebuild b/app-text/dvisvgm/dvisvgm-2.5.ebuild
new file mode 100644
index 000000000000..4f200db18915
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="http://dvisvgm.bplaced.net/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+# Tests don't work from $WORKDIR: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+# TODO unbundle app-arch/brotli
+RDEPEND="virtual/tex-base
+	>=app-arch/brotli-1.0.5
+	app-text/ghostscript-gpl
+	dev-libs/kpathsea:=
+	>=dev-libs/xxhash-0.6.5
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	>=media-libs/woff2-1.0.2
+	dev-libs/kpathsea
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	app-text/asciidoc
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	local myargs=(
+		--without-ttfautohint
+	)
+	econf "${myargs[@]}"
+}
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 4ae7d2c2d2d2..6f0e892d42f2 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,4 +1,6 @@
 AUX 3.24.2-CVE-2017-1000159.patch 1644 BLAKE2B dfb16a3fd8403d69212d0d20fa97dc06ad2b43d1c71894a0a2b366002b945110a73942446543276058ad5bb8ed867b68b3750eb9eed5bb23d2b130c14239f98e SHA512 a09d1e4a6f22c1b93ab322c1b7201bf4665bbc12b29dd9222db22b7d1b73f9ebc745c7e9b77e2bb54656916360757fd8007b6c38c004983b42f506bbaf4369ff
 DIST evince-3.24.2.tar.xz 3509216 BLAKE2B 3bcb9e15a6576650d17d6ea1df638c4b16759ddd2353ca47b425c1fec04f90b85ff7f338472e5e18defc01ab066ef241eff40e8f493fa2238814933703636e7b SHA512 77e099ff60188f982a49f5c8287eb2ed8d42402a15a54ccf8367b3814e7e16ba31354363d3f101117153792daa96f653f24bb06193b5e749d0ebfaac7d7c1e0f
+DIST evince-3.28.2.tar.xz 3379552 BLAKE2B 64f77f2c19649f74291d34f6a0dfc49348d2a8e80cf2b37ef40b2c3bbfbd1198c40a47dd56ca6b04166e9981ebade3b8f74eeefa9234246968fd1e7fb4babcdd SHA512 6deeefc5ed52d79627ae892b227bcf023c6ea45ac02c6a3a7c9fa1004f5da2e36051bfea73f6838cb8f9aed8cadfd145173a5d3b2be405f1d1f06bd4fdadae23
 EBUILD evince-3.24.2-r1.ebuild 2874 BLAKE2B dba10da7fdf7adfc96c52ed4cde40c9793bec028e3c56043f9bd6a1acec62f1b9d3dd900bfee8281c19fbf7eb43bab8a6895ca3bad21fd49669f0ec106459612 SHA512 92527495b1f50a477458599f01c00c652bfd572d179130920c49ecde92878adb3a8bea317645a10ead7f04c963ee46a082629dc05e153aaa0ea47bd91ed92b0e
-MISC metadata.xml 612 BLAKE2B 2736a02dc43835f7db7b02a3ffcd2c2e25a81971a61a008f67497612ce8f9c78b6641e110a00dacf5f158cf5a87104171c5aea7f82be241ee0b966bb802e78eb SHA512 a9ce7d786d979e14c852b0fe3f722b346dce2f1f52b8f9ab272a1f2291ce88adba78c5d347e3e33a3bb0a58f46d77d20febc92516a4c12bc9f987cccd7aa977c
+EBUILD evince-3.28.2.ebuild 2836 BLAKE2B a7bb13c67bbcf995cecbf7e954cc02a422217d1a7ffc0330e142cc6cb7ac0b1e0660e14ba732ee4582f34bbba3dec6349752e3c7160b893734f1affaa1fc0804 SHA512 0dabd52455c49be144e03854dcbca8cb901399de94fb081623f55f88e3a5d0945ae5b2da4c884dc2c5e231c4939137ca272b02a72a60ad10620889a4686e0c6a
+MISC metadata.xml 780 BLAKE2B 2d04283b6f69a9ba788c9d40049767219854376c36c5c1716084b62e2710fdadce7c917d6fa58e51f5e249954e22a0d725cccbaecd66bf6f7417d31b5c3a8865 SHA512 4580592dd517fcba266be541cada8bc0225d35bafaa9505bd5e8127c3cffee65917f4bb0b9aee1263f2d96f5fc47f0cf9d59ffb84e97d2f4727e4504f753a4b9
diff --git a/app-text/evince/evince-3.28.2.ebuild b/app-text/evince/evince-3.28.2.ebuild
new file mode 100644
index 000000000000..38a32708ad4d
--- /dev/null
+++ b/app-text/evince/evince-3.28.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 systemd
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# bundles unarr
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.36:2[dbus]
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=x11-libs/gtk+-3.16.0:3[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.33[cairo]
+	>=app-arch/libarchive-3.2.0
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		virtual/tex-base
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/yelp-tools
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#  app-text/yelp-tools
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://bugs.freedesktop.org/show_bug.cgi?id=29942
+	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
+		-i configure || die "sed failed"
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-pdf \
+		--enable-comics \
+		--enable-thumbnailer \
+		--with-platform=gnome \
+		--enable-dbus \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable gstreamer multimedia) \
+		$(use_enable gnome libgnome-desktop) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml
index 7601c5d749ed..464a13181670 100644
--- a/app-text/evince/metadata.xml
+++ b/app-text/evince/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="dvi">Enable the built-in DVI viewer</flag>
 		<flag name="nautilus">Enable property page extension in <pkg>gnome-base/nautilus</pkg></flag>
+		<flag name="postscript" restrict="&gt;=app-text/evince-3.26">Enable support for PostScript and Adobe Illustrator documents with <pkg>app-text/libspectre</pkg></flag>
 		<flag name="t1lib">Enable the Type-1 fonts for the built-in DVI viewer
 			(<pkg>media-libs/t1lib</pkg>)</flag>
 		<flag name="xps">Enable XPS viewer using <pkg>app-text/libgxps</pkg></flag>
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index 789fb821d54d..4e9393aede8c 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,7 +1,7 @@
-DIST master-pdf-editor-4.3.61_qt5.amd64.tar.gz 14950654 BLAKE2B a9dabeecde4a4f8657d29bca61f9ffbc1cb3f4e5f5002afba965a9a444572791a27316257768f3f2b793215f49d538b4ac68b4ae5271e5c1500557ab5cd9a192 SHA512 0c416df191a2796fdafa6014c258166d47037039fcc9205398138a46d59b1f771d9ffe38eb16f22f4300c3e965435300037d7413a86efb997395e6e974baecb5
 DIST master-pdf-editor-4.3.82_qt5.amd64.tar.gz 14934502 BLAKE2B f93c756f9270b2857af02047c6ebd242d35ddaf23b70118d440c21cc7a0718937aa9945bb24adad6544e984f9390e9f49bfce5298bb8bc54f3c705372aff0fd4 SHA512 9bc6b056bdc8ce349dbab139f64c90948f3e0498918f07df6249fee2fad98a35b133aa7913e375366d062e134878feed0fadd097ab1d5504e97884ffa2c37b24
-DIST master-pdf-editor-5.0.15_qt5.amd64.tar.gz 16008649 BLAKE2B ef8fb3a583eb13c0b3c1ecb125e90fc520f6b707cd9d54871eb16ee32b7dea961612e4e0fbb004791edf549dffa18b25e85e61f58024ceeb356b7f968cfd6c6b SHA512 b3f0d3b269b49680bba05c669ad14375710fbb19396c8242caaa564c961660af25c5654f6df2b477272b0a0966c7f46a0221d1792596cccaaf738effbdc369d9
-EBUILD master-pdf-editor-4.3.61.ebuild 1629 BLAKE2B c88f6d22a43d73855583732a4b7c409b2db9af4153e67180b08f7f614458dba1afaef55dbae7f4f0e82f789d7947b801982b36f63f879850c199649934d250b5 SHA512 8c5ac33caf8c69d9a606da47152c84aae104d4b566653003c5e437e5f018a09201a65ffd954f779404bd51cbdce43591e73a6a56867ff1eb3cd1ce6546aa2a9a
-EBUILD master-pdf-editor-4.3.82.ebuild 1457 BLAKE2B 6c12bbe6de844440a5924d0c8b8a417a5ab06c82163316e495da75b97345963d9ff5912b1f8eee42129c631079bd5fa8500a6a935beba441e31d45a4e9f2d287 SHA512 8af3a7995a69b851d0b0e0874d65460fe1e4fa203c7b39db676ed07ec8968a7dd84eeed00e0872216246b893cb6e64f4dce8268cdba022fc7262a25aa684d48b
-EBUILD master-pdf-editor-5.0.15.ebuild 1206 BLAKE2B 6c96819062e25858e9d9ab0edb4d4db7699c22b79b44b7ce47a102467bae4c0c3babfa88eed75355a7faca205f7501ad9aef1dc1a053a0ec74b43a3c1b896b0c SHA512 fcd6190b22638d71ae28b51d5c1247dc114f12ac61228ebb8d8191c68bd37f43b66dcd17bde29ae0fcc8949b2e8087a7f8b491958a2fc81db5005d1ae6c2c62f
+DIST master-pdf-editor-5.0.36_qt5.amd64.tar.gz 16021838 BLAKE2B d46b9f6205e2832535060584a8841e3fa35d3b59c99a7fc2bcca5f913771633eed0d987a94141ef186b2077b65c781509b5f9938a033a5a856a9b0ad914bd5fc SHA512 31bae232d4629e10b29a4c7273ef7635bb7ec7cce9dc837355fc0d9aacc98943ec009eeac7b445f022831da8a2c400a7ce2b1de82b4e780d625ff49120e2a964
+DIST master-pdf-editor-5.1.00_qt5.amd64.tar.gz 16045580 BLAKE2B 89696a74d2df83836b1e9201d1bee8ba6a30a41f6a39664a975f9bbfb061b4536558d8746e24c57bfcb495f5324ed9d851471276f0da9f9f1d8caa454bf48c38 SHA512 a67d0668cb4c9daa0287af7bce4f24436c31b1636d29aed03503c0976c3efbc2df9ff34c2e65421e5e4cd3e184544bd78a4312b85aa6aee6af0cdaa18ba9c4a2
+EBUILD master-pdf-editor-4.3.82.ebuild 1436 BLAKE2B 5ebf8d5d7998d610a159eca9dacc66ad66aa8b959b1ffd0cd11f4756d38624c7e3593e68fe65231f305cc4bd1e8ceb61516627d78cc30b5290e81cbf2b2cd0ab SHA512 ae2bc92cc35985c7978dd3e93e1432c51441ce191aa24e697e88eca45a48fc30341b8a62652942635fc0ec0b27cab49cbcd439456bd007e8fcf5aafc04e1e7e3
+EBUILD master-pdf-editor-5.0.36.ebuild 1185 BLAKE2B 14925aa16121393a994074998193a4c18ee94f8bebf578c5367b8b0f104cd370a482a836944560ac15dbd2d33354a51ed76175168bf580b3bc3f36f3c0d74211 SHA512 b7c6b37b095f76b8972f76cfdf62be541377c4178c05a5c5d25359dd058d74d0468e474bba5cac883de65d82002fb62b64c5d71dcf67fef64871caf97f3b3c8d
+EBUILD master-pdf-editor-5.1.00.ebuild 1185 BLAKE2B 14925aa16121393a994074998193a4c18ee94f8bebf578c5367b8b0f104cd370a482a836944560ac15dbd2d33354a51ed76175168bf580b3bc3f36f3c0d74211 SHA512 b7c6b37b095f76b8972f76cfdf62be541377c4178c05a5c5d25359dd058d74d0468e474bba5cac883de65d82002fb62b64c5d71dcf67fef64871caf97f3b3c8d
 MISC metadata.xml 367 BLAKE2B 8636a0f12f2f2a38aaa943268b978e9269877950e8ec447f4d012e9c1833c474cff5b1d7f53a99f2ec29315858812068e7ab7f42df60127944c8edcda3a5746e SHA512 d54bf635e54008ebabde5039e2527297b8f80204138c90c7744d928041445ca667232a92e6b7ca357f844f2c8ada6b80f13b7de4ae4768e30ec676b55ae73156
diff --git a/app-text/master-pdf-editor/master-pdf-editor-4.3.61.ebuild b/app-text/master-pdf-editor/master-pdf-editor-4.3.61.ebuild
deleted file mode 100644
index 7f5e919d6361..000000000000
--- a/app-text/master-pdf-editor/master-pdf-editor-4.3.61.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils eutils versionator
-
-DESCRIPTION="Master PDF Editor is a complete solution for viewing and editing PDF files"
-HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-
-SRC_URI="http://get.code-industry.net/public/${P}_qt5.amd64.tar.gz"
-
-LICENSE="master-pdf-editor"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	dev-libs/double-conversion
-	dev-libs/glib
-	dev-libs/icu
-	dev-libs/openssl
-	media-gfx/graphite2
-	media-gfx/sane-backends
-	media-libs/freetype
-	media-libs/harfbuzz
-	media-libs/libjpeg-turbo
-	media-libs/libpng
-	media-libs/tiff
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	>=dev-qt/qtsvg-5.4:5
-	>=dev-qt/qtnetwork-5.4:5
-	>=dev-qt/qtgui-5.4:5
-	>=dev-qt/qtprintsupport-5.4:5
-"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-$(get_major_version ${PV})"
-
-src_install() {
-	local dest=/opt/${PN}
-	local bin_name=masterpdfeditor4
-
-	insinto ${dest}
-	doins -r fonts lang stamps templates ${bin_name}.png
-
-	exeinto ${dest}
-	doexe ${bin_name}
-
-	dosym ${dest}/${bin_name} /opt/bin/${bin_name}
-	make_desktop_entry ${bin_name} \
-		"Master PDF Editor ${PV}" ${dest}/${bin_name}.png \
-		"Office;Graphics;Viewer" \
-		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
-}
-
-pkg_postinst() {
-	sed -i -e \
-		'/^Exec=/s/masterpdfeditor4/masterpdfeditor4 %f/' \
-		/usr/share/applications/masterpdfeditor4-${PN}.desktop || die
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-4.3.82.ebuild b/app-text/master-pdf-editor/master-pdf-editor-4.3.82.ebuild
index 2af6159261c6..cb32e02a6562 100644
--- a/app-text/master-pdf-editor/master-pdf-editor-4.3.82.ebuild
+++ b/app-text/master-pdf-editor/master-pdf-editor-4.3.82.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit xdg-utils desktop
 
-DESCRIPTION="Master PDF Editor is a complete solution for viewing and editing PDF files"
+DESCRIPTION="A complete solution for viewing and editing PDF files"
 HOMEPAGE="https://code-industry.net/free-pdf-editor/"
 SRC_URI="http://get.code-industry.net/public/${P}_qt5.amd64.tar.gz"
 
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.0.15.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.0.15.ebuild
deleted file mode 100644
index 6ef28a8e6ba9..000000000000
--- a/app-text/master-pdf-editor/master-pdf-editor-5.0.15.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils desktop
-
-DESCRIPTION="Master PDF Editor is a complete solution for viewing and editing PDF files"
-HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="http://code-industry.net/public/${P}_qt5.amd64.tar.gz"
-
-LICENSE="master-pdf-editor"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-COMMON_DEPEND="
-	>=media-gfx/sane-backends-1.0
-	>=dev-qt/qtsvg-5.4.1:5
-	>=dev-qt/qtnetwork-5.4.1:5
-	>=dev-qt/qtgui-5.4.1:5
-	>=dev-qt/qtprintsupport-5.4.1:5
-"
-
-RDEPEND="${COMMON_DEPEND}"
-
-QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
-
-S="${WORKDIR}/${PN}-${PV%%.*}"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r fonts lang stamps templates masterpdfeditor5.png
-
-	exeinto /opt/${PN}
-	doexe masterpdfeditor5
-
-	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
-	make_desktop_entry "masterpdfeditor5 %f" \
-		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
-		"Office;Graphics;Viewer" \
-		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.0.36.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.0.36.ebuild
new file mode 100644
index 000000000000..b3809849559f
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.0.36.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils desktop
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="http://code-industry.net/public/${P}_qt5.amd64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+COMMON_DEPEND="
+	>=media-gfx/sane-backends-1.0
+	>=dev-qt/qtsvg-5.4.1:5
+	>=dev-qt/qtnetwork-5.4.1:5
+	>=dev-qt/qtgui-5.4.1:5
+	>=dev-qt/qtprintsupport-5.4.1:5
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
+
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r fonts lang stamps templates masterpdfeditor5.png
+
+	exeinto /opt/${PN}
+	doexe masterpdfeditor5
+
+	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+	make_desktop_entry "masterpdfeditor5 %f" \
+		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.1.00.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.1.00.ebuild
new file mode 100644
index 000000000000..b3809849559f
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.1.00.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils desktop
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="http://code-industry.net/public/${P}_qt5.amd64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+COMMON_DEPEND="
+	>=media-gfx/sane-backends-1.0
+	>=dev-qt/qtsvg-5.4.1:5
+	>=dev-qt/qtnetwork-5.4.1:5
+	>=dev-qt/qtgui-5.4.1:5
+	>=dev-qt/qtprintsupport-5.4.1:5
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
+
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r fonts lang stamps templates masterpdfeditor5.png
+
+	exeinto /opt/${PN}
+	doexe masterpdfeditor5
+
+	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+	make_desktop_entry "masterpdfeditor5 %f" \
+		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index b9d82481c7a0..9179fc298e85 100644
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
diff --git a/app-xemacs/ada/Manifest b/app-xemacs/ada/Manifest
index 4e1ca9745db5..25c98a26354e 100644
--- a/app-xemacs/ada/Manifest
+++ b/app-xemacs/ada/Manifest
@@ -1,3 +1,5 @@
 DIST ada-1.14-pkg.tar.gz 55836 BLAKE2B d61de679848b2cda840ee24fc930495b3b16c664a63d8e5d960cc891c3b327417657b143b18052f33b530aa82971154737c66d71876ca872e7ec0973fdff0834 SHA512 9925cd30f9d67b72086114b1cc723ab131541f694eda77a6094a7d5b5d20b340ef9e285930e793b61c87bd8f732acc37a80ffe3fe0836ee01beca36b303bb1e3
+DIST ada-1.16-pkg.tar.gz 55782 BLAKE2B a5f7e7856a6fb990090fb8bd4295f58f4e8c2bb9b292e4922560c393189c6c8f92e075573aa2c3b2077b0f3c32dc077441cb3839312aba9e290a34991cdc0c0a SHA512 e6e461de26895ba3b3b3666d22af8fa5cec50cc9249dec6f79e433500a7b63f848c94943aeaa4c75ea2b305bf6e235ee62fb0e52fcdfd29410a51a803d8232d0
 EBUILD ada-1.14.ebuild 289 BLAKE2B ae9f8bc7c3eda10bb98c873e005ed15718e9c6c58ef337021928ddb135b18a4932c384cf4a30029ded2f798c417f73bb59418a22b2820ce2fec3116e37c789a5 SHA512 b0ad5a01215f3b04111441bb5f68341b53444dca3db55c9d90abc96669c318744f5a9d3c7c73482d5658effa36b37255cb2bac2e3d4b65eeaa74478683ac0f6a
+EBUILD ada-1.16.ebuild 295 BLAKE2B 0f8992ccbbf64311b83926b3f520af28c1e6593f60fd1ea477f46d0899c65abdda2da1e5a912451769276f5ed343344e763ed5e812882be2fc861e462ddcb292 SHA512 6bce56a637a1eab9fbf0a06361b82f2ec736c306fbbd79fed9da91df95b14a83b098e3da3caac0eebe819997578279486b9934e68047978a48d8c137eda23d97
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ada/ada-1.16.ebuild b/app-xemacs/ada/ada-1.16.ebuild
new file mode 100644
index 000000000000..bc9e72eb100c
--- /dev/null
+++ b/app-xemacs/ada/ada-1.16.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Ada language support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/apel/Manifest b/app-xemacs/apel/Manifest
index 8088410f5957..811f3234f1d5 100644
--- a/app-xemacs/apel/Manifest
+++ b/app-xemacs/apel/Manifest
@@ -1,5 +1,7 @@
 DIST apel-1.32-pkg.tar.gz 121589 BLAKE2B 177a29672eec4ee8b47235eebed5bce25c90431461e23f378c6dd3d3303abc6e2b9667dd845b80e27421d1007ee2e377395fd2b64b72fe4d1298ea689edd96d3 SHA512 5f0c18fcd05ef28766a0e5fe265cfbb5fd637fb393c10eee47475898617dfc54563e3e021a8b9cd54baca7b0a29168aeb451382c89c3ef0a3fe96f0682ba1d8b
 DIST apel-1.34-pkg.tar.gz 124989 BLAKE2B c8504878f8c0df2e41bfd81db76136f280f22309e339bdb119260acc6aed568b240db1b82bf506bf26034543df1134ff50874a233d0e959c34ba2df126c6e0e9 SHA512 29c42c0908499d4e78f1ba7197d2d0da57f1bea179dd870422b3ea8475c50a91cb5d0470b6b02d241b2af46b2ee4e05f7b3d836bb7315dbb58bf75751048da30
+DIST apel-1.36-pkg.tar.gz 124997 BLAKE2B 53e44f513d1e5d2513e2bf91a2585928d3150bc3509ce6d25475173c80273bf117fc19f003eb22b9cdc8e0fd9ad7faf368bc63736987a5e3b4baddfff0635500 SHA512 5fadf5892084eef5fb83c71340a927bdd70b031b9b6352c58ee567089c0d169bfa073cbf6409ed3fc46da262e540eee8c26611fd28a4cbbfcd943145936006bd
 EBUILD apel-1.32.ebuild 350 BLAKE2B f3399ca9a30c0c1beffd6f006df029e9eac4b0022c41bc3bab808d2ecce6b209bb5edab13b1f4a5658be0f22cb527e4652f6355fdf7f3963a4c1e5d67881b0a7 SHA512 14efacecac1dc5e4d3a80f8cf95cc4bbe852fa77109c04766ed21c3228c08140865183c580d3354dad6b4cfa73bac831edbf4bfefae19aff508ec9fd0de0e2d2
 EBUILD apel-1.34.ebuild 369 BLAKE2B dfc2c9583af55508ab5a9eb6b795a908f244fe5fce1418fc68ae7891100f0e1d372327523eeff2a3d16887a50a003180a0fbc91fe450ab20c1db98be60c95323 SHA512 7e779f36da5fae86d9539a9b0d3f0cacb4c137485ffd2449a5aa1125a6974ce5f41a1914b0b95a06eb134150eb4f0da8c5df927804e3a643096da25f9d9896fe
+EBUILD apel-1.36.ebuild 376 BLAKE2B bb4eee475aebf14f940e6d9f315ef986c7a8c75dcf99160b7a72d3a127ce4644b4a98af4c516d55703061e4c90fbe15cad53b27a9e01a1a0a0822f74209b4cfc SHA512 c00ebb8705e4d8e58e3f4a44aec7513d96cee0137f6760dc0cf74c799627e25b15a7643c9e9a93a0c4deeeec7ee7c903198cb20576b5206622cafe9b2f9cc31e
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/apel/apel-1.36.ebuild b/app-xemacs/apel/apel-1.36.ebuild
new file mode 100644
index 000000000000..378aeee4c8f5
--- /dev/null
+++ b/app-xemacs/apel/apel-1.36.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="A Portable Emacs Library.  Used by XEmacs MIME support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+
+inherit xemacs-packages
diff --git a/app-xemacs/auctex/Manifest b/app-xemacs/auctex/Manifest
index 2f29daa2b021..169f4179c158 100644
--- a/app-xemacs/auctex/Manifest
+++ b/app-xemacs/auctex/Manifest
@@ -1,5 +1,7 @@
 DIST auctex-1.47-pkg.tar.gz 710901 BLAKE2B 438296d1b4fb038b3c2956cfe4f54432680c76298f81610094a0be2c9cf0efa181f7cdc6d7fa1766b66f9851aa73636da018eb282b7c24de70a11bf246a74956 SHA512 a5c06277decb8ce5f515ec09103702bff95eeba48b7d9df9ca6f8fbaab33bd9964d6296de5d5baae0f02e07fb434b48831ff9bc86f061f38eedb1b6c708f4e56
 DIST auctex-1.51-pkg.tar.gz 1002835 BLAKE2B 8f71cb30bb78108d59e5ba76dbf0763c781167d112e1c59b2869a16e033061f5414709e31642a39ca0180333a3dfb50c304436a61d73653ff8b9a7812812cdf4 SHA512 f6a3edcf2992c03e6e39ecfdf534589341a5331df712a534c39b70976eaf6f353271987282d1217fc8bae2daf7104273f5eb0134f95a5bdf2d2e0fab31a5675f
+DIST auctex-1.58-pkg.tar.gz 1364246 BLAKE2B f0b906d676b3f75f9878a3fb5b0fb64299ad50d5055a986e1e4d3bcef19eab73412b0b217e167a876420d8dab3fc5a764fe9deb103790d28d8cf9f364cbfa51c SHA512 2a41c1a03c428958d2a572172680541c966ba2257f2f5601b18a5a44c95df7d0363240dd2060ca7d415513d1ebd7259446d9eccdd94eeca3fa656eb1d8a46ac5
 EBUILD auctex-1.47.ebuild 292 BLAKE2B 2e29d4192244b8e9acf8a2aaf2f6feba800f8bb3dadf451c4512f4c1cabbe3ed2088f1952222694ce34082757291189abce25d3d48c6bf01273285a2e61d7bba SHA512 bde4d8faed0b97e2c0268bb7f2447d00f9cd7993b7233fd466f8bcb88ca4d44fb3629e2fce2e61497ace48eaf55549aa4c4b9f35ed508954acc8c5a9c1f54222
 EBUILD auctex-1.51.ebuild 375 BLAKE2B 8aca3df5b55f813d6391d49c346f61eec994d3c06857ae9f757abc6859aa6601765303521175a205a7a8f2901c272e6e16a4182c392976c967a9b2a9ba8c5c0b SHA512 ba3330224ecab23f9322ea446613040e1b50c2d1059233558a2f250e0b5ebd20ea45dbfaaf5412271a35cba9bdd4e53d88b5d65a577220b616aa50d3b4dfa849
+EBUILD auctex-1.58.ebuild 406 BLAKE2B dd2592683d841c2a664caac2b6ce1a2742f1d90418fe129a27eabd5bfb5e1255afbbc430d06b5898e077c23593efe9f1a54f139896afceaafa1a7443e697d389 SHA512 e390fe783290a55d12fb2103e4cff9b0774ff839b615df686d1c41cb1d09588d3a47a347b557c615b8385e791efd7b270a2b5823048418d13722e65f192e31c2
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/auctex/auctex-1.58.ebuild b/app-xemacs/auctex/auctex-1.58.ebuild
new file mode 100644
index 000000000000..811b4f7d062d
--- /dev/null
+++ b/app-xemacs/auctex/auctex-1.58.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Basic TeX/LaTeX support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/texinfo
+app-xemacs/fsf-compat
+app-xemacs/mail-lib
+app-xemacs/edit-utils
+app-xemacs/xemacs-ispell
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/bbdb/Manifest b/app-xemacs/bbdb/Manifest
index dd370709cd20..83e112fc1341 100644
--- a/app-xemacs/bbdb/Manifest
+++ b/app-xemacs/bbdb/Manifest
@@ -1,3 +1,5 @@
 DIST bbdb-1.32-pkg.tar.gz 380002 BLAKE2B d4ba20cdcbb63cbe3aae65cf7c7dc69ef1dea7c888a841a697a77ca63bf6af58caab38efcda5993e6b029e8536cbe47312670498c0f0496dc2422138d8c8d6eb SHA512 238ab158f3a3606bfb753aa02aa6556170df61bfa523cada8570feb97d43cdee481264c2faef30eb2a9c6e345dc1e3f5fbdbe1e44272a2a57115733cc4e2e28c
+DIST bbdb-1.34-pkg.tar.gz 379894 BLAKE2B 5d6eba9c0594a4edc61d626245a0827f2886cf588de9c7fca9748af88cd3ac9740c9552f817f3f882129dbfa5daed9d5c7f00698aa14e63852daf2b81f5a1236 SHA512 2f92a7dca882083631bf0c4dcbad3e29cdd2920b48aebb19a6f83e21ccfefbd8534278579248d74f1f152613fa601af22f8d30236ed0fcae83c3e3eed0ccd4e3
 EBUILD bbdb-1.32.ebuild 591 BLAKE2B 27024b60588a9967300e660fa43b6bf5ebd5b880201a22efc2e778c7e02394f19cf6500bf06ef8126071856e02c84967e86ad9c22ec12e9849e716c0b6d22e0b SHA512 b303cc3a8b3ba132400a01651497e9d40685cefc503642ef22a86cf4856791e7a1256ef9d53b7842483549ec7f766115b4acab841d9e79010e48145e2eee494b
+EBUILD bbdb-1.34.ebuild 597 BLAKE2B 71b4b6f18f0bfaa80b8d418c915bc2db09907edfdba9b100cf1c5203e2b5be9d5a394031ca4367a02c12a8f2731eaa08c0aefee22811513476e0e4e6100c7a87 SHA512 40617d6fdea3ec62c71e459bdeefa3e5442a9f211cd8daf0ed2a4cf5618d6df86995198bb690a9c3a492783ac192460f37f0d7210e6eee38f215e85ef02bdcc6
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/bbdb/bbdb-1.34.ebuild b/app-xemacs/bbdb/bbdb-1.34.ebuild
new file mode 100644
index 000000000000..06710d64ad4b
--- /dev/null
+++ b/app-xemacs/bbdb/bbdb-1.34.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="The Big Brother Data Base"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/edit-utils
+app-xemacs/gnus
+app-xemacs/mh-e
+app-xemacs/rmail
+app-xemacs/supercite
+app-xemacs/vm
+app-xemacs/tm
+app-xemacs/apel
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/w3
+app-xemacs/fsf-compat
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+app-xemacs/net-utils
+app-xemacs/os-utils
+app-xemacs/ecrypto
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/build/Manifest b/app-xemacs/build/Manifest
index 5b9235acd945..a83aa0f29fea 100644
--- a/app-xemacs/build/Manifest
+++ b/app-xemacs/build/Manifest
@@ -1,5 +1,7 @@
 DIST build-1.14-pkg.tar.gz 49484 BLAKE2B 1d0072b9d7737a8d74a12ef0ce45909f212aeb58a4343522da0036f65be11955766756428fd7f6302c449cbb8936bfad70e69fc3b90ec90884de79b248753633 SHA512 bdda0904d8790df0adcaace0df038714f8175dea682af567daac8b0436436dd6e20d2f49f84deae5090f6d5013165de61b8ca50d81d5fea837b9f6013f9ba050
 DIST build-1.15-pkg.tar.gz 49849 BLAKE2B a41e3441a9e1734bfd5caf1b999644fe0ff36c5e9bcb12d03b551bbcee308c14a5378f45966ca5b460a52950e22b4e06c20b215e2b5ccd1d2caef3b8f1f36812 SHA512 bf72d2509250fbd93a512ce445a5a17f01ea47965a729dc3e9a4745093b3057158482674393fa10fd76574f1cad0a998d0ceb5cd37d959cee70a3d8f098e5640
+DIST build-1.18-pkg.tar.gz 50029 BLAKE2B a23fbd5f7d42c964673e0cf07559f5bcc5ad426001656c9d824f7390258cd1f40082b5674a30dedd4759cd49bde803d2074b67974b15be0cb38c030b9c397e57 SHA512 f4a189b65abd6a6373f0596d39ce061c4e1d371ae9bfee5daa70a60ee48cf99e9ed032bf9f70a4af90507239ee425c4dce7906f2dda98079da833b9b86a0cae7
 EBUILD build-1.14.ebuild 381 BLAKE2B 9cbc4568a8504108d2f378d7cc978d51c233de603c3e51bbc64fd673f8340555621f68ccab80b6bf7822d11f77ac6fcbf1bcac097b7f9e78c9f5f186e19278d1 SHA512 5e1e85a9f50ff96f7b189028be475d4614eb4a946878ff41f67b6d88d047ce532238b0d68f4f97219d2a4579cff9b8e0bdfcd20afd9b0096c8f73f202e585aa8
 EBUILD build-1.15.ebuild 381 BLAKE2B 9cbc4568a8504108d2f378d7cc978d51c233de603c3e51bbc64fd673f8340555621f68ccab80b6bf7822d11f77ac6fcbf1bcac097b7f9e78c9f5f186e19278d1 SHA512 5e1e85a9f50ff96f7b189028be475d4614eb4a946878ff41f67b6d88d047ce532238b0d68f4f97219d2a4579cff9b8e0bdfcd20afd9b0096c8f73f202e585aa8
+EBUILD build-1.18.ebuild 387 BLAKE2B 3fb0da7ea9059e098c2c454133eb729b2cb2eaa7be19ce6118b71dfcc91f62a8c09333bae3e9dfcf1b2750d5ba7bfd45e3acd012117da8a95549d3c33fced6cc SHA512 9b098e3197196e7c129dd224a8113241b9eb4f66561e08b18cbeff68a88750baf97ab98036fa41a8064aa15b005b62def72198489b8c118be4e18982f7218166
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/build/build-1.18.ebuild b/app-xemacs/build/build-1.18.ebuild
new file mode 100644
index 000000000000..d9ebc65fdffc
--- /dev/null
+++ b/app-xemacs/build/build-1.18.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Build XEmacs from within (UNIX, Windows)"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/pcl-cvs
+app-xemacs/dired
+app-xemacs/w3
+app-xemacs/prog-modes
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/c-support/Manifest b/app-xemacs/c-support/Manifest
index d498d3060cc2..56b1572e7f17 100644
--- a/app-xemacs/c-support/Manifest
+++ b/app-xemacs/c-support/Manifest
@@ -1,3 +1,5 @@
 DIST c-support-1.22-pkg.tar.gz 78027 BLAKE2B 6431841a5bde016211016723b633b6aa1c7c10e62f0a846d52b4b77053226392e4ed4170384144235ca48f5dde5d47312c34085069ef682bb0b199f7d926c289 SHA512 38ca69f114541a9886ac547701d3d2bae90707307e73ca9ef2b2867500c0ea1b16f9a1fe3bc69b039dafe9cfabafadab46c11d156873c3105c77026655ae00a4
+DIST c-support-1.24-pkg.tar.gz 77955 BLAKE2B 1e55fabfe0888fd84d416b3433e64ee45c597b38942048eca1d082afa1dc59ed3714c0be499e6b960c39c30dbd595fbe493167515f3a0968da74ada51650ab79 SHA512 dec220ef2b354da746b0552e37bada1b73f07f14b96996e2ad98cb089a105afbf95003f5d4f51a1ba09498d26fc9c65241835c2a40c19d1bd0c50ff9333216b9
 EBUILD c-support-1.22.ebuild 332 BLAKE2B f56f4a9911061bd91b8810eed68d2783443f320fa1073afd880b1386ee5dee1c1bae7401313369225253702f75977811b20afadbde73fd1f353fea8580c55d33 SHA512 98947148b5001de432f5449493beabc08af814d76097b7313e6d88cfa5762872afba17f4b3bb80437344b2e3dfad46bae6267e0befae072f9cdd04cc55a9c38b
+EBUILD c-support-1.24.ebuild 338 BLAKE2B 234c927e66a9c94ffec9b73fffc771a2734fdfe74af5d33577dd43b4fea7651c7f434c69866958bcb5bb6da2e790913188ad725dc5e93c9356ecf5eb20b67bc4 SHA512 c322ff3c6139ee87feb29943d526bc58d5dfc7ac5b5d8e8f59592ece9d3652339cd47457ef2d1913634cf2ea89e8c3386f0d465ef022ddb0e996ea83dbd08a9b
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/c-support/c-support-1.24.ebuild b/app-xemacs/c-support/c-support-1.24.ebuild
new file mode 100644
index 000000000000..b2cc61667f8e
--- /dev/null
+++ b/app-xemacs/c-support/c-support-1.24.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Basic single-file add-ons for editing C code"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/cc-mode
+app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/calc/Manifest b/app-xemacs/calc/Manifest
index 78370d2f4967..54f189b30ac4 100644
--- a/app-xemacs/calc/Manifest
+++ b/app-xemacs/calc/Manifest
@@ -1,3 +1,5 @@
 DIST calc-1.26-pkg.tar.gz 1600637 BLAKE2B 5ded27390d06e9e5ade53e6b33ad9583233ebae64f2600e9cb3c8717bac7e372bad4e45c2fad45f15090bfaa7e661f98a84414e297765dae0578a58f06b49394 SHA512 f727675754980f448d9607fd45b561642104888042fae35f64e20130e0ee7c9dae8cb24b07d871281e3e995b97addf268e6d2db390d900f4826c85c89c30845b
+DIST calc-1.28-pkg.tar.gz 1607492 BLAKE2B 34204674fd925dae07e0eb13c8303c38947dbe2bc7e7117b8cda96cbf3d100cf2ef12f94420e50e5dbbc925aa2a35383ab444734756f94e4920988750d999bd0 SHA512 829577c6cd1029e07ba1b813755bcf6b19d14be5e75e4d10c8e8dfca4dd250b66c76ce4cb63965274e2ba3235488d42112c295791c5dbc4ffd26faa855e70d90
 EBUILD calc-1.26.ebuild 285 BLAKE2B 5a6e6082e435507994fa305ea86f0ac5a670c871f35b8f8138b577e774e4ec269eaea1b3e79d4532804cdfa47ab47cc37440a9909a6ba64400d540559a9f1f1a SHA512 205ceae6b656f1a4278cb3ce52c6f56c888d772768965813bcf24e6b774aae717b57e6dbdac4d50a02bedda361be9ec82a34581b3c17be7c74318bad3bb8eb06
+EBUILD calc-1.28.ebuild 291 BLAKE2B f924629fa7967cfd73012084d1828553e788eb9331435ceb46e0dff5012e9162fdb64c6cd3a995127d9aac4d1b9cd493ec5bccf5e3859cce962d424996ef9ddc SHA512 41098ba3bcaff1431f80c4a1a540382deeb59f9a8ef02a4ee102d2dd0db6dac8484d4bb621f5688fa5b5427ea603d65745422fa192d2eaf4f3ebd142c6c18b82
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/calc/calc-1.28.ebuild b/app-xemacs/calc/calc-1.28.ebuild
new file mode 100644
index 000000000000..28092079ac3d
--- /dev/null
+++ b/app-xemacs/calc/calc-1.28.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Emacs calculator"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/calendar/Manifest b/app-xemacs/calendar/Manifest
index 735f3a0e118a..320a1805d313 100644
--- a/app-xemacs/calendar/Manifest
+++ b/app-xemacs/calendar/Manifest
@@ -1,5 +1,7 @@
 DIST calendar-1.32-pkg.tar.gz 410752 BLAKE2B 698ffcef148c6c84fbea7328da45d73bdf49601a94e3776b00ea7bae58223ef6ff1706ee8bf0e090e6aca16bcc6ed5c2037af2f9bb694ba03a840b20913afc19 SHA512 ca9a2dd135d012e094044f066939dafad0ef5f73f738b538c0f7aefc08c2e9efa0e1bcd3a3630681cfb90ec3b3319fd9b8594675ca2747627924d53d3fbe8ec1
 DIST calendar-1.38-pkg.tar.gz 411386 BLAKE2B be833c4f81a9d2e79e06768836fe1e58601c9b483f9febe127bd2c2bfe77259a3cd50630920e2df38de14234c1eece9c498b71073d967a06bf27258d91c9010c SHA512 d5158147df3fffcba550f4bdb34aba916b9071734c2e08b3bebb4c1969ac06b15b79337b4d2f50a53e057ff097fc63162849d5dc0983da4363e4e484357c571f
+DIST calendar-1.41-pkg.tar.gz 409552 BLAKE2B f4ccf53eaf68d8f7098cd94954a3165fcd7513fa920288b08694c6c47f4b43ffe1075090bd303a838a75d67d489ec19f0ed203e6fe92167e89513635ee09f48f SHA512 0b4f48e37a367ab7337b4fd12d97235114ac1e889b6e858c644ff308879a921787c88add3bfcf4d16155324167910254854171c74205fa1822dde86570ba6e0b
 EBUILD calendar-1.32.ebuild 295 BLAKE2B 7b3ad75b0119b31f8531a1dbd36166253231fcea2352ad1802e75381bda52f263f11a3fbbd36a63cf557cc6629438a65211ffb5674e12b509e733dddb915f2cb SHA512 c57e15c7bfd9d85693440be694a0eea8a243643884ac3a222c44a0c0680fe772e11c3e010889032685e4d757da4c4ca02150788e3b667abf2aea66ca16717680
 EBUILD calendar-1.38.ebuild 295 BLAKE2B 7b3ad75b0119b31f8531a1dbd36166253231fcea2352ad1802e75381bda52f263f11a3fbbd36a63cf557cc6629438a65211ffb5674e12b509e733dddb915f2cb SHA512 c57e15c7bfd9d85693440be694a0eea8a243643884ac3a222c44a0c0680fe772e11c3e010889032685e4d757da4c4ca02150788e3b667abf2aea66ca16717680
+EBUILD calendar-1.41.ebuild 323 BLAKE2B 23c964084976bcb1afd8e6c985fd348bfcd2fa0a277c1ed417235d919a977ea648bb9443805f0060b3f3acc960666c48991eec9aa8069cb855ecb76c80dc605a SHA512 258f2204e81588b11517ad35715479db7ca7089c1f5d10169ba2e48216912d0d5e23ef8c6ca8cf44a13784dd2c827778b815504196569f4d3aa9b5fe4dba2c12
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/calendar/calendar-1.41.ebuild b/app-xemacs/calendar/calendar-1.41.ebuild
new file mode 100644
index 000000000000..5e7641afd8c4
--- /dev/null
+++ b/app-xemacs/calendar/calendar-1.41.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Calendar and diary support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/fsf-compat
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/cc-mode/Manifest b/app-xemacs/cc-mode/Manifest
index da4d84725026..cef9efef85c3 100644
--- a/app-xemacs/cc-mode/Manifest
+++ b/app-xemacs/cc-mode/Manifest
@@ -1,3 +1,5 @@
 DIST cc-mode-1.45-pkg.tar.gz 524116 BLAKE2B ba250dd9f9fd97c7659768f23c215a31e1b0b9fc7e60824328048bf3624a88577586e3cb06bd9e12a667b30a6dd68d097d6c448a571498b6d88dc73afae65268 SHA512 1b584685e2d6878d29e07e0618ac1e3a8306be8e5f8e39f9ccecc9458d155967844a0544f87d9f25518d52f322dfc7433e5578f84e46423f14ffa8f901537d3c
+DIST cc-mode-1.99-pkg.tar.gz 815847 BLAKE2B d08ec17fb5c73b69cfd55de96a9cb65be48c3868f665187b5319fd4dbbe52112a8280c72ef5a565f4eb9529073c12a1351b8c76bdb30c26e9788c1f20361b239 SHA512 6e50b6bfcdfddac5e07b76e2fa8f5ece4db4279f1442a14ba6f7788ff187f4bed7d3b3c900c8403d9c0232768cc000f5ba63df87969d34fb6d35d6e5577fc835
 EBUILD cc-mode-1.45.ebuild 321 BLAKE2B 272310ee0f6cefc78870047275d0754875ce86a7b7acd1e59d6f5b42015e8b053107f08c4292337b5e98f38ec69915f3d30bd864f1fe507489259a002fff1c45 SHA512 6258db422c3eeb8fb1b0ed1a8f389fa7a78f25f70339ac3e074f77770a7b34bcb573fc800f6911439bd05910fcec55161568956a6c7f7251b2a9f73f4ff28888
+EBUILD cc-mode-1.99.ebuild 327 BLAKE2B 8840425c84cb9e7192f33351a87394d33cb816fc9393576e664a82c68268fae695ee5a8155e28869987a610aeb4b9f07a6ff49d48895d112a342dca234bb719e SHA512 3d001e40e4a05fa01dff9b04a1c8e164de5083a8af01a9ca4b116a00184542095313fac73f58ff6d533221d7a06696068111271b49ececa891d99daf815f9286
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/cc-mode/cc-mode-1.99.ebuild b/app-xemacs/cc-mode/cc-mode-1.99.ebuild
new file mode 100644
index 000000000000..307cfcdff2cb
--- /dev/null
+++ b/app-xemacs/cc-mode/cc-mode-1.99.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="C, C++ and Java language support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/mail-lib
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/cedet-common/Manifest b/app-xemacs/cedet-common/Manifest
index 38b49e64c437..56e43ad2d55c 100644
--- a/app-xemacs/cedet-common/Manifest
+++ b/app-xemacs/cedet-common/Manifest
@@ -1,3 +1,5 @@
 DIST cedet-common-1.01-pkg.tar.gz 73671 BLAKE2B ced597935ef483ee6d92a1245d255200a767b0663b7c90d0adefadecf5b42bc4734597cefcb35268ef6eda5bc1887ea7a9110fc894e72b6fcefd7ea8d1ddb2a7 SHA512 53ee8486ff02ff5dccfd9974b3f7bfc710befee95ad3db1bcfe5e67c5dcf740440f060770a080264f0b0f09013867ee7d66a83d7b3919c7e598ef3207340d9d8
+DIST cedet-common-1.03-pkg.tar.gz 73644 BLAKE2B 314d24fe951fcf7922a1e0c84dc96744d0b515a1ab27de4c23217b60936e746ac6ec78d6a526af8e1658d6c9b8494f77ea4dbb4135e5c3164e8f3a7f32bf36d8 SHA512 25263858e8cadb5bcc2e822021a0b7d76e61442d9de7670dc4f5b73c3cc752f36a43622ced8f4d9d9a594a2c5b9c6cfca052dfd3d60c639dc1854908cd6fbb0d
 EBUILD cedet-common-1.01.ebuild 334 BLAKE2B 9421490190b86b51504c88456ec14a0c28d9e914ed81bd8637d606a963a42118cb01369b69533b64a5aecc9eb96bcbad9e4ea3e6ee888a31d369255608eec787 SHA512 9dcb4c490deaba76e2cf4277b5293d2a433bf2419d287c6d8d6ead0b2f1d75447c8e00c9a5ac77ed438c2f46f2aaa89e50b75fe42a262f2da12a9cba5e6b8012
+EBUILD cedet-common-1.03.ebuild 339 BLAKE2B cfe9d7a02fd8c2686169801a9d6fe9a7d8f577907d02b53c7cad3ef9d2ae217cbe304b6cf3b9c8e5a1957e9f58331e76a60e64429e96114c1cd248ba257a207c SHA512 65536b6c2b41edc9c971653d9e9deaf71db039f3b048d254e023631a78e1ab2f97e6a51b8e0b61b7f59bd216a50868345c1464bb885cb4161d4ec5e486f7e129
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/cedet-common/cedet-common-1.03.ebuild b/app-xemacs/cedet-common/cedet-common-1.03.ebuild
new file mode 100644
index 000000000000..f8607098af39
--- /dev/null
+++ b/app-xemacs/cedet-common/cedet-common-1.03.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Common files for CEDET development environment"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/edebug
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/clearcase/Manifest b/app-xemacs/clearcase/Manifest
index 636a21b5870f..ab4814ded62b 100644
--- a/app-xemacs/clearcase/Manifest
+++ b/app-xemacs/clearcase/Manifest
@@ -1,3 +1,5 @@
 DIST clearcase-1.10-pkg.tar.gz 105865 BLAKE2B 42738b8614b4feae38fb45d4839219a523052bb330a78ca7f4c271b0163c89934c4e18b7329d970270880ae197a6ba1aec6e5713aebe073007cf079635ebfdd7 SHA512 a2e909efcc372e40f05af9a588eb8e6222c64947ca61460e137f516c43294120727527e98af72bbd9c4c3782d62cc9ff8fe06743d4dc498e0c12721f229d9a1a
+DIST clearcase-1.12-pkg.tar.gz 105934 BLAKE2B 313bb0079d2f8683cda9c68493f286adcb867e8feaa13134eec5b75b37d98778ea2a170685e359ec94b48f2be3832d0b15efbd26b2023b5b204592b9e78b479f SHA512 e5c284800ef5c42a367739fc71209acbc8d4a59a60851ac089693da1bf11458cda81f0cf46c05cb415337248dc9b448b82a230a5645ce414e54d61e197a3244b
 EBUILD clearcase-1.10.ebuild 383 BLAKE2B 1b165afb612e0667fac81e8cdad379001cdc947090f2b00d9ef5119eec21e8d3f6ba258d26e4a06fa86a0613fbc7a9db3ffa6d5058b0c697179178b6752716e3 SHA512 9f0e776e38f66968d5d8a76a58b90f334dd781e696c769c55c84b35fad23768e90243a848245425f1743b7eee620cd0451116b3146f6d0fe7bf3c4c710afef87
+EBUILD clearcase-1.12.ebuild 389 BLAKE2B 4a777c5a785cb0061fa22fae325fe6d0ee55c85c5fdd7380c21cfd5b0f675b186521359160cbd5079c16df5b4dd01414c8ee4135341949729729fa944dfd5403 SHA512 f8aba5f1254767693b0527a0cb4fa5c879a465718f46e9e44bed5542604640cd28670de64cc66dc0542c9bad2c6a5683db86d2917f3c9c4422d76b70ce77e3a0
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/clearcase/clearcase-1.12.ebuild b/app-xemacs/clearcase/clearcase-1.12.ebuild
new file mode 100644
index 000000000000..76360ec67b66
--- /dev/null
+++ b/app-xemacs/clearcase/clearcase-1.12.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="New Clearcase Version Control for XEmacs (UNIX, Windows)"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/dired
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/sh-script
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/cogre/Manifest b/app-xemacs/cogre/Manifest
index c4a99c11ddb6..ed4b8921c9e9 100644
--- a/app-xemacs/cogre/Manifest
+++ b/app-xemacs/cogre/Manifest
@@ -1,3 +1,5 @@
 DIST cogre-1.02-pkg.tar.gz 47588 BLAKE2B 6ce7f40e5aafa2aeaedbb5f17b4624decd0c87ec4fb38f186e0419c5496109d0b6fc267d6f484eb84fdd22f5f59c70451241e92c7bf7dc26c956e3ae6a95e7b7 SHA512 a3256df974d92440cb63b612e30807088450854cb157e1ba01e0362c36262fcdef11d5f1240796091ee2a6869f4dec06e9ab55dabd55ada5d2c7e7410e0e537c
+DIST cogre-1.04-pkg.tar.gz 47657 BLAKE2B fc211320bcfeb6aeb1b59e4ab1a68eec77752504106657229392c6d717427811f3afb81ae5911143a1db8c63fa3366f1fb4edcd7be6a785d54560bd484f655f3 SHA512 63db2e7a2942993661c729624d60938610117e3cfacc0734735958a6f9a5857cc881e65df6958638b56024a6cb5683031b7468d236311227cfec7013e54fe137
 EBUILD cogre-1.02.ebuild 391 BLAKE2B 2a4bec232569d440b4296f9cac9bb489252338c304372a4491e62f0cda85b23b67d5c2571a55457ad339dec3bd66f0ed144df0a198c531e90525c12f7664af30 SHA512 afe60bf332bf39afbfc06d93466b20c78977ee9159d9125fcbec543a0c6fea4a4b6cea5648b487c5e4c83b78cc50bbe5c82256ef44f66a7543199f1f4ea68207
+EBUILD cogre-1.04.ebuild 397 BLAKE2B 8fcd2e55b2fb02921474e138a1a5092228dea05eacd4193ce6e23baa65cf31276c0a6f40691aec8648f00e0c82b0aa79333b4ddd7907666f43b7fe157f2a3a81 SHA512 9e5a9e7199fcb5a4c3060cb5766bee3d290400a4d530d282ffd803b976e583cb9151c33c837b813e13f9de3d7539e8ce55ffeefd03bdaf52e26e380ae58711ee
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/cogre/cogre-1.04.ebuild b/app-xemacs/cogre/cogre-1.04.ebuild
new file mode 100644
index 000000000000..a54c2ee0b728
--- /dev/null
+++ b/app-xemacs/cogre/cogre-1.04.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Graph editing mode"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="
+app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+app-xemacs/edebug
+app-xemacs/cedet-common
+app-xemacs/eieio
+app-xemacs/semantic
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/cookie/Manifest b/app-xemacs/cookie/Manifest
index ff8e20b87eb4..4531b85076e3 100644
--- a/app-xemacs/cookie/Manifest
+++ b/app-xemacs/cookie/Manifest
@@ -1,3 +1,5 @@
 DIST cookie-1.15-pkg.tar.gz 35035 BLAKE2B 4cd1408781337b8f124a5106a0a1c5d0f47860c3300f5451a031ec0403e6434a13973d93906e6585318b757fbd670aa7dd7a239445f6882f2574f92e48bff66b SHA512 0fdbc6f1db7f0fceaa35aaf8ab148875f4b391a3a2accab41c02267ad385fff4e54538e5335b2acca3e2d2550a9b2b00e78ae1e0b1bb997617ab439db9c89ece
+DIST cookie-1.17-pkg.tar.gz 35032 BLAKE2B 9df6bc6fe8d3c14c62130aa87766b809700d10749a5f5127f8c378a6b2010f5f1dfcf174f2467fcda42acf120e076681e84559bb26c4d94337d2f0d0d7560764 SHA512 f6bacd78ee83ea78a91a16a77491ed763e46098a9a8b922aa6dca1150179272a6624563e802d0cdce09a317f2a70b6a4ddb07359e18d2d25726aa25b2d9c2d90
 EBUILD cookie-1.15.ebuild 297 BLAKE2B 873f4dc5ecbd0f43121a8628d21412c3947081f5808c2be386ffcd601b26881f5d0bd6cb8e42adb6d78c6bf42dbae48b455debcfedbbf339bf1cc938cec4ddd6 SHA512 1db90f0fe72a5730e0a0bbe9d65c5608580a181776cea9721bce4d342b056c84f8df34106f4d1f69bc7d8916ec1dd278ef0f4cb03b0ce6f46b06eb7a0f78dc8c
+EBUILD cookie-1.17.ebuild 303 BLAKE2B 21489de0ebed70de2ee95e382232eda03d7405a902e6a1dd271fb697a96a6292722ad7918ebffe721ee2137d398ff143bae3112d66045b8e43231badfc4ddd03 SHA512 a1fcb3823e24736e00db55ac9d5f88dfdaad5c5ba0c38013189bfd2db954a40f852abb26bf0e37bac563a0848467524985ecff183b7d0b1ee1a9ea6e2b5b8c32
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/cookie/cookie-1.17.ebuild b/app-xemacs/cookie/cookie-1.17.ebuild
new file mode 100644
index 000000000000..e070c3cde313
--- /dev/null
+++ b/app-xemacs/cookie/cookie-1.17.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Spook and Yow (Zippy quotes)"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/crisp/Manifest b/app-xemacs/crisp/Manifest
index 4e3276e98162..6029a37ae203 100644
--- a/app-xemacs/crisp/Manifest
+++ b/app-xemacs/crisp/Manifest
@@ -1,3 +1,5 @@
 DIST crisp-1.15-pkg.tar.gz 10436 BLAKE2B df57ef3f1eb7cc235f21bf40c8770cecf3ea139833cb1f27b3c25649721734fe88eb9af88a7da2e19cc98d869816087c52464e13dc254d6c1693e05089ed8083 SHA512 815d86bfc854e78c35fc8468f4e9aa3de05f9b029f4ec9e344880d398ae4b5a2bf8cc3391b0f6b8030090fcb4966dbc3871518410c99cd265c751b40c0e2b42f
+DIST crisp-1.17-pkg.tar.gz 10489 BLAKE2B 5929ef5e5d91a5516a4ab56e61106def470cbe0c3d0075b9bd4f030a1c9afdc1e8bd92b3c6620dafec51a43d8ece08889674acb421d63834825b01d8de24e33a SHA512 9cd9da5166e5651b719ff3d7f499e7b92311fe6bf6df072ccfafce85d6cdd54ad24295fdc1165304db79625f159db5078a2e5f51290f269a87db38493f7f4458
 EBUILD crisp-1.15.ebuild 256 BLAKE2B faeb0c7773bfd4b7116335608f3a4d4f896ca377bbb1948e83adabf4385d875e4eb1e1fd916ab5ce64e2b35159272a3a4afec369ab3005a094250b8915a0c4b1 SHA512 13ab4764960d884e7e5643d4866573a26c4eb6e0b70e1ee2dea178f5be3610181572fc64b854e1c30d8d76b68d8a8f9b53da5f8f4768a5d6d037f85d635f876f
+EBUILD crisp-1.17.ebuild 262 BLAKE2B 6c943e0a701f8bf5aef1949e1d548b95cc0e3b25fc6dea841e31e5defefdf591f4e5e0f6b66924757a96c878e1d2f49523672d04e560c84744f6cafccf1bc2a6 SHA512 ba62dfdabbd272166ae6da8272e439e4a6e6ff9fb17668eedd349779d9fc2f74887392d37a7aa93189f8be443b67e4f658a1d9edda2e8c8a47318170e2da47d1
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/crisp/crisp-1.17.ebuild b/app-xemacs/crisp/crisp-1.17.ebuild
new file mode 100644
index 000000000000..fb23418c07de
--- /dev/null
+++ b/app-xemacs/crisp/crisp-1.17.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Crisp/Brief emulation"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/debug/Manifest b/app-xemacs/debug/Manifest
index 63ca9f33ee85..b5da7edfa1be 100644
--- a/app-xemacs/debug/Manifest
+++ b/app-xemacs/debug/Manifest
@@ -1,3 +1,5 @@
 DIST debug-1.18-pkg.tar.gz 107997 BLAKE2B 06873ef6d3886c8b5e9659084bb3a50db955e27ab5104d0f29271ebcfa2e5c298c1bee59f46dac0d4d10f8c0dd89c4b0c99e23bef2c449da697d22641d15bb6f SHA512 0bbd5496636bf6b850d44f953865ca7c23bb5f5040be0d8f6ec385a590ffaa6d5e325b24aac7f07b0b6c8ba0abf3fc3b7214f06a09d20eabc6bdf940237106a1
+DIST debug-1.20-pkg.tar.gz 107953 BLAKE2B 90af70a49f6d62224248a73907dec986ba9671a99782aa84cdf9024426f192fca74781ced10f539da9c3115586cc1fe6ecfbe91fef536228d259280c251fb6f3 SHA512 3985447986f5129a8789d1f9058a662cef5dbbe0e9d565f00973e79a6d32139581fef777f0e6d683ad5338896cc679bea3ffaf18d51976a5a2e27ba5484cd9c9
 EBUILD debug-1.18.ebuild 324 BLAKE2B 0510a2ad345b7ef9fa8cb575ce5c9b8ec7004bb3f434bebde260cafd696c02dfdcc0bf112b088338f53e1f90ea75f488a8cfc28eae882f5bec6bec44e37cb41d SHA512 68846bd7418cf47cc8367f6bc6f2176aebd8cf8ef387f28cb4d9201f48916bf5d853c69693bd7b1536cc713af92fe656b7670e4ac2af1173abe77788b00dcad1
+EBUILD debug-1.20.ebuild 331 BLAKE2B f0a52914de408d0c6ba42c41be530acefa5470177a252f659f09d8bcd3a53cceaf6bd742fda6d4acaf0c198b8acd03b86ba70c82091cf10be33636047c99ac3a SHA512 2844c2d3371f7238f0585699a045538463821bf523854611f2f2beef71db5146d4c7927bcdb2d61cefef5fae04eb51c5f4d0e2f9a630a5aa00b1c19f818a40c9
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/debug/debug-1.20.ebuild b/app-xemacs/debug/debug-1.20.ebuild
new file mode 100644
index 000000000000..07d8f44bb547
--- /dev/null
+++ b/app-xemacs/debug/debug-1.20.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="GUD, gdb, dbx debugging support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+
+inherit xemacs-packages
diff --git a/app-xemacs/dictionary/Manifest b/app-xemacs/dictionary/Manifest
index a5bc16e974ac..cdad7f956c4b 100644
--- a/app-xemacs/dictionary/Manifest
+++ b/app-xemacs/dictionary/Manifest
@@ -1,3 +1,5 @@
 DIST dictionary-1.16-pkg.tar.gz 40085 BLAKE2B 413d5b82704eed5f96b99ffaedecdb149e8e562fa7e1a559cb396076d1ddae758fb634e00326f3f8682f7a1199905e3be7b0f271903f52faa532dbf31b8367fe SHA512 8dc0c0809d713f9eda280b110dbffa6f237c50ebb2e6c93f571efb3d22c1875ee5359fa91bc3faa58b3b0f431e75b84527262defb8aff5174a400be61f1a80dd
+DIST dictionary-1.18-pkg.tar.gz 40135 BLAKE2B 1fab7942a70e622613a5e126d2e48403d6b0d5594aca00e4cff9ac56db03aa2379a9742301a5a959e54ba8ca29780bd138d871577e31dc72805a6ccdabc4b44a SHA512 bdcdf63eb60dfe1a296b22b7493d842cbb3ae210dfc4cbcf7602fd00e7791736690961bb339293e1fdcee2bb527b87c003acd0dc640dce0c4dd5208c03fb1386
 EBUILD dictionary-1.16.ebuild 308 BLAKE2B 5552a050c03fd5b7d6ca8abda40d138604017a2da9147191003aaff3b30ac2e646615d53974388eefb854601575f53a79331f2e1c9d6bcddef1c9ccc3fa7d18d SHA512 08d737064247aa16149c95a719d75ccdbb249255cd57a464e3305e2ed1acb8dd31ae280d80264b7f16ec07a4783283885c7e201af558f61f08e26a17d72e39a0
+EBUILD dictionary-1.18.ebuild 314 BLAKE2B 2c372700fe42254ff23168139cfb04754b894251ff46dc585215ec07e3e1da669262c4f1fc42ee857269fa63d21af9626af6aefd6b148fdead9c805212251c08 SHA512 fc7e6d7ab1bb2e7607acb02e810dcc1aeb443e175da6750f4d1ae3fa279ed1dc1e1c60baa396b94e426a5e78f8ea253e8b54fc46f711d7b552a27e647f9d5fbe
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/dictionary/dictionary-1.18.ebuild b/app-xemacs/dictionary/dictionary-1.18.ebuild
new file mode 100644
index 000000000000..ecf40359c239
--- /dev/null
+++ b/app-xemacs/dictionary/dictionary-1.18.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Interface to RFC2229 dictionary servers"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/dired/Manifest b/app-xemacs/dired/Manifest
index 1ea7278f7e20..585e60aea80e 100644
--- a/app-xemacs/dired/Manifest
+++ b/app-xemacs/dired/Manifest
@@ -1,7 +1,9 @@
 DIST dired-1.17-pkg.tar.gz 201027 BLAKE2B f5662499f2c374fe8fe8bbcf7b859e3d923576078b126012d5d2b9b8c4581df607df0e3a9b9244afe333652ce0c92051e939d029c74d168b7052fa11e7e9cbb8 SHA512 337e32734df33520d3bfb492f04c82430ca473da5d8f69ced98f7562260e40d1ff85739e905c05412d8ad8b0e175927e90304fb2c79b8670899173d8c0cc0472
 DIST dired-1.19-pkg.tar.gz 203355 BLAKE2B 9825024621fc488d8ba603bf430b5ab9457afecdf288b95bcafab5e04bbf0524b49d642371e82aa1cee9d551c70867ed93a721e6568598f0797a8e2d4ac800c3 SHA512 522d63a018f640cc1120dfe4bce8215649b745f8c692e0dd875f41b92ffb54cf22968983befb7a3e3dcede562c947aa92336c247522bd520b8fb5e53909f5d51
 DIST dired-1.20-pkg.tar.gz 203778 BLAKE2B 90fdcdfc6cc33e58745bf65eb226c52617cccc73a246bcc4e7bb5525cb625b40ca0cbfd2bef1a97e1b7176c21efa11a0c157103bed7a35417ba06af034b3db94 SHA512 889b922cc187689c67c3b6f98264780b4653fe2707730cfa9c32cf5e3d93a5c80c4599daabbe1273f25f32dfc4f487288cdcbc09b8d0ac8b58dc09efb18f689d
+DIST dired-1.22-pkg.tar.gz 203803 BLAKE2B 24a8980ecea5c3f1630f70cece6f84a25cf3949c04107a9dcd9fc045a0303f4664550f85c713653972cc135d81cb189d288249a2d00c9e00e043a68f6f2a11d5 SHA512 9a6e1e5cb4a219049386704b8cb45f533f0f1a300bfb1d9cdf13eca9b61cad64452306425b12acfc401b889570af1007b5fd0adcd6e71416718205321a9bb5e5
 EBUILD dired-1.17.ebuild 310 BLAKE2B 810c6bc627cbd3b2c412a49181e5b1d7645133b83e166830f96a9456d67cfffae4ebfecdf01e7fd87546d70d489d65546e3cd7c9b4bfb0c1f73eb9ed318e9679 SHA512 a53e403a8c7c9eddd7f47e8695d366080e24fca28b7bd7fe7287d6f15c3d5511d345837cf386f5dd5d6f65dbbf2b5a6291d377996a4af6f32fd4baf867bc4d29
 EBUILD dired-1.19.ebuild 316 BLAKE2B 92244d2f28d006695cab4528a4b683baf80832aa6bdee43a3328702302f36ca4b9afc91edd79243faabae57a54089116410abf23662ea40511e7f1fff68a3061 SHA512 44a64f869617cb770abd7a9dc6bb1b6edd878abb896932282ab2234f78a51b7ab10aff5e9f43984bd47d75ba38b632fcaf2101b8eb85165c616a7f2ba396eab7
 EBUILD dired-1.20.ebuild 310 BLAKE2B 810c6bc627cbd3b2c412a49181e5b1d7645133b83e166830f96a9456d67cfffae4ebfecdf01e7fd87546d70d489d65546e3cd7c9b4bfb0c1f73eb9ed318e9679 SHA512 a53e403a8c7c9eddd7f47e8695d366080e24fca28b7bd7fe7287d6f15c3d5511d345837cf386f5dd5d6f65dbbf2b5a6291d377996a4af6f32fd4baf867bc4d29
+EBUILD dired-1.22.ebuild 316 BLAKE2B b556f644b5025752c45daf07329249c314b0753ecd782251fb12abc3f3fcb52e195d7a3f5b28ed76194de4d2be56e39f8b06a01978fab49b41a5eebd8142c6bb SHA512 e4ae7b216758b1ee0023a2f576803e7b9da0680991ac3f83ffdd0f5a89b792f49e774606ba8cc83196e26e63bfaa45d95fb61df9dc981f53a46d98c67d7b4c85
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/dired/dired-1.22.ebuild b/app-xemacs/dired/dired-1.22.ebuild
new file mode 100644
index 000000000000..67bd009c27a1
--- /dev/null
+++ b/app-xemacs/dired/dired-1.22.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Manage file systems"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/prog-modes
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/docbookide/Manifest b/app-xemacs/docbookide/Manifest
index 010d70ebdafb..628bee10338f 100644
--- a/app-xemacs/docbookide/Manifest
+++ b/app-xemacs/docbookide/Manifest
@@ -1,3 +1,5 @@
 DIST docbookide-0.08-pkg.tar.gz 32061 BLAKE2B 051331b77ed2d68feaadd163134b7c39e1c57e87b3ff925ba2c2c353d470f94f575c4977ee18e84acf9e84de5440ebf32a31f507d99b110dbc1bf271069d1164 SHA512 a5de9193285bf185ab808c9aef3f483f81493a0f30327a923ed898700a5a7dcc489e4b6f9fc7767cadae481b62faa5f18e956955575543a037aba1a4059a42b0
+DIST docbookide-0.10-pkg.tar.gz 32361 BLAKE2B 88aa1d4cc69d632fa11f856a49b30e94decbe2b96c53312963b2b40fc965f45e40b0f3b550442ee51d90845d19eabb62aa47fa4b94a530498aa8470dc9deb9df SHA512 831bee6d1214b027ae4b6c95c5166af63181966d42487881986f8b66db125cc54d34770c2a1cfece630257645380a3f926f2d197f20f4c32c6d42fdf56081f88
 EBUILD docbookide-0.08.ebuild 337 BLAKE2B b8e9e3f4d2b49a5cae2bd38d6b7449ccdfcd6fb8efae5117961f513f507c9ac409414637aa1e6efda9dc0f9c5b0e8108bb52aaa4394b937fcd3ea2f07425bbd3 SHA512 ab270110ac5c740f24fec0657a54f6ef1002370a444d436fb7185396dfdea7ae7e929e3c6e57f606c21e98cf6d00b368ef63187a5f0dc0ef406179e05ea5445c
+EBUILD docbookide-0.10.ebuild 343 BLAKE2B 4983ac97b85a17adde1de098690d248ce61d78bcfdf41195d2eb0695e0c90b0c1bfa56fb1905ec8132193d9b589f9f7c4cf5301ae95f03ad1e881f9a434a0d65 SHA512 68bbb1dde66a73190eb4242c14f7afba97c4d65539956fab60298707b6c2312e8abef7e89e3a034adf3c15e37697b30219b98832d4ff575301990b821e055ea0
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/docbookide/docbookide-0.10.ebuild b/app-xemacs/docbookide/docbookide-0.10.ebuild
new file mode 100644
index 000000000000..31851168aff0
--- /dev/null
+++ b/app-xemacs/docbookide/docbookide-0.10.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="DocBook editing support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-ispell
+app-xemacs/mail-lib
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/easypg/Manifest b/app-xemacs/easypg/Manifest
index 05cc4f20bd08..2bea49af79d2 100644
--- a/app-xemacs/easypg/Manifest
+++ b/app-xemacs/easypg/Manifest
@@ -1,5 +1,7 @@
 DIST easypg-1.02-pkg.tar.gz 73462 BLAKE2B 050b064cf3b7618defbaf893babb5406f6715cb292aed99d9f54ae4e31a26f89a032a90aff0ffa313c7dd12d07e894ebc302fd311e5e5f3e7c49630285ff5fdf SHA512 ec73fbdec50a01788ca586212d4b71e2c744e3283117515a71f73c3bda82b26d86ef9be52c4f78efeb574635e0b84a87b763f09bb1ced956699d1d97fb294aee
 DIST easypg-1.03-pkg.tar.gz 78192 BLAKE2B 5369dbf4f5da0c25c9a2e451dd775a0dc4e6bb5fe077e35b98f655cd23174ec5fc3bcf5df397ad0e9fc5b5728b919da666e91397f0cf13c3a0d9788c580275af SHA512 62541d38a09bcd60232cd18c54ded710515a88c2aa7940d823f120fef1c5316afca746723fb7ac564fad7407365daa736d96afc9d228d74b5d9ff19c4121b506
+DIST easypg-1.05-pkg.tar.gz 78239 BLAKE2B 9ffa9b61b4089111d36119d0a011fbaf4b26c5715c383c65600499ca1d06f7f0030ee6d1fd4c746239757745058032aaad562bdeb5ac2ee0a8997ca4167e0f31 SHA512 be7f6770a6f343375ddc9aa54025985382ca41a598c935bceee6055d0bbddb7780f820e4124a5b634cb2c61585c6bcc4b9e3859a62a57f55538bc17c76a6e4ee
 EBUILD easypg-1.02.ebuild 308 BLAKE2B 37bc16f8b21c0c835269baccb6cf9b705111a27b5fd06c8b3133e34ca0351fee642df8001f619fd9370d1377afec87d86fdd50a4d91f7d4ab32bfbf6e5a32047 SHA512 a3cb0980b83c149a7abb9953e6c79cb815ba0d24e1a6e30183f30f7ed9a0d710e0a60daed9ce682acb3995c0f7cbdf6492abccc6c074dc624d259ccd2e41979d
 EBUILD easypg-1.03-r1.ebuild 333 BLAKE2B 7d63e60278a4231fe3d99c1f4c1181db5ca87311f7e23ff42c7337f49afa020a3832ab469c591a33d9a58572be74efce7b91d27d48b4d911b737fd73f36378d8 SHA512 86cb1e51e54120d923f1bf0c079cb07662b633e6bf8e492eb2f16f626bf63c7bf6b41bcfdb297c8aeaf142d7e01c41e7de857f6f4001c0a16d0819bc8f5acaf8
+EBUILD easypg-1.05.ebuild 339 BLAKE2B 836df61c5896c1c0351b9fecbe162de05c99f2f14ffdcf8c6419f46cb88e11269cdeb38ebf301ba2ea1a9c86b93c451e95421caf3c85536a39f76c2cd25ec485 SHA512 b280ade3b459fdce413943dc76fbaac365bf934780b827421b96ea6fec257d3df37334f86642dc804dd2048572daa00dcfa8803c1c78176c03e6ca8fe657ca66
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/easypg/easypg-1.05.ebuild b/app-xemacs/easypg/easypg-1.05.ebuild
new file mode 100644
index 000000000000..6152b39b75a2
--- /dev/null
+++ b/app-xemacs/easypg/easypg-1.05.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+XEMACS_PKG_CAT="standard"
+
+inherit xemacs-packages
+
+SLOT="0"
+DESCRIPTION="GnuPG interface for Emacs"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/dired
+app-xemacs/mail-lib
+"
diff --git a/app-xemacs/ecb/Manifest b/app-xemacs/ecb/Manifest
index 28ef20a5a542..bb087985de17 100644
--- a/app-xemacs/ecb/Manifest
+++ b/app-xemacs/ecb/Manifest
@@ -1,3 +1,5 @@
 DIST ecb-1.22-pkg.tar.gz 887270 BLAKE2B 3185c440a06e90f0bfdf2314a8689eb992f568109a98aedf95f65438fee40e2d665cf5b30a175bc6f0cb02591b80439db072fae452a707e93537c2a0b630e650 SHA512 13c1254cd39f346b9165ea9b0eb3195372da54a5d6afce83a86b2c6b2e7673b0d614526f14330a2483a6eed45ce04b8d72ad119e02db2d3aaeff0fd9fd234b41
+DIST ecb-1.25-pkg.tar.gz 872399 BLAKE2B 513181b108efa75b0d54ed2f568d586db6bd944a453ac2334a6b43ce83d8331b53dd34a68029869a1b7cc1e4f0218277c5966e8d49a4bd87a065719bc3dac58c SHA512 bfcb9e9d7fc55b9eb281f991ee57ef7059b7ecc6cf9b7a3c9693d40afbec36fc90789cfe2c3b007aab737db341154ac5cee73ea5056fc435ff6b0d86941ca8ba
 EBUILD ecb-1.22.ebuild 510 BLAKE2B c3a0acfa9a498f9fdc9273fc6af2335bd1b4fa5fa89a465cf4079d31ead20bcfd8c35853caae3b36db850aeca3084458d5275505287a30cac69716a1b007c922 SHA512 9fd65cd1eeda1e0679ab33ad540cfef18a728b1289642dc9311484942a363ad4cb9c700be0d13a9892aa9becd8368a706da9fa1df50175b43906a96abde36aeb
+EBUILD ecb-1.25.ebuild 560 BLAKE2B 44e2ff741df948d65af448690f86b30c18692384161187642320c6bcf7e0636107617d467592b888d25ffb1beb4d1f6eace654c474cb599bd0e4d8156a224c05 SHA512 ee667c91fd8f5c8614164a50980015ab1ba5ae394cbcaca5c6d0feaa958ad08acb26c1081c330b052e484b4913b5fb4dd7d055518304bc2ea4f37abf9f85cd5e
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ecb/ecb-1.25.ebuild b/app-xemacs/ecb/ecb-1.25.ebuild
new file mode 100644
index 000000000000..5e84aa1ffadf
--- /dev/null
+++ b/app-xemacs/ecb/ecb-1.25.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Emacs source code browser"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/semantic
+app-xemacs/cedet-common
+app-xemacs/eieio
+app-xemacs/fsf-compat
+app-xemacs/edit-utils
+app-xemacs/jde
+app-xemacs/mail-lib
+app-xemacs/eshell
+app-xemacs/ediff
+app-xemacs/xemacs-devel
+app-xemacs/speedbar
+app-xemacs/c-support
+app-xemacs/os-utils
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ecrypto/Manifest b/app-xemacs/ecrypto/Manifest
index 9170568b5a8a..4ecc063e8b80 100644
--- a/app-xemacs/ecrypto/Manifest
+++ b/app-xemacs/ecrypto/Manifest
@@ -1,5 +1,7 @@
 DIST ecrypto-0.20-pkg.tar.gz 76257 BLAKE2B f9ae37e7addb3670a162ac36750def814121da60864372ab1f75ceacd7133e7071d94962b41a103a27edd081d0f093859eb2db6f6a84f3dcb9517e12af37fe1e SHA512 bacf0b8e5ee3c11aed744a9e7a3b33a7e4d10aa698b43b95226cc476db0daaa821b1d8e9fd64a487efc8a8c69b932c3112020815ca8abfaa7e5b08785d8b3e9b
 DIST ecrypto-0.21-pkg.tar.gz 76396 BLAKE2B b5f730a90370968ab5596a5b0ec8ee72ec93eb71f14df30161be19a9d0b2b8ca82195df462c80120aca3dc6189a1a2158b724eae7ac21c47c88332db79c4f9bb SHA512 b5d74079d940753a809ac294f466ee93244f5c96a79d9af26a45d005ed9b2b4ccb2459baeb63430b8e3dab44db31ea845ec8c64c8d57482e382955b793510e67
+DIST ecrypto-0.23-pkg.tar.gz 76345 BLAKE2B c6d28f0d9b7b733fd5a976ebb14cfc846ed8bbe563d75f75103c0f05ae8b6830927d8cdef6c7f225d37fbf536687c54a0dfece04796714c39ee488fc5397bce9 SHA512 a273f687eb89360c521d478fc6f1d7bfde0bb0537c95eb05d5ffde2a20024e99cdd44ab8ec253093ab941322c1c7574bef474e8659d94c480079e3f58cdbdcbe
 EBUILD ecrypto-0.20.ebuild 303 BLAKE2B 1bb6a31fc02fd4b846009e4df9c00c3d2d7a9436dbbada3ec210dbada7de27510ce3c38138d488943c241f09771e8caeed6f1a4976c6b29d1f7be689ab07da42 SHA512 4d7ca5139b9dddb25f809c2ca54fca91f65574b2e9e722a8544bf2d5ee916c62ea54e9fd9340d39f6e3ce73a02cd281690dfa402693ee48e50f51383aa82cf50
 EBUILD ecrypto-0.21.ebuild 303 BLAKE2B 1bb6a31fc02fd4b846009e4df9c00c3d2d7a9436dbbada3ec210dbada7de27510ce3c38138d488943c241f09771e8caeed6f1a4976c6b29d1f7be689ab07da42 SHA512 4d7ca5139b9dddb25f809c2ca54fca91f65574b2e9e722a8544bf2d5ee916c62ea54e9fd9340d39f6e3ce73a02cd281690dfa402693ee48e50f51383aa82cf50
+EBUILD ecrypto-0.23.ebuild 309 BLAKE2B 34a6bde22cc0a0a07fe0dad0765e5fa34c64f05594a28e303b37fdc5f0793c89e482bad84187394c3a2febd46f0d3e65567947540c4a165543fffaa887e30848 SHA512 ec9d00f63c553b8ddd1bf66a96bf38bcfd399f31a828f0450477da566a311362c000b85cada7273c29064e4cf9af3d1e13cfe7b6b6c0aa4795ad5c22ea7462b0
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ecrypto/ecrypto-0.23.ebuild b/app-xemacs/ecrypto/ecrypto-0.23.ebuild
new file mode 100644
index 000000000000..dad8da2a7467
--- /dev/null
+++ b/app-xemacs/ecrypto/ecrypto-0.23.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Crypto functionality in Emacs Lisp"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ede/Manifest b/app-xemacs/ede/Manifest
index 2adf653a9188..f418d8b4e08e 100644
--- a/app-xemacs/ede/Manifest
+++ b/app-xemacs/ede/Manifest
@@ -1,3 +1,5 @@
 DIST ede-1.03-pkg.tar.gz 124600 BLAKE2B bcd1bdc260b401c2eac620e176d54707ea8ec014205d9d04e9f207629b4c22e311db1215450c2e9f66e6f7ebbd742c1bfe51bd1ccf0412fcfcb37cad7b865035 SHA512 9ac35acf8df8fd6b649720602772404a808556b105dc438bbc495af3ce3323afd0c3ebd05cec4ee5b12199342d836fcc6873146cf06525e12de8277248968de2
+DIST ede-1.07-pkg.tar.gz 126684 BLAKE2B a32e7d043c20e2beae05c9494f855163586f0aa85362dde5287dc9e5433e4241a5bdf57d411eed2016c46a7403c4fa1a03b41e9abb8441fe7c4dcd37f860a0a9 SHA512 e4e9be6c93ff31e8be63d7c5b4f091f6108746b993905d4b2bfe93a957099dbc0ee27651a403aaa7ac07d4e3f66eee40dbce96668a8e00873911c2cd133fa2c0
 EBUILD ede-1.03-r1.ebuild 265 BLAKE2B cf67717e68b750aa98140631e314272db29e45fb68cfde0dcf6538cedd46861c44de5f2f7359cb1fac3a78fc96063d43d0d5169868b5056db087c412d2fec3a0 SHA512 bd219459daab5dc639f9f0684d38d60e243f6262bdca1002ad6b77cf60bd93e2d3966a48ac5f011346913ae7d47ecdc2be58251bf6157909afbb0d902515df00
+EBUILD ede-1.07.ebuild 271 BLAKE2B 7a6c02adc72fd33e49ad88161d4fe84b53331d81c6d7cf94d2840955c60eb5f3d8b640469261240ba529f5057f4cfc38e1ffac21e09640c434930ab54713fd7a SHA512 2abb2b41d0c009e0f168babf2242b55e1a270629db84c7a8b903a7eef46fd14aa20b4f8d3d1e798163385778e9e5e969aea7b300956a9d2116f7278e4e965159
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ede/ede-1.07.ebuild b/app-xemacs/ede/ede-1.07.ebuild
new file mode 100644
index 000000000000..788c976536a7
--- /dev/null
+++ b/app-xemacs/ede/ede-1.07.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+XEMACS_PKG_CAT="standard"
+
+inherit xemacs-packages
+
+SLOT="0"
+DESCRIPTION="Emacs Development Environment"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-xemacs/edebug/Manifest b/app-xemacs/edebug/Manifest
index c2de1c2e6a00..66fdb13705ca 100644
--- a/app-xemacs/edebug/Manifest
+++ b/app-xemacs/edebug/Manifest
@@ -1,3 +1,5 @@
 DIST edebug-1.22-pkg.tar.gz 115557 BLAKE2B ce828bf916a02d15a699cbf0e1da97b3f2492595685bcd40c038dfdb3de2bc93cb1ef62a1ba280642384363a8c7fc7a23aa35073036d7e13aaa43597015a94e3 SHA512 5f4d86d770d68ab2199cb781da4f3b67dbda979396349212d851890bd257a85195fc5a8e0fa4ab337335887b3c2ff27e46002758926828093b6dce25f8796ada
+DIST edebug-1.24-pkg.tar.gz 115557 BLAKE2B 8112dcaf87747389c8311cbc47416b84eecda1b3393964444e342d97ec3ac3dd27330c16334c5ef435a314343a993c42892f50631149621cb94bcf2c2ce332cb SHA512 6af78de22e6ab18cf84602c4f19e0c6c8e91bf996e7c9faf97470246ec25df203cccff43b4172689ab1bfc3a7fd888f06e5306f6f5d3118d2cbfe453efa37b22
 EBUILD edebug-1.22.ebuild 315 BLAKE2B a0be97e8648ef463df346b2a4c0c256d07f58c766e326f7005e76b427fd2fd225f3a7b1ae912186ef0c7b0aca9752f600da9bafe04d844790a29b17e0d0d1d18 SHA512 634585da96e8e8e248aa3da87dcb0e27118bec28631e358e1bcd59b579a77b27517abf4c01a94f9f5a4de8e8d3bd0430243e100dcd9778f9e8bac9a135a13253
+EBUILD edebug-1.24.ebuild 321 BLAKE2B 66ca3aa030241ffe8ff69e903ecc300e044fc25f07fe321444bbf0a1270fb6bb3d0da80611f2dfe77a2706eb03ec70572b6d6ad9aff57f4cbb9ca99b5f7fa5d3 SHA512 4334bfa6ead46ae3380ca532ed2caac05454c6ad3df0f353b134afc31baa720da47026f058a333714bbc5129114e3b0b5bfca4b91775af777fbfc0ca3c59daf4
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/edebug/edebug-1.24.ebuild b/app-xemacs/edebug/edebug-1.24.ebuild
new file mode 100644
index 000000000000..b883c38a5fa4
--- /dev/null
+++ b/app-xemacs/edebug/edebug-1.24.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="An Emacs Lisp debugger"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/edict/Manifest b/app-xemacs/edict/Manifest
index fb70f09075b0..775ce49fba93 100644
--- a/app-xemacs/edict/Manifest
+++ b/app-xemacs/edict/Manifest
@@ -1,5 +1,7 @@
 DIST edict-1.16-pkg.tar.gz 96111 BLAKE2B 60d0a990e8c2938205cdca4159f0d77360bb864b7ee66ac11b8f5714aa7cab1c2baf23fbcd891a2e0151be221efd9e46754e6ce651b2b4db2172a8835d7bbc46 SHA512 702d8d454310aaeb0804a96ed5f90c34eb2eeb72c598504404e257640a6cc153e5603cd7d8d1233b152e828fa44ec6919c7e0f9a9870a303b837db6dd5e0632c
 DIST edict-1.17-pkg.tar.gz 96241 BLAKE2B 7f353921e15a4334d5ba62048ed755b35e492536e43009c07d52acbb6a81ae92bc2190e3e8c033e1b9ad7cb685b2c673097ebe17c1eceab3d74fff4c9d82b44f SHA512 df70e1c128fd5d70ce9b5a927e25d3787b6f7e9bf7683c2da98e7a428d8bedbf2da9f1b26f7db41e94857cb30eed43e01eb9073b85a70650cabeea706599449c
+DIST edict-1.19-pkg.tar.gz 96228 BLAKE2B 32654036721787e8f3617303b61b26532d2e2ef56861c6d97e7f25a28953f95c275edb6c8778263a3209a22ebd2b22fed333740feaaa101169fba915a35f8e8d SHA512 2ce2028108a4d8923b3d9d82b8afffb228d103bab2d21c8a18649861a8e2281d3e68dda7990ac2d28d31171426344a0d7ab3a329f6f9d4a71b0300d368c4d36f
 EBUILD edict-1.16.ebuild 333 BLAKE2B 301fa1a83f3971b1cb8f33fce17ea6af0460e3f8f8a187646f558ad1c57d09e6ea5fa849bbe40862bb2e46b243b58c9bb75c4a7dd79e3455c17874055b7ce8ae SHA512 6e9b305a54d92abb478cd03a35540a3f4e61131cd1158b65e35cdcdb3d91ee80482fc71f218fcb84bab798b30a6bf45b65f1dbe927c80c872795a1b8e5933a2a
 EBUILD edict-1.17.ebuild 333 BLAKE2B 301fa1a83f3971b1cb8f33fce17ea6af0460e3f8f8a187646f558ad1c57d09e6ea5fa849bbe40862bb2e46b243b58c9bb75c4a7dd79e3455c17874055b7ce8ae SHA512 6e9b305a54d92abb478cd03a35540a3f4e61131cd1158b65e35cdcdb3d91ee80482fc71f218fcb84bab798b30a6bf45b65f1dbe927c80c872795a1b8e5933a2a
+EBUILD edict-1.19.ebuild 339 BLAKE2B 7dc17b1aa1777b469e31d6711f701f7c0932e053132bf93423396c700978f1419437028e9a8af5fc39fde5d78201187be5dd6471bd8cb26c80971b3d37a06b3e SHA512 f3c85d28d81d79d0535d95931c2ef520a5c7ccadf5ec27adffcbe84e9f64e53ce06299cd597f0f451b491a11576317c5051c4c065acfcbc27e03c25779362975
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/edict/edict-1.19.ebuild b/app-xemacs/edict/edict-1.19.ebuild
new file mode 100644
index 000000000000..f229ae52e0f8
--- /dev/null
+++ b/app-xemacs/edict/edict-1.19.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Lisp Interface to EDICT, Kanji Dictionary"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/mule-base
+app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ediff/Manifest b/app-xemacs/ediff/Manifest
index e18d082ec939..80d89ebcc5f7 100644
--- a/app-xemacs/ediff/Manifest
+++ b/app-xemacs/ediff/Manifest
@@ -1,7 +1,9 @@
 DIST ediff-1.68-pkg.tar.gz 317183 BLAKE2B 56610f91e61cf4cfba0c7ad444d06a929ddfb6fc65e41bc8dce57ba354e1e6d5b99c5cea0121d11c32d4f277b7f8303026522b0423669d2e77126905b8d61a0b SHA512 adf3fc6fb0692022d4f44e9b966d076574dc12025b3f90bfb7f7bab6f3735d39c993757619d09a19479afdb73554cf484aae457f1184a8bf5bf831923c4ac6bb
 DIST ediff-1.77-pkg.tar.gz 317283 BLAKE2B 1f0fb3206ef6b05cc56ae9512ba7a3f9368952b898e6e324e7b73f748c91de3ec7ed0d7c34dd4961ba9c2d86b988e75065d0578f0777bba602e7693983829e20 SHA512 5f1ba2019dfa762382639516eabcfd81da14dcbb35df77c82f24ae3250d003fb4c596d529c6897b7502ee227a67be85da8d01d4d3109d9f28ef6558f0ebc78d2
 DIST ediff-1.81-pkg.tar.gz 321669 BLAKE2B b4d28035fc6ed786053c04f759524f538e1e61c18df6db1d9e844e8f5718c228cd4c3e8d62f0ba3ef112b6e7bd85c02727a4404fb067fca0135784b963323e20 SHA512 1535f39a6af02e488f756303223cb116687c28d635f761f8456a439c576bf6691119d29e5fa2c7fca2e2a578faa4d09bac34145a8ca92116aca14e7ea93d694f
+DIST ediff-1.84-pkg.tar.gz 321644 BLAKE2B 8d328b8d85103c6485af311b93265c0c48336f6c587a287312d654c57e97b80924b342e5fbab72a7ce23ea08461361ddb81ae4b9120c6e18f45c5e4f8f05e72d SHA512 e3655de8af7bfa44193ca2d168804ad047de686df5b46e8bdf521df69e38e6f9818415b7b031e8379ab2579276bd114920c1e7796f6a98f9808099a56a5c5913
 EBUILD ediff-1.68.ebuild 385 BLAKE2B a998fe0983e857e0f1fbd201256f9e63de9598e6e395ea3b92d1562fa1203f7f0e0502bef66a3e87c83dc23278c3faeb719af38ba486d38a775f615d4ce5e1b8 SHA512 597a0fa865c3b9839a312f1d2f4408acb9a5a4934fc22705a66f0d80a4a0e4c7bbd9661f997e09e7a9ede77aad96879efd2fc17092bd657c6470752148b5cf0e
 EBUILD ediff-1.77.ebuild 438 BLAKE2B 3c83c1884e1f6aa76fdb6dc5560fef1f9f0edd923981ab5e5fbe2be61388da3f7334b204adaf6e7a7f8f77ee67d1ac546fd89543cc86f9b20711eeff317b36f4 SHA512 51fbeca99179ded5f0ddb65d892a123e1f484d7198d75025e0d287aa8f3049737e05bd2a5286ad87631db771baa5151ccf38879f4c8174b36fd4cab0bc836b1f
 EBUILD ediff-1.81.ebuild 432 BLAKE2B 6ad5637e1cc80d5582b24abe17ee0618942aebdcc130970bf476b781c2420c78e9928ac2f1494ded56bf46b60b3a6ea56017b3d9f39cf9c5013e02119489d4bb SHA512 8c809b38b935fe38076c8aabe089b4a712705a1538f7519662dd0a159f862f9df10e57b143da39beddc00a4b8058dadb4760a23e571d2bfc674a1c6f04af1648
+EBUILD ediff-1.84.ebuild 459 BLAKE2B 2e0db108ecc3e4484e9abdd7d29af2f68b63bb73fc111deba4afecddbf21065ad3c084adae194f80987eb1a628000fd441b2110f8c72a36f45ad841e01aa80ea SHA512 cfe6aea9214e7c3971fdfec12874ee3316c0fb285599b30ed15036833938a6c279a7723d2c7762041c0d8aaa984780bc96f7612e73aa4b4bf5f41b4a92da8481
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ediff/ediff-1.84.ebuild b/app-xemacs/ediff/ediff-1.84.ebuild
new file mode 100644
index 000000000000..ffdec34fe923
--- /dev/null
+++ b/app-xemacs/ediff/ediff-1.84.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Interface over GNU patch"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/pcl-cvs
+app-xemacs/elib
+app-xemacs/dired
+app-xemacs/xemacs-base
+app-xemacs/edebug
+app-xemacs/prog-modes
+app-xemacs/gnus
+app-xemacs/tramp
+app-xemacs/vc
+app-xemacs/sh-script
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/edit-utils/Manifest b/app-xemacs/edit-utils/Manifest
index eae81bcc436f..1136bef709fa 100644
--- a/app-xemacs/edit-utils/Manifest
+++ b/app-xemacs/edit-utils/Manifest
@@ -1,7 +1,9 @@
 DIST edit-utils-2.39-pkg.tar.gz 962340 BLAKE2B 58fd356da23467c29976f39642d5aeac0898418deb60edc909b79d76e0e196bdf3757a672a12bebfd258014c495a8c43cc177dc00b5da5877905fe991814c41e SHA512 dcd6634ec0eb9cb71336ac445fa063a3fabf34d5bfe47f417c00b111a82c42f10679ab6512e1bfcb80596cacb532fa14cb3f5675fb36a5e6258696bb7491fb51
 DIST edit-utils-2.43-pkg.tar.gz 958798 BLAKE2B 276bc16f5e7dbf29fcc78ed05da80976262dd48b1a088e8070192dd414240389da08a737dc6fb8c8459552d9c5ae491e248196ba8e7bf30d49cd7c74d0070cae SHA512 e42e416002f0f0c580f241ce4753c3868494025b4bfd087f5654e3c238a4b5c99d56f01db6b0fa47d1142085d5b4183625248266d76381387030a89e47a9e68f
 DIST edit-utils-2.44-pkg.tar.gz 958866 BLAKE2B 826d508304a2b08b76b7f358e7629184ef5d441d5a728e4943158b6e5c37cd128a5353f4b760a1a460f7f6487b51f10882462859388618587a984b298dc92b98 SHA512 fcb37c24304756e83cd273497cedf671e62ddce78f7bc460052cd3725948e35d87ce9d3108938483cd2ab8fb2d663ffb1df033b47b6e4b7e73f3a71d6d0ae886
+DIST edit-utils-2.58-pkg.tar.gz 1159051 BLAKE2B 4eb07e163863724431e2b2692014db84b0aa3926f1a40e3ef958285f692107fc00c132b30e6b74bd68fd90e916d1602dbc98b29c13d3c1e59e2f4f58b387c3a9 SHA512 42fa35bf31a0941186ceeb89afd138604cfc9903ad2feeaa7623e8d2343660368cb57b8aaaa9104182eb314a3641b0a7a9f8ee8fa525cff88a6b071c96820b5d
 EBUILD edit-utils-2.39.ebuild 407 BLAKE2B aedfec505d2c7e91591c2a83a9b0f1b997ffb3dee4336b5b9d21f22f003c14ec2e0ea537bf49353518b27daa7313739730ee8484b4c1a865ee2efe0283a5a792 SHA512 4f9a5e69aadf5b843a2aac32ac472d716d7b6a1d009e5a07deec5a25330950798dafe9a5e53baadb4655f7cd0fabed1b581059d9607798daf96e9778a29fc541
 EBUILD edit-utils-2.43.ebuild 407 BLAKE2B aedfec505d2c7e91591c2a83a9b0f1b997ffb3dee4336b5b9d21f22f003c14ec2e0ea537bf49353518b27daa7313739730ee8484b4c1a865ee2efe0283a5a792 SHA512 4f9a5e69aadf5b843a2aac32ac472d716d7b6a1d009e5a07deec5a25330950798dafe9a5e53baadb4655f7cd0fabed1b581059d9607798daf96e9778a29fc541
 EBUILD edit-utils-2.44.ebuild 441 BLAKE2B 80e3e76d4377de7a1fcc9feb131c8c1b747c8821dad6f3677b031df875251ccc19429e77ab4cc897f9c7c0ca47f8369f80483d26893509ae5c0f71f9e8364e7f SHA512 b0e5deb82a3725758175ef0348229d59a9e647a6efd40dbf689baa842aedb9f3521cd6ca18b013ceade9f709e65abf826abe9c7e322b8ca7aad40a10c79a5b1a
+EBUILD edit-utils-2.58.ebuild 413 BLAKE2B 77f8d5efa9f35578a933d8527351ed3997ea71a8e15cd61deeefd47cee326d818a95a7bba9545d6c1a4c8b2dda9c1ca8404e6d4e9105f6da33be50119d8a36b5 SHA512 a34408243ce4dbdd23ab880af8777db453f1cc3674a62de76faba30f3d5873e85017a558fdedd5311ad5a65ff5ec5fee06d1e6547c7a8ed470ab1fcedf96dddc
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/edit-utils/edit-utils-2.58.ebuild b/app-xemacs/edit-utils/edit-utils-2.58.ebuild
new file mode 100644
index 000000000000..efcece0b1fc3
--- /dev/null
+++ b/app-xemacs/edit-utils/edit-utils-2.58.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Miscellaneous editor extensions, you probably need this"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+app-xemacs/fsf-compat
+app-xemacs/dired
+app-xemacs/mail-lib
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/edt/Manifest b/app-xemacs/edt/Manifest
index 05c36944f28b..a6eb86dec3fb 100644
--- a/app-xemacs/edt/Manifest
+++ b/app-xemacs/edt/Manifest
@@ -1,5 +1,7 @@
 DIST edt-1.13-pkg.tar.gz 62754 BLAKE2B f327f44febb3fcca7a79771126ff85716464ce23739b2caf49a95047f2244da706576f80e5ea58125f0c7cd4723262b6d759c77c66581d3393f56f1950465544 SHA512 8371dd96b6996d1257c769be4fcc77ae386d187bfb51ccd03c57e09b12a2b193c575f15b8fce29380a59f795adaf02a3528fa80f3b24536c349fc10ab54f808a
 DIST edt-1.14-pkg.tar.gz 62824 BLAKE2B 9ab1cc9e55364b901ee51d16b97ea8a72a935e10d2aec5ef4f1757954a5f3e0c36132686225bb64e47227e2c83171632b004621f14b1508a9bfc07c8ad4cfc04 SHA512 8179652766eeffdd12b673e453f4dbe0117bc8f2ad743943c5f613dd217c80d3433b7cbe3a2d8b55604eaff489416edc5afd3e5bafafcec8782dd471688555c2
+DIST edt-1.16-pkg.tar.gz 62865 BLAKE2B 22f62a7ab87a723339693fcd6351263b1347b464db1f2f15ad79543505faf837154d95efa03f9401a03d7838452cab72484251c80a517cb3337ea8e3bf2f595b SHA512 46a0452b11119d926a3d612acdbefec37731ac60a86b207e125c7ca6dcd962b419173d4a5cb96117a8f0afb29b9c8173a5bbdc69e8d8ae09276829a6dc44c931
 EBUILD edt-1.13.ebuild 291 BLAKE2B ab72441b0d2df38f5d9f0e01746eb1763b45467a2abb31b79940d51897423ba8fcc14917464dc6df765b56722446dd15d8b040288490ddb56f13ba480b951072 SHA512 cc3e85fa76a2a37c1d49c042cf364cfbfa32a642693e4e2f41c40ede0e9656cfbb08785a4d2d68b31fa1e9cae93cb491b1dff2d4c3e8a7f8a1f7be53828922d4
 EBUILD edt-1.14.ebuild 291 BLAKE2B ab72441b0d2df38f5d9f0e01746eb1763b45467a2abb31b79940d51897423ba8fcc14917464dc6df765b56722446dd15d8b040288490ddb56f13ba480b951072 SHA512 cc3e85fa76a2a37c1d49c042cf364cfbfa32a642693e4e2f41c40ede0e9656cfbb08785a4d2d68b31fa1e9cae93cb491b1dff2d4c3e8a7f8a1f7be53828922d4
+EBUILD edt-1.16.ebuild 297 BLAKE2B f5b70476abd86496f696d7ac8e4c3b3767c8b90104d8da2987caabf9f8f71804969aa29721fecb69321b5ac8fa14ce53512d5e26290b65acaf18ebc76917b5cb SHA512 bd6f7b31452d1380d31a63e04f3c37347c82d26d9fc55a3bff4ac747da685b81a16c16dd900b89a44c4a8251fa4ecd4d0ec5ddee8b525d88bfca5a3fb199f06a
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/edt/edt-1.16.ebuild b/app-xemacs/edt/edt-1.16.ebuild
new file mode 100644
index 000000000000..1951947dcd69
--- /dev/null
+++ b/app-xemacs/edt/edt-1.16.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="DEC EDIT/EDT emulation"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/efs/Manifest b/app-xemacs/efs/Manifest
index ad21d4467218..ce56c590da91 100644
--- a/app-xemacs/efs/Manifest
+++ b/app-xemacs/efs/Manifest
@@ -1,5 +1,7 @@
 DIST efs-1.33-pkg.tar.gz 375842 BLAKE2B 61e7751d5571a57ed0781773a6f26d476cc63a86a82ff9f381f4221e82c6731287c138e66326cb7881fab5656e04be1cb5de4f2a0fe09cb71cc82526c390efb0 SHA512 d588b8885ec659a78b4b64dadf10e75d08766e1cdfbd03dda9fc822081552dd8f27ed77dbff6be28a8f52fcb6f6747d27b7dea5ed3c7defd704639d49d7d4ae1
 DIST efs-1.34-pkg.tar.gz 376920 BLAKE2B c441fb03cebb97f845d3767001312a99d505c3fb7af4ae7d1902a67ba27633f18952136fdcfda442608034bc843a0a1754d3db829da967aa816a484f21a2f67e SHA512 44550090f4b122d995c10fa4e82972adeb4261bb27a431f7ac40a61773252fff1024a0f6a480cc7f35705aaa90781aed8473b96b5468d0ed18d2f5b3f59cb9fd
+DIST efs-1.37-pkg.tar.gz 377188 BLAKE2B 88c4d38e174cb1afe56db3148348e3b33a985692160e28ffa1db39b7da521ee2057bb709608c8c692c512b9acc9663bcf13105cc5e7ed531c4f9d5dedbad1873 SHA512 f66dce45470654dc4d47fecec10648db2e2940972f4f03540e4006e585f88379da90b6ef3fd6ecbff6517226b596520e129389a06df42a4bffb1b0b2d01b3676
 EBUILD efs-1.33.ebuild 339 BLAKE2B 72c5fa6594de3a7d8e9c4fa08b6cc990a44ad800b30701c712664747e8ea7682be7a56758e867cf9208d00d396b704272e1c85fec88e7bf3bc8b788a035524e9 SHA512 ee1fc143c69873f6a42f212ef5175f3f7deed704d335bba06e47a623663bf77e790e4f75628b8f0d98d954f70f0c11a750e2b4f416719210423260a93c52c3d5
 EBUILD efs-1.34.ebuild 339 BLAKE2B 72c5fa6594de3a7d8e9c4fa08b6cc990a44ad800b30701c712664747e8ea7682be7a56758e867cf9208d00d396b704272e1c85fec88e7bf3bc8b788a035524e9 SHA512 ee1fc143c69873f6a42f212ef5175f3f7deed704d335bba06e47a623663bf77e790e4f75628b8f0d98d954f70f0c11a750e2b4f416719210423260a93c52c3d5
+EBUILD efs-1.37.ebuild 345 BLAKE2B 3a568225a21c1e38943d1bfbee9fe7134d38f7f0990815014d5006c70a30fa27aae20532ff2d642223b1bf476a9eb4f542684b5ed2a077c7a8b895e1a6d1df69 SHA512 945c846836b1a5a55e8c2b7c039b1610484a6798119b3f3b23f1e64cd9264aef5fbd79d326998268416b76a5360dab4e3e788cb17b5f8098e279c8dbdeb2d4ca
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/efs/efs-1.37.ebuild b/app-xemacs/efs/efs-1.37.ebuild
new file mode 100644
index 000000000000..85118905d8af
--- /dev/null
+++ b/app-xemacs/efs/efs-1.37.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Treat files on remote systems the same as local files"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/dired
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/egg-its/Manifest b/app-xemacs/egg-its/Manifest
index ec06ad2d6d3a..1a604659d8cd 100644
--- a/app-xemacs/egg-its/Manifest
+++ b/app-xemacs/egg-its/Manifest
@@ -1,3 +1,5 @@
 DIST egg-its-1.27-pkg.tar.gz 261339 BLAKE2B 8e0fb9cf66d373ccdee6d54c0eb0d996d5ebc03a5d85e1ae8c43b66ae53b7a9ee97a90526b70d52232397ef2982baefc3d4bb327bdebe60aa79bb77ffe4a785a SHA512 f5a2a9412175cc4a825de907f566df0228a1838b082a20f9f11164fb76b7f87db2f4f4e337a8d58f7e0479ffb498c32ac0a7413a70f047a10ecc631edebd4ded
+DIST egg-its-1.29-pkg.tar.gz 261073 BLAKE2B cc5c515f4ae3918954ad4fedb21b5262b29fe3cbfcb43faabbefb7882f16583b53b8a68cc943af77471fc4431898db6de1dd38f1146150050f5d422308ef241f SHA512 9457e69c652f13309616ffaa97bfbe64bb0699c958442a0b0bd5f9f215951688a77d7d689567b1fb09d74229460c2a7687b661bcd21a68646a01283929ef764f
 EBUILD egg-its-1.27.ebuild 367 BLAKE2B 81b1e1de789b402d9544ac847d41e2113093d0d99eef4eb3bd518cc433175fca8624032c0c4de64ca900161e6634a305fc79a6a427d7cc0847864d2ccc654412 SHA512 d91736ff1edda687e5e810b80b54157e7dcc2bdb4d2259a921acbe0e0c22cc349882012bfa43abbcae830fdbca4039560bc73317959d17c046d03cf7e23ff983
+EBUILD egg-its-1.29.ebuild 373 BLAKE2B 1b8bb5918ae7afaa3b4c2396d306b0b03f1ce2697e60493d11c8277b501fc9f1a45e7daa144f4f25afb1081520834fee15eff872435287076ca41bab41edf95e SHA512 9e4d28d5d39d7b7fc1faae9fc17c4fca39a4f1c8f44bae0fe81cf8e1fdc7a4c05c06aaf4e4f8c8a23be5a5c5ad589e95357d64041bd7ecf1959adc1816c7448d
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/egg-its/egg-its-1.29.ebuild b/app-xemacs/egg-its/egg-its-1.29.ebuild
new file mode 100644
index 000000000000..e6d72a6e844b
--- /dev/null
+++ b/app-xemacs/egg-its/egg-its-1.29.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Wnn (4.2 and 6) support.  SJ3 support"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/leim
+app-xemacs/mule-base
+app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/eieio/Manifest b/app-xemacs/eieio/Manifest
index aae47e00480e..e7cdf3322b5d 100644
--- a/app-xemacs/eieio/Manifest
+++ b/app-xemacs/eieio/Manifest
@@ -1,5 +1,7 @@
 DIST eieio-1.05-pkg.tar.gz 165803 BLAKE2B 92425dbaf275be435acc9d51f1ab5fad0a771d8205b11881229a244372059f71a8fa5c2d485c9cdc5208a21a4b54acd03f41e39847c4901bde81bb42b30bb2a5 SHA512 7caa2cff977f850e4b59b00a2c34252bb235d901e4605092181aebac7690eb996b2bce7bb9262a9ec4c6aa691e89046cb723b8f0cd643f5b9b6cb5af51385497
 DIST eieio-1.07-pkg.tar.gz 177923 BLAKE2B efc84c48fac4bd76ca4c843a4bff97dc10f21f45be9067c54c871a64314c9012b80e8d5e292f8844e1b7c3ed86a3f8044dfa547109c09891a3aeb11d515b7b0d SHA512 e4c76aa617bf80ca3fa7de249535ba63b22c3c8d787361dfce9381f4cb31500cb8f40e564c70928ee99492a0b71a67a13dd90e9626335b18b2a49877a124a551
+DIST eieio-1.10-pkg.tar.gz 179945 BLAKE2B 5bca0fb3ac1a94adc73dc7d0233645308aee5bd12923cb390c648a1334cb2b69488b8593781936ccea8719dc1e9a53526b1b348e1b9ca42681531f409029a48c SHA512 deb5de328e40a7c2fed189c89a3e3ab5cd5a26cd7243398c34bf2ed6bc1ebe7e72ecc23a2aef9d967a2477ecc4c797486e477a50e1cc78cd506c1e3170a85512
 EBUILD eieio-1.05.ebuild 359 BLAKE2B f729edffdcc0e421a9e41163f7b50d45ac4403ddd8422764a798d2adfdc4f190d517d455d53d0896cc1a638b196424d5f7dd388b4585ea3d944a550104d26c2f SHA512 82eca548ab6da03bd4c878d1838be7f743304d2e4f7a0753c8349ed0d62c6d789dda3e5ee04fdc55add8a8d5d5780357e9531d3ed1075ccc1147695b8f572897
 EBUILD eieio-1.07.ebuild 383 BLAKE2B b1ca1c4c03e64069624236871a2a92ab66a7d5dda5cb8da8db95f41c9f67b24e5fd812bf42631f4eab156f307a94a219883ca1a5ca6d625ed6b72a44dc19f069 SHA512 aeb650bc7784ca50eee5aa336e8a7c756823444734e6b835171752d2118054afcac403ee06d3520bc0eea9fbb6c154d2158b3db74438b0686a0369ab42c56484
+EBUILD eieio-1.10.ebuild 389 BLAKE2B 2d09d8427984950e237f9d489b21440d94491a337a15c779c4fae80269b409df2c6999763e8135049ee5729e275e6f8d04533c5c971f5089c70d1610fe627a08 SHA512 cde8899f7908fa94249ab7cabe83ba92250b68113f7bb736101a1898d4c806ddc40ba095042e72f7507b84ed2425d545126f3bc9e710adb6d683ec413133cdb1
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/eieio/eieio-1.10.ebuild b/app-xemacs/eieio/eieio-1.10.ebuild
new file mode 100644
index 000000000000..802f4d7753c9
--- /dev/null
+++ b/app-xemacs/eieio/eieio-1.10.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Enhanced Implementation of Emacs Interpreted Objects"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/edebug
+app-xemacs/cedet-common
+app-xemacs/speedbar
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/elib/Manifest b/app-xemacs/elib/Manifest
index 0a339e9c3cc2..41c586e42e1e 100644
--- a/app-xemacs/elib/Manifest
+++ b/app-xemacs/elib/Manifest
@@ -1,5 +1,7 @@
 DIST elib-1.11-pkg.tar.gz 73387 BLAKE2B 423476172a1a1ffe2731ca67fc24bec37a52de5387afc22c044aa90c40dbc0c2d4d858f57ccf2237274b7b3cc7b7b366bb44cd52c9c6f0d1264d1ad051a10be8 SHA512 0ed1b6bd47b13c69b5990e6e1ca8e203440e28527f860a70e22fe0da94811909bcddcf184cfc9a8016a2fe590cea5e3ceec270bfb33ff655b542a3c8c0ea8638
 DIST elib-1.13-pkg.tar.gz 80235 BLAKE2B b81ca5b529a808ee5a9c7f514cf53dfa1c5d5ad4531b3aef10706ba746b4ee4a3216460e006842f733bba073d1048d2d26c88643c1d3f9f5744924e66f84a9c4 SHA512 edffc77f9db1300693701df56fea7fa6e0fe3c4d11949bd8766faea21ccad79cb52b60f5c25e84350fa7f3cfc45820035b06f82890ea760dcb90e93a065feec9
+DIST elib-1.15-pkg.tar.gz 80288 BLAKE2B b336e467ef1b586bfcdec74f7c7766f16623ad223ced12c66b4a38282683e7a9ce7b8eb70b0b263be5e2cc42468c7cab622e8c2ce843680c28751c6202966e82 SHA512 16594062b094330a6cecfb9de8698c4f6608ed9276f8e4600658a9026ace1b3185fb9d23ec70fe4474093c8e95d67255d5a8741f0d84a906b415704e6fdc78ce
 EBUILD elib-1.11.ebuild 283 BLAKE2B a205ba055bbf7f1ad6dfc1823c1d741544be4c7ff625baba798f2fea584c8c85c12955aad5a52c95718ea196909662eea4092f523ec6341b9e87675e15393ea4 SHA512 d96460e055259058fd0a23bd4b376bb4893c72481816b94d7dc5f9fe0af93c5831ac0515e9ab4d2051e1de78ffa0419126f1d47f986566993db909491750d442
 EBUILD elib-1.13.ebuild 306 BLAKE2B 373ce3a3e0f5e3ec81fb8284846bcf76426e80d3d845dbb4bce43bccb1d825062f343a8c5c6937704a45171e34b9feada73c4ed4cfeab99b17aeebe4f41a99b8 SHA512 b50fce9a1fb7f93bd421f4ab471c75e7bc6d28ed2589832de7289a8a026ac8e52e198df61a9e71db0f7517a08823934e57a12008f4571e84a57a15bcab2cd68b
+EBUILD elib-1.15.ebuild 312 BLAKE2B 169535e62205e11d10933c5e704ec7c892b10b68148e8c19bcedd798d9bf9bd02f9dd4e4735e900574b27632025398df1ff9d8e930d1495d803bb471d0dff0e9 SHA512 abcd3867233ab9c5e73795d5ef0c6bd239460a03307951fb90c772bdc08a8a505fa4b6b5f6c16099a619b17a61a860a529c788027c874567325959505e666eea
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/elib/elib-1.15.ebuild b/app-xemacs/elib/elib-1.15.ebuild
new file mode 100644
index 000000000000..1bca6430fd89
--- /dev/null
+++ b/app-xemacs/elib/elib-1.15.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Portable Emacs Lisp utilities library"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/emerge/Manifest b/app-xemacs/emerge/Manifest
index ebe8a7c36693..6366e250ff95 100644
--- a/app-xemacs/emerge/Manifest
+++ b/app-xemacs/emerge/Manifest
@@ -1,3 +1,5 @@
 DIST emerge-1.11-pkg.tar.gz 61367 BLAKE2B 4b97e5118c34d89f7387e29c7e19337a0adc89c1588d35f338f910ea8d5f3003e358613850acf3124911e88aee31f387a7853ad51cf9a0f90d5b13608c81fcaa SHA512 c72569dc28b5db4c1e6b5b35107dcb4e1772de7a7b42898895c538f0ec127e28104b0ea0612d01138c1ff715285f06b9cd642609272ed40360f9b97e5e8dc784
+DIST emerge-1.13-pkg.tar.gz 61362 BLAKE2B 23269f38554fe99532389831ed3f9ad310ebe78d8edb3475096170a8062671e609bfe2ec45e2b27bf6f90d0e90db1592be360c4600828f3f2c8fb9e71d07769b SHA512 4fe0545d6bf67bdd7456e19fbaefb741c20a0119e1bf780e9d43163970c1d2d76ab0a79bdadf24b38643423773db89d37e6cdeb131fb96154ed5df91cc7e55d8
 EBUILD emerge-1.11.ebuild 267 BLAKE2B ba7597ef6e34d05c73157cf08dc17180e3983a65299474a736b64ea661d247a570243aa801484b65b5a1dff4dbeffe95890cc99a6e7eb447aed9b0342bc3cb58 SHA512 0dd6c2772e8523e1b192d7c978921636d2590160744a3297375402230aca5964983272558e140914b72769c6f903d1804dc9f0397eccf1d30208913f9a12a701
+EBUILD emerge-1.13.ebuild 273 BLAKE2B 6690eb587d540f67b8f3e20444b89caf87a3f5ea050cbe519ce79109b143c3a9ad28b57ef35304d611a4154d387654747c0e25e09533ce2eb637fbd1e2fcd2d6 SHA512 a8078286115762adc726ea093731bb61afadcc161f48954cf5e3614660724e0ae54bb6e0473c8d66220dce862935e32aa1ba66570d79091df4d285eeaf807a41
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/emerge/emerge-1.13.ebuild b/app-xemacs/emerge/emerge-1.13.ebuild
new file mode 100644
index 000000000000..53c954926833
--- /dev/null
+++ b/app-xemacs/emerge/emerge-1.13.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Another interface over GNU patch"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/erc/Manifest b/app-xemacs/erc/Manifest
index b952c70271fe..4aa768aa53b1 100644
--- a/app-xemacs/erc/Manifest
+++ b/app-xemacs/erc/Manifest
@@ -1,5 +1,7 @@
 DIST erc-0.21-pkg.tar.gz 516214 BLAKE2B f9f7811e9f73d895186e4c3bf6774db6304aba11af829886ccb4a7a4553a43e055baaf6ff830e757d75436cbbbdf1e1d341441d71cab4b75ca253481910390fe SHA512 5743fe1840a1e42700aa3fe41292b29a31f93e7ba7956ec80eda6df0c4d4300da268ccc692fe48b24dc59a60234e7d5a5d774dd8e9db8b6bcd91ddd4b11562e2
 DIST erc-0.23-pkg.tar.gz 517288 BLAKE2B ce5a5f41b70b25d8e4a123d3a7a8d32815f3059da2e5353dace6ef185d8df2d2539c88155136a60ef7bd934a79db87b772267836cdce1ee2d691a9f1a4917f8f SHA512 54df94abb666d76f65faf668e8f85d20f5411c70031e709387706fe7d77b9403dd9e8d4fc2c634cbe58f5de896bb2780e2fae2706758774e295e3bc2704e7dc0
+DIST erc-0.26-pkg.tar.gz 517470 BLAKE2B 49bbe65ed658310397e4407f50b32b768c67723256123920f924d8cfe7b496b8185cc94753a7e5a778b928466ed8599b21d2cfbcfa063851f4eb424f75a066df SHA512 d1a9300dba716d9d569708977864cefeca225d22980df80617428c76c940a54c726cc99699e19a7fc966831042e5358c10744b4ffa7c8093e0b5feee4c070d1c
 EBUILD erc-0.21.ebuild 294 BLAKE2B f30a951ef4c633ba500c110bd98dadb6867541f824327c0f1e0bcd508862e1968fa49a2f6e5cdc504b89848225fd98179e6820d1e5e15513e308eaa116d16901 SHA512 34b4588e22b92c8084b7599be8cde4a922bc5d6fa9fffc4dd4b80c199df5725b91febf843f06785a234175740fdd94295c02634424c9b63f5105552fc74b635f
 EBUILD erc-0.23.ebuild 441 BLAKE2B 924b1fc3eb823cde51b49e123803bf21fc6de40a7f996ea8717eeb426df8f2de4353761f7a7548b720217fe6f840cc62785941c77ff56fa17dd4afd36cde97f4 SHA512 4f59427469e9838c343733050b90f4fc0f9798e24b2900dc5f9b0bd958a9b8254825dd9e8136ac41deed1daa2454c4f16b9310902cdd3ab6873771663835a343
+EBUILD erc-0.26.ebuild 447 BLAKE2B 4015b9f8b246485d97006c69efdffd668bb1e4bda796d51175c9d077095e2a860fe09c3572cd64dce0cc81cec5b133cc7b5a23ddd9a7f389b512bfff60c4a514 SHA512 0e69cfa797ae2ad808ed4650493d6c9b271f394a8c3c7e20beab64d48a49c187088a1181588d05e5fd248b91b3ddbef94a6cb5af88179e23bbc591a48ee82013
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/erc/erc-0.26.ebuild b/app-xemacs/erc/erc-0.26.ebuild
new file mode 100644
index 000000000000..efd9cc6db149
--- /dev/null
+++ b/app-xemacs/erc/erc-0.26.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="ERC - The Emacs IRC Client"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
+
+RDEPEND="app-xemacs/edit-utils
+app-xemacs/fsf-compat
+app-xemacs/gnus
+app-xemacs/pcomplete
+app-xemacs/xemacs-base
+app-xemacs/text-modes
+app-xemacs/xemacs-ispell
+app-xemacs/viper
+"
diff --git a/app-xemacs/escreen/Manifest b/app-xemacs/escreen/Manifest
index cce76002f61c..3e641eaf05a8 100644
--- a/app-xemacs/escreen/Manifest
+++ b/app-xemacs/escreen/Manifest
@@ -1,3 +1,5 @@
 DIST escreen-1.01-pkg.tar.gz 14639 BLAKE2B 4686dfecc40c7f90b4351de0b3ab20b5c5fcbc77760de7d5e0e115ddfbf792b5f7238df5272b33c3f98e7fd5ef4ecc8b79b08723217a4dad7e0c65bc0f4e8eed SHA512 3fb4d47ed6ae6173a530ea31b7ae759a34e2257e85e3f512c841234f7eba9780cd160e4ed600dd5f1871a022d4b2b28dd3dcdff788f679a07c05745914a04a89
+DIST escreen-1.03-pkg.tar.gz 14702 BLAKE2B 1057fcb27b555f4ebc173570df8b8b1f44a0e91fbd7e01b6196c963a3f76ed8f8c0889223b089482658269afd728e84aacc46cdb6ea56b50bf354dfa95afadb6 SHA512 7645fc60611162d60f8c7d0d81727c3c273d7b8883a0613d83cb98ae44a01ba62d575f67a657ce8d1c67afe7f6a8b7e925790c3e4429a715db3aff297eaeeaf4
 EBUILD escreen-1.01.ebuild 333 BLAKE2B 64ca5c9e2edf1c377694c819687d19e7f40b96580b7df4a06a980592343988e1ac005bc03474f9e0937de8873fa22152dcc42a5f7b9f881201af6f7d3b246a6a SHA512 92d3ef0a0c22ff6bcd90af185acc7679fbfc5d9fc0ad9d5d75b29261d6686cbe2bd939f534c4366fb6d7a53e3f01c07c17abb9a4888b5731d4053ad3fc1647f9
+EBUILD escreen-1.03.ebuild 339 BLAKE2B 9dc081a4b8f61220e0f0d1a6f4a09a1fcc8ed5ff63d41ac8705c9b88fa419a16b5008391e55c05b1d659d283a804d3f7c0b8019e1c0f7e9ba1b0acd32e5696b6 SHA512 cadc1179e5a49698d384254ae4d9e78bceabac2e59e2afc6a0a3f81c2816e4ef0af6ee3c54aed72243ea8116fe8f47114ca2cf26ede6736edad57d201e7b757a
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/escreen/escreen-1.03.ebuild b/app-xemacs/escreen/escreen-1.03.ebuild
new file mode 100644
index 000000000000..2398458f497b
--- /dev/null
+++ b/app-xemacs/escreen/escreen-1.03.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Multiple editing sessions withing a single frame (like screen).."
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/eshell/Manifest b/app-xemacs/eshell/Manifest
index 8ac497925fc5..9471806f1c29 100644
--- a/app-xemacs/eshell/Manifest
+++ b/app-xemacs/eshell/Manifest
@@ -1,5 +1,7 @@
 DIST eshell-1.10-pkg.tar.gz 232616 BLAKE2B 42c057c6afc401f480c8531be0b6dd2f1a1d1230063ca9649c23f751c6d988d2eb1918a3158840ada50d1b59f02319f7e06d1e021bd0b502be77dfe13036ea64 SHA512 97b4d81b024513b4dacbdbd3d04150a3dcc10aa9c2a8ed0e7157ada3aa404de6c44f8cce60c59f1c75c0e9e31f0f7b6de86b402b2c6527111162e2ee54e51dc9
 DIST eshell-1.18-pkg.tar.gz 238988 BLAKE2B d595f9c36ca5cd50ac46efabc813575b6f8415f47ac1d44632151bf8a39233c7166a0d9fdc2eb2cf00565b4e4f9ed9b4828ffb385ef4941745529260d31850e3 SHA512 3cb3f66c2714ffc5e2875bdbc3fd02dd60032db338ef9ef9c0904ec89945075ae95a5e02ce402299dbbc98b6e53d7304dbe50fc3cb3eb0dd2aacaef5535f2792
+DIST eshell-1.21-pkg.tar.gz 239308 BLAKE2B a20c3cfdb64f0b604f4aa0af44279598f0564bc623ce75303df7133b560846d4e79286914e8b5f06941503563cab6204962ba9c1be7f54290d1af3afbb023ef3 SHA512 d7724d43b2451e237f7a9f281f3aebb15266a1f58fe0e5a5f4c8104a6d85163d61877cdeee57ee7ace2d824ffe2d131624e4bfe3854ddd4581ba7b92cad076e3
 EBUILD eshell-1.10.ebuild 341 BLAKE2B 7f27a6f3a5ea11d21b9c760e50440395d866d90f20dbb7238fee97c948bd31579c77b09d2fa94d448d00a674b83fc511ebe1a12e6428ec374dcb83690bb783e9 SHA512 e560058fa946c52bb0bb913df5c379e505803de138e580dcec9a4608ed928e150623aac687d9648a8fa503ec61fe0c5121da21a5ad27f3cf10165d94313bf699
 EBUILD eshell-1.18.ebuild 341 BLAKE2B 7f27a6f3a5ea11d21b9c760e50440395d866d90f20dbb7238fee97c948bd31579c77b09d2fa94d448d00a674b83fc511ebe1a12e6428ec374dcb83690bb783e9 SHA512 e560058fa946c52bb0bb913df5c379e505803de138e580dcec9a4608ed928e150623aac687d9648a8fa503ec61fe0c5121da21a5ad27f3cf10165d94313bf699
+EBUILD eshell-1.21.ebuild 347 BLAKE2B b31e913af47a4d0af24934ceeee83e6b2b83a62b350041a04a563d0ccdcf45eeab752de982f8638b2c35316ba04a7a9532101c3cc9f09049afac1ba6fbe2d955 SHA512 4217d4afe1bc83339b509c19b7b1ccee70b21d8e01a550dbf5ae40e34d634845f58129aaed54d7856eee1f48d2e7954787c86070a1185ae9ee30edb909863d3f
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/eshell/eshell-1.21.ebuild b/app-xemacs/eshell/eshell-1.21.ebuild
new file mode 100644
index 000000000000..6967a3169de9
--- /dev/null
+++ b/app-xemacs/eshell/eshell-1.21.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Command shell implemented entirely in Emacs Lisp"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-eterm
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/eudc/Manifest b/app-xemacs/eudc/Manifest
index ebff61381ba5..a080f843eed3 100644
--- a/app-xemacs/eudc/Manifest
+++ b/app-xemacs/eudc/Manifest
@@ -1,5 +1,7 @@
 DIST eudc-1.39-pkg.tar.gz 79488 BLAKE2B 62789aeedcc6f1efa1cb453161cee6d3134295d84bff591c606b5a871cf355a2f377d557a99bb4e818916b5a611c18d838bc375e539fe0219f07d111125914df SHA512 c2442e701dad665fc0651aee3d9f0affd72006abcceb6da46eea67f0cdaf75a285f330615de54a5097ce39786537612b1dd053268fda01c0c18a00bb44c0fdda
 DIST eudc-1.40-pkg.tar.gz 79675 BLAKE2B e3bac796fb0b7d496d6a3066795c5e89372b22a4af693a91cc3dbe6b6e68b3b9327841a18fb42b03bc6435b8831785872dad95516f2b494bc003be4ac85745ef SHA512 ecd14560771652450e6f4acbf468efad9215681e6c85e8f5b3c999a222f8e90299f7e63c4951a122f5d04a08ec247c95bc5da910df47f66b5f88656acf2ad827
+DIST eudc-1.43-pkg.tar.gz 79973 BLAKE2B 86c53b32707c715f7501d5467c8c6e80a5829a5c36baf57ee6ec23766a5ab5882731eacf258489fa8c1120ab1e593e8fbfc66e33b1cb758ac3a9743f85536e2c SHA512 2a4b4c46c4e164fcac083dc75c8c2f2b8eafc0882d966c5e7fea8cc899a13f0c89f8d7b8562a79f972482dc569d48e8004a121a02a7a0b430a1da0800009635d
 EBUILD eudc-1.39.ebuild 497 BLAKE2B 150cf7ceef45c7ccd78135e1a74e7d4ebc0688a68a56a23d70e2a2a2d212c13ea974af8fabdd2422bbf6db8a4d012e1cf597b2e14c1aa7c18e2bd8ff609b76c0 SHA512 43551a8ce3825c90b283b33c16f122586a535a586593032433d5f48de29fef99ef4f88cd75607e6eb6bde8e6bb90f3ee3f7fc331c2b1e9a2a0e623db168125b5
 EBUILD eudc-1.40.ebuild 516 BLAKE2B 3e8c871295d0e3551df0bf557228f857550d769d9e3be6ccdeee7cab01dc8285d553e2d4a7a7323f319dd41e5d25bd9ebb584f7ef74faa4da2028eb66409369e SHA512 6961c39d98abed22ec1a266098f27ed5d3119e1d37d8d8c8a1c307938965a566efa549e46ae579a3b09bc015aad02a5ba98635e50fe468cfd5ba2d8b9ffbe66d
+EBUILD eudc-1.43.ebuild 522 BLAKE2B 6545ae5012305d90928abfd3cc42623cd5282cc121d0aeb810fe3254af01877d1dd9448d14ce75cd21740b9cf0c9671d92747a122dac80ff63be54a49d53d091 SHA512 72d1c26ea17f383d2cb90a2cae90150c712d515263339c3146bc027393cc6aa1b638e3b11eb0d5d81bb5e0ff895890b821975d29a651fbeeba30dc167b856612
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/eudc/eudc-1.43.ebuild b/app-xemacs/eudc/eudc-1.43.ebuild
new file mode 100644
index 000000000000..ddde8125ea79
--- /dev/null
+++ b/app-xemacs/eudc/eudc-1.43.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Emacs Unified Directory Client (LDAP, PH)"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+app-xemacs/bbdb
+app-xemacs/mail-lib
+app-xemacs/gnus
+app-xemacs/rmail
+app-xemacs/tm
+app-xemacs/apel
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+app-xemacs/net-utils
+app-xemacs/ecrypto
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/jde/Manifest b/app-xemacs/jde/Manifest
index 288139933a68..befd96436aee 100644
--- a/app-xemacs/jde/Manifest
+++ b/app-xemacs/jde/Manifest
@@ -1,5 +1,7 @@
 DIST jde-1.51-pkg.tar.gz 3508064 BLAKE2B f3dd080be5bedc5dc01cdd8d270da9407e70b979af4ebb0ec7beee92f664af95217354cb952bf7fcf3e4d14d4b32c4ff4b2f45dd2175fbee84b395bc991c3e0f SHA512 6bd21d073562a7aef66f4a5c3fff014b5d293bbcb08483f003c0d914c18034806a4cb9e3fb31f07149106a9e0f69eea6311e8740a1660bc2317a63d158c2acc8
 DIST jde-1.52-pkg.tar.gz 3767445 BLAKE2B fddef76a453d594d896480089b45bb8472c72535b4a259d61a8facca62932c0420e9161843f494b2badc11f977d57b85c85687c50534a2d1b3c5320ab98d1bb1 SHA512 f2fa2e266cd832b5761ee967e2b4be52694b941699a099ffc363869bb4036a439ca8010e6428b98cf0dfc474b451f48b031e042092e1f66706b9a50e0f88c413
+DIST jde-1.54-pkg.tar.gz 3767364 BLAKE2B 1f4eaa30c72676aa71098780fdae0bd4a2bea0f24be1970a735875319faa32fe6a11ce4eaa306f3e185da2ebd4d270fdb9b2fc5681345380b541407162b982b1 SHA512 f35e8a13dc9c329f50ee3ec94551fee12317c8615e45c00b2699dd40a77f925268819c1d92223b0d2328f08e0bde537daf658f42922b7e1f23d6be670d96ded7
 EBUILD jde-1.51.ebuild 554 BLAKE2B 9db7ba09f5fc0cee20f736c5fed6ba355725642188d24a8bc995fdd3435da3e3089d8f63a8700d5fb253ae7f4a1d863034def37d3e0f86d2b75e05aa42ad3141 SHA512 8f15d2b66ecf31479091cbde1294530fba41ec7f9dda9ec9149f297499aaaacde39cf61a4a23c597476f70bf7b8e9be920a2ab32503ac0197deddc4ab87042ce
 EBUILD jde-1.52.ebuild 598 BLAKE2B 53cf0c7d90cfefab084869edf67a605e8ff6e8964d9ff85cfa7ddbb79c33dc679610cd5888ad7e41b6bf9ae39057f62452b1b8044ac73a011a430736a07f918b SHA512 484eab8b5aba4b467a8c512ce69352da3f34f5bf3703ad02bd6e90cd6ac4bd6d2da2a7093e02cf9d87472fa1cbc4bb31868217de25043eb6d69513f890d5a083
+EBUILD jde-1.54.ebuild 604 BLAKE2B 39a030885c18500c9d5cd8920239c8c89c59cdcba1f232a4d9d46e562fb4bbcee561b9b4969814a66d577c70f4510683b70e65d29a234e9b4727a108b0f2bc78 SHA512 2e7eca4eceff43d196cbb7f85f403ebadceb3e71f64d6fb8856ab882cd209ed7bd97d4ffc27b20df776988955277dc08e3c57fbac6fdc34a5b614bb2e49e698c
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/jde/jde-1.54.ebuild b/app-xemacs/jde/jde-1.54.ebuild
new file mode 100644
index 000000000000..7dd03b21d8a8
--- /dev/null
+++ b/app-xemacs/jde/jde-1.54.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Integrated Development Environment for Java"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/cc-mode
+app-xemacs/semantic
+app-xemacs/debug
+app-xemacs/speedbar
+app-xemacs/edit-utils
+app-xemacs/xemacs-eterm
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+app-xemacs/cedet-common
+app-xemacs/eieio
+app-xemacs/elib
+app-xemacs/sh-script
+app-xemacs/fsf-compat
+app-xemacs/os-utils
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/semantic/Manifest b/app-xemacs/semantic/Manifest
index 05c24abe98de..ccfd5679643b 100644
--- a/app-xemacs/semantic/Manifest
+++ b/app-xemacs/semantic/Manifest
@@ -1,5 +1,7 @@
 DIST semantic-1.20-pkg.tar.gz 455896 BLAKE2B 1b3b7ba434493f328bc2141e897c344b01fffdfc0c4df29df2c9747ff0eec3523b3acdb438148c2e9d1339aaadd0e375a4e6e1a9afc3c8558bc217caf5d3d76b SHA512 5432807711c89fc0ae740f87bd04617e0497786ace687f017352c5d44562c711dab1075801e93067d02e116dd3716f1792d5cfa2f69204d92cf531f0bc7eae84
 DIST semantic-1.21-pkg.tar.gz 1367279 BLAKE2B c4c4d0fc81039455e511ccf9b8439cafc439c7f42d2fe8fa42fa614e23556615ec98254f31ef27ccb1d29ec316b37e88abed42eca33b0a8a8530dbafbe582492 SHA512 8815ccae1c38ee25176d14b2e5d9e2ca05b2d3fbf7e97105892ea8604d6acf88d81a51d6c138b8ebaf5823a518aef312eefed9dcff905c55daa39fd4c3c7139d
+DIST semantic-1.23-pkg.tar.gz 1368143 BLAKE2B a08c133146bd09587172f00a6fb17b6fc5e83f61ce06411fa316ac8727fa1c943e6b049d565e25762a14d948748529e25e76e2cf8e23e73f9fb33a145847a246 SHA512 9b95bd29083a6ead42255a51c46b2f8ca7c8a176044374764b2769e63167913e650ffb2007f17954394b8d2388e1e3fe410906aea826359ecb5982573b6952ab
 EBUILD semantic-1.20.ebuild 488 BLAKE2B 3c9d67b129c5c1d202ee650f3beb5e09e9f8592362107b6c3607dc9c51dee87cadb1e80f2a9355a4f4729f5a07186b4ea32b6ba49b2e6d20c8426d9a611e8d03 SHA512 449eac40a5a46c5bfc6e80cb5d7e726da370cbf7d1ea93f774755e57a7955a5dafa4127c24bf775739ff4b1852984baba8e49c3b6de684934269f1b192798f75
 EBUILD semantic-1.21.ebuild 543 BLAKE2B 9146f0ad986a9ea4b264e13890aa9909274fdc92824d50d11f341edb03c461fa0f7735ff726c5926d34e9b6f38dffceb7cc7c71c5cc3019f3e81ac506538a14e SHA512 a877ba4c411bbb0a500eac0672cbd4f2a1a1297a58235d6e9303570e32c18594ba1431fc954aef78fe8264b6eeb90f354588f1af7842663bcb8c89d519b8e342
+EBUILD semantic-1.23.ebuild 549 BLAKE2B ab306c7ffdc72e9be8e9fe7def52869c2559eaa47fc205c9ce7cdbc8f52af569332f4aa79edbbb4c53b3922d52710585d46d8e2443ae2821bdd76b7d617fc636 SHA512 e74c748db3f6b0c543eaaf2fe04146c086d55dea0e3bab2d32226c3c319045376b585f6e3e661ccd857f723db2ba217f03f1f676db725993873412f263d577cc
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/semantic/semantic-1.23.ebuild b/app-xemacs/semantic/semantic-1.23.ebuild
new file mode 100644
index 000000000000..cef930a573cc
--- /dev/null
+++ b/app-xemacs/semantic/semantic-1.23.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Semantic bovinator (Yacc/Lex for XEmacs). Includes Senator"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/ede
+app-xemacs/cedet-common
+app-xemacs/eieio
+app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+app-xemacs/edit-utils
+app-xemacs/speedbar
+app-xemacs/texinfo
+app-xemacs/fsf-compat
+app-xemacs/cc-mode
+app-xemacs/edebug
+app-xemacs/sgml
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xetla/Manifest b/app-xemacs/xetla/Manifest
index acd58464133c..c9ded4ed4d1f 100644
--- a/app-xemacs/xetla/Manifest
+++ b/app-xemacs/xetla/Manifest
@@ -1,5 +1,7 @@
 DIST xetla-1.01-pkg.tar.gz 294912 BLAKE2B 3dd9b6bf725445f98f7623a261b37906a4b0f81d046e80941658799dcf9abf77ab661255bc182b29e149be1d6eec226102ed4900fa8f94a4c56dfa51130271f7 SHA512 535c40e4a6a6b0ba28818a5835540d8d8908eb7624144e4dfb301bf5fac4b8b08f1db8c11cfbb855695d082b5d4705aee9c7f6be409969868414472e3cdf7186
 DIST xetla-1.02-pkg.tar.gz 294986 BLAKE2B fd586413dd9836987fb429e669bebe72117f10d07f98dcb530ff8b26d04803eb5b1803e6a31ccfbc37fe0ef7472c65c18c9abb407ae73fb5ac8a6a9d0a207bde SHA512 91f6886f34d3d331deda5d1b172010482b9941f7b702981c77c87ead00fd16d5ac54f650b472ba03621f551c5e400abf7b19fe53ef88d6d82f2f86e28cd0e5e2
+DIST xetla-1.04-pkg.tar.gz 295025 BLAKE2B 9a373e77d53f77c5d05ab2cf5d12942281c6dd32158a6e16d6e8eb0494ded373e10b27a5d48a55ffdea35676c9d7eeeb5724818eb3311114448ae76a86526766 SHA512 4d214ae76eecaf4011ca1f49b21b60786c29b6c6652d05f024f37114f7bacbf1bfdd3f48d7ab7f4d0e3e9808986aea2de9703d498acdaa676ab0344b26af5e96
 EBUILD xetla-1.01.ebuild 402 BLAKE2B f6243f0684a3ccfb6db1032203663921f94cc2848ca05a2d9ae56c15238fe3b983f187d34793b6379f76e8173b09ee4677cf76fd4bbd490ab981e17b4a851c41 SHA512 bd718a00ba5bc4280f5726a42e992ad24768415a3d5f1af6ae59ed4d9ca39634d58ce6af83b9a220423a97fd257a6449f93d3fac5802eb782df0794f6ca7ec3f
 EBUILD xetla-1.02.ebuild 517 BLAKE2B fc57a1e6e7b235a47304e9f5b2ec5a5f3a37fbac79867ac41b01520a6fa166f10b1bbfeca6dffde8ddb14df8ccb86219b299f9dd3b4787d0374979788ee25f8b SHA512 979ffcece6f518e21553fbe6389861d200c70d6757419fb3b2a681be1ee99d87c81fa296b707e90dd73db6d7b24acc95abc85723ff30bab072efaffd1ec376c8
+EBUILD xetla-1.04.ebuild 523 BLAKE2B 09ff4fecbc7eceb3fbe94e4f467178db8d441f713008e6e802ad894be064b4f5543b927ffca813a554dfbc52eca6b2ef45b374f01c6a3b42ddad3ced5c41bfc0 SHA512 e62131afb4e17ed8c6c4505b49328c168802b72d46a8e410a9b3167bbd34bd77275316c72976f6039b9eb7aecbeed5644188499b2eee8d7c8b501c3366d4e723
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xetla/xetla-1.04.ebuild b/app-xemacs/xetla/xetla-1.04.ebuild
new file mode 100644
index 000000000000..41589f7a7ca4
--- /dev/null
+++ b/app-xemacs/xetla/xetla-1.04.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION=" Arch (tla) interface for XEmacs"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/ediff
+app-xemacs/xemacs-base
+app-xemacs/jde
+app-xemacs/mail-lib
+app-xemacs/dired
+app-xemacs/prog-modes
+"
+RDEPEND="app-xemacs/ediff
+app-xemacs/xemacs-base
+app-xemacs/jde
+app-xemacs/mail-lib
+app-xemacs/dired
+app-xemacs/prog-modes
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xslt-process/Manifest b/app-xemacs/xslt-process/Manifest
index 0053a55dadf8..8096cc33993d 100644
--- a/app-xemacs/xslt-process/Manifest
+++ b/app-xemacs/xslt-process/Manifest
@@ -1,3 +1,5 @@
 DIST xslt-process-1.12-pkg.tar.gz 59594 BLAKE2B 3e0d23799465a61bd209435e59ae11cc6f4d9dd58ab24674dbb83bfd836949bbd2f83e9c9d8397b904813169ec7b0e0121355046230094daaf008e95b1d5ba90 SHA512 47945fc2c105e6ce54cb7bd5e1b5a437444a85b0a059ecce7ee6ebdc22b9d6140f939711a79d7b65b43b628afd7c57acc34e56e3592efc1bd0ff488810af134e
+DIST xslt-process-1.14-pkg.tar.gz 59643 BLAKE2B 12c8914ed20b92e07b1a34783fc83ff8be31ebe8fb1de05e94a89ea9c1ac245e0317a7dc2e3a5ba8c530209e913f6bec5c35276315fc10bbfa4b27f190d36648 SHA512 6f4e0d6d28e37ab798594d50336094cfe3e58a4488476585927b92ca77f7258caf9803afb8caf3083bce850fba31b8e461f346c2ad8f1aeac7fd793f055671b8
 EBUILD xslt-process-1.12.ebuild 549 BLAKE2B b6459b9635b383ef0b34bc24aeef1640f42233844c9b41bd3f40f3f10d6283f7eda03a1f33f5d07ef287658a42c6ad1c2077e0528d764ff8fe6238509e63741c SHA512 75410632b29ecda7dbe7768e68f6565e66cb2fa7d1dcbb94e5a59be9edb89d0fac28edd2b0a708fa2f494e16683e261072580cd923089c7941aace3e5a5a7b16
+EBUILD xslt-process-1.14.ebuild 599 BLAKE2B e505e039cecde5e51f74c0dbee4572d379ab2d60d21ef07d8bd2c55f539498cbe35811b2fa9f27ad1015f7bf82417ae7612b70e1ba96d77d30c7391192a18fe6 SHA512 ef45c6921b9ec0ca8372e2c4706739d8bb52eb3589d35a92ef96cdc9b105105f27555fb112381785890308fdbd6f921bd32f3bc8149803dd18e3cb834a16cd7c
 MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xslt-process/xslt-process-1.14.ebuild b/app-xemacs/xslt-process/xslt-process-1.14.ebuild
new file mode 100644
index 000000000000..6efa16573923
--- /dev/null
+++ b/app-xemacs/xslt-process/xslt-process-1.14.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="XSLT processing support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/jde
+app-xemacs/cc-mode
+app-xemacs/semantic
+app-xemacs/cedet-common
+app-xemacs/debug
+app-xemacs/speedbar
+app-xemacs/edit-utils
+app-xemacs/xemacs-eterm
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/elib
+app-xemacs/eieio
+app-xemacs/sh-script
+app-xemacs/fsf-compat
+app-xemacs/xemacs-devel
+app-xemacs/os-utils
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index c120e80fdef2..c757d313138d 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 77803838eed8..4343370db280 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -5,5 +5,5 @@ DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6
 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
 EBUILD libgpr-2016.ebuild 1243 BLAKE2B 68a8d2acd9a75c49cdbfc8828bc004ca4f1a586914302f108fdb655672ea229d965c3d00f08b041c6dc32316627d90a0d9fb1ca9c9126cf9f5fbd51e07043831 SHA512 389b16cbf67e40ef924f50492ac81cecb54eddf25342a435d16cebaf7b3b1be74e86b7ed2539a2c4cbb288f301ed6877998f8c50d5788fb7d075143f9f917349
 EBUILD libgpr-2017.ebuild 1388 BLAKE2B 97c790d84d22f76209bdc4f47a834a190e5faa8f6a3b179bf0d67ef91077e9c98b6a522903ee232a0444dd73a9fb6b8862f2a98155241657193c0175ef03ec93 SHA512 0430a17c2e7250b209cbe9508229a4dc59ff9f3b1f51f2c13de8a6484703946e59ae7380169c0e892b45aa78a5275b987075cf0903ab9e59068e30fab59945ac
-EBUILD libgpr-2018.ebuild 1546 BLAKE2B 2a9fe66051f7ee45c2007191903f7750c5124cd7b2549c45a1325b779802164ff95f52c90b8532003a1c0bf6cf2fc18ff59f16ee141776d948ec5208e942b258 SHA512 8458b8b1e0df071a827f3443488975ecc382b5e796f038e716ad562ef0e9200fd1eee29383763f45eb27d9578869206b924e6ffadb54808044716b50353882fc
+EBUILD libgpr-2018.ebuild 1562 BLAKE2B 910ce408a6b2570240a2169e4ae18efd77792d9e81d75e6dfb2b845f920d79c73716fb7d480fd5fda4edfdbd50470631f887fa08540cfda4496d58f6e966aafe SHA512 0573b94a327abe3fcc5b4191d21d072ab58edf7c629c653536d78455f095f14face6ad79aafda8cc834932414839a2e0e8e1f47804f2bf95228c699bd44c4935
 MISC metadata.xml 1175 BLAKE2B 8b512fd5efae4481d319fc52a11f3730af081d5c3ff12f6c6d62768e905e0651e3b4792765f65edbf659862b56372f32ba3aa7ae51c12b2911b711cb12a013e1 SHA512 edd6bb889abfe036d2509e56f350cf058e249e398811fdb2890bd001b75143b8d9df28bb64acba195852d01d484b7e6381e82ce972aad6d8cf1e0c961b3ade72
diff --git a/dev-ada/libgpr/libgpr-2018.ebuild b/dev-ada/libgpr/libgpr-2018.ebuild
index 9a2f65dac23a..c16efb2bfd51 100644
--- a/dev-ada/libgpr/libgpr-2018.ebuild
+++ b/dev-ada/libgpr/libgpr-2018.ebuild
@@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
 
 RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?]
-	dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=]"
+	dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=]
+	!net-libs/grpc"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]"
 
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 72e3ef13e1a2..c4671cfbe673 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/antlr-cpp/Manifest b/dev-cpp/antlr-cpp/Manifest
index b4512f0adb22..7f0c0a13f9a9 100644
--- a/dev-cpp/antlr-cpp/Manifest
+++ b/dev-cpp/antlr-cpp/Manifest
@@ -2,8 +2,10 @@ AUX 2.7.7-gcc.patch 402 BLAKE2B be143ebbf062aa2ed59630424e7741ac8105eb3575494639
 AUX 2.7.7-libtool.patch 621 BLAKE2B a0e48b7911bf016dbf1422768cd73e887cded6a9795d8f38d522e3e13b4f0a81f94653d61fb688db4ee1c6d3170035380fc9763b83ae68c28d88ef1902a3b715 SHA512 3f1d68eff40fac13a4f482724456cb8ed801feff71a254871368f22ab98024431c718f3fb35f13da4183bdebe62ece26908a341fe1a945118bf0d78f5d8ea622
 DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
 DIST antlr-cpp-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
+DIST antlr-cpp-4.7.1.zip 462076 BLAKE2B 209e7a4f50ae0686a21a85728f5a7478305971ac6653941e19b34a9fdd367fbcf87300c32a83cd6cc021216d564f6348e589ede7a3491a5411f16ca8fe373569 SHA512 24d53278db56b199e6787242f22339f74e07d2cd3ed56f851ad905b110c2ba3cb001e1e2fcbc8624f0e93e00ba1fe1b23630dd1a736558c694655aeb1c3129da
 EBUILD antlr-cpp-2.7.7-r1.ebuild 2808 BLAKE2B 207d0ecf0e231a7eed984c5d4032d53bd6bd9a5cd169b24797f7ba41fe14218e9051077d6efa5379ed966d006a5008f2ad1e6781d0829bfb31f6f80f35d525b3 SHA512 7fe1f19bdf361adf562f6387df2d66503f6d4c7dbf5bb4d91a029843dc86435dec9ffc1e3ad241c910107fda99d6b0b3591d3dfafd83959e56a5b4f5d7d0f1f2
 EBUILD antlr-cpp-2.7.7.ebuild 2776 BLAKE2B c97cc26c1ceb320716344ad9a0e457f38df3efe0ebd2bf2cf795930a6605ba1aae516015b5cebf675ff05d4dbd263de73c9b1efdad1749b4eb9b6f31fcd229db SHA512 e293605b61353aa5e1cbd6b8be82e1fbb2e19fd10fbce2f791129109c70a9ae97e94438494137fbf5fd59bc3bf51686fc56524a8f37f0cf765d11a49a763c478
 EBUILD antlr-cpp-3.5.2-r1.ebuild 452 BLAKE2B 56646e0ac63748260421e4f602ccc3bc0d49a517df7ef63744b3720e1d30e1eee910438f7edeccf7d0a947df4f155ff026f1dceccfd6202637892ba4f6ddac5d SHA512 cf7b5a9a7588437d423c571f1b14f90959e0d7a9440b3d249464a21898ec4900e066789ceef6acdb7a949a8c5e0600425d1095e0cefb410eebd05c815071b636
 EBUILD antlr-cpp-3.5.2.ebuild 512 BLAKE2B 0a684c17366afec326fb969d17ab3d48fedd4073dadb85669a8f4ffb74dc5ae3a1e7a1fca75fb722bdcdcaf85acebdc000d1cdfd858389a37589a7fb33f42dff SHA512 9335b7840649a2a155084191fd82ac83cbbec389c0682d09442ad56e8202107f72010d85eb50573eb9af3d49dd4fdac71c056764b0c33a098d6042bfb0e102b5
+EBUILD antlr-cpp-4.7.1.ebuild 383 BLAKE2B afa63d607ae46b8d19537beb3e1cf0d497177e093c0b44cb1778871e8ba17f4b95c4ad71eec74a36f879cf41cbed4dca9fc08d7e5ce4f294e3a9eca32e13771a SHA512 599f1dd5a312e16068d3a018bd54b4ce18acf94d64d2f9dd13a2a0ee5b0211ed5d09bffb722fa998e0d1ecc7de44de0e0a870346ae01738afcc860ad39d231aa
 MISC metadata.xml 313 BLAKE2B 3ddef83abe4413f33dae4c121c76dfdfab2336d433ef94716eced1df9f669f83883b4174d5a472b06ae8fb16c7179094469fe65258646d7dd9094b5c1673a2a3 SHA512 39988a3826d440aa378b455d18ce23230ba1870bf7b7c64123cfdd09c54b112e8586c87d421a2227370c6b4eae385af46ce3a9e4aab3c676fdfdac360fed8265
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-4.7.1.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-4.7.1.ebuild
new file mode 100644
index 000000000000..173656e8e08c
--- /dev/null
+++ b/dev-cpp/antlr-cpp/antlr-cpp-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="The ANTLR 4 C++ Runtime"
+HOMEPAGE="https://www.antlr.org/"
+SRC_URI="https://www.antlr.org/download/antlr4-cpp-runtime-${PV}-source.zip -> ${P}.zip"
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip"
+
+S="${WORKDIR}"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 7599545ce915..f3856dbfd703 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 0beff913cf0d..90a82af5fa2c 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -3,5 +3,5 @@ AUX couchdb.init-4 439 BLAKE2B 4b334d42238616a1bfef41f915e7e42038457b6e52b713af6
 DIST apache-couchdb-1.7.1.tar.gz 9963069 BLAKE2B 69a3f835f6a7b5752e4707b02edfa726cfdb76813e36e570566641b999eea556ff788b0ca8ce1e66beb819119d90e387beab3bba8618e3b7a606870794307fef SHA512 cd7417ef4b1eaeb1fe4251b559d904238fd25881c542f1498e6e9f1c4a55a79e34e06e711f90ce39e5e65fcac8be9c611943b8ed57d4a7465859b5811ac0a21f
 DIST apache-couchdb-1.7.2.tar.gz 10009424 BLAKE2B 3d3b4922fe5b2c55e4851e48993442ba23369753fb17d5cafba936947624af0d3dac70e0a23d0c22c79e7e2776a3a441d5b1020a4a420b7d9a621fb59aad48d9 SHA512 507a35a7f1e826b1562eec86146cc6fcff3c65fa7762f9742e6e8fdacfca735473105772757624183778f7a532c742f6644b301677607bb81c1f3f0ceb742867
 EBUILD couchdb-1.7.1.ebuild 1833 BLAKE2B 40ee843a46d254f64cf4b7de9927db335f2c928f8ceca249b8cdfc3e45dc5051a28da81a8bbd286f9a0e45ece27b0a21872067f59c5fff50ecf9792fec795b83 SHA512 48561428b5da0cf6afc118c782e9d627dc82208e7bc9825cdf186e51c746d0bca6040dac52586b56d42f4ecb01d08fb7b12c431641a23de47cd814a2648372f0
-EBUILD couchdb-1.7.2.ebuild 1834 BLAKE2B d1a4e1798cfa27f549d5e3703695bb1d1f91a54e583ce854454707d81b55a2ae7fc499e880a7e656fc96715be7ebbe899a2c6cddd87afaf57c3a20a21ee58dc8 SHA512 a98b412cb52af5fad53dc725f8bbd258d1d0a6a4653c86f6b509c73d70b7bd1e217f05ab1d003bc6812d6eabca7cb5e1a6f87984248b6065806e6a971e5c75ef
-MISC metadata.xml 212 BLAKE2B 99a9c24bc730c412eb431bd6853c25ac91329aa9be6e6db58f56e4831aa66fd93d779c08f3569ec7c5b45940bc23d0cb90c508605d27e502d2b9a70ca436d7ba SHA512 e4f4b6dbbf6bf039ff5c19bb6a209ad4e0b1286f8cf7cc0cbafcc04fcf93fb92766c8cae06ff19f980a069c7fe9a1686437ab215f84ce10e301275ae107d00bd
+EBUILD couchdb-1.7.2.ebuild 1833 BLAKE2B 7f7e685bf752daf2b0a968543956b8b3debf293e01441c9e812f9740407b6df6d324f75c146f0eec8be39dc423f37991cd4b69b68cf0a3e2c7688c93dd00799e SHA512 cb0ce76bdef08e39fa286486da0b0787ef9d5c0c894aa31eb750875de5f5562c19a4ecc8216c67c5c7cb87ccee6f9ce53bc33b3acdf8e41bcc9d8c1827616b1c
+MISC metadata.xml 168 BLAKE2B 28995e217ebfd4a11f4738455bcd495fccb2214a7e4f48a820d2057a7d29a1d510707f94d15bff49abf69d68fdecd658381f34692181502eb587de9f2c7e0f9e SHA512 9f2101e330a89b03cbbc1814dcf7ad75f3dd4117abeeed5047cb695f81cd8f0719d3285b39acfb93f3ea1ba1b98911cc452b5d332d266b84a19791190ca123b6
diff --git a/dev-db/couchdb/couchdb-1.7.2.ebuild b/dev-db/couchdb/couchdb-1.7.2.ebuild
index 8f033f12687b..85ea96ed35b8 100644
--- a/dev-db/couchdb/couchdb-1.7.2.ebuild
+++ b/dev-db/couchdb/couchdb-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="libressl selinux test"
 
 RDEPEND=">=dev-libs/icu-4.3.1:=
diff --git a/dev-db/couchdb/metadata.xml b/dev-db/couchdb/metadata.xml
index 37f6a3033902..cc08d6296c93 100644
--- a/dev-db/couchdb/metadata.xml
+++ b/dev-db/couchdb/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>djc@gentoo.org</email>
-</maintainer>
+  <!-- maintainer needed -->
 </pkgmetadata>
diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index aad44179f26b..2e680aa13a11 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -2,8 +2,8 @@ AUX without-flags.patch 1859 BLAKE2B 846c177b9773c27b329a23f54592a2b789b0d8d123a
 DIST freetds-1.00.41.tar.gz 2904915 BLAKE2B d92789c9a08dc9f7f04e8efc828841c3cace0e5a3affd11d8751a785db70db79fedffb3745a681b960d30a11efbb4fa457805eb4f72444eecc20eb65d46e2d82 SHA512 dec3197a6478fc59b7386f9a7a562df8b581bba7184210c42f26827e957b9746e6820d687a9c6cbcd7c825fc5d4f556547c0483d06c786a064d5c4859db4daa1
 DIST freetds-1.00.54.tar.gz 2907015 BLAKE2B 332888565c2890657ca6440e4bbe92e0324daf6c6e67f3fa2243bd2d5746e7e9aa100a7838d33cc8fa93e71e5d6a650976ce5164317f3147b192ceb915362534 SHA512 a2a5034705fe06ee38b085f980f6ddf086789abc9485331fdaf829e7243f7ba95a5f0c612d7e3ec9e10f28a5c8b3a3fd8e7853d66f67110bd860afce949c798c
 DIST freetds-dev.1.00.341.tar.gz 3002134 BLAKE2B c9396c1f205e13c9f3449bef19830cf3b6c2fa72539555ebd6bc1532c014472c862ba2ac7f495bee8f53d640d628c6b15bb50183585d43cf3dbbea4e314636d2 SHA512 fd691535dfa5c97463ff72056cfa5721557b71e41b6186ffcb08e193e51214cf966a33ee55b8e538a6f035aeeef14ac5b15fe8758f1afea9e1252a3b8951ba58
-EBUILD freetds-1.00.341.ebuild 1856 BLAKE2B 8cf069020ba0fa8a06b2b4af9e760a0cc46ce5a7fdd4a48ec5286f1550ceb316cfa096a0281e4e6f115d8f83a1535bfb51015b79eea7c86c202d6ab3758b8a42 SHA512 08a74242a8df775fc7360e7dac588713acce0abb1cdeee06219aeb051083622992fdaa94369fed37cefb1afac911af3d3b59f2cf35e8362e77f63ad0c43c5e32
+EBUILD freetds-1.00.341.ebuild 1891 BLAKE2B c033f9851e0cd02697976652d48fc50d40faf24282f7c337b9df6bb12c6a2d5443ff35c710d7460f3691f927256475c4cd60d0b4113da93e54e719d181a83a83 SHA512 ebcb93cd255f63f5f8d6fa67eb149853d6d21b392f8371cd2f696a69563a48eaabfbf4499f59569309c59ac44b463f66703454ff7e993073611f7922cedb31cc
 EBUILD freetds-1.00.41.ebuild 1988 BLAKE2B 58e5b9ecc1ec5196c3e4e50cfccefa6ca44510ba344b1d024f1280667e47d4351ce1946dea1f963cc3feb0a8a5382812e046173579fd961d522b3155ad422261 SHA512 a48ffe06b8303885d2e795d9cfe756979652460da4912de33dde0a06b635c3466f3abebfdad17ef7aa8cc35fb5f79eeca8457f18c2999108b13367eb2a8d7e02
 EBUILD freetds-1.00.54-r1.ebuild 2064 BLAKE2B 6ec6575c86163e8678fbf841fbe8aa85e5fc7fd6e1839ff423dc542718e8ef88c2ef19e178bc7f76493e78b8e6edbbcfec87af85ebad2ca1153e07cdbb15e664 SHA512 48931c5f0e49cdd9f07e413339a0e647a4b48eec562cfe337a6c57243d11a99d47977d8987902a6ecafa3930a94a1102912c57359e146f155f6fcf6ee5753ce0
 EBUILD freetds-9999.ebuild 1603 BLAKE2B 4a6149df3ad684b7246fed4f19c457f8a74c12a6ad89114d04890a86f9a41a02f7023c07dc55c139865091aed89a70accf993dc77bae4ffdc1f0bb3ff1698794 SHA512 264144b12f57bd34d1ace56458e4ea2cda0f4f5fd9f789373d8e7b4695cdf910562441359218b0c7c8bac446c8fa5673c56a37d0cfef444fc6d11fe57f2121b9
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-db/freetds/freetds-1.00.341.ebuild b/dev-db/freetds/freetds-1.00.341.ebuild
index f975c08fe565..77ec3228c82b 100644
--- a/dev-db/freetds/freetds-1.00.341.ebuild
+++ b/dev-db/freetds/freetds-1.00.341.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # This is from the "current" release series, because the "stable" series
 # is a little too stable for us (missing bug fixes, and so on).
@@ -13,25 +13,23 @@ SRC_URI="ftp://ftp.freetds.org/pub/${PN}/current/${MY_PN}.${PV}.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 ~ppc-macos"
-IUSE="gnutls iconv kerberos libressl mssql iodbc odbc ssl"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+IUSE="gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs"
 RESTRICT="test"
 
 # sed, grep, and awk are used by the build system and the osql script.
 COMMON_DEPEND="sys-apps/sed
 	sys-apps/grep
 	virtual/awk
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	iconv? ( virtual/libiconv )
 	iodbc? ( dev-db/libiodbc )
 	kerberos? ( virtual/krb5 )
 	odbc? ( dev-db/unixODBC )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
 	)"
-
 DEPEND="${COMMON_DEPEND}"
 
 # bind-tools is needed because the osql script calls "host".
@@ -48,15 +46,23 @@ REQUIRED_USE="?? ( iodbc odbc )"
 S="${WORKDIR}/${MY_PN}.${PV}"
 
 src_configure() {
-	local myconf=( $(use_with iodbc) )
-	myconf+=( $(use_with odbc unixodbc "${EPREFIX}/usr") )
-	myconf+=( $(use_enable iconv libiconv) )
-	myconf+=( $(use_with iconv libiconv-prefix "${EPREFIX}/usr") )
-	myconf+=( $(use_enable kerberos krb5) )
-	myconf+=( $(use_enable mssql msdblib) )
-	myconf+=( $(use_with gnutls) )
-	myconf+=( $(use_with ssl openssl "${EPREFIX}/usr") )
-	myconf+=( --docdir="/usr/share/doc/${PF}" )
-
-	econf "${myconf[@]}"
+	econf \
+		--enable-shared \
+		$(use_enable iconv libiconv) \
+		$(use_enable kerberos krb5) \
+		$(use_enable mssql msdblib) \
+		$(use_enable static-libs static) \
+		$(use_with iodbc) \
+		$(use_with odbc unixodbc "${EPREFIX}/usr") \
+		$(use_with iconv libiconv-prefix "${EPREFIX}/usr") \
+		$(use_with gnutls) \
+		$(use_with ssl openssl "${EPREFIX}/usr")
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
 }
diff --git a/dev-db/freetds/metadata.xml b/dev-db/freetds/metadata.xml
index 6f49eba8f496..7a38bb900964 100644
--- a/dev-db/freetds/metadata.xml
+++ b/dev-db/freetds/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 0b594103ffef..bccfeb18f525 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,19 +5,20 @@ AUX my.cnf-5.7 138 BLAKE2B 71862b4b77334ab74002237453d2c7f6b51cd1ae57dba3b00b19e
 AUX my.cnf.distro-client 631 BLAKE2B 9ba4edf4398410ef40bf7312a485edd70a807a9da37c69bb6f6bee2c58a722fef1b9f37d28f09f41912722451cc0e9913218d15be472a853a942119f019bf486 SHA512 f40539a56afe79b7c0dff14de46690fd67e8350755b27fbb490d914001c01836cdf9f851aa461bd8b60943ef2ca084b70e48d995f5c18bcc241309f3473c610c
 AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1fd14b4c2dea398814beda3c09aabea04dd3a9e145464524c629e7e69dc257d1245e0a46dd8584b7f685172 SHA512 cf172edc23d3dda49c21af6b8adef8aa13694d8ceecddf1d612d4ae34d00ba53c51ae4ae7ca4d11083eeacb5d862f59a855a9d80e9e448ab8bbf17f42aac2650
 DIST mysql-5.5.60.tar.gz 21025041 BLAKE2B c4010c64b30ca72aff011053189981cc0676806ed9f18a0ac584e07f71e1f7fe062a3ca78db6f109a2b96d324d778b239880f96852fdc058892b09d0d09e740b SHA512 734395f3ce2c12e7703fe48d5bb2ce85ff8d7f04ae51cbe2d04a46b72b9689f804e5b498ae0b4722b0c098e2eed43d4f93b622964059525e6d9d14a47d55f775
+DIST mysql-5.5.61.tar.gz 21027098 BLAKE2B b7589f632a211349fc34cec94e333b878e07113969bf5cf6f78cd37435d95b15c03eaf188ed09768033b182de125c9f018a5fe902094f17ab891f94cab9de6dd SHA512 978384915c145ec8f0d85deb764154d8d4a9764f2d342928bda6ad43a00bc110aa888895416d2ba5684a4432e433037990dd3fe8c5caf024faa487bc2e153f49
 DIST mysql-5.6.38.tar.gz 32197625 BLAKE2B 5edd6d05e562568d2418edd81c6822b397103013e92beacc00964401c6df67f8a934f05b57c6679aa25a49ef6db2e4a06056f3f1850e0f2afe4de895c7b8f686 SHA512 8144aec822f053fbdfa11ae542e96d3e7da93552b60ed131f041ec4832f48c95025b322340a2e90a82c18b6ee6bfd708f209735f82e37532198245aad697b93d
 DIST mysql-5.6.39.tar.gz 32110958 BLAKE2B 2f279c6745bc995c860bb4f2868409136e112cc8b9fb0c04fa7673bb6d5612f3ef6d3462666de736d6e7fe5439275ab49908a6609175d1cb8c096d5db5ecb59c SHA512 e1e60854c82d71f9600bf611df964f441815d9d0f896134110a749b29fe340fa216d7c89f4da63d492929565f19a2502463549b8c8c038c658e0be8409a3ffb5
 DIST mysql-5.6.40.tar.gz 32083035 BLAKE2B efcc078341bae239df28ac0504111aa34926885ae47edb5011352b56552a5a3abd1f824f8cbdc23d8d667592b8f5510946ef18c3efa61865dbbc7f4bb8a2d4a0 SHA512 c8e458b4cd34cae87f1b088ed2188bd00de8cdc42709d5964e82fa2e4aaecfc12a75ae006c54ffa0d3d286fbdef9704d0cbb83436437d5705fb8921d960e758c
-DIST mysql-boost-5.7.22.tar.gz 48985783 BLAKE2B 208d684e038366824de4bfbe87b6761f91d05fc5cd46cfa89eb627025fb726efe2d7a08a8ce252fed369e399d2d4921bb93c446a296b617320c53ce351fc17c2 SHA512 186c9e9735114e312c65531c70e6b0b9b48b0fe14384b7a6ebfac2c1f91c3f4ac223d06e27a424fc75f57e0aaf2f74d6a8411a8ab9c6fed45c499068d0f1dc2a
+DIST mysql-5.6.41.tar.gz 32111985 BLAKE2B 5ccad59333525b354db4fa892857e237cddf8fe1a4d289c6e410c31d6142a71d3ce4dab8d954fa9932ec1f83b50e8eccd5845e082deaaa56f1c0c5e21b2ce6c0 SHA512 a62d7a68c6bb49de33f8c9e634bce53cb453a87238e92967115e8e928fa9ed291727b8bd5a5271a0b5b634d957eb310c745edfb14b6be1deb9099bb757aa2cff
+DIST mysql-boost-5.7.23.tar.gz 49025014 BLAKE2B 669f10779bc2cda866d6bd876b4efe55fb4b0c796f596f66513a3ca85f322e2a03e9879eecd72a69729a0cb71d408c46cdd9086ae456712b4adff6ae7c584c97 SHA512 e4317f89d108a68652cd95e41ffd670c37b6663aabd6af3985d18052fb7e8d8879b5822399caf9091cecc0a949ec588c121c87cfd60d69941f68d0ecbedd0953
 DIST mysql-extras-20171121-1518Z.tar.bz2 313539 BLAKE2B c397fdf7ffb3fcbcecda20933e18234062a9500dcf4031e9b17131e2a1f23dca7535ed33ff541fc075eb9995c67a9a8fd7261d7524dd42d8d333543c368b4c15 SHA512 dd0d4a00c0ed710e786d157a73f02c6f555ab7a68e57014d958627096a4245a0b45d22ec860dc5389002d106554e80166661c0b6ddcadff1f737e3fa195badda
 DIST mysql-extras-20180214-0024Z.tar.bz2 316686 BLAKE2B a893e2975a8062ab236f642d158a7833656942adb31d467b784a9224e7dd87872c3784bb29e93b620a58cd9a835d65248f1a817cdbafa574b5949e2b4262108a SHA512 ad0e81695a70954ad107fe104f9140be24e53d499aed6c123e68e1a062ec5cc90c70f6272fdc014e567794e331301e656ba01b22c2c7a1afaf11e14a9190fb0b
-DIST mysql-extras-20180312-2011Z.tar.bz2 319047 BLAKE2B 1da22a0c763a85a6350122c0c56aef4999279c1ef7cf99bcec28348acc83964eb257bb4340c1a21bdcd3b1eb024b23fa62879bed8679c410d847324cb7e24b82 SHA512 b0aa9fc8fbc050451ef147cee99b00cf10d34a71641837821e78655241f7d79a94fe2efb4cef9a23fe9741e08ada2fc0b58ef3b3663752bc567babfbcaa547c8
-DIST mysql-extras-20180628-0201Z.tar.bz2 322141 BLAKE2B fce35cfea4ffa9860908fcdf440cd0d714c402c42ee2afb22cec9e727971c216310c7db561ca1b37deebb2cea5137fe24f19b491ad500949e3170ccec3de0b13 SHA512 71a3800ec091b41e41d25536199149eb714c0bbfc0f6fc478e8e4dcaf4cf87a7e4d49c513da3c9badc0de810d7d78c05ad91dd898e45005b42136346237de42a
-EBUILD mysql-5.5.60-r1.ebuild 25523 BLAKE2B 7d6f2e438d58e91a7f4f3f01df3e2b8ac98b82c8e38ab1b97ef259ca5d1d19c804e2a79cf2d270dfd1e7d51b83546f65a8a06cd5cfd19c575dc94c6c60e18c76 SHA512 8ecb7f79481736dc30d65d237485b1afaa5e29804efe3b53e6ba3bfe2dcf02ecc94ce8154ca1ff7b57c2de345ec0b463c2fc929b8ef37beab465e8e77a0e1516
+DIST mysql-extras-20180804-2323Z.tar.bz2 322215 BLAKE2B cca9e502e375bf43473335868517f6c450fc7bcf03e55de5a294c8bdcfcac2bb783dec09bbb3b6c30a561ba7e3a943543c017e2d42b61d466e699acdef4c0231 SHA512 efd9d416f394cc61b977ab76f05ab3acc5803ff8bdee8e1dbc65cc5b3f07e4f9742140d9586c028908b10fcc44f21c98ebffdebcc5c3578acbe05b07526bcb3d
 EBUILD mysql-5.5.60.ebuild 4381 BLAKE2B c48db634322354aeb487df4df4eff2a27b2e69d9aa5785f349c45f8e947a7e3572e86f013d71e0063b69731fda9155811928336f270d0fee3230caf6eeeae6ed SHA512 f3e4946ede777c0bc39ae415f3f30bb33be145f15f452829683fcbd2e191cd65d6d0f3c6d372651468bb25ea7bfab3f5c8dbadcf4021ca3f0cebf1590eed6ce9
+EBUILD mysql-5.5.61.ebuild 25516 BLAKE2B 3363fc9f99fb6a3085a7de3cf540ddd853365b5865a418c752255417040ca568fa16a02e0b74cd98502eeadda4d11e7bd37269d1416232db279eedee15630320 SHA512 ccfbdef198de75215efb498a76525e03f469a5c596b9fe366f9e1973969f928263be1628b378369d76899eea6d7750c45ce07827d11b0f277b2aee2242540645
 EBUILD mysql-5.6.38.ebuild 6466 BLAKE2B c85ee0bd78a7b75a328a72120444277c9425886e06dc9134662669c73af4d1da45c6d49943f44fbe518379d0babd0590a3ae127f7552862aeb6eacbc18e6cd1c SHA512 e4272584a5de91df2b5f4fee2060e3ca3b5151472bc5e9d472004fdc213f0fc9527874958995bb039847f7f5da97047fc3e9b12f61cecdf03b9d3f65d707be78
 EBUILD mysql-5.6.39.ebuild 6520 BLAKE2B d21e873fb57b7b311e7c06d680963794f1b7eb63c118a90aba8d4d036b0449c109e7c50c58a7616bf0b6545225f505fa5a6bcbcb3c0b095ba7c09dc3d296cc63 SHA512 e3c0b406a9c738d0474428c3007888d70832cd61c5a1d1bfad9ff9842f54c67f9494ca81e9647621b68a7e8ccb40af2ecc7fec4118538e569aeb58fe797c54e5
-EBUILD mysql-5.6.40-r1.ebuild 25132 BLAKE2B 294e3d6f059684e5e83948652dfd9afc93b9c4deb9ea087bf0a3560c3920b4cf56a9d30a1ebe36e71d6e899d42590280f8dc876a71f2ef74079271e2915e9c43 SHA512 83975be32ff344515d81d405be5cbc3b29942e8e78eea1f5c3eaa9b5d9035b095843cdea6f81cf225caf2c905670948cda54924b1597beeaadc25891e294784a
 EBUILD mysql-5.6.40.ebuild 6522 BLAKE2B 827d56358a9ce44501ca273f8d8029e66f93c07bf1668ca3e35cba65e226f8ca5cd95652e14c7cd27e5ea447897a3848f5faae6c5106349dd9a9ec60345a0999 SHA512 f5b76ad45fe1ff384126c4ca034fcace50e116d2748e242102a14f335b937187abaaea7d86e9ffcfd3c9bd74a06fed97a1c634704aabc7c62641804c0f5f7dad
-EBUILD mysql-5.7.22.ebuild 26968 BLAKE2B 12c16254b4173f661462e5b65a84966e60816d40294defaa3cf8d2dd21b1d2cc3d5210230527bbbe4f3e40ed38c99704e059d810001eaa008811b23ee6bd0e76 SHA512 4d10eb23cd398739dac2234ba33cf4009b8ca01acf3b0549bd8e48f427b702102c9a01b7c5e3f699ca7faa1e068d600bcd0a3d8e758f02bc98f617d3f51e9e4a
+EBUILD mysql-5.6.41.ebuild 25132 BLAKE2B c4a4eda7d5d55f30caf4f500c5e67ddc4b3b129fbdd71e10a9cbec07f1da04d931e35caf5ba0ab6cdc08d6da9f86ec575a100538c945d73069ba89f819272501 SHA512 531fbecde63be61078dd7be79b3a11abb11ff8e266dd3ef093775e5c2f66b5f2305735242939f53d047be1494c630f4cfb14fdea2f0c0451f67c33fd5bd13352
+EBUILD mysql-5.7.23.ebuild 27020 BLAKE2B b430c1582c802202d25a13049fccbbfa761d729b868ac7a22930f685c40d8e6a122a7a4c8bf8b830b17328592cb353cc33a4b32094675dac95aa957e6332652d SHA512 f1284dc26df2fee22d8f3dcdcbe3a0c34da350849fa99fcd30e661310eb51dc09ad18cdf2b65d2527d91a9bc37f96f6553b9c3994f8110b4f134bd8656711430
 MISC metadata.xml 1916 BLAKE2B da2c681ac07c234aa7ecc6f52a1ed63bf49241f7cb270733d0acf523ae5c420bb8f91628bf8510f9365b137ddd63224fd9da6a00df976832947ce043da49a602 SHA512 eac8cb1f76264b46137794c7c47907579af51ac9184aba324f3951135f60dc58c642efdd0a7a3e5c438322f8de4066425ec306d0924472853413be2fd19cbaf9
diff --git a/dev-db/mysql/mysql-5.5.60-r1.ebuild b/dev-db/mysql/mysql-5.5.60-r1.ebuild
deleted file mode 100644
index 36a1e5f70c45..000000000000
--- a/dev-db/mysql/mysql-5.5.60-r1.ebuild
+++ /dev/null
@@ -1,791 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20180628-0201Z"
-SUBSLOT="18"
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eutils flag-o-matic prefix toolchain-funcs user cmake-utils multilib-build
-
-SRC_URI="https://cdn.mysql.com/Downloads/MySQL-5.5/${P}.tar.gz
-	https://downloads.mysql.com/archives/MySQL-5.5/${P}.tar.gz"
-# Gentoo patches to MySQL
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-HOMEPAGE="https://mysql.com/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2"
-SLOT="0/${SUBSLOT:-0}"
-IUSE="bindist client-libs debug extraengine jemalloc latin1 libressl
-	+perl profiling selinux +server	static static-libs systemtap tcmalloc
-	test yassl"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc )
-	static? ( yassl )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
-	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
-	EGIT_CLONE_TYPE=shallow
-else
-	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
-	"${MY_PATCH_DIR}/01050_all_mysql_config_cleanup-5.5.patch"
-	"${MY_PATCH_DIR}/02040_all_embedded-library-shared-5.5.10.patch"
-	"${MY_PATCH_DIR}/20001_all_fix-minimal-build-cmake-mysql-5.5.41.patch"
-	"${MY_PATCH_DIR}/20002_all_mysql-va-list.patch"
-	"${MY_PATCH_DIR}/20006_all_cmake_elib-mysql-5.5.53.patch"
-	"${MY_PATCH_DIR}/20007_all_cmake-debug-werror-5.6.22.patch"
-	"${MY_PATCH_DIR}/20008_all_mysql-tzinfo-symlink-5.6.37.patch"
-	"${MY_PATCH_DIR}/20009_all_mysql_myodbc_symbol_fix-5.5.38.patch"
-	"${MY_PATCH_DIR}/20018_all_mysql-5.5.60-without-clientlibs-tools.patch"
-	"${MY_PATCH_DIR}/20027_all_mysql-5.5-perl5.26-includes.patch"
-	"${MY_PATCH_DIR}/20030_all_mysql-5.5-fix-client-mysql-type.patch"
-)
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-	kernel_linux? (
-		sys-process/procps:0=
-		dev-libs/libaio:0=
-	)
-	>=sys-apps/sed-4
-	>=sys-apps/texinfo-4.7-r1
-	jemalloc? ( dev-libs/jemalloc:0= )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
-	!yassl? (
-		!libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	>=sys-libs/zlib-1.2.3:0=
-	sys-libs/ncurses:0=
-	!bindist? (
-		>=sys-libs/readline-4.1:0=
-	)
-	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
-"
-DEPEND="virtual/yacc
-	static? ( sys-libs/ncurses[static-libs] )
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	${COMMON_DEPEND}"
-RDEPEND="selinux? ( sec-policy/selinux-mysql )
-	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
-	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
-	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	${COMMON_DEPEND}
-	perl? ( !dev-db/mytop
-		virtual/perl-Getopt-Long
-		dev-perl/TermReadKey
-		virtual/perl-Term-ANSIColor
-		virtual/perl-Time-HiRes )
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		local GCC_MAJOR_SET=$(gcc-major-version)
-		local GCC_MINOR_SET=$(gcc-minor-version)
-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
-		# non x86{,_64} arches
-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
-			eerror "${PN} needs to be built with gcc-4.7 or later."
-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-			die
-		fi
-	fi
-	if has test ${FEATURES} && \
-		use server && ! has userpriv ${FEATURES} ; then
-			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	if use server ; then
-		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-			einfo
-			elog "You might want to run:"
-			elog "\"emerge --config =${CATEGORY}/${PF}\""
-			elog "if this is a new install."
-			elog
-			elog "If you are switching server implentations, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		else
-			einfo
-			elog "If you are upgrading major versions, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		fi
-
-		einfo
-		elog "Be sure to edit the my.cnf file to activate your cluster settings."
-		elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
-		elog "The first time the cluster is activated, you should add"
-		elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
-		elog "This option should then be removed for subsequent starts."
-		einfo
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack
-
-	mv -f "${WORKDIR%/}/${P}" "${S}" || die
-}
-
-src_prepare() {
-	_disable_engine() {
-		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
-	}
-
-	_disable_plugin() {
-		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
-	}
-
-	if use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
-	fi
-
-	if use jemalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
-	fi
-
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
-	local plugin
-	local server_plugins=( semisync )
-	local test_plugins=( audit_null daemon_example fulltext )
-	if ! use server; then # These plugins are for the server
-		for plugin in "${server_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-	fi
-
-	if ! use test; then # These plugins are only used during testing
-		for plugin in "${test_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-	fi
-
-	# Don't build example
-	_disable_engine example
-	_disable_engine ndb
-
-	cmake-utils_src_prepare
-}
-
-src_configure(){
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	append-cxxflags -felide-constructors
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		-DWITH_ZLIB=system
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		# The build forces this to be defined when cross-compiling.  We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DWITHOUT_CLIENTLIBS=YES
-		-DWITH_READLINE=$(usex bindist 1 0)
-		-DENABLE_DTRACE=$(usex systemtap)
-	)
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	if ! use yassl ; then
-		mycmakeargs+=( -DWITH_SSL=system )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	fi
-
-	if use server ; then
-
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
-		if ! use extraengine ; then
-			mycmakeargs+=(
-				-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-				-DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1 )
-		fi
-
-		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-			ewarn "You MUST file bugs without these variables set."
-
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-			)
-
-		elif ! use latin1 ; then
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=utf8
-				-DDEFAULT_COLLATION=utf8_general_ci
-			)
-		else
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=latin1
-				-DDEFAULT_COLLATION=latin1_swedish_ci
-			)
-		fi
-		mycmakeargs+=(
-			-DINSTALL_SQLBENCHDIR=share/mysql
-			-DEXTRA_CHARSETS=all
-			-DDISABLE_SHARED=$(usex static YES NO)
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DENABLED_PROFILING=$(usex profiling)
-		)
-
-		if use static; then
-			mycmakeargs+=( -DWITH_PIC=1 )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-			-DWITH_PARTITION_STORAGE_ENGINE=1
-		)
-
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DEXTRA_CHARSETS=none
-			-DINSTALL_SQLBENCHDIR=
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-	if [[ -f "${ED%/}/usr/include/mysql/server/private/config.h" ]] ; then
-		rm "${ED%/}/usr/include/mysql/server/private/config.h" || die
-	fi
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED%/}/usr/data" ]] ; then
-		rm -Rf "${ED%/}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${D%/}/${MY_SHAREDSTATEDIR}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf
-	local mycnf_src="my.cnf-5.5"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR%/}/${mycnf_src}" \
-		> "${TMPDIR%/}/my.cnf.ok" || die
-	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8|latin1|g" \
-			"${TMPDIR%/}/my.cnf.ok" || die
-	fi
-	eprefixify "${TMPDIR%/}/my.cnf.ok"
-	newins "${TMPDIR}/my.cnf.ok" my.cnf
-
-	if use server ; then
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		local script
-		for script in \
-			"${S%/}"/support-files/magic
-		do
-			[[ -f "$script" ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S%/}"/scripts/mysql* ; do
-			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
-		done
-	fi
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED%/}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED%/}/usr/bin/mytop"
-}
-
-# Official test instructions:
-# USE='extraengine perl server' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	_disable_test() {
-		local rawtestname reason
-		rawtestname="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}'"
-		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ $UID -eq 0 ]]; then
-		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
-
-	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	# Run CTest (test-units)
-	cmake-utils_src_test
-	retstatus_unit=$?
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-	# Enable parallel testing, auto will try to detect number of cores
-	# You may set this by hand.
-	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" > /dev/null || die
-
-	touch "${T}/disabled.def"
-	# These are failing in MySQL 5.5 for now and are believed to be
-	# false positives:
-	#
-	# main.mysql_client_test, main.mysql_client_test_nonblock
-	# main.mysql_client_test_comp:
-	# segfaults at random under Portage only, suspect resource limits.
-
-	local t
-	for t in main.mysql_client_test main.mysql_client_test_nonblock \
-		main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam \
-		main.mysqlhotcopy_archive main.mysqlhotcopy_myisam main.openssl_1 \
-		rpl.rpl_semi_sync_uninstall_plugin ; do
-			_disable_test  "$t" "False positives in Gentoo"
-	done
-
-	if ! use client-libs ; then
-		_disable_test main.plugin_auth "Needs client libraries built"
-	fi
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd > /dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "$failures" ]] || die "Test failures: $failures"
-	einfo "Tests successfully completed"
-}
-
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1`
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_config() {
-	_getoptval() {
-		local mypd="${EROOT}"/usr/bin/my_print_defaults
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
-	}
-	local old_MY_DATADIR="${MY_DATADIR}"
-	local old_HOME="${HOME}"
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX}/root
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-	if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-	if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
-		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
-	fi
-	if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
-		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
-	fi
-	if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
-		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
-	fi
-
-	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now"
-		einfo "or through the ${HOME}/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options
-	local sqltmp="$(emktemp)"
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in grant-tables host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-
-	einfo "Creating the mysql database and setting proper permissions on it ..."
-
-	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
-	PID_DIR="${EROOT}/var/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]]; then
-		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]]; then
-		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
-	fi
-
-	pushd "${TMPDIR}" &>/dev/null || die
-
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
-	local cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
-	[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
-	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
-	einfo "Command: ${cmd[*]}"
-	su -s /bin/sh -c "${cmd[*]}" mysql \
-		>"${TMPDIR}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-	fi
-	popd &>/dev/null || die
-	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-
-	use prefix || options="${options} --user=mysql"
-
-	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT}/usr/sbin/mysqld \
-		${options} \
-		--log-warnings=0 \
-		--basedir=${EROOT}/usr \
-		--datadir=${ROOT}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--socket=${socket} \
-		--pid-file=${pidfile}
-		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	einfo "Command ${mysqld}"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
-	"${EROOT}/usr/bin/mysql" \
-		"--socket=${socket}" \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	if [[ -n "${sqltmp}" ]] ; then
-		ebegin "Loading \"zoneinfo\", this step may require a few seconds"
-		"${EROOT}/usr/bin/mysql" \
-			"--socket=${socket}" \
-			-hlocalhost \
-			-uroot \
-			--password="${MYSQL_ROOT_PASSWORD}" \
-			mysql < "${sqltmp}"
-		rc=$?
-		eend $?
-		[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
-	fi
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}
diff --git a/dev-db/mysql/mysql-5.5.61.ebuild b/dev-db/mysql/mysql-5.5.61.ebuild
new file mode 100644
index 000000000000..b2c26da97b4f
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.61.ebuild
@@ -0,0 +1,791 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20180804-2323Z"
+SUBSLOT="18"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils flag-o-matic prefix toolchain-funcs user cmake-utils multilib-build
+
+SRC_URI="https://cdn.mysql.com/Downloads/MySQL-5.5/${P}.tar.gz
+	https://downloads.mysql.com/archives/MySQL-5.5/${P}.tar.gz"
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+	SRC_URI="${SRC_URI}
+		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+fi
+
+HOMEPAGE="https://mysql.com/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="bindist client-libs debug extraengine jemalloc latin1 libressl
+	+perl profiling selinux +server	static static-libs systemtap tcmalloc
+	test yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="!bindist? ( bindist ) libressl? ( test )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )
+	static? ( yassl )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
+	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
+	EGIT_CLONE_TYPE=shallow
+else
+	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
+fi
+
+PATCHES=(
+	"${MY_PATCH_DIR}/01050_all_mysql_config_cleanup-5.5.patch"
+	"${MY_PATCH_DIR}/02040_all_embedded-library-shared-5.5.10.patch"
+	"${MY_PATCH_DIR}/20001_all_fix-minimal-build-cmake-mysql-5.5.41.patch"
+	"${MY_PATCH_DIR}/20002_all_mysql-va-list.patch"
+	"${MY_PATCH_DIR}/20006_all_cmake_elib-mysql-5.5.53.patch"
+	"${MY_PATCH_DIR}/20007_all_cmake-debug-werror-5.6.22.patch"
+	"${MY_PATCH_DIR}/20008_all_mysql-tzinfo-symlink-5.6.37.patch"
+	"${MY_PATCH_DIR}/20009_all_mysql_myodbc_symbol_fix-5.5.38.patch"
+	"${MY_PATCH_DIR}/20018_all_mysql-5.5.60-without-clientlibs-tools.patch"
+	"${MY_PATCH_DIR}/20027_all_mysql-5.5-perl5.26-includes.patch"
+	"${MY_PATCH_DIR}/20030_all_mysql-5.5-fix-client-mysql-type.patch"
+)
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	jemalloc? ( dev-libs/jemalloc:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	!yassl? (
+		!libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	>=sys-libs/zlib-1.2.3:0=
+	sys-libs/ncurses:0=
+	!bindist? (
+		>=sys-libs/readline-4.1:0=
+	)
+	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
+"
+DEPEND="virtual/yacc
+	static? ( sys-libs/ncurses[static-libs] )
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+	${COMMON_DEPEND}
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+	fi
+	if has test ${FEATURES} && \
+		use server && ! has userpriv ${FEATURES} ; then
+			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+
+	# This should come after all of the die statements
+	enewgroup mysql 60 || die "problem adding 'mysql' group"
+	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+	if use server ; then
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+
+		einfo
+		elog "Be sure to edit the my.cnf file to activate your cluster settings."
+		elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+		elog "The first time the cluster is activated, you should add"
+		elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+		elog "This option should then be removed for subsequent starts."
+		einfo
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	# Grab the patches
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack
+
+	mv -f "${WORKDIR%/}/${P}" "${S}" || die
+}
+
+src_prepare() {
+	_disable_engine() {
+		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	_disable_plugin() {
+		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
+	}
+
+	if use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
+	fi
+
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
+	fi
+
+	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
+	if [[ -d "${S}/support-files/SELinux" ]] ; then
+		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+	fi
+
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+
+	local plugin
+	local server_plugins=( semisync )
+	local test_plugins=( audit_null daemon_example fulltext )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	if ! use test; then # These plugins are only used during testing
+		for plugin in "${test_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	# Don't build example
+	_disable_engine example
+	_disable_engine ndb
+
+	cmake-utils_src_prepare
+}
+
+src_configure(){
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mysql
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_SCRIPTDIR=share/mysql/scripts
+		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_ZLIB=system
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DWITHOUT_CLIENTLIBS=YES
+		-DWITH_READLINE=$(usex bindist 1 0)
+		-DENABLE_DTRACE=$(usex systemtap)
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	if use server ; then
+
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			mycmakeargs+=(
+				-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+				-DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1 )
+		fi
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DINSTALL_SQLBENCHDIR=share/mysql
+			-DEXTRA_CHARSETS=all
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DENABLED_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+	if [[ -f "${ED%/}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED%/}/usr/include/mysql/server/private/config.h" || die
+	fi
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED%/}/usr/data" ]] ; then
+		rm -Rf "${ED%/}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D%/}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf
+	local mycnf_src="my.cnf-5.5"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		"${FILESDIR%/}/${mycnf_src}" \
+		> "${TMPDIR%/}/my.cnf.ok" || die
+	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
+	if use latin1 ; then
+		sed -i \
+			-e "/character-set/s|utf8|latin1|g" \
+			"${TMPDIR%/}/my.cnf.ok" || die
+	fi
+	eprefixify "${TMPDIR%/}/my.cnf.ok"
+	newins "${TMPDIR}/my.cnf.ok" my.cnf
+
+	if use server ; then
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S%/}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S%/}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+	fi
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED%/}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED%/}/usr/bin/mytop"
+}
+
+# Official test instructions:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	_disable_test() {
+		local rawtestname reason
+		rawtestname="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}'"
+		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ $UID -eq 0 ]]; then
+		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake-utils_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+	# Enable parallel testing, auto will try to detect number of cores
+	# You may set this by hand.
+	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	# Run mysql tests
+	pushd "${TESTDIR}" > /dev/null || die
+
+	touch "${T}/disabled.def"
+	# These are failing in MySQL 5.5 for now and are believed to be
+	# false positives:
+	#
+	# main.mysql_client_test, main.mysql_client_test_nonblock
+	# main.mysql_client_test_comp:
+	# segfaults at random under Portage only, suspect resource limits.
+
+	local t
+	for t in main.mysql_client_test main.mysql_client_test_nonblock \
+		main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam \
+		main.mysqlhotcopy_archive main.mysqlhotcopy_myisam main.openssl_1 \
+		rpl.rpl_semi_sync_uninstall_plugin ; do
+			_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	if ! use client-libs ; then
+		_disable_test main.plugin_auth "Needs client libraries built"
+	fi
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd > /dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1`
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_config() {
+	_getoptval() {
+		local mypd="${EROOT}"/usr/bin/my_print_defaults
+		local section="$1"
+		local flag="--${2}="
+		local extra_options="${3}"
+		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+	}
+	local old_MY_DATADIR="${MY_DATADIR}"
+	local old_HOME="${HOME}"
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	export HOME=${EPREFIX}/root
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+	if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+		MY_DATADIR_s="${MY_DATADIR_s%%/}"
+		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+			else
+				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+				|| die "Moving MY_DATADIR failed"
+			fi
+		else
+			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Attempting to use ${MY_DATADIR_s}"
+			else
+				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+			fi
+		fi
+	fi
+
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=15
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
+		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
+	fi
+	if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
+		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
+	fi
+	if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
+		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
+	fi
+
+	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "(${ROOT}/${MY_DATADIR}/*)"
+		ewarn "Please rename or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+		einfo "Please provide a password for the mysql 'root' user now"
+		einfo "or through the ${HOME}/.my.cnf file."
+		ewarn "Avoid [\"'\\_%] characters in the password"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same"
+		fi
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+	fi
+
+	local options
+	local sqltmp="$(emktemp)"
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+	for opt in grant-tables host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+		; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+	done
+
+	einfo "Creating the mysql database and setting proper permissions on it ..."
+
+	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+	PID_DIR="${EROOT}/var/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]]; then
+		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]]; then
+		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
+	fi
+
+	pushd "${TMPDIR}" &>/dev/null || die
+
+	# Filling timezones, see
+	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+
+	local cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
+	[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
+	einfo "Command: ${cmd[*]}"
+	su -s /bin/sh -c "${cmd[*]}" mysql \
+		>"${TMPDIR}"/mysql_install_db.log 2>&1
+	if [ $? -ne 0 ]; then
+		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+	fi
+	popd &>/dev/null || die
+	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+	|| die "MySQL databases not installed"
+
+	use prefix || options="${options} --user=mysql"
+
+	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+	local mysqld="${EROOT}/usr/sbin/mysqld \
+		${options} \
+		--log-warnings=0 \
+		--basedir=${EROOT}/usr \
+		--datadir=${ROOT}/${MY_DATADIR} \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--socket=${socket} \
+		--pid-file=${pidfile}
+		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
+	#einfo "About to start mysqld: ${mysqld}"
+	ebegin "Starting mysqld"
+	einfo "Command ${mysqld}"
+	${mysqld} &
+	rc=$?
+	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+	eend $rc
+
+	if ! [[ -S "${socket}" ]]; then
+		die "Completely failed to start up mysqld with: ${mysqld}"
+	fi
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
+	"${EROOT}/usr/bin/mysql" \
+		"--socket=${socket}" \
+		-hlocalhost \
+		-e "${sql}"
+	eend $?
+
+	if [[ -n "${sqltmp}" ]] ; then
+		ebegin "Loading \"zoneinfo\", this step may require a few seconds"
+		"${EROOT}/usr/bin/mysql" \
+			"--socket=${socket}" \
+			-hlocalhost \
+			-uroot \
+			--password="${MYSQL_ROOT_PASSWORD}" \
+			mysql < "${sqltmp}"
+		rc=$?
+		eend $?
+		[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+	fi
+
+	# Stop the server and cleanup
+	einfo "Stopping the server ..."
+	kill $(< "${pidfile}" )
+	rm -f "${sqltmp}"
+	wait %1
+	einfo "Done"
+}
diff --git a/dev-db/mysql/mysql-5.6.40-r1.ebuild b/dev-db/mysql/mysql-5.6.40-r1.ebuild
deleted file mode 100644
index 38515733ba7b..000000000000
--- a/dev-db/mysql/mysql-5.6.40-r1.ebuild
+++ /dev/null
@@ -1,768 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20180628-0201Z"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eutils flag-o-matic prefix toolchain-funcs \
-	user cmake-utils multilib-build
-
-SRC_URI="http://cdn.mysql.com/Downloads/MySQL-5.6/${P}.tar.gz
-	https://cdn.mysql.com/archives/mysql-5.6/${P}.tar.gz
-	http://downloads.mysql.com/archives/MySQL-5.6/${P}.tar.gz"
-
-# Gentoo patches to MySQL
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-HOMEPAGE="https://www.mysql.com/"
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-LICENSE="GPL-2"
-SLOT="0/18"
-IUSE="client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux
-	+server static static-libs systemtap tcmalloc test yassl"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/mysql-extras"
-	EGIT_CLONE_TYPE=shallow
-	MY_PATCH_DIR="${WORKDIR}/mysql-extras"
-else
-	MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
-	"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
-	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
-	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.6.35.patch
-	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
-	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.6.37.patch
-	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.25-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
-	"${MY_PATCH_DIR}"/20028_all_mysql-5.6-gcc7.patch
-	"${MY_PATCH_DIR}"/20031_all_mysql-5.6-fix-monitor.test.patch
-)
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-	kernel_linux? (
-		sys-process/procps:0=
-		dev-libs/libaio:0=
-	)
-	net-misc/curl
-	>=sys-apps/sed-4
-	>=sys-apps/texinfo-4.7-r1
-	jemalloc? ( dev-libs/jemalloc:0= )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
-	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	>=sys-libs/zlib-1.2.3:0=
-	sys-libs/ncurses:0=
-	server? (
-		numa? ( sys-process/numactl )
-	)
-	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
-"
-DEPEND="virtual/yacc
-	static? ( sys-libs/ncurses[static-libs] )
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	${COMMON_DEPEND}"
-RDEPEND="selinux? ( sec-policy/selinux-mysql )
-	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
-	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
-	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	${COMMON_DEPEND}
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		local GCC_MAJOR_SET=$(gcc-major-version)
-		local GCC_MINOR_SET=$(gcc-minor-version)
-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
-		# non x86{,_64} arches
-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
-			eerror "${PN} needs to be built with gcc-4.7 or later."
-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-			die
-		fi
-	fi
-	if has test ${FEATURES} && \
-		use server && ! has userpriv ${FEATURES} ; then
-			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-}
-
-pkg_preinst() {
-	# Here we need to see if the implementation switched client libraries
-	# We check if this is a new instance of the package and a client library already exists
-	local SHOW_ABI_MESSAGE libpath
-	if use client-libs && [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
-		libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
-		elog "Due to ABI changes when switching between different client libraries,"
-		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
-		elog "Please run: revdep-rebuild --library ${libpath}"
-		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
-	fi
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	if use server ; then
-		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-			einfo
-			elog "You might want to run:"
-			elog "\"emerge --config =${CATEGORY}/${PF}\""
-			elog "if this is a new install."
-			elog
-			elog "If you are switching server implentations, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		else
-			einfo
-			elog "If you are upgrading major versions, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
-
-	mv -f "${WORKDIR}/${P}" "${S}" || die
-}
-
-src_prepare() {
-	_disable_engine() {
-		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
-	}
-
-	_disable_plugin() {
-		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
-	}
-
-	if use jemalloc ; then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-	if use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
-	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
-
-	local plugin
-	local server_plugins=( semisync )
-	local test_plugins=( audit_null daemon_example fulltext )
-	if ! use server; then # These plugins are for the server
-		for plugin in "${server_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-	fi
-
-	if ! use test; then # These plugins are only used during testing
-		for plugin in "${test_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-	fi
-
-	# Don't build example
-	_disable_engine example
-	_disable_engine ndb
-	_disable_plugin innodb_memcached
-
-	cmake-utils_src_prepare
-}
-
-src_configure(){
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	append-cxxflags -felide-constructors
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		### TODO: make this system but issues with UTF-8 prevent it
-		-DWITH_EDITLINE=bundled
-		-DWITH_ZLIB=system
-		-DWITH_LIBWRAP=0
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DWITH_DEFAULT_FEATURE_SET=0
-		# The build forces this to be defined when cross-compiling.  We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DWITH_LIBEVENT=NO
-		-DWITHOUT_CLIENTLIBS=YES
-		-DENABLE_DTRACE=$(usex systemtap)
-		-DWITH_SSL=$(usex yassl bundled system)
-		-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mysql/mysql-test' '')
-		-DWITHOUT_VALIDATE_PASSWORD=1
-	)
-
-	if use server ; then
-
-		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-			ewarn "You MUST file bugs without these variables set."
-
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-			)
-
-		elif ! use latin1 ; then
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=utf8
-				-DDEFAULT_COLLATION=utf8_general_ci
-			)
-		else
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=latin1
-				-DDEFAULT_COLLATION=latin1_swedish_ci
-			)
-		fi
-		mycmakeargs+=(
-			-DWITH_NUMA=$(usex numa ON OFF)
-			-DEXTRA_CHARSETS=all
-			-DDISABLE_SHARED=$(usex static YES NO)
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DENABLED_PROFILING=$(usex profiling)
-		)
-
-		if use static; then
-			mycmakeargs+=( -DWITH_PIC=1 )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-			-DWITH_PARTITION_STORAGE_ENGINE=1
-			-DWITH_INNODB_MEMCACHED=0
-		)
-
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DEXTRA_CHARSETS=none
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
-	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf
-	local mycnf_src="my.cnf-5.6"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR%/}/${mycnf_src}" \
-		> "${TMPDIR%/}/my.cnf.ok" || die
-	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8|latin1|g" \
-			"${TMPDIR%/}/my.cnf.ok" || die
-	fi
-	eprefixify "${TMPDIR%/}/my.cnf.ok"
-	newins "${TMPDIR}/my.cnf.ok" my.cnf
-
-	if use server ; then
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		local script
-		for script in \
-			"${S}"/support-files/magic
-		do
-			[[ -f "$script" ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S}"/scripts/mysql* ; do
-			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
-		done
-	fi
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-}
-
-# Official test instructions:
-# USE='perl server static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	_disable_test() {
-		local rawtestname reason
-		rawtestname="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}'"
-		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ $UID -eq 0 ]]; then
-		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
-
-	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	# Run CTest (test-units)
-	cmake-utils_src_test
-	retstatus_unit=$?
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-	# Enable parallel testing, auto will try to detect number of cores
-	# You may set this by hand.
-	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" > /dev/null || die
-
-	touch "${T}/disabled.def"
-	# These are failing in MySQL 5.7 for now and are believed to be
-	# false positives:
-	#
-	local t
-
-	for t in auth_sec.keyring_udf federated.federated_plugin ; do
-			_disable_test  "$t" "False positives in Gentoo"
-	done
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd > /dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "$failures" ]] || die "Test failures: $failures"
-	einfo "Tests successfully completed"
-}
-
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1`
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_config() {
-	_getoptval() {
-		local mypd="${EROOT%/}"/usr/bin/my_print_defaults
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
-	}
-	local old_MY_DATADIR="${MY_DATADIR}"
-	local old_HOME="${HOME}"
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-	if [[ ! -x "${EROOT%/}/usr/sbin/mysqld" ]] ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT%/}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT%/}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-	if [[ ! -d "${EROOT%/}/$MYSQL_TMPDIR" ]]; then
-		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_TMPDIR"
-	fi
-	if [[ ! -d "${EROOT%/}/$MYSQL_LOG_BIN" ]]; then
-		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_LOG_BIN"
-	fi
-	if [[ ! -d "${EROOT%/}/$MYSQL_RELAY_LOG" ]]; then
-		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_RELAY_LOG"
-	fi
-
-	if [[ -d "${ROOT%/}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT%/}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now"
-		einfo "or through the ${HOME}/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options
-	local sqltmp="$(emktemp)"
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR%/}/mysqld-help"
-	"${EROOT%/}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-
-	einfo "Creating the mysql database and setting proper permissions on it ..."
-
-	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
-	PID_DIR="${EROOT%/}/var/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]]; then
-		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]]; then
-		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
-	fi
-
-	pushd "${TMPDIR}" &>/dev/null || die
-
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	echo "USE mysql;" >"${sqltmp}"
-	"${EROOT%/}/usr/bin/mysql_tzinfo_to_sql" "${EROOT%/}/usr/share/zoneinfo" >> "${sqltmp}" 2>/dev/null
-	chown mysql "${sqltmp}" || die
-
-	# --initialize-insecure will not set root password
-	# --initialize would set a random one in the log which we don't need as we set it ourselves
-	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
-	einfo "Command: ${cmd[*]}"
-	su -s /bin/sh -c "${cmd[*]}" mysql \
-		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
-	fi
-	popd &>/dev/null || die
-	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-
-	use prefix || options="${options} --user=mysql"
-
-	local socket="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT%/}/usr/sbin/mysqld \
-		${options} \
-		$(use prefix || echo --user=mysql) \
-		--log-warnings=0 \
-		--basedir=${EROOT%/}/usr \
-		--datadir=${ROOT%/}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--socket=${socket} \
-		--pid-file=${pidfile}
-		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	einfo "Command ${mysqld}"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${MYSQL_ROOT_PASSWORD}'"
-	"${EROOT%/}/usr/bin/mysql" \
-		--no-defaults \
-		"--socket=${socket}" \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}
diff --git a/dev-db/mysql/mysql-5.6.41.ebuild b/dev-db/mysql/mysql-5.6.41.ebuild
new file mode 100644
index 000000000000..7ec34a50aadc
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.41.ebuild
@@ -0,0 +1,768 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20180804-2323Z"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils flag-o-matic prefix toolchain-funcs \
+	user cmake-utils multilib-build
+
+SRC_URI="http://cdn.mysql.com/Downloads/MySQL-5.6/${P}.tar.gz
+	https://cdn.mysql.com/archives/mysql-5.6/${P}.tar.gz
+	http://downloads.mysql.com/archives/MySQL-5.6/${P}.tar.gz"
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+	SRC_URI="${SRC_URI}
+		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+fi
+
+HOMEPAGE="https://www.mysql.com/"
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+LICENSE="GPL-2"
+SLOT="0/18"
+IUSE="client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux
+	+server static static-libs systemtap tcmalloc test yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="libressl? ( test )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/mysql-extras"
+	EGIT_CLONE_TYPE=shallow
+	MY_PATCH_DIR="${WORKDIR}/mysql-extras"
+else
+	MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+fi
+
+PATCHES=(
+	"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
+	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
+	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.6.35.patch
+	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
+	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.6.37.patch
+	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.25-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
+	"${MY_PATCH_DIR}"/20028_all_mysql-5.6-gcc7.patch
+	"${MY_PATCH_DIR}"/20031_all_mysql-5.6-fix-monitor.test.patch
+)
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	net-misc/curl
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	jemalloc? ( dev-libs/jemalloc:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	!yassl? (
+		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	>=sys-libs/zlib-1.2.3:0=
+	sys-libs/ncurses:0=
+	server? (
+		numa? ( sys-process/numactl )
+	)
+	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
+"
+DEPEND="virtual/yacc
+	static? ( sys-libs/ncurses[static-libs] )
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+	${COMMON_DEPEND}
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+	fi
+	if has test ${FEATURES} && \
+		use server && ! has userpriv ${FEATURES} ; then
+			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+
+	# This should come after all of the die statements
+	enewgroup mysql 60 || die "problem adding 'mysql' group"
+	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+pkg_preinst() {
+	# Here we need to see if the implementation switched client libraries
+	# We check if this is a new instance of the package and a client library already exists
+	local SHOW_ABI_MESSAGE libpath
+	if use client-libs && [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+		libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
+		elog "Due to ABI changes when switching between different client libraries,"
+		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
+		elog "Please run: revdep-rebuild --library ${libpath}"
+		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
+	fi
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+	if use server ; then
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	# Grab the patches
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
+
+	mv -f "${WORKDIR}/${P}" "${S}" || die
+}
+
+src_prepare() {
+	_disable_engine() {
+		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	_disable_plugin() {
+		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
+	}
+
+	if use jemalloc ; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+	if use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
+	if [[ -d "${S}/support-files/SELinux" ]] ; then
+		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+	fi
+
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+
+	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
+
+	local plugin
+	local server_plugins=( semisync )
+	local test_plugins=( audit_null daemon_example fulltext )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	if ! use test; then # These plugins are only used during testing
+		for plugin in "${test_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	# Don't build example
+	_disable_engine example
+	_disable_engine ndb
+	_disable_plugin innodb_memcached
+
+	cmake-utils_src_prepare
+}
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mysql
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_SCRIPTDIR=share/mysql/scripts
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		### TODO: make this system but issues with UTF-8 prevent it
+		-DWITH_EDITLINE=bundled
+		-DWITH_ZLIB=system
+		-DWITH_LIBWRAP=0
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DWITH_LIBEVENT=NO
+		-DWITHOUT_CLIENTLIBS=YES
+		-DENABLE_DTRACE=$(usex systemtap)
+		-DWITH_SSL=$(usex yassl bundled system)
+		-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mysql/mysql-test' '')
+		-DWITHOUT_VALIDATE_PASSWORD=1
+	)
+
+	if use server ; then
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DWITH_NUMA=$(usex numa ON OFF)
+			-DEXTRA_CHARSETS=all
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DENABLED_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+			-DWITH_INNODB_MEMCACHED=0
+		)
+
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
+	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf
+	local mycnf_src="my.cnf-5.6"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		"${FILESDIR%/}/${mycnf_src}" \
+		> "${TMPDIR%/}/my.cnf.ok" || die
+	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
+	if use latin1 ; then
+		sed -i \
+			-e "/character-set/s|utf8|latin1|g" \
+			"${TMPDIR%/}/my.cnf.ok" || die
+	fi
+	eprefixify "${TMPDIR%/}/my.cnf.ok"
+	newins "${TMPDIR}/my.cnf.ok" my.cnf
+
+	if use server ; then
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+	fi
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+}
+
+# Official test instructions:
+# USE='perl server static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	_disable_test() {
+		local rawtestname reason
+		rawtestname="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}'"
+		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ $UID -eq 0 ]]; then
+		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake-utils_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+	# Enable parallel testing, auto will try to detect number of cores
+	# You may set this by hand.
+	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	# Run mysql tests
+	pushd "${TESTDIR}" > /dev/null || die
+
+	touch "${T}/disabled.def"
+	# These are failing in MySQL 5.7 for now and are believed to be
+	# false positives:
+	#
+	local t
+
+	for t in auth_sec.keyring_udf federated.federated_plugin ; do
+			_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd > /dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1`
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_config() {
+	_getoptval() {
+		local mypd="${EROOT%/}"/usr/bin/my_print_defaults
+		local section="$1"
+		local flag="--${2}="
+		local extra_options="${3}"
+		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+	}
+	local old_MY_DATADIR="${MY_DATADIR}"
+	local old_HOME="${HOME}"
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	export HOME=${EPREFIX%/}/root
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+	if [[ ! -x "${EROOT%/}/usr/sbin/mysqld" ]] ; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+		local MY_DATADIR_s="${ROOT%/}/${MY_DATADIR}"
+		MY_DATADIR_s="${MY_DATADIR_s%%/}"
+		local old_MY_DATADIR_s="${ROOT%/}/${old_MY_DATADIR}"
+		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+			else
+				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+				|| die "Moving MY_DATADIR failed"
+			fi
+		else
+			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Attempting to use ${MY_DATADIR_s}"
+			else
+				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+			fi
+		fi
+	fi
+
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=15
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${EROOT%/}/$MYSQL_TMPDIR" ]]; then
+		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_TMPDIR"
+	fi
+	if [[ ! -d "${EROOT%/}/$MYSQL_LOG_BIN" ]]; then
+		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_LOG_BIN"
+	fi
+	if [[ ! -d "${EROOT%/}/$MYSQL_RELAY_LOG" ]]; then
+		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_RELAY_LOG"
+	fi
+
+	if [[ -d "${ROOT%/}/${MY_DATADIR}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "(${ROOT%/}/${MY_DATADIR}/*)"
+		ewarn "Please rename or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+		einfo "Please provide a password for the mysql 'root' user now"
+		einfo "or through the ${HOME}/.my.cnf file."
+		ewarn "Avoid [\"'\\_%] characters in the password"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same"
+		fi
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+	fi
+
+	local options
+	local sqltmp="$(emktemp)"
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR%/}/mysqld-help"
+	"${EROOT%/}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+		; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+	done
+
+	einfo "Creating the mysql database and setting proper permissions on it ..."
+
+	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+	PID_DIR="${EROOT%/}/var/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]]; then
+		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]]; then
+		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
+	fi
+
+	pushd "${TMPDIR}" &>/dev/null || die
+
+	# Filling timezones, see
+	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	echo "USE mysql;" >"${sqltmp}"
+	"${EROOT%/}/usr/bin/mysql_tzinfo_to_sql" "${EROOT%/}/usr/share/zoneinfo" >> "${sqltmp}" 2>/dev/null
+	chown mysql "${sqltmp}" || die
+
+	# --initialize-insecure will not set root password
+	# --initialize would set a random one in the log which we don't need as we set it ourselves
+	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
+	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+	einfo "Command: ${cmd[*]}"
+	su -s /bin/sh -c "${cmd[*]}" mysql \
+		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
+	if [ $? -ne 0 ]; then
+		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
+		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+	fi
+	popd &>/dev/null || die
+	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
+	|| die "MySQL databases not installed"
+
+	use prefix || options="${options} --user=mysql"
+
+	local socket="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.sock"
+	local pidfile="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.pid"
+	local mysqld="${EROOT%/}/usr/sbin/mysqld \
+		${options} \
+		$(use prefix || echo --user=mysql) \
+		--log-warnings=0 \
+		--basedir=${EROOT%/}/usr \
+		--datadir=${ROOT%/}/${MY_DATADIR} \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--socket=${socket} \
+		--pid-file=${pidfile}
+		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
+	#einfo "About to start mysqld: ${mysqld}"
+	ebegin "Starting mysqld"
+	einfo "Command ${mysqld}"
+	${mysqld} &
+	rc=$?
+	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+	eend $rc
+
+	if ! [[ -S "${socket}" ]]; then
+		die "Completely failed to start up mysqld with: ${mysqld}"
+	fi
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${MYSQL_ROOT_PASSWORD}'"
+	"${EROOT%/}/usr/bin/mysql" \
+		--no-defaults \
+		"--socket=${socket}" \
+		-hlocalhost \
+		-e "${sql}"
+	eend $?
+
+	# Stop the server and cleanup
+	einfo "Stopping the server ..."
+	kill $(< "${pidfile}" )
+	rm -f "${sqltmp}"
+	wait %1
+	einfo "Done"
+}
diff --git a/dev-db/mysql/mysql-5.7.22.ebuild b/dev-db/mysql/mysql-5.7.22.ebuild
deleted file mode 100644
index 3c0a0ac7c387..000000000000
--- a/dev-db/mysql/mysql-5.7.22.ebuild
+++ /dev/null
@@ -1,843 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20180312-2011Z"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eutils flag-o-matic prefix toolchain-funcs \
-	user cmake-utils multilib-minimal
-
-SRC_URI="http://cdn.mysql.com/Downloads/MySQL-5.7/${PN}-boost-${PV}.tar.gz
-	https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-${PV}.tar.gz
-	http://downloads.mysql.com/archives/MySQL-5.7/${PN}-boost-${PV}.tar.gz"
-
-# Gentoo patches to MySQL
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-HOMEPAGE="https://www.mysql.com/"
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-LICENSE="GPL-2"
-SLOT="0/18"
-IUSE="client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux
-	+server static static-libs systemtap tcmalloc test yassl"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/mysql-extras"
-	EGIT_CLONE_TYPE=shallow
-	MY_PATCH_DIR="${WORKDIR}/mysql-extras"
-else
-	MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
-	"${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.7.patch
-	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
-#	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.7.6.patch
-	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
-)
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-# MULTILIB_USEDEP only set for libraries used by the client library
-COMMON_DEPEND="
-	kernel_linux? (
-		sys-process/procps:0=
-		dev-libs/libaio:0=
-	)
-	net-misc/curl
-	>=sys-apps/sed-4
-	>=sys-apps/texinfo-4.7-r1
-	jemalloc? ( dev-libs/jemalloc:0= )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
-	!yassl? (
-		client-libs? (
-			!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
-		)
-		!client-libs? (
-			!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] )
-	!client-libs? ( >=sys-libs/zlib-1.2.3:0= )
-	sys-libs/ncurses:0=
-	server? (
-		>=app-arch/lz4-0_p131:=
-		>=dev-libs/boost-1.65.0:=
-		numa? ( sys-process/numactl )
-	)
-	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
-"
-DEPEND="virtual/yacc
-	static? ( sys-libs/ncurses[static-libs] )
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	${COMMON_DEPEND}"
-RDEPEND="selinux? ( sec-policy/selinux-mysql )
-	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
-	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
-	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	${COMMON_DEPEND}
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		local GCC_MAJOR_SET=$(gcc-major-version)
-		local GCC_MINOR_SET=$(gcc-minor-version)
-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
-		# non x86{,_64} arches
-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
-			eerror "${PN} needs to be built with gcc-4.7 or later."
-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-			die
-		fi
-	fi
-	if has test ${FEATURES} && \
-		use server && ! has userpriv ${FEATURES} ; then
-			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-}
-
-pkg_preinst() {
-	# Here we need to see if the implementation switched client libraries
-	# We check if this is a new instance of the package and a client library already exists
-	local SHOW_ABI_MESSAGE libpath
-	if use client-libs && [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
-		libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
-		elog "Due to ABI changes when switching between different client libraries,"
-		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
-		elog "Please run: revdep-rebuild --library ${libpath}"
-		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
-	fi
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	if use server ; then
-		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-			einfo
-			elog "You might want to run:"
-			elog "\"emerge --config =${CATEGORY}/${PF}\""
-			elog "if this is a new install."
-			elog
-			elog "If you are switching server implentations, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		else
-			einfo
-			elog "If you are upgrading major versions, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		fi
-	fi
-
-	# Note about configuration change
-	einfo
-	elog "This version of mysql reorganizes the configuration from a single my.cnf"
-	elog "to several files in /etc/mysql/${PN}.d."
-	elog "Please backup any changes you made to /etc/mysql/my.cnf"
-	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
-	elog "You may have as many files as needed and they are read alphabetically."
-	elog "Be sure the options have the appropitate section headers, i.e. [mysqld]."
-	einfo
-}
-
-src_unpack() {
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
-
-	mv -f "${WORKDIR}/${P}" "${S}" || die
-}
-
-src_prepare() {
-	if use jemalloc ; then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-	if use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
-	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure(){
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	append-cxxflags -felide-constructors
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	if use client-libs ; then
-		multilib-minimal_src_configure
-	else
-		multilib_src_configure
-	fi
-}
-
-multilib_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if ! multilib_is_native_abi && ! use client-libs ; then
-		return
-	fi
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		### TODO: make this system but issues with UTF-8 prevent it
-		-DWITH_EDITLINE=bundled
-		-DWITH_ZLIB=system
-		-DWITH_LIBWRAP=0
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DWITH_DEFAULT_FEATURE_SET=0
-		# The build forces this to be defined when cross-compiling.  We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DWITH_RAPID=OFF
-		-DWITH_LIBEVENT=NO
-		-DWITH_CURL=system
-		-DWITH_BOOST="${S}/boost"
-	)
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	if ! use yassl ; then
-		mycmakeargs+=( -DWITH_SSL=system )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	fi
-
-	if ! use client-libs ; then
-		mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
-	fi
-
-	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
-	# systemtap only works on native ABI  bug 530132
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DENABLE_DTRACE=$(usex systemtap)
-		)
-	else
-		mycmakeargs+=(
-			-DWITHOUT_TOOLS=1
-			-DWITH_READLINE=1
-			-DENABLE_DTRACE=0
-		)
-	fi
-
-	if multilib_is_native_abi && use server ; then
-
-		mycmakeargs+=(
-			-DWITH_LZ4=system
-			-DWITH_NUMA=$(usex numa ON OFF)
-		)
-
-		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-			ewarn "You MUST file bugs without these variables set."
-
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-			)
-
-		elif ! use latin1 ; then
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=utf8
-				-DDEFAULT_COLLATION=utf8_general_ci
-			)
-		else
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=latin1
-				-DDEFAULT_COLLATION=latin1_swedish_ci
-			)
-		fi
-		mycmakeargs+=(
-			-DEXTRA_CHARSETS=all
-			-DDISABLE_SHARED=$(usex static YES NO)
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DENABLED_PROFILING=$(usex profiling)
-		)
-
-		if use static; then
-			mycmakeargs+=( -DWITH_PIC=1 )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_EXAMPLE_STORAGE_ENGINE=0
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-			-DWITH_PARTITION_STORAGE_ENGINE=1
-			-DWITH_INNODB_MEMCACHED=0
-		)
-
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DEXTRA_CHARSETS=none
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	if use client-libs ; then
-		multilib-minimal_src_compile
-	else
-		multilib_src_compile
-	fi
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	local MULTILIB_WRAPPED_HEADERS
-	local MULTILIB_CHOST_TOOLS
-	if use client-libs ; then
-		# headers with ABI specific data
-		MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/mysql/server/my_config.h
-			/usr/include/mysql/server/mysql_version.h )
-
-		# wrap the config scripts
-		MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
-		multilib-minimal_src_install
-	else
-		multilib_src_install
-		multilib_src_install_all
-	fi
-}
-
-# Intentionally override eclass function
-multilib_src_install() {
-
-	cmake-utils_src_install
-
-	# Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
-	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-}
-
-multilib_src_install_all() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
-	eprefixify "${TMPDIR}/my.cnf"
-	doins "${TMPDIR}/my.cnf"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
-	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
-	eprefixify "${TMPDIR}/50-distro-client.cnf"
-	doins "${TMPDIR}/50-distro-client.cnf"
-
-	if use server ; then
-		mycnf_src="my.cnf.distro-server"
-		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-			"${FILESDIR}/${mycnf_src}" \
-			> "${TMPDIR}/my.cnf.ok" || die
-		if use prefix ; then
-			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
-				"${TMPDIR}/my.cnf.ok" || die
-		fi
-		if use latin1 ; then
-			sed -i \
-				-e "/character-set/s|utf8|latin1|g" \
-				"${TMPDIR}/my.cnf.ok" || die
-		fi
-		eprefixify "${TMPDIR}/my.cnf.ok"
-		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		local script
-		for script in \
-			"${S}"/support-files/magic
-		do
-			[[ -f "$script" ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S}"/scripts/mysql* ; do
-			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
-		done
-	fi
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-}
-
-# Official test instructions:
-# USE='perl server static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	_disable_test() {
-		local rawtestname reason
-		rawtestname="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}'"
-		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ $UID -eq 0 ]]; then
-		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
-
-	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	# Run CTest (test-units)
-	cmake-utils_src_test
-	retstatus_unit=$?
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-	# Enable parallel testing, auto will try to detect number of cores
-	# You may set this by hand.
-	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" > /dev/null || die
-
-	touch "${T}/disabled.def"
-	# These are failing in MySQL 5.7 for now and are believed to be
-	# false positives:
-	#
-	local t
-
-	for t in auth_sec.keyring_udf federated.federated_plugin ; do
-			_disable_test  "$t" "False positives in Gentoo"
-	done
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd > /dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "$failures" ]] || die "Test failures: $failures"
-	einfo "Tests successfully completed"
-}
-
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1`
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_config() {
-	_getoptval() {
-		local mypd="${EROOT%/}"/usr/bin/my_print_defaults
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
-	}
-	local old_MY_DATADIR="${MY_DATADIR}"
-	local old_HOME="${HOME}"
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-	if [[ ! -x "${EROOT%/}/usr/sbin/mysqld" ]] ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT%/}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT%/}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-	if [[ ! -d "${EROOT%/}/$MYSQL_TMPDIR" ]]; then
-		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_TMPDIR"
-	fi
-	if [[ ! -d "${EROOT%/}/$MYSQL_LOG_BIN" ]]; then
-		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_LOG_BIN"
-	fi
-	if [[ ! -d "${EROOT%/}/$MYSQL_RELAY_LOG" ]]; then
-		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_RELAY_LOG"
-	fi
-
-	if [[ -d "${ROOT%/}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT%/}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now"
-		einfo "or through the ${HOME}/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options
-	local sqltmp="$(emktemp)"
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR%/}/mysqld-help"
-	"${EROOT%/}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-
-	einfo "Creating the mysql database and setting proper permissions on it ..."
-
-	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
-	PID_DIR="${EROOT%/}/var/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]]; then
-		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]]; then
-		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
-	fi
-
-	pushd "${TMPDIR}" &>/dev/null || die
-
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	echo "USE mysql;" >"${sqltmp}"
-	"${EROOT%/}/usr/bin/mysql_tzinfo_to_sql" "${EROOT%/}/usr/share/zoneinfo" >> "${sqltmp}" 2>/dev/null
-	chown mysql "${sqltmp}" || die
-
-	# --initialize-insecure will not set root password
-	# --initialize would set a random one in the log which we don't need as we set it ourselves
-	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
-	einfo "Command: ${cmd[*]}"
-	su -s /bin/sh -c "${cmd[*]}" mysql \
-		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
-	fi
-	popd &>/dev/null || die
-	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-
-	use prefix || options="${options} --user=mysql"
-
-	local socket="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT%/}/usr/sbin/mysqld \
-		${options} \
-		$(use prefix || echo --user=mysql) \
-		--log-warnings=0 \
-		--basedir=${EROOT%/}/usr \
-		--datadir=${ROOT%/}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--socket=${socket} \
-		--pid-file=${pidfile}
-		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	einfo "Command ${mysqld}"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${MYSQL_ROOT_PASSWORD}'"
-	"${EROOT%/}/usr/bin/mysql" \
-		--no-defaults \
-		"--socket=${socket}" \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}
diff --git a/dev-db/mysql/mysql-5.7.23.ebuild b/dev-db/mysql/mysql-5.7.23.ebuild
new file mode 100644
index 000000000000..aad033f5ecc8
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.23.ebuild
@@ -0,0 +1,845 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20180804-2323Z"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils flag-o-matic prefix toolchain-funcs \
+	user cmake-utils multilib-minimal
+
+SRC_URI="http://cdn.mysql.com/Downloads/MySQL-5.7/${PN}-boost-${PV}.tar.gz
+	https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-${PV}.tar.gz
+	http://downloads.mysql.com/archives/MySQL-5.7/${PN}-boost-${PV}.tar.gz"
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+	SRC_URI="${SRC_URI}
+		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+fi
+
+HOMEPAGE="https://www.mysql.com/"
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+LICENSE="GPL-2"
+SLOT="0/18"
+IUSE="client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux
+	+server static static-libs systemtap tcmalloc test yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="libressl? ( test )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/mysql-extras"
+	EGIT_CLONE_TYPE=shallow
+	MY_PATCH_DIR="${WORKDIR}/mysql-extras"
+else
+	MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+fi
+
+PATCHES=(
+	"${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.7.patch
+	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
+#	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.7.6.patch
+	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
+)
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+# MULTILIB_USEDEP only set for libraries used by the client library
+COMMON_DEPEND="
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	net-misc/curl
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	jemalloc? ( dev-libs/jemalloc:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	!yassl? (
+		client-libs? (
+			!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+		)
+		!client-libs? (
+			!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] )
+	!client-libs? ( >=sys-libs/zlib-1.2.3:0= )
+	sys-libs/ncurses:0=
+	server? (
+		>=app-arch/lz4-0_p131:=
+		>=dev-libs/boost-1.65.0:=
+		numa? ( sys-process/numactl )
+	)
+	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
+"
+DEPEND="virtual/yacc
+	dev-libs/protobuf
+	static? ( sys-libs/ncurses[static-libs] )
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= )
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+	${COMMON_DEPEND}
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+	fi
+	if has test ${FEATURES} && \
+		use server && ! has userpriv ${FEATURES} ; then
+			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+
+	# This should come after all of the die statements
+	enewgroup mysql 60 || die "problem adding 'mysql' group"
+	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+pkg_preinst() {
+	# Here we need to see if the implementation switched client libraries
+	# We check if this is a new instance of the package and a client library already exists
+	local SHOW_ABI_MESSAGE libpath
+	if use client-libs && [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+		libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
+		elog "Due to ABI changes when switching between different client libraries,"
+		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
+		elog "Please run: revdep-rebuild --library ${libpath}"
+		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
+	fi
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+	if use server ; then
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+	fi
+
+	# Note about configuration change
+	einfo
+	elog "This version of mysql reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/${PN}.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropitate section headers, i.e. [mysqld]."
+	einfo
+}
+
+src_unpack() {
+	unpack ${A}
+	# Grab the patches
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
+
+	mv -f "${WORKDIR}/${P}" "${S}" || die
+}
+
+src_prepare() {
+	if use jemalloc ; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+	if use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
+	if [[ -d "${S}/support-files/SELinux" ]] ; then
+		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+	fi
+
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+
+	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	if use client-libs ; then
+		multilib-minimal_src_configure
+	else
+		multilib_src_configure
+	fi
+}
+
+multilib_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if ! multilib_is_native_abi && ! use client-libs ; then
+		return
+	fi
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mysql
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_SCRIPTDIR=share/mysql/scripts
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		### TODO: make this system but issues with UTF-8 prevent it
+		-DWITH_EDITLINE=bundled
+		-DWITH_ZLIB=system
+		-DWITH_LIBWRAP=0
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DWITH_RAPID=OFF
+		-DWITH_LIBEVENT=NO
+		-DWITH_CURL=system
+		-DWITH_BOOST="${S}/boost"
+		-DWITH_PROTOBUF=system
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	if ! use client-libs ; then
+		mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
+	fi
+
+	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+	# systemtap only works on native ABI  bug 530132
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DENABLE_DTRACE=$(usex systemtap)
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_TOOLS=1
+			-DWITH_READLINE=1
+			-DENABLE_DTRACE=0
+		)
+	fi
+
+	if multilib_is_native_abi && use server ; then
+
+		mycmakeargs+=(
+			-DWITH_LZ4=system
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DEXTRA_CHARSETS=all
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DENABLED_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_EXAMPLE_STORAGE_ENGINE=0
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+			-DWITH_INNODB_MEMCACHED=0
+		)
+
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	if use client-libs ; then
+		multilib-minimal_src_compile
+	else
+		multilib_src_compile
+	fi
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	local MULTILIB_WRAPPED_HEADERS
+	local MULTILIB_CHOST_TOOLS
+	if use client-libs ; then
+		# headers with ABI specific data
+		MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/mysql/server/my_config.h
+			/usr/include/mysql/server/mysql_version.h )
+
+		# wrap the config scripts
+		MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+		multilib-minimal_src_install
+	else
+		multilib_src_install
+		multilib_src_install_all
+	fi
+}
+
+# Intentionally override eclass function
+multilib_src_install() {
+
+	cmake-utils_src_install
+
+	# Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
+	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
+}
+
+multilib_src_install_all() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
+	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	if use server ; then
+		mycnf_src="my.cnf.distro-server"
+		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+			"${FILESDIR}/${mycnf_src}" \
+			> "${TMPDIR}/my.cnf.ok" || die
+		if use prefix ; then
+			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		if use latin1 ; then
+			sed -i \
+				-e "/character-set/s|utf8|latin1|g" \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		eprefixify "${TMPDIR}/my.cnf.ok"
+		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+	fi
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+}
+
+# Official test instructions:
+# USE='perl server' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	_disable_test() {
+		local rawtestname reason
+		rawtestname="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}'"
+		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ $UID -eq 0 ]]; then
+		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake-utils_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+	# Enable parallel testing, auto will try to detect number of cores
+	# You may set this by hand.
+	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	# Run mysql tests
+	pushd "${TESTDIR}" > /dev/null || die
+
+	touch "${T}/disabled.def"
+	# These are failing in MySQL 5.7 for now and are believed to be
+	# false positives:
+	#
+	local t
+
+	for t in auth_sec.keyring_udf federated.federated_plugin ; do
+			_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd > /dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1`
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_config() {
+	_getoptval() {
+		local mypd="${EROOT%/}"/usr/bin/my_print_defaults
+		local section="$1"
+		local flag="--${2}="
+		local extra_options="${3}"
+		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+	}
+	local old_MY_DATADIR="${MY_DATADIR}"
+	local old_HOME="${HOME}"
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	export HOME=${EPREFIX%/}/root
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+	if [[ ! -x "${EROOT%/}/usr/sbin/mysqld" ]] ; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+		local MY_DATADIR_s="${ROOT%/}/${MY_DATADIR}"
+		MY_DATADIR_s="${MY_DATADIR_s%%/}"
+		local old_MY_DATADIR_s="${ROOT%/}/${old_MY_DATADIR}"
+		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+			else
+				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+				|| die "Moving MY_DATADIR failed"
+			fi
+		else
+			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Attempting to use ${MY_DATADIR_s}"
+			else
+				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+			fi
+		fi
+	fi
+
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=15
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${EROOT%/}/$MYSQL_TMPDIR" ]]; then
+		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_TMPDIR"
+	fi
+	if [[ ! -d "${EROOT%/}/$MYSQL_LOG_BIN" ]]; then
+		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_LOG_BIN"
+	fi
+	if [[ ! -d "${EROOT%/}/$MYSQL_RELAY_LOG" ]]; then
+		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_RELAY_LOG"
+	fi
+
+	if [[ -d "${ROOT%/}/${MY_DATADIR}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "(${ROOT%/}/${MY_DATADIR}/*)"
+		ewarn "Please rename or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+		einfo "Please provide a password for the mysql 'root' user now"
+		einfo "or through the ${HOME}/.my.cnf file."
+		ewarn "Avoid [\"'\\_%] characters in the password"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same"
+		fi
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+	fi
+
+	local options
+	local sqltmp="$(emktemp)"
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR%/}/mysqld-help"
+	"${EROOT%/}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+		; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+	done
+
+	einfo "Creating the mysql database and setting proper permissions on it ..."
+
+	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+	PID_DIR="${EROOT%/}/var/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]]; then
+		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]]; then
+		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
+	fi
+
+	pushd "${TMPDIR}" &>/dev/null || die
+
+	# Filling timezones, see
+	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	echo "USE mysql;" >"${sqltmp}"
+	"${EROOT%/}/usr/bin/mysql_tzinfo_to_sql" "${EROOT%/}/usr/share/zoneinfo" >> "${sqltmp}" 2>/dev/null
+	chown mysql "${sqltmp}" || die
+
+	# --initialize-insecure will not set root password
+	# --initialize would set a random one in the log which we don't need as we set it ourselves
+	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
+	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+	einfo "Command: ${cmd[*]}"
+	su -s /bin/sh -c "${cmd[*]}" mysql \
+		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
+	if [ $? -ne 0 ]; then
+		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
+		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+	fi
+	popd &>/dev/null || die
+	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
+	|| die "MySQL databases not installed"
+
+	use prefix || options="${options} --user=mysql"
+
+	local socket="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.sock"
+	local pidfile="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.pid"
+	local mysqld="${EROOT%/}/usr/sbin/mysqld \
+		${options} \
+		$(use prefix || echo --user=mysql) \
+		--log-warnings=0 \
+		--basedir=${EROOT%/}/usr \
+		--datadir=${ROOT%/}/${MY_DATADIR} \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--socket=${socket} \
+		--pid-file=${pidfile}
+		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
+	#einfo "About to start mysqld: ${mysqld}"
+	ebegin "Starting mysqld"
+	einfo "Command ${mysqld}"
+	${mysqld} &
+	rc=$?
+	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+	eend $rc
+
+	if ! [[ -S "${socket}" ]]; then
+		die "Completely failed to start up mysqld with: ${mysqld}"
+	fi
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${MYSQL_ROOT_PASSWORD}'"
+	"${EROOT%/}/usr/bin/mysql" \
+		--no-defaults \
+		"--socket=${socket}" \
+		-hlocalhost \
+		-e "${sql}"
+	eend $?
+
+	# Stop the server and cleanup
+	einfo "Stopping the server ..."
+	kill $(< "${pidfile}" )
+	rm -f "${sqltmp}"
+	wait %1
+	einfo "Done"
+}
diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest
index 67bdf5415b17..ddff65af59bf 100644
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@@ -10,6 +10,7 @@ DIST percona-toolkit-2.2.17.tar.gz 1420968 BLAKE2B 886634cb4f1ed196595c0ebe9d2d5
 DIST percona-toolkit-2.2.19.tar.gz 1425623 BLAKE2B fe9b363ec924b1af9110ea7e7dab70ad4471ddf30868391f9e02a2f6d5a5698a2cb0238dd1cca81428adcac2f21262f10ea2da272ffd881dee1b8b88be1405e0 SHA512 8da35e2ee4d81465131623e5b423c2c49c0bf0faf01862952dd5ca72c2ffea64fabcaf88dda883e633e23de8ae4a6c75a095a751708bac6a8136fc8daaae2383
 DIST percona-toolkit-2.2.20.tar.gz 1431840 BLAKE2B 76565662b4037010f7e8de98316f568c2994f55d042ae3a21b80dc3b839444a11014b61db675cc21c149f26c3b7df52013d7b06c9c1127ec325dae2942a4e4c0 SHA512 f7a5f47e9ca05c43dcb80866a1eacd13066e1f036f4f58d51145fc6354ddc86dd6515a9aa33c8f736029800bf4c80f7ba5fcb9f1e6ac41653b3351597885f679
 DIST percona-toolkit-3.0.10.tar.gz 17335242 BLAKE2B c24103576c537eb9afbdcedc6acf51671853c8e0764092f76d3ee4a1de338a521d91b956b13665ca92a06a70726b92cb9d530ab04b50ed30990868305bd0a7a0 SHA512 e9477f908bbcc5c975f11d42fe9b2b61adebe823657e23a2c74c639767c73f3f71ebdf2bec1d839ad14f2d5080c5f1f9620db07c6bf9694bd7623e86f390e902
+DIST percona-toolkit-3.0.11.tar.gz 18254993 BLAKE2B a6c582bdda96bf5c74e7b5340c465d71f4f119d8364c1d36fc02c650d741972e706bb5eee86fd5bc22ed4f7298a45f0d5c5d9e4438230a8b7b09a58498dda7e8 SHA512 f722ccc8b0fde8f61d4cf269ec89df410f656153da06cf396d222cbb817e88b50e23c0ace383429acf39ddec0501e75d6d3e358fb5ed53ee50a0162eaed9a717
 DIST percona-toolkit-3.0.7.tar.gz 79294306 BLAKE2B e3a556c823d355e5af504210dfb360e6fcf217ca6bfb7ba729e83e66cfdd09231c09d05fb51df1eac6bee0c6615620ac96ffce47c4f0473394d9c008ce8bdabe SHA512 e5a23ce6f4fd74f0956187679810de23a9d60f8073609289d641411c9f397f49b02c05cbcd0a68d78992849f17b70fb3ae411ac967e25c7be45f95ec374414fe
 DIST percona-toolkit-3.0.8.tar.gz 79316265 BLAKE2B 5d6efdbaa4fd3ac914c059c9240f6dcd0de89c6b2ea444c407b115b380bb676c51266f907f6e37a62a40032fd5aa6e1816752c8ec08150dddf71c7568f42c739 SHA512 d5380395b052aebe651806649ff22f259d1af9401112b7ffe86b10664b87f917fecfe91bdc72b401d00471fc9c141391006cd322c9464fca1343f704ecaa8623
 DIST percona-toolkit-3.0.9.tar.gz 15197340 BLAKE2B 095d8c0b26853caa6d2515de1d8fb8ff13b3084caa46498c8c789cd4e7b18473d41992701e393ad91cd7fdda8b3e56a099600285aeb4ba788110d36a028f76b6 SHA512 56a8732cfdbd58d0602e482d7bf049d2049104b7ae203d756db81a052cd837f16d2a35f75def4f23748534d0d2eb6441cb9fe49175a931fbcdbb6adeb42f1c53
@@ -19,6 +20,7 @@ EBUILD percona-toolkit-2.2.19.ebuild 1213 BLAKE2B 784c406e8b359b1c75c49725ee670c
 EBUILD percona-toolkit-2.2.20.ebuild 1213 BLAKE2B 2bcc433599d64b15225e508fa16c50634b34c9963c38fae7d8ac412e730c9566751bfa1c784254018e40b5a6d8fcb6b4e52c2f85df7362d43bcf153282f7766b SHA512 f1b0b8a48e99d616d9a54a5bf6c39a06ef5e6f48992fe3e0584d464d7ed1abc5f6f08a14488cbffd4fcf4d8afe8791112094438baf06a5a4b788a953d539288b
 EBUILD percona-toolkit-3.0.10-r1.ebuild 1330 BLAKE2B acf05bb59b278883dece85f7a60a6ae114a5a5253a867b0f2c5259196eddb4a95acdf66809c1ecb5ad47140f220b9cff47efeedc0ddc1f370db1ee6181c4f12c SHA512 cb5d77f6f689989ae2aa5e4eb4ca7273981b9f18e6308d67dd5ca25ddb163db24655b3d54e84f70f911ffd098bacf5d114dd8afd1a4b2c06198ad55f9fcbcff4
 EBUILD percona-toolkit-3.0.10.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982
+EBUILD percona-toolkit-3.0.11.ebuild 1330 BLAKE2B acf05bb59b278883dece85f7a60a6ae114a5a5253a867b0f2c5259196eddb4a95acdf66809c1ecb5ad47140f220b9cff47efeedc0ddc1f370db1ee6181c4f12c SHA512 cb5d77f6f689989ae2aa5e4eb4ca7273981b9f18e6308d67dd5ca25ddb163db24655b3d54e84f70f911ffd098bacf5d114dd8afd1a4b2c06198ad55f9fcbcff4
 EBUILD percona-toolkit-3.0.7.ebuild 1167 BLAKE2B f61aaf597895efa1b68a04f889e93fef6207d4e2cc9f14e986aee81cccb6ca7888d7479bc01bf11bea554bb9f860615ebfb95111420c641ad7e8b16808121a24 SHA512 940474cb8cf56cff984dffc33c3848808d184c33f6d31a4bcafdc2ee16feecbe6f4084c80e243d18eb62c9f09759f274144aff2c3f45d465bc01c8f82d1e5ac1
 EBUILD percona-toolkit-3.0.8.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982
 EBUILD percona-toolkit-3.0.9.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982
diff --git a/dev-db/percona-toolkit/percona-toolkit-3.0.11.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.0.11.ebuild
new file mode 100644
index 000000000000..4a54323f4338
--- /dev/null
+++ b/dev-db/percona-toolkit/percona-toolkit-3.0.11.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit perl-module
+
+DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks"
+HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit"
+SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Package warrants IUSE doc
+IUSE=""
+
+COMMON_DEPEND="dev-perl/DBI
+	dev-perl/DBD-mysql
+	virtual/perl-Time-HiRes"
+RDEPEND="${COMMON_DEPEND}
+	dev-perl/JSON
+	dev-perl/libwww-perl
+	dev-perl/Role-Tiny
+	virtual/perl-File-Path
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-Local
+	virtual/perl-Digest-MD5
+	virtual/perl-IO-Compress
+	virtual/perl-File-Temp
+	virtual/perl-File-Spec
+	virtual/perl-Scalar-List-Utils
+	dev-perl/TermReadKey"
+DEPEND="${COMMON_DEPEND}
+	virtual/perl-ExtUtils-MakeMaker"
+
+# Bug #501904 - CVE-2014-2029
+# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/*
+# ^ is *-no-versioncheck.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch
+	"${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \
+		Makefile.PL || die
+}
diff --git a/dev-db/percona-xtrabackup-bin/Manifest b/dev-db/percona-xtrabackup-bin/Manifest
index 0f932b09d2a7..038b0287eb66 100644
--- a/dev-db/percona-xtrabackup-bin/Manifest
+++ b/dev-db/percona-xtrabackup-bin/Manifest
@@ -1,10 +1,7 @@
-DIST percona-xtrabackup-2.4.10-Linux-i686.libgcrypt20.tar.gz 84004091 BLAKE2B 0fde32a53aaba54d71e34b729ba4d3dc94c21d8852a4c87da221b6967b6e9c6b59c7fc4966724cbdf3fd474082b3e14717dc34b30b3f235b2271c0f7fdbf52e8 SHA512 07e75c0770736f2566d44395a5ed455b5f90a64244754e621e9c90d8e7a0ad3fe1d7a05037b9f0ecba53b821a8f1ad4d51914ef0b414ae470091ccd489379b19
-DIST percona-xtrabackup-2.4.10-Linux-x86_64.libgcrypt20.tar.gz 86736776 BLAKE2B b55915b1ad34bb55668b90de2441502491e98d2a685932848e756ea61562592416a05eba33d0c6df2bcad9f113b867b64eca39813a3683b25c18574535ba2b70 SHA512 1293e9511e09cd8cac2ef2a117282d3f79573974b7b7c3ffe6e80fe1c57edb27f32fe19e14c0ea643084c62ad83f6e5e25b5f01671628735fae940fcfb7795f1
 DIST percona-xtrabackup-2.4.11-Linux-i686.libgcrypt20.tar.gz 85158090 BLAKE2B 3d6565542208d1a9c74154d0a7e23610a34416f4840bcff240a262958fe4e4b0f489883349760934469619d225dccc7a2d531919e716dfdc3c2f10b1f98263e2 SHA512 bd6419f1b2e79e8e41817c677209a0d08912b247314f611689e0208028d4870e1e2a2b559fe8d60a3a369704aaee57e300643d9d355f083bb89c950f13d724bb
 DIST percona-xtrabackup-2.4.11-Linux-x86_64.libgcrypt20.tar.gz 87975988 BLAKE2B 850b06d3e063b2884f0731ada7ad20e09816e38f60ee5eef2b1150c2b1f0cd59082d26fa026bf7e80ccebdf6b513ab8af6c7d228ade96d532ef41a74490093e9 SHA512 dc412e3ad65a5d3aed6053e107a79094760b868f008171c9aaee190c97e666a38716b0c7d3e7f3db74eecff98b35c114be29114d50630f554a0c2cb0b1b71cfe
-DIST percona-xtrabackup-2.4.9-Linux-i686.tar.gz 79816483 BLAKE2B 0fd97ee14c97f66edf629fa0300bfa2d6b333ac5942f5cee46dd9d0ad04ef2fe12750209971ff8f6a8ca225a85deaa42ca64c484e12e60c85789153689e55c42 SHA512 014921b0ea9fec783adbdd4556301e8df77f801729faae5b2b7245c349df069fc3af33ebef5ec65ef0e020c7b0ec8ebf4aa7a7acc0e9936c6f4a90b721a5de19
-DIST percona-xtrabackup-2.4.9-Linux-x86_64.tar.gz 90282874 BLAKE2B 2c4cdb8c6da443baf01857fbe4b27be002df370b67687f417a9fde6b08a5e72482552b165a9f27fda305787b42089fb138a4fca2f1d683afbd42efa23746b13c SHA512 24138c098d8e674de291dc494c38f2fce52f4d6a5a2552a62b34ea801b867431917449656f990043c7bbbc1e18a8806c4343eadbe1fea17e36ff1b10109e5047
-EBUILD percona-xtrabackup-bin-2.4.10.ebuild 1530 BLAKE2B 87233dfc8725ce661367ff5d426fdf0b4e1f9335295abbe1f154715a19cc2658a60d84e4040ea837d2c6b0b0d61b493fe1836dd632cec01211e8eb96b803d308 SHA512 87ab06a801645538a5d8a335c22ab16a21a507681ffbefeeaeb2fa0069e231cf8f332ffce63481bd6ffd8a185d451cbdd56f93ce74fd9b70693f62a660efbc29
+DIST percona-xtrabackup-2.4.12-Linux-i686.libgcrypt20.tar.gz 85181957 BLAKE2B b066ff9efa8c57829a441c2e416ac1eeeff60cb0839ccdab4cd685bff9b2ead552ba9b7105541e0a824ca8aaeeb47d89d66180fe428842470c4743dfd149f31d SHA512 adbaae8ad3347e15b13fe360dd5d4721330d6b17e75696128dfe770d03ad85056abeb861ffcbfe1d08020c8b9d726dd9e5650f63b7199804fe4d3cd9806debe2
+DIST percona-xtrabackup-2.4.12-Linux-x86_64.libgcrypt20.tar.gz 87975175 BLAKE2B b21ab8dd4fac27ae8c731b5fbd816dfc39572bc52a9273255a4c89ddf99ee490cc66ed4f92945b18f4ec58e731ae036a16e08674cb9837544ca5150cb6b91c7b SHA512 355b9f7f052a1242e502ddcbdc26cb931d16366be4db405730a2bb04de3030e0d0e6d4d15eb87f68fe232648dd435c85505a6d895b7c27b3baea0cb851214766
 EBUILD percona-xtrabackup-bin-2.4.11.ebuild 1530 BLAKE2B 87233dfc8725ce661367ff5d426fdf0b4e1f9335295abbe1f154715a19cc2658a60d84e4040ea837d2c6b0b0d61b493fe1836dd632cec01211e8eb96b803d308 SHA512 87ab06a801645538a5d8a335c22ab16a21a507681ffbefeeaeb2fa0069e231cf8f332ffce63481bd6ffd8a185d451cbdd56f93ce74fd9b70693f62a660efbc29
-EBUILD percona-xtrabackup-bin-2.4.9.ebuild 1461 BLAKE2B fbe02435623b2c09f811dc5683733fbc2768e67a498f4e465c27f0f28a6341eb2ce92ab1192dc99aaed1a590da8a9c4f0183e1a030ad49253a35ff7cd81779e1 SHA512 9227a8efb509e94bd6be062959de7447bc8461b7278a0b7b633a58ac2a65f17726902ba9ec5d5a407d5e913cbe1c62620d01b139fd303d798567ce1b81b92dd2
+EBUILD percona-xtrabackup-bin-2.4.12.ebuild 1530 BLAKE2B 4e0b7346ea30fa263debd715fae3175677ffe3a217db3766b151b489bef906b4c62f0f3428ea1f122da5758a03408bab3ff82c554d80eeafc960b2c077355f4c SHA512 9551643af7e6b93f8ecb164b6f0663f252859222eb0e4f7249708d4f015ee31b29a2d7bbc71868b15bedbad6a9a6644d09b97069e8afca161628e7374ef42f47
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.10.ebuild b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.10.ebuild
deleted file mode 100644
index 2e9e7ddc7525..000000000000
--- a/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.10.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases"
-HOMEPAGE="https://www.percona.com/software/percona-xtrabackup"
-SRC_URI="
-	amd64? (
-		https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-x86_64.libgcrypt20.tar.gz
-	)
-	x86? (
-		https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-i686.libgcrypt20.tar.gz
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# NOTE: dev-perl/DBD-mysql still necessary, now for bin/xtrabackup?
-DEPEND=""
-RDEPEND="dev-libs/libaio
-	dev-libs/libgcrypt:0/20
-	dev-libs/libgpg-error
-	dev-perl/DBD-mysql
-	sys-libs/zlib
-	sys-process/numactl"
-
-QA_PREBUILT="usr/bin/*"
-
-src_unpack() {
-	default
-
-	if use amd64; then
-		S="${WORKDIR}/${MY_P}-Linux-x86_64"
-	elif use x86; then
-		S="${WORKDIR}/${MY_P}-Linux-i686"
-	fi
-}
-
-src_install() {
-	# Two new tools with an old libcurl.so.3 dep...
-	# TODO: Wait for a new release using libcurl.so.4
-	# net-misc/curl dev-libs/libev
-	# dobin bin/xbcloud{,_osenv}
-
-	for tool in xbcrypt xbstream xtrabackup; do
-		dobin bin/${tool}
-	done
-
-	for man in innobackupex xbcrypt xbstream xtrabackup; do
-		doman man/man1/${man}.1
-	done
-
-	dosym xtrabackup /usr/bin/innobackupex
-}
-
-pkg_postinst() {
-	ewarn "innobackupex got deprecated in 2.3.x series and is just a symlink to xtrabackup"
-}
diff --git a/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.12.ebuild b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.12.ebuild
new file mode 100644
index 000000000000..29a995636cfc
--- /dev/null
+++ b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.12.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases"
+HOMEPAGE="https://www.percona.com/software/percona-xtrabackup"
+SRC_URI="
+	amd64? (
+		https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-x86_64.libgcrypt20.tar.gz
+	)
+	x86? (
+		https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-i686.libgcrypt20.tar.gz
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# NOTE: dev-perl/DBD-mysql still necessary, now for bin/xtrabackup?
+DEPEND=""
+RDEPEND="dev-libs/libaio
+	dev-libs/libgcrypt:0/20
+	dev-libs/libgpg-error
+	dev-perl/DBD-mysql
+	sys-libs/zlib
+	sys-process/numactl"
+
+QA_PREBUILT="usr/bin/*"
+
+src_unpack() {
+	default
+
+	if use amd64; then
+		S="${WORKDIR}/${MY_P}-Linux-x86_64"
+	elif use x86; then
+		S="${WORKDIR}/${MY_P}-Linux-i686"
+	fi
+}
+
+src_install() {
+	# Two new tools with an old libcurl.so.3 dep...
+	# TODO: Wait for a new release using libcurl.so.4
+	# net-misc/curl dev-libs/libev
+	# dobin bin/xbcloud{,_osenv}
+
+	for tool in xbcrypt xbstream xtrabackup; do
+		dobin bin/${tool}
+	done
+
+	for man in innobackupex xbcrypt xbstream xtrabackup; do
+		doman man/man1/${man}.1
+	done
+
+	dosym xtrabackup /usr/bin/innobackupex
+}
+
+pkg_postinst() {
+	ewarn "innobackupex got deprecated in 2.3.x series and is just a symlink to xtrabackup"
+}
diff --git a/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.9.ebuild b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.9.ebuild
deleted file mode 100644
index 061d2fc6a0c8..000000000000
--- a/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases"
-HOMEPAGE="https://www.percona.com/software/percona-xtrabackup"
-SRC_URI="
-	amd64? (
-		https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-x86_64.tar.gz
-	)
-	x86? (
-		https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-i686.tar.gz
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# NOTE: dev-perl/DBD-mysql still necessary, now for bin/xtrabackup?
-DEPEND=""
-RDEPEND="dev-libs/libaio
-	dev-libs/libgcrypt:11/11
-	dev-libs/libgpg-error
-	dev-perl/DBD-mysql
-	sys-libs/zlib"
-
-src_unpack() {
-	default
-
-	if use amd64; then
-		S="${WORKDIR}/${MY_P}-Linux-x86_64"
-	elif use x86; then
-		S="${WORKDIR}/${MY_P}-Linux-i686"
-	fi
-}
-
-src_install() {
-	# Two new tools with an old libcurl.so.3 dep...
-	# TODO: Wait for a new release using libcurl.so.4
-	# net-misc/curl dev-libs/libev
-	# dobin bin/xbcloud{,_osenv}
-
-	for tool in xbcrypt xbstream xtrabackup; do
-		dobin bin/${tool}
-	done
-
-	for man in innobackupex xbcrypt xbstream xtrabackup; do
-		doman man/man1/${man}.1
-	done
-
-	dosym xtrabackup /usr/bin/innobackupex
-}
-
-pkg_postinst() {
-	ewarn "innobackupex got deprecated in 2.3.x series and is just a symlink to xtrabackup"
-}
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index a398e8a26bbd..9365b4feeec5 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 65047ad0d13c..0bac65ab200e 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,7 +1,9 @@
 DIST tiled-1.0.3.tar.gz 6601791 BLAKE2B 86bca36994b8596931b68dace6db61443bfa488444d06d7bae616a1c095da2d8fd476fd7a466d6b7e95b2291a977e4893125fd09091e96733973bfbc5f66a651 SHA512 4f3c97a91794f86f04965a2332e04f51bc588f7bcfef402edb1092c4e58bb6ace9c90ea522a5fa15a46ca39c8249f62818b80be6d65c11a8d41092ead31cd4f7
 DIST tiled-1.1.4.tar.gz 16029257 BLAKE2B 622afd39623af2b713accca5d6ae989224547833e566d1506c90ea846159481f438a484f4a923e9040949bac2d3903e97e23e57f311eb235c68cdad3ee2335f0 SHA512 861f4916968d88bfbf0359db3972994d98608fe9aa4e405a2e89f1c7a11e2521c8c5e18796809db5597b123706dcad0d120221f1e3143dd6e310111487d1aec3
 DIST tiled-1.1.5.tar.gz 16034738 BLAKE2B 7486d6267780ad0ab4bc0e7bb6da9e1e48b9e35e0a22a1c6a534cb21227554cba7ce40c5013db88fe9f3547bdfe9723a14c500f2e55164f684d8a5426e632018 SHA512 4c1d03825c76ba14b0469af564fe5eb78fa51790b41ddc51f3f72a8247b0aba1118142144453f4cbdaeedb54ac23812086eeac91bf61457887f1d9635508dbe7
+DIST tiled-1.1.6.tar.gz 16051699 BLAKE2B 61e33682cbd0d3045c12b20fc852ec8ae81103fc1d9818a7e17222615676dd2d3889033d6d6ba536e63e069a44aaeebeaaffb96b94a2cbcb8f1793553a466703 SHA512 d1083a938bbbd87897c5897fe79d424706e719a4319680ed907be481773daea656fc5b3230ba6b674e5ea044e22ee0044df2a07a7c91c56f9521e32b86847830
 EBUILD tiled-1.0.3.ebuild 1276 BLAKE2B 31c9ef74b458163b5ecbed4c307b1a32ebec6d5d635d4cb8373add7b3e3749057a307550fe68b35d0694fbf566cabc04d5c3abf1cb4ac2e7d9449c91f61c61ff SHA512 cbc32e28411d3cbcd7973e6072d1f9874997b467fc3760fa2ca54e8595e7bcd5599fe5b85db3cf6b1b78da1a393d48843f749713a647a2c8d6df63aacfb2a9df
 EBUILD tiled-1.1.4.ebuild 1277 BLAKE2B 485c63e57a90369e1779850554604554ba769794d3226b661c4d78abb8af3db09cdac455b517e5795e5293e404fd6318351b666768284563e235311ed3d405b6 SHA512 fb47bf46726da4dbd04fc51c78b376f181bf2b2d38e356a86093a51cfa3600430f363db7cebd94ef720ba50f187ae042fe596d0c3fa671f58f37d415e0ad4051
 EBUILD tiled-1.1.5.ebuild 1277 BLAKE2B 485c63e57a90369e1779850554604554ba769794d3226b661c4d78abb8af3db09cdac455b517e5795e5293e404fd6318351b666768284563e235311ed3d405b6 SHA512 fb47bf46726da4dbd04fc51c78b376f181bf2b2d38e356a86093a51cfa3600430f363db7cebd94ef720ba50f187ae042fe596d0c3fa671f58f37d415e0ad4051
+EBUILD tiled-1.1.6.ebuild 1277 BLAKE2B 485c63e57a90369e1779850554604554ba769794d3226b661c4d78abb8af3db09cdac455b517e5795e5293e404fd6318351b666768284563e235311ed3d405b6 SHA512 fb47bf46726da4dbd04fc51c78b376f181bf2b2d38e356a86093a51cfa3600430f363db7cebd94ef720ba50f187ae042fe596d0c3fa671f58f37d415e0ad4051
 MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/tiled-1.1.6.ebuild b/dev-games/tiled/tiled-1.1.6.ebuild
new file mode 100644
index 000000000000..a78bd8eb9206
--- /dev/null
+++ b/dev-games/tiled/tiled-1.1.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2-utils multilib python-single-r1 qmake-utils xdg
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="https://www.mapeditor.org/"
+SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.7:5
+	>=dev-qt/qtgui-5.7:5
+	>=dev-qt/qtnetwork-5.7:5
+	>=dev-qt/qtwidgets-5.7:5
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS COPYING NEWS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	einstalldocs
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 24fbeeb86cad..ebba13bddbfc 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/pgp-wordlist/Manifest b/dev-haskell/pgp-wordlist/Manifest
index 6c60d38e8124..1746b4d58927 100644
--- a/dev-haskell/pgp-wordlist/Manifest
+++ b/dev-haskell/pgp-wordlist/Manifest
@@ -1,3 +1,3 @@
 DIST pgp-wordlist-0.1.0.2.tar.gz 10142 BLAKE2B 6a4efe0e495a3755b19a8bf49f5fd0e44853a77bec5c9731a4fb0ba9ea2da524d737b7580baebb1aa1bd6e8df40c4584f8e5aca57b95d67e5a4936a66a8a761e SHA512 c34d565b043d6ffb3fee10258fb30596ae08e5c4d57bf8d129f49b4794daf13ae55fae7f648f218821133a824f2abb66a8b5f02b10a9e11f4529007b1a4620b3
 EBUILD pgp-wordlist-0.1.0.2.ebuild 811 BLAKE2B 0935772e4c23c9f66a4b6a764a3994cac9beb165525eb43e8b7f5003d47daf530497ef427db1033509ce55632343338769ee547a056934457fa2005c2068ed00 SHA512 8f20035ff324b1144d50f13b7ed19699bc7eca5806c8dc293285efa5acf2f89f82ca269c3a04bdecf8910a1b01613702a1da9d0844279b8e9be27bf7b6c928f5
-MISC metadata.xml 711 BLAKE2B 03f5cd0583dc81e535b8d1763d0fb2f97ca3b2502f1939ac4337c803a15d43370562acfda23d5790cf6517a3852795fb1d8338a85062260e28cb61074965908f SHA512 87bfd8e09b5ae2d794708027f7d95b3afcff44135a4a9090fc10d3a68196be401e695061c3d8d833d272281d5b42d78f1d40d3e7764dd09fabeb51dbd9fc076a
+MISC metadata.xml 793 BLAKE2B 31de74e5791a25f4a8166a099041b38d18fa97fd1d1cabc0d9f40bae32763076427e4a75e6077e90a17069a758ebe541a7c7b92d4cd14bf5082c91bd8db75683 SHA512 ea2360cb9f18ddb50da1be41c4b339c0dcbb21216c352835f1137ee48afb6fc4e13af3887a5bb91b5a06e05521cecd0bdeb1f25c1dc70f87e2259bc2ee5f1d45
diff --git a/dev-haskell/pgp-wordlist/metadata.xml b/dev-haskell/pgp-wordlist/metadata.xml
index df062b638c35..36a5661f1120 100644
--- a/dev-haskell/pgp-wordlist/metadata.xml
+++ b/dev-haskell/pgp-wordlist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		Translate between binary data and a human-readable
 		collection of words.
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index d76318f699bc..105de1cfa083 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/cssparser/Manifest b/dev-java/cssparser/Manifest
index c0ef54a580f6..711cbd0c678c 100644
--- a/dev-java/cssparser/Manifest
+++ b/dev-java/cssparser/Manifest
@@ -1,3 +1,5 @@
 DIST cssparser-0.9.25.jar 256517 BLAKE2B 5281f70dd4e293aaf4aad44efc46107372756b03962057df8701947ec71478c40ace0728099122a0166e902a00075d7d89e6e93b50d8bc16d7f563a3553ad9c2 SHA512 94dffa2ff1edc01c183d2de4f77f106a9409ec5d1e68e9af4f3cd427b76c9d80c942a4d312c3e40ef5c8bd444975eedba173bf0eb730cf517a818dd69421a7bb
+DIST cssparser-0.9.26.jar 256518 BLAKE2B 9f92aa366711b91ca90e1efa48e05c15e9ed877f8ae5346506bb727373ea334c6fec58b67f5df4e7e01467b4d1aa571ef47c8f2ae83e7fada4bc6d9d100e1d78 SHA512 c8e9c3c1cdf8d6fc29227693f28a11397b63cc46cf88083298e0613cc7f79c558dbc71760799fc214aecc5ed8ccdd966f0518085abe08deacf088b445579a8b8
 EBUILD cssparser-0.9.25.ebuild 526 BLAKE2B 05384d781bd99bbfc191faccef066dd7a0ed90ccfaa49ef77e1f77ee4f117e6850dd1c5481bef718d6eae58f98893213135023a8ef183ce1f7ef3544b28ac5a4 SHA512 19abcc2a991321bf3c334110db5a1de38a48da60490f50123741a6032ac9ead32b45a1ac37eda8e14729bdc9256291ebc4f371a39a772c1130dd546b9a8e9c1c
+EBUILD cssparser-0.9.26.ebuild 526 BLAKE2B 05384d781bd99bbfc191faccef066dd7a0ed90ccfaa49ef77e1f77ee4f117e6850dd1c5481bef718d6eae58f98893213135023a8ef183ce1f7ef3544b28ac5a4 SHA512 19abcc2a991321bf3c334110db5a1de38a48da60490f50123741a6032ac9ead32b45a1ac37eda8e14729bdc9256291ebc4f371a39a772c1130dd546b9a8e9c1c
 MISC metadata.xml 396 BLAKE2B 01cf3f00bcb1fa2f26aeb6813157821b5f6b4dd0316b8261f16a90e1cd3a66dda3a736921dd78e16ef500cc09dfecc9a045276e18c7c9e269715c1911fcd8a7e SHA512 d95036978f0c8b18cc4722df3e9f1be9fbc80df058255c4903746f00217c8e284ba7a87dbd0498b38e3f8185a95dace21a908e02304a2aaa49c32c53e02b0700
diff --git a/dev-java/cssparser/cssparser-0.9.26.ebuild b/dev-java/cssparser/cssparser-0.9.26.ebuild
new file mode 100644
index 000000000000..6b38a3223d5f
--- /dev/null
+++ b/dev-java/cssparser/cssparser-0.9.26.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="API for parsing CSS 2 in Java"
+HOMEPAGE="http://cssparser.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar -> ${P}.jar"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/sac:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_GENTOO_CLASSPATH="sac"
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 73c60c6f432d..dacf3761e713 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,5 +1,7 @@
+DIST jdk-10.0.2_doc-all.zip 69312792 BLAKE2B ad2cad74e78098672ecc7d4f80f0babbded5ac564948c51ec5eb50b4e4e2688bec5bb6804d6829ea6137354ef8b1554b0ef6f8d0e62fe40b2e0bd80836691b6f SHA512 424ca11b661eaf4012d31cbe200ce5209098dd8fb21648eae5838ba2dd55d96aec5a263664d0b4ab21bc5f8cfe13cfbc61294cf92353dcbf8d8134613b25f67a
 DIST jdk-8u172-docs-all.zip 93491812 BLAKE2B 7d670aa054a73c9711b78b6094a8e4f8c8b8b774543a9b067acce7cb2e572d6536ad0c525d1ac112f2585a648b3209ac63df0d3ac85bf8c23ec91937b70add01 SHA512 6b1157822fd7d25bd4bb56394e8243e3e315ce772a908bb05fe260b5f1d6506f336b8afca6febef7caafcbf9463b4713fb27b657726ee4b6578d2e6732b9a2fe
 DIST jdk-9.0.4_doc-all.zip 70500089 BLAKE2B 549da2c6baf1b39082f05d42d0fd02f7682a765c1d43a605063b155b3b3e2e20053b4044a238afb41c758700efa5de9ec53c29e2e8be1d682c2e9e7b221c0875 SHA512 7d8b40499a0ea91ac922c6916b19a061b39e73e54e123a943fcaa75fcfe66672ad445dbd789c2c9448c8cee0e7f72974ca6ad53bcaa5667547feca5791dab92b
 EBUILD java-sdk-docs-1.8.0.172.ebuild 1444 BLAKE2B ac3a3567183b958e4c4d56ba8ea0e61ca844ffecd76d19f536f3fb1598f987173fe3075ad2b015f2763406f59700cdf5b82b2e33ded6d49f917084b83d591592 SHA512 208368ba6143f60dbcce2d7e0098be90294470d5c539a69c3003ca9e514e35755ec6c3f50b4dec590fe11eb77ca3b7e2f082530e32b11c3146eb0a2a11e4cbe9
+EBUILD java-sdk-docs-10.0.2.ebuild 1278 BLAKE2B 9e65d585197edbc771d06524cc1b10a1206397d413f51af1e903212e155ad7e486390e28399e3d7c310157a98a5dab7ef737a02856035c42cbdc56f4e69c79e0 SHA512 c1883973538623b240c0104df6c4610e9af82113872274326fbfb3bd17336454e5c5a660e70c6b089d71fd1b952eac9499b9f4dd64e21918ad28dc7a1cb17728
 EBUILD java-sdk-docs-9.0.4.ebuild 1277 BLAKE2B 0e2610b8541e0470b9ca4d093ffdf46dd244694b13f23aa5ad7e139a9b5085795efba9553bf1cbfe68b64ff1bed3b8eec51b27c1f106da69b964aaa17fb8d84e SHA512 7772dd3232e6ed790570c82cf23a67006944cdd7676d4e4d6ce69e19ee9f8f3c4cf4fc18cff85bb68c0f50173bc92bb5442ac0050b73aebe662b819e7866d532
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-10.0.2.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-10.0.2.ebuild
new file mode 100644
index 000000000000..0e88ec13e526
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-10.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk10-doc-downloads-4417029.html"
+
+SLOT="${PV%%.*}"
+DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
+HOMEPAGE="https://docs.oracle.com/javase/${SLOT}"
+SRC_URI="jdk-${PV}_doc-all.zip"
+LICENSE="oracle-java-documentation-${SLOT}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+RESTRICT="fetch"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/docs"
+
+pkg_nofetch() {
+	einfo "Please download ${SRC_URI} from"
+	einfo "${DOWNLOAD_URL}"
+	einfo "by agreeing to the license and place it in your distfiles directory."
+	einfo ""
+	einfo "If you find the file on the download page replaced with a higher"
+	einfo "version, please report it in bug #67266 (link below)."
+	einfo ""
+	einfo "If emerge fails because of a checksum error, it is possible that"
+	einfo "the upstream release changed without renaming. Try downloading the file"
+	einfo "again (or a newer revision if available). Otherwise report this to"
+	einfo "https://bugs.gentoo.org/67266 and we will make a new revision."
+}
+
+src_install() {
+	insinto /usr/share/doc/${PN}-${SLOT}/html
+	doins -r index.html */
+}
diff --git a/dev-java/jmh-core/Manifest b/dev-java/jmh-core/Manifest
index 0a4f1809a120..a9aae37733ea 100644
--- a/dev-java/jmh-core/Manifest
+++ b/dev-java/jmh-core/Manifest
@@ -1,3 +1,3 @@
 DIST jmh-core-1.4.1.tar.gz 585746 BLAKE2B ff6e9d3e8b11827042a9ff9983505fa5272d943a8365cf14ac43d940a7815f280c2b82c3ab810f1c22328a932912f6b09b9c5d5f1838a3cb357e6ebe21006e49 SHA512 a33c63b82712deb53218bb8d955c9606e5f393ff0c6256052ac8df022ec45be79bc0ee5ee08ce0d3762594214814bcf1e562717d83daa9ce13c664ca9e7c431b
-EBUILD jmh-core-1.4.1.ebuild 977 BLAKE2B a01c01762fdbb02267e0b00917452f072ec54e0fe973df70f5ec3f2971c02b8ae1fa289b39f9bbd3883576792c2eec0ae80d4a33152c4513f14348f2047b3867 SHA512 38beaf02a01a0c12e6148ba3c0d337cf6c04b2b6c996955f74071fa522b8369bf2e86f4ccfc12dc8b90b917fe27d64efd6c6cd231895aef22d31b4ab3508a8fa
+EBUILD jmh-core-1.4.1.ebuild 973 BLAKE2B 7071fed0c19efaf7f06e1d43dce2b76113ed59b4337220c2a34f50802a0ccd9cbb7e1288421918bbe58500a9203bff9a3e1c0e0a080930f5154d9f9d0aeee4eb SHA512 4d33e35a17571595b71bc01c46c2ce2ab7bfb596a61fcf64ddfd0564a014f753591682f1d7456ab006dfb4dc019d2f16c3cb339f4f4750635b18f3554189aceb
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jmh-core/jmh-core-1.4.1.ebuild b/dev-java/jmh-core/jmh-core-1.4.1.ebuild
index ea497f214475..7cc5df2b7800 100644
--- a/dev-java/jmh-core/jmh-core-1.4.1.ebuild
+++ b/dev-java/jmh-core/jmh-core-1.4.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"
@@ -21,11 +21,10 @@ KEYWORDS="~amd64 ~x86"
 # jopt *must* be 4.6, see http://mail.openjdk.java.net/pipermail/jmh-dev/2016-October/002395.html
 CDEPEND="
 	dev-java/asm:4
-	dev-java/commons-math:3
-	=dev-java/jopt-simple-4.6:0
 	dev-java/junit:4
-	source? ( app-arch/zip )
-"
+	dev-java/commons-math:3
+	dev-java/jopt-simple:4.6
+	source? ( app-arch/zip )"
 
 DEPEND=">=virtual/jdk-1.7
 	${CDEPEND}"
diff --git a/dev-java/jopt-simple/Manifest b/dev-java/jopt-simple/Manifest
index 511fa636cf62..88bc3189f396 100644
--- a/dev-java/jopt-simple/Manifest
+++ b/dev-java/jopt-simple/Manifest
@@ -1,7 +1,5 @@
-DIST jopt-simple-4.6.tar.gz 107066 BLAKE2B 469ff2c3d6359b14ec95dd6b25639f01d681d72b492d28061e0ecaac729d6a1520202691da619be274e8412af88905afe93c44b3026dccaa126bd91c4d3fd67b SHA512 33c7e111312c46376d46195cdc659f011af688d4078316a2b8dcc0dfdee480a658a331902b53bb53d1b952978623e012ed595fee269e24680cffeb6c04b40f8b
-DIST jopt-simple-4.8.tar.gz 110173 BLAKE2B 75fa9659ba772ffa4d4acbbba6524c0719a0a5af8afbbd9dec0a5f9225ec75971907be3edbbbf73f320b67da8c7b3075be45380ef821913518b8e4b1917eb37b SHA512 cc5360cf97446117849f93397c41734a9a001ea623e9ea4223b8d760f36897c62103ab9d2dabfcf0fa032db8e33f7bc51759d626d7bd76dda3adc61fa6622984
-DIST jopt-simple-4.9.tar.gz 114636 BLAKE2B c694ab5fe373de6baad8789346aa763bea946da766c8123c6576616f0a081768e364c4b012772c8da0e8961f10bcefff60807ffc45f94d04921df4e5065fd58d SHA512 28b95ac9a508251b80b0283fc57422fef3f36676ad9160974386faf7f02eb7a0cda00ca1970046ed66863d49e784efba955695fcfd8b5b2535cfaefcb1035360
-EBUILD jopt-simple-4.6.ebuild 698 BLAKE2B 165bca7b16963c631e4f15e1c779f6b845584ca8cf54c657f117ce74168b73d3f32e0b10d6f7ce9655b506ef865ca5f74f0f1c789eb08c70e617fa043d064e8f SHA512 9041520b0490eb2566f860964ccbac55b6be12c3bfd111963a3fc9d7a945268db36acae67a39d8044288307bd5db339e385cde73cba0aea8fce39b3014f68617
-EBUILD jopt-simple-4.8.ebuild 689 BLAKE2B 6ca2f093cf41f99e543522fdd4a267a68e0b1111569c0a3fb512a0c6b20297db4e8b1217ec007d69946a4689825f2f049a86f5008dcdb8fdf965dfb3b59e182c SHA512 32b16f5431e8210f1187a6690e65be0f95866d5c1aa996032cdba5c8608bc8b43c363c9f7bcbbcbb22974b9411907d897538ff2333b8ce9811c55b3bfe71b6d0
-EBUILD jopt-simple-4.9.ebuild 656 BLAKE2B b8940f7ece3aea999f490984ce00f5bd0cb213b2bcb28586daf296dfe468dec2e8cbff1e0f3a8018fadd413286cee1a3403ba89b1e90f3b80e5535d6f2259036 SHA512 e1af8baac937f616554f77a501ebb1ba26f6c274bd531d4b9cd2de2389938001da5e55dc4f8144f52e00840a5a6d1493a60698b5477303e82862a1c81f1adf90
+DIST jopt-simple-4.6.tar.gz 107082 BLAKE2B 622144647b24049861398cc99ca3cc268baae045f8ca23cdd5bddb2e656bc97d17397ae752ca9a6edc91b8486e1e55ce19ba335d2afadf6c6df4f858faf43a1e SHA512 c2f467521f6419f91206f6036d420671b02106beadff3fc51d1893e6f3f6302b8fcbb31957327b9e40cbfd7a7d55030e0c999d9570d7e29fe7a4375bab10ed76
+DIST jopt-simple-5.0.tar.gz 119502 BLAKE2B 975a0d338fa3154963954fd3b218c944dded023b3a2da59ee2671c73450a578dbf1aee8e52b9f715839e15c1937e0a493c4b37518b73038aa017e1d0ec1ca06a SHA512 f440c62cb307aad7cab64f091c82f78e11a117e60aaadf71883c149a622576531272de3d67859f6df093df658bb0bfb435d9bb33bc729bcda24dcc99d27369ff
+EBUILD jopt-simple-4.6.ebuild 648 BLAKE2B 9c669a9e6b2fa635d1a6c377d5aced31b77faa2d77d890446b3f200ab06e3e526030ecc9c1620cf1cbefef2dd383a3ae2e1ce1041d548bb60373e31f0619c3b5 SHA512 da9587440b79faedaf962e68f16d1c4d95040e594709f3a7f2bd67b02e04c922200e178cda019d9a0bc7a3f32301edab1686c5317611654b0dd9cff786eec6af
+EBUILD jopt-simple-5.0.ebuild 648 BLAKE2B 137db3a025327e0e9cc2c57c465f9f8734f523e350ad91263f33ffb3edb761ac99c9f84a897a60387694a61d5cb46c67dd12579dd68dca8321b5e70428ac1934 SHA512 3c2863dbcc4613fe33bdf4e3afac16d8f006e0c958315ad35cfbfb4428a519cf743a2532f8a831c37fc0a5bad7608daecd2aac27fc23588e4d8a95bdcf51903a
 MISC metadata.xml 320 BLAKE2B 618d24786328b35f3b25fb733c2add95fdb6fc602ddd451ec972662f5c80787f4f2283285e7a753d6dc66a4c2a7efca3aaa196cf329311f1b4799737e974b714 SHA512 e64ac86acc3088038b5ebcca26f7481730c5bdcda5d7fe05fcadbf66a4ba7d472b9787c288c1b8b4ed077d2a960cd9be3fa1645deba813de3b55e7ead642b61a
diff --git a/dev-java/jopt-simple/jopt-simple-4.6.ebuild b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
index d0cb07818b33..496fbd46f1c0 100644
--- a/dev-java/jopt-simple/jopt-simple-4.6.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
+
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
@@ -10,24 +11,22 @@ DESCRIPTION="A Java library for parsing command line options"
 HOMEPAGE="https://pholser.github.com/jopt-simple/"
 SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
 LICENSE="MIT"
-SLOT="0"
+SLOT="4.6"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
-IUSE=""
-
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
 
-S="${WORKDIR}/pholser-jopt-simple-8808a39"
-
 JAVA_SRC_DIR="src/main/java"
 
-java_prepare() {
-	# Easier to use java-pkg-simple.
+S="${WORKDIR}/${PN}-${PN}-8808a39"
+
+src_prepare() {
+	default
 	rm -v pom.xml || die
 }
 
 src_install() {
+	default
 	java-pkg-simple_src_install
-	dodoc README.md
 }
diff --git a/dev-java/jopt-simple/jopt-simple-4.8.ebuild b/dev-java/jopt-simple/jopt-simple-4.8.ebuild
deleted file mode 100644
index 688255a6465c..000000000000
--- a/dev-java/jopt-simple/jopt-simple-4.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for parsing command line options"
-HOMEPAGE="https://pholser.github.com/jopt-simple/"
-SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/pholser-${PN}-587d4ee"
-
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	# Easier to use java-pkg-simple.
-	rm -v pom.xml || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md
-}
diff --git a/dev-java/jopt-simple/jopt-simple-4.9.ebuild b/dev-java/jopt-simple/jopt-simple-4.9.ebuild
deleted file mode 100644
index e8d3065f34ce..000000000000
--- a/dev-java/jopt-simple/jopt-simple-4.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for parsing command line options"
-HOMEPAGE="https://pholser.github.com/jopt-simple/"
-SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/pholser-${PN}-94ad77a"
-
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	rm -v pom.xml || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md
-}
diff --git a/dev-java/jopt-simple/jopt-simple-5.0.ebuild b/dev-java/jopt-simple/jopt-simple-5.0.ebuild
new file mode 100644
index 000000000000..763a855732f2
--- /dev/null
+++ b/dev-java/jopt-simple/jopt-simple-5.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for parsing command line options"
+HOMEPAGE="https://pholser.github.com/jopt-simple"
+SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="amd64 ppc64 x86"
+
+RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8"
+
+S="${WORKDIR}/${PN}-${PN}-01719a6"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	default
+	rm -v pom.xml || die
+}
+
+src_install() {
+	einstalldocs
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest
index 63dfc1cfb14f..69da51923e15 100644
--- a/dev-java/xz-java/Manifest
+++ b/dev-java/xz-java/Manifest
@@ -1,7 +1,9 @@
 AUX xz-java-stop-fetching-external-files.patch 693 BLAKE2B 8b6e55a71921a3b6f16aab712b298684577639cb57cb8a3b2216811effd3e107c385ca26cb4edb5bfb83a035ed46fe4a1dc7493e92f48b66b4ca5b425a6aff12 SHA512 048a21f8a99091f5e940f775b187eccbeda10c4b6c41e194dd5295f9be618676195ad0e256752ac1929989e90eafb272d10d93bfea5d85027dfc88d296c90125
 DIST xz-java-1.5.zip 131544 BLAKE2B 3984cf1e20bbf1d5f2508766e3ef4aff87f0bef774cb6f7a3f6e6b4bf7b744e74f1640330a4278b70006b7ec05e9d758bb55d63f247cc7afb1c2f4a4e64591aa SHA512 8f425b86b216927490c1ab7303ae9db7faf2c275777765ec7d10c4acd4717d2ecf76068afe9a81d099ea0941c05c517cd5e7fe1b4e8bfec804fd3355dd064f41
 DIST xz-java-1.6.zip 138434 BLAKE2B 015074e64f8b354b617cd2519f83cf4a7aa491a7229e54fecb012eabe80d3ff65394a433b88eb58b5c2eadf1855aeefa0eb4c0e904f34ab36d0c430c04a7ba90 SHA512 a1a6a2da05d51695e58b8e91503106bae6030cb83853df32bc7b8a23db4189c4afef01544c21de91ee3df9ad11e065059c758f121c52e6b6a319b93b2136f666
+DIST xz-java-1.7.zip 151864 BLAKE2B 6fc952d8f5ff7f75eecf64c8a26ca1a0cff78f5fe8cc71b7cf12d516d702a92b503e5e7e9ef2a3980922f2bcbc57fc95df475b612fe2f19e49969ef1c873a85e SHA512 6909d4c6bcf0479a5c1a6178c56971517dbb2a923ce6e05b3d21bd5dd1e1ead7d06f3f533276279f440f129607b89e6eb9ba909bad94340d67b16d83cf72b445
 EBUILD xz-java-1.5.ebuild 764 BLAKE2B 4748847ca4d7c6281423767b7b6e749c4d19b0157bbf2b9e994883aff286cba9153760d7770bf4151dd3573446e76da7957b0d3b0064ba5524796c4bcfd8ce6d SHA512 8184e39d04253dffff50d9899230176fed63ea957817f75d6568c2d7a33a2aa7d5dfcda32c32a9cef8507e07f42b48844d0b1026fc11ec3a6fd0d011178f3a96
 EBUILD xz-java-1.6-r1.ebuild 651 BLAKE2B c810d938d1e27719d5098d6d256c5a5f5383e49ccdebb309c5c53ba1f302f67ab95c017dd35d92aae7dcebb85e4dca2f874cf13fb45347257c6221b42d73de09 SHA512 0266edcbf8678ca58bba9bf01d10dd7eaa3d96fd405803aa8c60ea25b903bc0e44f11f043a5c238d9405215bf252c24a0c7a7aa9acb508916d3af6141725aa43
 EBUILD xz-java-1.6.ebuild 808 BLAKE2B a3222e8abac79531bc0c3a87211054ca499f11639076772820de127cdb448e2d978b643e083b7449a3679d0dec24cef78670ee15bf44e47218162721ba669aa3 SHA512 cbcfaa0cc5bfef2ad065b4493cb58fae2e45bcd219745e68a5c775073747d7141f23583927ccbbac042997353b9bbeb3dc5aa0292f921a194b5d67c08af84307
+EBUILD xz-java-1.7.ebuild 651 BLAKE2B c810d938d1e27719d5098d6d256c5a5f5383e49ccdebb309c5c53ba1f302f67ab95c017dd35d92aae7dcebb85e4dca2f874cf13fb45347257c6221b42d73de09 SHA512 0266edcbf8678ca58bba9bf01d10dd7eaa3d96fd405803aa8c60ea25b903bc0e44f11f043a5c238d9405215bf252c24a0c7a7aa9acb508916d3af6141725aa43
 MISC metadata.xml 352 BLAKE2B 8390000455654697f473905c14903172230b9667fd16c4db74dd32643b096cb7c8efa21f8614b30d676fb32e052a76c613298e2a28c362d6135f61a4fe27c242 SHA512 a3c6ce3cd97b39644238700277dd416e1ee79df975184de3429810ca4d77f7160112adef6a9b56f77243a003187f6642798b278cf8501d55da766ccfbaa861cf
diff --git a/dev-java/xz-java/xz-java-1.7.ebuild b/dev-java/xz-java/xz-java-1.7.ebuild
new file mode 100644
index 000000000000..0be4079e7b1d
--- /dev/null
+++ b/dev-java/xz-java/xz-java-1.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementation of xz data compression in pure java"
+HOMEPAGE="https://tukaani.org/xz/java.html"
+SRC_URI="https://tukaani.org/xz/${P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="src/org"
+
+DOCS=( README NEWS COPYING THANKS )
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples src/*Demo.java
+	einstalldocs
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 272d95c8ebbb..9115ae592766 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 34d9c1210c4e..ccbfaa801225 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -2,8 +2,10 @@ DIST elixir-1.4.5.tar.gz 1829098 BLAKE2B bc8e2beafe53c3af507215d913558e295370ed8
 DIST elixir-1.6.5.tar.gz 2075889 BLAKE2B 73586354f3672ef7892b462781e8e94ab913548b4753129a08e4864f222590e95b310c55df628e4e42015bed642569a7183624c2d107cd07dac560ba2b9a57fa SHA512 e2cf9c2d9198da32cefb841cae4ce64bb52eb28239bbffb6d991916cfdee420b242773664efa7381eb4609c67438ab608f5f96ca2c403b54ecdd9bfdddf91a95
 DIST elixir-1.6.6.tar.gz 2078742 BLAKE2B 4a793ac55db97c1d604d5f0012758d039f4a26eff5866a2ad2b90010f8477a8f62cc8f01a391f93133c927c5da5494b6d10b76f087a4af1206da977b0ec14a17 SHA512 62010100274b99423bb6a660e34ef53a702250a09371ef4b49ec03a3afe8761611b3734aea31763afa361560eb74c6d23e022d4d9bc4453c1bdef36bb37f9b4d
 DIST elixir-1.7.1.tar.gz 2139430 BLAKE2B 71fb91134ec707f254cdc5aa36e9335c2a5855b8d65f5a42a75df7dc7e690b342531748e36cfca051cb751eed5487e39b5ef03fc3af35871ca389033ea79ab14 SHA512 f1d5f1f1c5df78673b318d69e1863e2780ad7cd54b050ac6ac9767a07952828a91d749bf16cd6c8d384d3a0c5b6154683d93086121787b5f03783113d8bd3b2c
+DIST elixir-1.7.2.tar.gz 2140217 BLAKE2B d29889a89ab4f29cfb0ee9be75ad62db0ca70f59dfaf75a740b0647ba74d8e1c93e19adea74ef9722e315c011ef6c316fc73da08ee192bb9344ac4130ee46549 SHA512 b105014530f8d68b1b3f15b0199c38efeacdcfc8595269a4ed0275f653e747fce60e6bc0fc94c34a056a6ebbaaf312f061f1aba37988dd984e6b717e856bbab8
 EBUILD elixir-1.4.5.ebuild 610 BLAKE2B da40f0452c6571e8c72f1dc85e845ffced68579db1903479d4df21d20447d3d800ebd69ad75da3675213feee30d0438fa868a377d6cba94b365bac14adbd6132 SHA512 a05d132efcde374b0772b17a92cd13ffb78ab4a8d72c4b33c9cee3ab1312df0d1c7621627042895594ab563f75161f55f0382a348867254be4b3706440f77c17
 EBUILD elixir-1.6.5.ebuild 742 BLAKE2B 017a3956c75e57c612a3f3b2836536da678bc189a95092117aee9bc0602df9e1df26c1ddd8f8ac6a95a354c45b4f6511963add65f83e38efcb486699aa978a37 SHA512 fc902f86e10586266e825fb6eb508389d936470377161c19e45ea0e90287c36c53642db605d8e1241b329e47cc487975c2809484ffc87d3f11e29d15a2685824
 EBUILD elixir-1.6.6.ebuild 742 BLAKE2B 017a3956c75e57c612a3f3b2836536da678bc189a95092117aee9bc0602df9e1df26c1ddd8f8ac6a95a354c45b4f6511963add65f83e38efcb486699aa978a37 SHA512 fc902f86e10586266e825fb6eb508389d936470377161c19e45ea0e90287c36c53642db605d8e1241b329e47cc487975c2809484ffc87d3f11e29d15a2685824
 EBUILD elixir-1.7.1.ebuild 742 BLAKE2B 017a3956c75e57c612a3f3b2836536da678bc189a95092117aee9bc0602df9e1df26c1ddd8f8ac6a95a354c45b4f6511963add65f83e38efcb486699aa978a37 SHA512 fc902f86e10586266e825fb6eb508389d936470377161c19e45ea0e90287c36c53642db605d8e1241b329e47cc487975c2809484ffc87d3f11e29d15a2685824
+EBUILD elixir-1.7.2.ebuild 742 BLAKE2B 017a3956c75e57c612a3f3b2836536da678bc189a95092117aee9bc0602df9e1df26c1ddd8f8ac6a95a354c45b4f6511963add65f83e38efcb486699aa978a37 SHA512 fc902f86e10586266e825fb6eb508389d936470377161c19e45ea0e90287c36c53642db605d8e1241b329e47cc487975c2809484ffc87d3f11e29d15a2685824
 MISC metadata.xml 790 BLAKE2B 33e4a37225c8f5bd142c5cbbe097ad3330f6c5b1115f834c1c20613281bdc0afa0927734ec3b0a2b1da595980abeec2fcf2bb20e725f5701590d1c3629972910 SHA512 5489797d3771c405edb4c9883082f780279470d7821dbdd1a4790bcdc74c0e31327c8f15286dc421bfe426d7371d6be2819e707389f425101e2d0d0577475586
diff --git a/dev-lang/elixir/elixir-1.7.2.ebuild b/dev-lang/elixir/elixir-1.7.2.ebuild
new file mode 100644
index 000000000000..844bd80c8914
--- /dev/null
+++ b/dev-lang/elixir/elixir-1.7.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="https://elixir-lang.org"
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/erlang-18[ssl]"
+# 'mix' tool collides with sci-biology/phylip, bug #537514
+RDEPEND="${DEPEND}
+	!!sci-biology/phylip
+"
+
+RESTRICT=test # needs debug symbols
+
+src_compile() {
+	emake Q=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
+	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
+}
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index a7e0c5161c43..cfc75342dc4c 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,9 +1,10 @@
 AUX 18.2.1-wx3.0.patch 3849 BLAKE2B 02912cf61094d8217eab7181a4cc35aead224df7872c412db0b40b072778cfb900bf18219baf52e29f609b72305d3a11ea1079b2e873cf56a0a3bd42e3303d2f SHA512 33d8b67542266ae224ffb2bc86fbf36fff6737252810cfb445662ecc418fb30b0b00cbddd2f706ca836f1a8809c505e61edfe221d29dbe91c78c371bff6cec15
 AUX 50erlang-gentoo.el 134 BLAKE2B df2da5c0c4be3e6855b51b820e3304f5c212a92d13ec48aa5d73ea3a0e801a8dddd371fd8894d49aa9d5573def56b3a864e463734d72fcf5356d39753dbda1ba SHA512 7a862e0ef1e96e88a484e80aeb92eb4465c7e8661efb0291c28abc13225eb3aa69442fe29417f5ad0d264e54399d645d9cd4713bc9869b48e87a91e50b9b2473
-AUX epmd.init 407 BLAKE2B 958698de3eb49ed66d59b3bd3435f64feec22ca8a9d7260ff9141b8d46e0afa40024fd11c6b84ff3cb5ae46f42a795355e594632300a096ca6a862b254994829 SHA512 9a9d1c0d512e31254170a601edb3a023c1f0abfa9c02656ea86cc04f38bfd4b3bffa131cef2c20ee81d3f62073036b0dcaa399736be7d413fcfa48e4001a5304
+AUX epmd.init 537 BLAKE2B 8b7c45ec9820d37b01cbbe824e0fd13f4651ac280383f8830dc42037f76f918569ce68c00d6c880ab34a95f5c2831dfb3edaf62e13112e5a1c0e77534fd9239c SHA512 231eb48c02eb183eac7aa2f6ec811b0934098e04faf49b130d5f6e184d351f3c1d6484ff5330e5c8d707473be79f220247a9b7076cf3bf27fdd659b1ccdcc111
 AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab557e3f71cab48baf59b5a9533a4dccb2cb61a4434e3a51d44eae06010718dbf9a732d605c40f73 SHA512 405740f8f9cd55d4ecd7420748399ab3f374b7cb09e53605f44ba49d0af86b70e4a1baf1fde05a703fb90c8a83dbcdd5cfbbf09185e9d7b58ff9612aefc2dd28
 AUX erlang-20.2-libressl-2.6.1.patch 4228 BLAKE2B 8c671d3aa8329562b274e6b9f233a3f93565f5a0f4491b83e7e57fb6881d0fbaaf955d7aa5537bdcfc85dbf4c979a3625aed2c203679eccaf9fcc4bd93133836 SHA512 66ff54153264d37d21822a19c07dc7d07fb4ed5c32234be7270821c060fcbd2673069dfd23a38512c7b0373fc97e6e44799f4b4280a1391b300f60f422ef6d69
 AUX erlang-20.3.2-dont-ignore-LDFLAGS.patch 1337 BLAKE2B 7272c96b1ee947a98f0a5b1f3bd1fce11e8d02f121348208196ae60af965dfde7fac15263ca0a58df96dff21785a1a63f4fc10f7e7e10c0f68a618e760e5ffd7 SHA512 59d39b1680ac3406e4c37f81a0207588208a873279920258235af54700f80bd67584c3e55c9278f893cd7813573bbec8b13195e47ba00101fc578d5a2b40fa34
+AUX erlang-add-epmd-pid-file-creation-for-openrc.patch 2359 BLAKE2B 54a3148144bcbb9a4dd68e89fd609a09a9e9a0a9c7a71a4e9eaafc12632e23da44411d72c1590e482fda73d5464b1071386aa564b8d9a73b032b62c474d20570 SHA512 301aed1980a8638a8cd069ecb6e968e5c15d3e82b38580861a0ed6a2fc7a9505d99525a53a6ac19c2d9b786703aac6bf51751275a6a7fafd8f530c07ea0c7e8c
 DIST erlang-20.3.2.tar.gz 53492641 BLAKE2B 2cdf78b6003801400d99949865a5b3e17d2209bf411bbe07dc12f749c84725710d12f85cb2559bc39ac04a7d6f7a9ae07b5f131a5524cf4ce3eb8559ca0259bc SHA512 060874cd4f72c1ecea178dd102f4b37a644485a810127092ad04fee76b52729ce199ee476335a2a40370bc718b7e03eb76869c3a48d457773856fd9f6d30a20b
 DIST erlang-20.3.8.tar.gz 53499006 BLAKE2B 0c38fb739a9c4f4b79533faea8c533f85c30d680081b5de96e70722a243d53b9317a26c7138a24a78cadd938777bd48a515484fffef2fdfd720819ab12bb8c0c SHA512 2ada142b47fdd0d1807a179e7cd3067e001f94682011436d33e503219a8a93495a187f8192fa2ebcdac48409e489b7b310d538779447981e6ba033a6dde12e1c
 DIST erlang-21.0.2.tar.gz 52835517 BLAKE2B bf7e2e166236a7c0a3e3411889f163dce0d938c1a854a6c264c137b601587c4cd4d62d58d9a87cf925406272d6e3d6547e4403927adc8e901716289ee2164162 SHA512 ff736a6df92ac7feec7b9ebb1b6523d511a533d48e536f36aee20fa21b5a1dc33791065d45f6900bbbaa48b4ba80b57a306b416801456a5ac33468786dfb00b7
@@ -26,8 +27,8 @@ DIST otp_src_20.3.tar.gz 88170904 BLAKE2B 3f92641e4eb4079572c0cc1cbc6ba1f56977ef
 EBUILD erlang-19.1.ebuild 4482 BLAKE2B 36a4249649473f50cce66f542c98dbefee41a56d57bd6327f911e6137d5d9bd5fc0656e3f5770f804ae425d428739530be8395a078cc6d930e6c4df2e44edc90 SHA512 26067ee69b78c63a40800b87fcd41f74f1b5a04fdc9e1103b2953f1c721195ec6dfb992474d442193c0673c548ed76a3e88938cc3f93bdbee9e26403164e5e60
 EBUILD erlang-19.3.ebuild 4535 BLAKE2B 248bcab46bc6830e6ffcc626d8170b99f5705c7955fd7184e2f8b8799e0ab4fc97c9741bf4ad9413da479c703b585589e2eae63c9fb298d7e36750fadcb1b56b SHA512 c1b60ca3420d5a3cb1561376c6622d346dbd483e8ff5965f2823a6b1e1e3b0146b32a805307d0a7563ae5171d005cfc27a6662ae2ba8fff0511c5db221851b14
 EBUILD erlang-20.2.ebuild 4586 BLAKE2B e3eed51b916285c87e212446047d07d47492410580464a2c800642be36426848f859573387204afd7ab67d72bbfaefec4189b973525f23829bed9f7a365d436b SHA512 80d5567d6233c7d9fcd53ca64814dd8cf188094decc6f8708563c22bef77b0b85bd23623df825f085f738547bf64b68fdde160b2ca9389b743a2c56259bf37b6
-EBUILD erlang-20.3.2.ebuild 6607 BLAKE2B d25ae5f93fc21e7304beeeecc99cd39516d52685d13003b5c9458272e1e6a9301a028009f746be53c20d20d1d896ec4177d9f06ed1d608ad4c466f1497226046 SHA512 dc6f1228f0f0b9a852f0d8cae149476b44f6069ec647340d259e8cb016a54c80265234e97e49686b33a3948cff485a2a30d276e03c1186749ecdc724e9cbefe2
-EBUILD erlang-20.3.8.ebuild 6650 BLAKE2B a6d808b56317da3fb65ccad9ef422bf602db0546729e8a61f70c233d4d4aa908b09acbb9c435ddcee6990d1372fb7f1dad5ab8a2ab4c8f21cb9ff0600996df9a SHA512 eca902776825efaf825183adbfdf158452bac38476ea6abea88ccdc8e15bf08f34921835acd9a81664b28216e909712dbae75e9b087587778aedae8c15fdf1dc
-EBUILD erlang-20.3.ebuild 4694 BLAKE2B 5d66f16b192c72d5890dc656530a743fd4ffd1f5e7a4770e8a2dbd0f69b631ade821163bdda3dfdf579fbddaa723d10564a4990f0c2c272fcc0455c45277154d SHA512 f059ffc739cbe0026c50d1a9019aef3bd63b8da887d755b3cbf6673ee208f294125ff38d261ce27e6b7f884a9a8156ca3bfe57da3bf3794f149b592ea905ed2a
-EBUILD erlang-21.0.2.ebuild 6648 BLAKE2B 3da97597dae434a2e35c0f2fb0682258b96f6d41e63760ec9f9acb458ae6db03e9189e346e3d644416f2082d5b13f15d6c0fc3a4d97d673dfedbe22b5c029dca SHA512 fbf641ce18a3c3ae2c3223f629bbd01c3ac0d63e5767c9576d31f9b009f45658adf8c5cbc32447882ebdbbaaf58952160eda1b8ebe4a1cf7c543e2287c8d6a86
+EBUILD erlang-20.3.2.ebuild 6673 BLAKE2B 47afb094d4d6b0866075a7db996d59bf6836a559b8cc17396622f6fee8248b7c116601f95d8ade51ecf218546dad9c105ea16d0ec0fc24072f0aebb5ebc88d92 SHA512 3150ebee49b8739ec42c4562743b51a3b4c0501297a2b1fdb6eedd642ed45c5b1b3e5aa30f8f8fa99898f255cc8418fc2911b0005a0d8fc2ffdcad8a155af3c0
+EBUILD erlang-20.3.8.ebuild 6715 BLAKE2B 17490339c9a438c11464a62918b7b16ae9a6f9e15fa554b52c943fe51075d04c3e22e3f6cce1996bc241c6fd98d84196f7abd13545a84488432eb5bff0ea0c6d SHA512 b5a225da6d0029cac2cf64ba2966fc09fd48357c8f018c7851bd62bc15186bc0732e70a9b4973f7893d3768f1292b45b3797bdfee5818b87102fdcd911cdac5b
+EBUILD erlang-20.3.ebuild 4762 BLAKE2B 441de4c69a235e22d6105ce65569d77254684edaf7bf03812e591e2da7015eb0bac1e70193682ed49c7cbd27870ebbb1d2d667b62c212439e37a73a441a4eaf1 SHA512 f9358e7e3f4207b89f02f719c30a529b9cbe56bba679b31ed94cfc3a7736005f91b7248b14e644109406c32cb0ba00403a076aa8a4ca42b4e20533206043b0c1
+EBUILD erlang-21.0.2.ebuild 6714 BLAKE2B e8a082a1b0c7b57182e6bae6d878ff226b2ebd3f49fa92d755f79c825c5b9b185da64b8f826c31c4f9f66f5fa6e37492074c6415ecaf8ac2010eb9568c810bb1 SHA512 3c495fe4c31c6e84f2666bd208a5d2c7871d28adb59dcb981af2f9d2119d50820f0eb50d18789903960c9c1251f3b1c00c3df07afee56dc01153ac5e56f12f50
 MISC metadata.xml 700 BLAKE2B f71879bdfc301ed27bd8212f074e5dbb176b29bcdab9edeb5ce0ba3dab3d8cb888977a140e91b0a50fbe35960799ab487afa3cd26a7b3b52d01909c678c1f30c SHA512 cada8e7cf719a6f0249c9f8538452d599e9ea938b2d57a9083e728c8f9d1c259871cc0f32c4f01c725692dd5e8270f0f67d84335593bdfe5ae31a54f117b1b84
diff --git a/dev-lang/erlang/erlang-20.3.2.ebuild b/dev-lang/erlang/erlang-20.3.2.ebuild
index d9828cad710b..fa93bdca5607 100644
--- a/dev-lang/erlang/erlang-20.3.2.ebuild
+++ b/dev-lang/erlang/erlang-20.3.2.ebuild
@@ -48,6 +48,7 @@ S="${WORKDIR}/otp-OTP-${PV}"
 PATCHES=(
 		"${FILESDIR}/18.2.1-wx3.0.patch"
 		"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
+		"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
 	)
 
 SITEFILE=50"${PN}"-gentoo.el
diff --git a/dev-lang/erlang/erlang-20.3.8.ebuild b/dev-lang/erlang/erlang-20.3.8.ebuild
index ed20da173d49..e9f4f68c03bd 100644
--- a/dev-lang/erlang/erlang-20.3.8.ebuild
+++ b/dev-lang/erlang/erlang-20.3.8.ebuild
@@ -48,6 +48,7 @@ S="${WORKDIR}/otp-OTP-${PV}"
 PATCHES=(
 		"${FILESDIR}/18.2.1-wx3.0.patch"
 		"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
+		"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
 	)
 
 SITEFILE=50"${PN}"-gentoo.el
@@ -170,7 +171,7 @@ src_install() {
 	[[ -z "${ERL_ERTS_VER}" ]] && die "Couldn't determine erts version"
 	[[ -z "${ERL_INTERFACE_VER}" ]] && die "Couldn't determine interface version"
 
-	emake INSTALL_PREFIX="${ED}" install
+	emake INSTALL_PREFIX="${D}" install
 
 	if use doc ; then
 		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
diff --git a/dev-lang/erlang/erlang-20.3.ebuild b/dev-lang/erlang/erlang-20.3.ebuild
index 80c077ee54b3..80b1e5b08a41 100644
--- a/dev-lang/erlang/erlang-20.3.ebuild
+++ b/dev-lang/erlang/erlang-20.3.ebuild
@@ -48,7 +48,8 @@ SITEFILE=50${PN}-gentoo.el
 src_prepare() {
 	default
 
-	eapply "${FILESDIR}"/18.2.1-wx3.0.patch
+	eapply "${FILESDIR}"/18.2.1-wx3.0.patch \
+		"${FILESDIR}"/${PN}-add-epmd-pid-file-creation-for-openrc.patch
 
 	if ! use odbc; then
 		sed -i 's: odbc : :' lib/Makefile || die
diff --git a/dev-lang/erlang/erlang-21.0.2.ebuild b/dev-lang/erlang/erlang-21.0.2.ebuild
index 4d85955c4706..874512907a2a 100644
--- a/dev-lang/erlang/erlang-21.0.2.ebuild
+++ b/dev-lang/erlang/erlang-21.0.2.ebuild
@@ -47,6 +47,7 @@ S="${WORKDIR}/otp-OTP-${PV}"
 PATCHES=(
 		"${FILESDIR}/18.2.1-wx3.0.patch"
 		"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
+		"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
 	)
 
 SITEFILE=50"${PN}"-gentoo.el
diff --git a/dev-lang/erlang/files/epmd.init b/dev-lang/erlang/files/epmd.init
index 9b3b9e2ad72c..f0ef7c224165 100644
--- a/dev-lang/erlang/files/epmd.init
+++ b/dev-lang/erlang/files/epmd.init
@@ -1,14 +1,21 @@
 #!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the Erlang Public License 1.1
 
+ZT_ADDRESS=""
+pidfile="/var/run/epmd.pid"
+command_args="-daemon -relaxed_command_check -address 127.0.0.1"
+
 depend() {
-	need net
+	need loopback
+	before sshd
 }
 
 start() {
 	ebegin "Starting Erlang Port Mapper Daemon"
-	start-stop-daemon --start --quiet --user nobody --group nobody --exec /usr/bin/epmd -- -daemon
+	start-stop-daemon --start --quiet \
+		--pidfile $pidfile \
+		--exec /usr/bin/epmd -- $command_args
 	eend $?
 }
 
diff --git a/dev-lang/erlang/files/erlang-add-epmd-pid-file-creation-for-openrc.patch b/dev-lang/erlang/files/erlang-add-epmd-pid-file-creation-for-openrc.patch
new file mode 100644
index 000000000000..56e3946c93fa
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-add-epmd-pid-file-creation-for-openrc.patch
@@ -0,0 +1,90 @@
+From 04ace92c33a699f75445dc99c30d521311aba826 Mon Sep 17 00:00:00 2001
+From: Steve Arnold <nerdboy@gentoo.org>
+Date: Mon, 6 Aug 2018 16:38:30 -0700
+Subject: [PATCH] Add daemon-mode pid file creation when not configured for
+ systemd
+
+Signed-off-by: Steve Arnold <nerdboy@gentoo.org>
+---
+ erts/epmd/src/epmd.c | 39 ++++++++++++++++++++++++++++++++++++++-
+ erts/epmd/src/epmd.h |  3 +++
+ 2 files changed, 41 insertions(+), 1 deletion(-)
+
+diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
+index 44e997e609..c74888a1ee 100644
+--- a/erts/epmd/src/epmd.c
++++ b/erts/epmd/src/epmd.c
+@@ -40,6 +40,37 @@ static int check_relaxed(void);
+ #ifdef __WIN32__
+ static int has_console(void);
+ #endif
++#ifndef HAVE_SYSTEMD_DAEMON
++static int create_pidfile(void);
++static const char *pidfile = EPMD_PIDFILE;
++#endif
++
++#ifndef HAVE_SYSTEMD_DAEMON
++static int create_pidfile(void)
++{
++    int fd;
++
++    unlink(pidfile);
++
++    /* open the pidfile */
++    fd = open(pidfile, O_WRONLY|O_CREAT|O_EXCL, 0644);
++    if (fd >= 0) {
++        FILE *f;
++
++        /* write our pid to it */
++        f = fdopen(fd, "w");
++        if (f != NULL) {
++            fprintf(f, "%d\n", getpid());
++            fclose(f);
++            /* leave the fd open */
++            return 0;
++        }
++        close(fd);
++    }
++
++    return -1;
++}
++#endif    /* (no) HAVE_SYSTEMD_DAEMON */
+ 
+ #ifdef DONT_USE_MAIN
+ 
+@@ -340,6 +371,13 @@ static void run_daemon(EpmdVars *g)
+     
+     umask(0);
+ 
++#ifndef HAVE_SYSTEMD_DAEMON
++    if (create_pidfile() < 0) {
++        dbg_perror(g,"could not create pidfile %s", pidfile);
++        epmd_cleanup_exit(g,1);
++    }
++#endif /* HAVE_SYSTEMD_DAEMON */
++
+     for (fd = 0; fd < g->max_conn ; fd++) /* close all files ... */
+         close(fd);
+     /* Syslog on linux will try to write to whatever if we dont
+@@ -614,4 +652,3 @@ static int check_relaxed(void)
+     char* port_str = getenv("ERL_EPMD_RELAXED_COMMAND_CHECK");
+     return (port_str != NULL) ? 1 : 0;
+ }
+-
+diff --git a/erts/epmd/src/epmd.h b/erts/epmd/src/epmd.h
+index cffcd4ae7a..e53322acf5 100644
+--- a/erts/epmd/src/epmd.h
++++ b/erts/epmd/src/epmd.h
+@@ -20,6 +20,9 @@
+ 
+ /* The port number is defined in a makefile */
+ 
++/* The name and path to the pid file */
++#define EPMD_PIDFILE "/var/run/epmd.pid"
++
+ /* Definitions of message codes */
+ 
+ /* Registration and queries */
+-- 
+2.17.0
+
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index fe05985b65a4..66273e67be2b 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -3,30 +3,25 @@ DIST rust-1.25.0-arm-unknown-linux-gnueabihf.tar.gz 152774994 BLAKE2B 438fc55edc
 DIST rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.gz 150376603 BLAKE2B 44aadf00b74d3d35039486289b319db5b1820dfb3b0fdbc03714ae2a8df78e09ee09fa41d9d8ec1377b91fb4a8f67cd7f4cdc99ceb39da4b48ba464ee1b73600 SHA512 a45312bec4c06b04d3c148d87a64aa55e14cc160eaaa6b712ce738590063137c8f9dd1030656071c1ac9a22cb852f34efdb98c435527c7371da381b802fb9104
 DIST rust-1.25.0-i686-unknown-linux-gnu.tar.gz 169267482 BLAKE2B 8fb18c95adf7edd74cd305683ab2ee33d59cce1a0f515e9ba63dfd105ffaf9150444e281502747856fa5164f24707b4bbbe110a2b1b7a1cf65c96b883a6f2ede SHA512 76bcd978b9b23b0fc6315f91bed153e59616aa62f520aae8e8d3587b5f5fae74fef15f8b0a749b02a69be56fad4df9a413019438135481917bca1fb1a7704de7
 DIST rust-1.25.0-x86_64-unknown-linux-gnu.tar.gz 178696930 BLAKE2B 0f82e837494d394c86462583f3d65f1ad839a97eda00fbc00476d06255831088cb7e554cc14edbf9dd23fbebf75078dc78204bdbec4795781f7fae0cbb6de63d SHA512 544e85bb69359d8ff6059d0f470b5995822f73e6d361be43f69f87d394b7252a11686f835336930bc257ba4347c0498abf5b1fbd751180d96bd9ca872b76d65c
-DIST rust-1.26.0-arm-unknown-linux-gnueabi.tar.xz 98262664 BLAKE2B 1de2aeef6d035f9f5a4238ad0c730baabfa39944a0cc47ab31fb51b1dd7f606688a4e9c7cd323e7a4998601fce4ebd0102e2d011cfff3caa3a20f91579442cd4 SHA512 44fdff800a6da1929ccab717f544add5a0500856b4ae1edbd6202d5d8b9781bd336c75c857ddf40e6f7175916fb026210bc5ec2656f4b564dd69cc9189bda3d6
-DIST rust-1.26.0-arm-unknown-linux-gnueabihf.tar.xz 98490960 BLAKE2B ad4210bc39d11974f0a5032f6779b4c8ca04f705da8c15a755d5072d157724896a65fc149c16c6f9a479f0c61a6cb0a70d90e48543f6d72725de6baf25d4a94b SHA512 3822303a7a8c567f3a917f4c934f1411fd606a335d5f6e574dd0be9d463e9fe27ff948c820b25a305e53d83b5d9fa0e1cbfca86451a0b3e11ff84ef7a82f65c8
-DIST rust-1.26.0-armv7-unknown-linux-gnueabihf.tar.xz 98788032 BLAKE2B 3727effee1eaf89d979e27f339901ac938acc22d9dd8e664c20941e46db8250f349493f65598243d5234539bb2037e9dabd38f1a047dd8f9bbe20ae2c8270747 SHA512 5766dbba6f4faae3e8dfd1d98ea948e3835d5b1c28b8daf6c734afd7f27301aa857147eb28762462f77c9da539aae2a81319f194154245abd5cdae7067f24d6c
-DIST rust-1.26.0-i686-unknown-linux-gnu.tar.xz 143003764 BLAKE2B 4c0b1872196c21bf9bc9d927455b4c8eb379e40281ef9fdd8a440b702b919628a00bf2e7b392084e8f41f30119c93bfa6e57ba47ee1adecb1d5cdda43778f821 SHA512 1257f9edefc49ee1742c3acd666d15f077c4d999a82dfe0d574df5c41981c3f716adf86b23d96cf9a6757508aea92abcbe06ad9e3bec2cb4ac19512d60ebba31
-DIST rust-1.26.0-x86_64-unknown-linux-gnu.tar.xz 139246408 BLAKE2B dc386c7b9e016bdcb8b2475d789b100922defc0bcd400476e4e618f51c338338edfc463428c9fa0fdcf8f051465a126d1c61030c5881d5c21888e80b8068bad8 SHA512 457503fea324251a92f25d0d45f1e2ac7d342a6a8f52d1abe93a579c7ae9b7f453a707d353e82614b37790747e8551f9762188ee25ff883495598cbf17b3f97e
 DIST rust-1.26.2-arm-unknown-linux-gnueabi.tar.xz 98267104 BLAKE2B ae44fcead124e5e3993240be0c8a46e545df5d045d39184cfada86d9a820fa30a771396a2ced86c2454aef224951e85cf0b6965c13ed98a3024e07d4ca1ec6a9 SHA512 a96295ef2d0eca5a682e3b3bcfe3b3ffeb5bbe45bc949f467cfd1e7ac7252d74e86d2d8f25e5722e75e7f537afeb3b0ae9054bd3908916ea461623f8c13ba5bf
 DIST rust-1.26.2-arm-unknown-linux-gnueabihf.tar.xz 98502692 BLAKE2B 124040a31e93923f66319244dbeba2be5836fb05ea3c1b8d833bdfac796ab1818139651a798ff398c7448958835ea238e9a111899493b992cc25c026a096ae89 SHA512 e23aa8e1167990a61413cdc0c0f336eafee02c90763120a08fdd7fcd7fbf04bbdbe38c59017cfa43ef622cac1b03f0850d5ace15046d384311a9f8af3cbe8b40
 DIST rust-1.26.2-armv7-unknown-linux-gnueabihf.tar.xz 98828932 BLAKE2B 2f60e65128bd32d97422d82d99f5c5447d1c1e77582028089d52208e3ede4af5e72c278a3fb5001348c864087f3e85af05604a0b6078891c5ed812d745840d93 SHA512 7b8e3f39a62b7b5fdaa6d53e5638de26968799d97b5d53e09bf49456b02f968495cff4757f25d38bc3393ca33dc1b9da353ec290ba9416770e082548aa5079ac
 DIST rust-1.26.2-i686-unknown-linux-gnu.tar.xz 143090096 BLAKE2B 7871fa4e4d0f320ff949cd31cefa116bc7b741927626958e1d10197f05fc9a662b8d6c21ddd4d2910700e6f7273e4fc18738e6ff58cd85b9af4ed25eceea31d9 SHA512 859b5b72c78cca8cd473012599ca12539ef9a5ee38d1aaaad024019fd84220e344e1cd0efd2b027ef333555b158b23529f35ceb5d59d76c35e7946b5fe4a8a52
 DIST rust-1.26.2-x86_64-unknown-linux-gnu.tar.xz 138609432 BLAKE2B 54507a8ce3ab2676e6e66852b6d3f1a47ca07ad4b56383f6247149309a0f60f67fbf0a6ba27d968c24340c07d7d5074942c6eaccbc1207c5e75fd9a6f47b2481 SHA512 29e474b0eab4dd2ffa0b964d83f52ffce530e75c4193e307410ef6d20ef9ad2b300a4f467bdf06b3311157340e9295cb9b1efdcf08dafee66979b076c2afba7e
-DIST rust-1.27.0-arm-unknown-linux-gnueabi.tar.xz 101002020 BLAKE2B e725b5cd8ec5ec9c035b70c7a45f49e21332846bc4e760afce4abc5d6de3a84029d06e1df0ca430d9b9b1117d4b534146310391254ebad458552d40b152aa56a SHA512 c0924ae1296802d6bed09944cb04b98414dcd4e102387cc1c4810e26793409daf4622300d451d297c9a84890f108dff1bb4ef70381d582b6d26aae0b2c38e476
-DIST rust-1.27.0-arm-unknown-linux-gnueabihf.tar.xz 101316444 BLAKE2B f3c2e5f0cd6c75e51c3a25bd9aad34180d04bb97187f1ce240b6682e64026efee3359a71d1aadf9ea2fadf0cffa277daade02703d1e70c2fa43f68624ccf43a8 SHA512 5c374d103377dc94e5a68c46deba22080b374dd652cfc64abc69fbbe69e59b40537208534a15c860fb985abb426468eef33b7d6c9a8fee3f855a447c6c0ced4f
-DIST rust-1.27.0-armv7-unknown-linux-gnueabihf.tar.xz 98186744 BLAKE2B add9b9ce125e8e0216579fc4eb9a615396bc6798bd8fe52fc5e02b4eddbca991e227fa1022d5ea86473e4a2f4738fe8e30ad01899bac78b6c2072eead9b9e69d SHA512 034288fd8767f1773b4a5232b26e68a812d0f8084e39dff776d3c8d235f2b3f51c12620a0346851fccbb0ab3cd194938682fa8e9d8641f8ee3c3d9259c96a86f
-DIST rust-1.27.0-i686-unknown-linux-gnu.tar.xz 144744880 BLAKE2B ef48cd1b2601868840c59274a776be40e0ac8ce674d0a00712176e28f5e381b95b790d898fdfdae153768b754f87662c581cd5b11752d5d4401aadd9b446fc7b SHA512 66508f09e7a48d72d4a18da209dadd5e11fc1e9811726fdfa8de609359eee6bc1d8d3b578b50ab0b4dcff879e96edd6d60449508eed7d2d44f72b2c8c29e2546
-DIST rust-1.27.0-x86_64-unknown-linux-gnu.tar.xz 144343920 BLAKE2B 214530a0724f0fa6e1c4e769787a1c0d56e9a6c13a0cacdb9f639d523915fbd413fe42ccd9073308b14b551804d269061ed9bc03cc6761b817bc556e1837d005 SHA512 e57b60cafec48a396cde1ff62bd01148e0e3c803b9b97d70a7cf477a7d3a4295ca98fa99a1252004751e8529b214c2859cd2134ce722b3336b9640c2aef6f625
 DIST rust-1.27.1-arm-unknown-linux-gnueabi.tar.xz 101083416 BLAKE2B 2fd3a4b0c8a6cc1e7f7bc11300081183144639c4d02b8bb989154fbad92ad1e30ac8171993d8296ce8f0486dd018df46360693d912b50ca0c299c4c059f79d17 SHA512 7fa376f077abad6e24b81aa98ab7d953b8257388212a509c7a061ebe022cefd5bd042f24fc4444287bc4fb4cb9a6cbb651ae0d8146b5d4fe73d395ebb7192367
 DIST rust-1.27.1-arm-unknown-linux-gnueabihf.tar.xz 101382108 BLAKE2B 8743930b86b8ac1032afc5ced83f57b0606e9143a9d8e30a8b2ede70abb415fc2f1a904cb4b92adde7f71d54e83384509f02220cea9a9ab189a79815a58bd434 SHA512 be49a245163bef0345cd138fdc8d13a8403bf6b523505666650119eba87921f6a1abb04267bc698da30e5e688d8592fc20d8d3d63aff7ac1fa7397950531d329
 DIST rust-1.27.1-armv7-unknown-linux-gnueabihf.tar.xz 98288932 BLAKE2B 4794e8c54c8f733de6129829bab9e02644651fd6350db76bdb8c69f32fcff0a61e4992241431fea2b871e04a6f28607810918c5161a5a8a0b3fe756a37b619e3 SHA512 405bd579e69ec73de384487c4cd77eefcbc6c537ca3421f38ce2d35b8cd911def82fb9006b788a8aa6cdef69f620a5b1f2a2f7364bf7ddd0452d80b33315fa43
 DIST rust-1.27.1-i686-unknown-linux-gnu.tar.xz 144852524 BLAKE2B f087ad3ee7f942482c6aa02f9dcdc4adf6ede64e698024f7dcca6dccedcc5f9e9805050015d8328c5b672c94cb7f1008551a95a69b1ce8e754e048c5604dd11e SHA512 e0c7d5f64db768321bbdf229529b12f93e36507db03329b0b26094fd81cdf013804f929105ac4545903eb4494770120407c40616086b431ea66413be7e1163d3
 DIST rust-1.27.1-x86_64-unknown-linux-gnu.tar.xz 144328984 BLAKE2B 45551c2f4258c821e9b56ac09d673c46032b5f480da5fc51c0e0e33f66be7f0619aa4ad878336dbffae32e6eb43f2adfbba927ad5cfbb919b9e4395169d5c3bd SHA512 b419c19f75082a63a669ebeeefbce907ca7e7ac50a1c1355d1b10b3a4c1f8e28a76c4fd677efd8cb966a6e70a76059813e39b8dfe93de1401c7419d57ddca52a
+DIST rust-1.28.0-aarch64-unknown-linux-gnu.tar.xz 98937652 BLAKE2B 836d3dd4e583fa50dd317c3bea56257e6ea19defdb38c16be6debb2854e147c8a92c4832263e4ac314136022a176526fe7d3774a3c5a84cd8d364cd2a1532860 SHA512 8d9acbc90ddaa1e0de0234a21798b19b5365ea371a12f9a143c6ebacbb48f57344da6e827e867513be502bce2801de27a0dbbacdf8618c653aeb58026b6c469c
+DIST rust-1.28.0-arm-unknown-linux-gnueabi.tar.xz 104676648 BLAKE2B b26b23c3605e6584c51e0e914dbb3be60996e079e52ff2d4850ed43c1f1f7cd5ac575b40dbe852f927d36654f5ab7e384548f3a92b3466bfbb1cda7f9f069bcb SHA512 a1eaf1d7826ebfe222d233cabd8b88073ca2c8dd42a0b870e324dfc63e7290308418222c56802bc421c9bda119dc7c5f3e225ff33cacad5776b79cbcc1a877b2
+DIST rust-1.28.0-arm-unknown-linux-gnueabihf.tar.xz 104992084 BLAKE2B df97766d7abf73f668a2936834bc0f35739289eeeb5395276a2fdfd5b6c0baee3ba1eee1099f19d4f4f1cbd1a33cf62ad888dd3d1856b613ac853c6a17650741 SHA512 3b58b83f38bf8d8e841ae6614d72bb6e6faf75fb7c19abc5451548b0e6de0ef3b64dfbc70481a1e40f74074bfad701aa7a58296b4a0d07957a418bd3cd769917
+DIST rust-1.28.0-armv7-unknown-linux-gnueabihf.tar.xz 105144132 BLAKE2B d9e0791c7dc77ade26d383a5c57117a2b7b50c6a523b31fbf604c0b779c966c5055554f85c718353f2e581bfe8a228369671a8b731f808bc0133ad3fad61f853 SHA512 9142110e0c24657aca41468648d9364c2e6fce60b08ca7113c944a53701fc5a309481a8fdd5845b229bcc750ccad63af561d452c3a3a0727ab1ca7a461b06d3d
+DIST rust-1.28.0-i686-unknown-linux-gnu.tar.xz 136925948 BLAKE2B 85d9239533920c3f16d7c61bada0caeabceceade29032b70bb4562bfd04fa0158cdd85b8a0a1119506416fa5916ade8a0466bf6c10da457299a6319aa25f9dd6 SHA512 ffdfab46db14f07354b553e02fdb9dc6602c2c52b78d8f17c499f4ddb1e257aa53479df836eb3f06a2548d34296b0277cdb6b4c6f3cec57265823df22752c135
+DIST rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz 134120432 BLAKE2B 56fb79a98659d9c8e56b8eef87dea3302ee5901bc4507d1c204628370b20cf34b2875c9586faa0acc2bc2b1a5beedeb9b5ba199cfb85d52f268f084a02f04f27 SHA512 4f427c11a9cd22aedd01bd7ed5bee2ba5e00a27db25af4f596cf8627d88eff8e72625eb83729d2e6c6780aaffd44c0e7065a1c8fa22f4899349b72c726cf6a5f
 EBUILD rust-bin-1.25.0.ebuild 3456 BLAKE2B c25d70226b0ea86619e749fce47b34706b08257bb0a33f99d6ceeff477040e1dadb4daa830e9c23463f4b20283109292c499dc216753ab9070717275800a8133 SHA512 a423705eb4fc96bd0fe3efe5f79187be88f46a965c1735a65c1990b43917d8d2fb8298b536375db590edd25314c41fa0aef344f8444c9413426013885f0adcc7
-EBUILD rust-bin-1.26.0.ebuild 3591 BLAKE2B 37db63381b0ece72c839661baa5102b7359b7e5ab68b36e2a6de513deff00a413c5dfe27ffcc94c45807a5f2288620b2bd10dc48da06790adb330a54d5bff47f SHA512 f297a3b61e89996fb8e4e52274571fad69602772cb3168574c724b42f59d710f571cba30bcbf32086584d8a93e87313689aeeab4c600a24355b3e82e31e297c9
 EBUILD rust-bin-1.26.2.ebuild 3584 BLAKE2B 932ca808ee2ec13b9b3b400a3ba1b88eddbca83b1d80d03951692c8ec232ebe4df1e7ee9c2a80a8753a8069d4ed2db67d352ba6a89e4e2d13333c7c30494cec5 SHA512 9a4c592ffa1793574b31d73e8922257651b8336812755fa98a576d05bd346118d08e9344f0c11a21e3024e3346da115c2adba44c2393185e051e18bbc4bf0eec
-EBUILD rust-bin-1.27.0.ebuild 3584 BLAKE2B 932ca808ee2ec13b9b3b400a3ba1b88eddbca83b1d80d03951692c8ec232ebe4df1e7ee9c2a80a8753a8069d4ed2db67d352ba6a89e4e2d13333c7c30494cec5 SHA512 9a4c592ffa1793574b31d73e8922257651b8336812755fa98a576d05bd346118d08e9344f0c11a21e3024e3346da115c2adba44c2393185e051e18bbc4bf0eec
 EBUILD rust-bin-1.27.1-r1.ebuild 4276 BLAKE2B 5d333ac21078b8c31570665b882d7f21a4f10efc1b79a016bc032dc0aa7c95db8fa822d05befbe5ba5ff0ff6991478e6c197dc4c57173eb9a2a037182a282004 SHA512 5dcde407708a0f7000e8a3e5a237c8b0ba80a1d2ee7dda47adcdfa24ad25c5c7a7c37774931f93ebe79b50f71ebd1df8b05400f12cb65f5b7689f55a5c101a97
-EBUILD rust-bin-1.27.1.ebuild 3839 BLAKE2B f420bb2b4c550670872b635ebf8bc9aa19811a640f6cacf5d4a79e6bec7c7793685813fc4ec2aa5ee4eec45f2f6e06a0b54f821492ac481f86cc177ebcad37f2 SHA512 9f9a50a92b018361fb0044f97c94a11239ddd03bf3aa91521029e59d79bca15c29f66559f3bdd280acd413bf7dc8af5d5c5b6a15dcb2d66e0bc4519d2879a059
+EBUILD rust-bin-1.28.0-r1.ebuild 4999 BLAKE2B 2bfaac31c41749be07dcb6c6956eb3d4bda1b697447b14f89851a0c4e53881d95b1908b97582b00c5254c135786e25b537a3712a75b7895ab10dc6c2797c8c30 SHA512 7f38a476bcb0f1801a5cdfd5a131f417f00e830428aa7c69904f75f5dabf944ec2ddcd56c8c10d8b496fd841b4d7f07d3bccc6e11ddbb86705ff888f0e46ca32
+EBUILD rust-bin-1.28.0.ebuild 4276 BLAKE2B 5d333ac21078b8c31570665b882d7f21a4f10efc1b79a016bc032dc0aa7c95db8fa822d05befbe5ba5ff0ff6991478e6c197dc4c57173eb9a2a037182a282004 SHA512 5dcde407708a0f7000e8a3e5a237c8b0ba80a1d2ee7dda47adcdfa24ad25c5c7a7c37774931f93ebe79b50f71ebd1df8b05400f12cb65f5b7689f55a5c101a97
 MISC metadata.xml 379 BLAKE2B e2b131a15a86c6230ef9ff560fc522c9e37ed06d2d44eb7e63fa91a01673acbe0dbf80d6e774e68edca439521bb9d61d509ea69203f3c10f496f0c638c8c5368 SHA512 ed16a24b5d5f34471dbc5d411de5a819015cd9da81b55e593401ed52425fc5aa53c793e0e00966fc44e599a99036c5b9756a66b31a85cd80abe41dc97f9f785f
diff --git a/dev-lang/rust-bin/rust-bin-1.26.0.ebuild b/dev-lang/rust-bin/rust-bin-1.26.0.ebuild
deleted file mode 100644
index d9614aad8ef0..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.26.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils bash-completion-r1 versionator toolchain-funcs
-
-MY_P="rust-${PV}"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-SRC_URI="amd64? ( https://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.xz )
-	arm? (
-		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.xz
-		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.xz
-		https://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.xz
-		)
-	x86? ( https://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.xz )"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-
-DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-	!dev-lang/rust:0
-"
-RDEPEND="${DEPEND}"
-PDEPEND=">=dev-util/cargo-${CARGO_DEPEND_VERSION}"
-
-QA_PREBUILT="
-	opt/${P}/bin/rustc-bin-${PV}
-	opt/${P}/bin/rustdoc-bin-${PV}
-	opt/${P}/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.rlib*
-"
-
-pkg_pretend () {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
-src_unpack() {
-	default
-
-	local postfix
-	use amd64 && postfix=x86_64-unknown-linux-gnu
-
-	if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
-		postfix=arm-unknown-linux-gnueabi
-	elif use arm && [[ ${CHOST} == armv6*h* ]]; then
-		postfix=arm-unknown-linux-gnueabihf
-	elif use arm && [[ ${CHOST} == armv7*h* ]]; then
-		postfix=armv7-unknown-linux-gnueabihf
-        fi
-
-	use x86 && postfix=i686-unknown-linux-gnu
-	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
-}
-
-src_install() {
-	local std=$(grep 'std' ./components)
-	local components="rustc,${std}"
-	use doc && components="${components},rust-docs"
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${D}/opt/${P}" \
-		--mandir="${D}/usr/share/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	local rustc=rustc-bin-${PV}
-	local rustdoc=rustdoc-bin-${PV}
-	local rustgdb=rust-gdb-bin-${PV}
-
-	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
-	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
-	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
-
-	dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
-	dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
-	dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/opt/${P}/lib"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	EOF
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust-bin/rust-bin-1.27.0.ebuild b/dev-lang/rust-bin/rust-bin-1.27.0.ebuild
deleted file mode 100644
index 0eea0a7d10c1..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.27.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils bash-completion-r1 versionator toolchain-funcs
-
-MY_P="rust-${PV}"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-SRC_URI="amd64? ( https://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.xz )
-	arm? (
-		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.xz
-		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.xz
-		https://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.xz
-		)
-	x86? ( https://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.xz )"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-
-DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-	!dev-lang/rust:0
-"
-RDEPEND="${DEPEND}"
-PDEPEND=">=dev-util/cargo-${CARGO_DEPEND_VERSION}"
-
-QA_PREBUILT="
-	opt/${P}/bin/rustc-bin-${PV}
-	opt/${P}/bin/rustdoc-bin-${PV}
-	opt/${P}/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.rlib*
-"
-
-pkg_pretend () {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
-src_unpack() {
-	default
-
-	local postfix
-	use amd64 && postfix=x86_64-unknown-linux-gnu
-
-	if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
-		postfix=arm-unknown-linux-gnueabi
-	elif use arm && [[ ${CHOST} == armv6*h* ]]; then
-		postfix=arm-unknown-linux-gnueabihf
-	elif use arm && [[ ${CHOST} == armv7*h* ]]; then
-		postfix=armv7-unknown-linux-gnueabihf
-	fi
-
-	use x86 && postfix=i686-unknown-linux-gnu
-	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
-}
-
-src_install() {
-	local std=$(grep 'std' ./components)
-	local components="rustc,${std}"
-	use doc && components="${components},rust-docs"
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${D}/opt/${P}" \
-		--mandir="${D}/usr/share/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	local rustc=rustc-bin-${PV}
-	local rustdoc=rustdoc-bin-${PV}
-	local rustgdb=rust-gdb-bin-${PV}
-
-	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
-	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
-	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
-
-	dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
-	dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
-	dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/opt/${P}/lib"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	EOF
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust-bin/rust-bin-1.27.1.ebuild b/dev-lang/rust-bin/rust-bin-1.27.1.ebuild
deleted file mode 100644
index c1554f3d217c..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.27.1.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 eutils bash-completion-r1 versionator toolchain-funcs
-
-MY_P="rust-${PV}"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-SRC_URI="amd64? ( https://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.xz )
-	arm? (
-		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.xz
-		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.xz
-		https://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.xz
-		)
-	x86? ( https://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.xz )"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="~amd64 ~x86"
-IUSE="cargo doc"
-
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-
-DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-	!dev-lang/rust:0
-	cargo? ( !dev-util/cargo )
-"
-RDEPEND="${DEPEND}"
-PDEPEND=">=dev-util/cargo-${CARGO_DEPEND_VERSION}"
-
-QA_PREBUILT="
-	opt/${P}/bin/rustc-bin-${PV}
-	opt/${P}/bin/rustdoc-bin-${PV}
-	opt/${P}/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.rlib*
-"
-
-pkg_pretend () {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
-src_unpack() {
-	default
-
-	local postfix
-	use amd64 && postfix=x86_64-unknown-linux-gnu
-
-	if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
-		postfix=arm-unknown-linux-gnueabi
-	elif use arm && [[ ${CHOST} == armv6*h* ]]; then
-		postfix=arm-unknown-linux-gnueabihf
-	elif use arm && [[ ${CHOST} == armv7*h* ]]; then
-		postfix=armv7-unknown-linux-gnueabihf
-	fi
-
-	use x86 && postfix=i686-unknown-linux-gnu
-	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
-}
-
-src_install() {
-	local std=$(grep 'std' ./components)
-	local components="rustc,${std}"
-	use doc && components="${components},rust-docs"
-	use cargo && components="${components},cargo"
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${D}/opt/${P}" \
-		--mandir="${D}/usr/share/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	local rustc=rustc-bin-${PV}
-	local rustdoc=rustdoc-bin-${PV}
-	local rustgdb=rust-gdb-bin-${PV}
-	local cargo=cargo-${PV}
-
-	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
-	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
-	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
-	use cargo && mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}" || die
-
-	dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
-	dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
-	dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
-	use cargo && dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}"
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/opt/${P}/lib"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	EOF
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust-bin/rust-bin-1.28.0-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.28.0-r1.ebuild
new file mode 100644
index 000000000000..75593e6949a4
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.28.0-r1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils bash-completion-r1 versionator toolchain-funcs
+
+MY_P="rust-${PV}"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="amd64? ( https://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.xz )
+	arm? (
+		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.xz
+		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.xz
+		https://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.xz
+		)
+	arm64? ( https://static.rust-lang.org/dist/${MY_P}-aarch64-unknown-linux-gnu.tar.xz )
+	x86? ( https://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.xz )"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cargo doc libressl rustfmt"
+
+CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+
+DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+	!dev-lang/rust:0
+	cargo? ( !dev-util/cargo )
+	rustfmt? ( !dev-util/rustfmt )
+"
+RDEPEND="${DEPEND}
+		cargo? (
+			sys-libs/zlib
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+			net-libs/libssh2
+			net-libs/http-parser
+			net-misc/curl[ssl]
+		)"
+PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
+
+QA_PREBUILT="
+	opt/${P}/bin/*-${PV}
+	opt/${P}/lib/*.so
+	opt/${P}/lib/rustlib/*/lib/*.so
+	opt/${P}/lib/rustlib/*/lib/*.rlib*
+"
+
+pkg_pretend () {
+	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+	fi
+}
+
+src_unpack() {
+	default
+
+	local postfix
+	use amd64 && postfix=x86_64-unknown-linux-gnu
+
+	if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
+		postfix=arm-unknown-linux-gnueabi
+	elif use arm && [[ ${CHOST} == armv6*h* ]]; then
+		postfix=arm-unknown-linux-gnueabihf
+	elif use arm && [[ ${CHOST} == armv7*h* ]]; then
+		postfix=armv7-unknown-linux-gnueabihf
+	fi
+
+	use arm64 && postfix=aarch64-unknown-linux-gnu
+	use x86 && postfix=i686-unknown-linux-gnu
+	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
+}
+
+src_install() {
+	local std=$(grep 'std' ./components)
+	local components="rustc,${std}"
+	use doc && components="${components},rust-docs"
+	use cargo && components="${components},cargo"
+	use rustfmt && components="${components},rustfmt-preview"
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${D}/opt/${P}" \
+		--mandir="${D}/usr/share/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	local rustc=rustc-bin-${PV}
+	local rustdoc=rustdoc-bin-${PV}
+	local rustgdb=rust-gdb-bin-${PV}
+	local rustlldb=rust-lldb-bin-${PV}
+
+	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
+	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
+	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
+	mv "${D}/opt/${P}/bin/rust-lldb" "${D}/opt/${P}/bin/${rustlldb}" || die
+
+	dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
+	dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
+	dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
+	dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}"
+
+	if use cargo; then
+		local cargo=cargo-bin-${PV}
+		mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}" || die
+		dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}"
+	fi
+	if use rustfmt; then
+		local rustfmt=rustfmt-bin-${PV}
+		local cargo_fmt=cargo-fmt-bin-${PV}
+		mv "${D}/opt/${P}/bin/rustfmt" "${D}/opt/${P}/bin/${rustfmt}" || die
+		mv "${D}/opt/${P}/bin/cargo-fmt" "${D}/opt/${P}/bin/${cargo_fmt}" || die
+		dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}"
+		dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}"
+	fi
+
+	cat <<-EOF > "${T}"/50${P}
+	LDPATH="/opt/${P}/lib"
+	MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	/usr/bin/rust-lldb
+	EOF
+	if use cargo; then
+		echo /usr/bin/cargo >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}
diff --git a/dev-lang/rust-bin/rust-bin-1.28.0.ebuild b/dev-lang/rust-bin/rust-bin-1.28.0.ebuild
new file mode 100644
index 000000000000..53d2d4e87ebe
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.28.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils bash-completion-r1 versionator toolchain-funcs
+
+MY_P="rust-${PV}"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="amd64? ( https://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.xz )
+	arm? (
+		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.xz
+		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.xz
+		https://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.xz
+		)
+	x86? ( https://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.xz )"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~x86"
+IUSE="cargo doc rustfmt"
+
+CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+
+DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+	!dev-lang/rust:0
+	cargo? ( !dev-util/cargo )
+	rustfmt? ( !dev-util/rustfmt )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
+
+QA_PREBUILT="
+	opt/${P}/bin/*-${PV}
+	opt/${P}/lib/*.so
+	opt/${P}/lib/rustlib/*/lib/*.so
+	opt/${P}/lib/rustlib/*/lib/*.rlib*
+"
+
+pkg_pretend () {
+	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+	fi
+}
+
+src_unpack() {
+	default
+
+	local postfix
+	use amd64 && postfix=x86_64-unknown-linux-gnu
+
+	if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
+		postfix=arm-unknown-linux-gnueabi
+	elif use arm && [[ ${CHOST} == armv6*h* ]]; then
+		postfix=arm-unknown-linux-gnueabihf
+	elif use arm && [[ ${CHOST} == armv7*h* ]]; then
+		postfix=armv7-unknown-linux-gnueabihf
+	fi
+
+	use x86 && postfix=i686-unknown-linux-gnu
+	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
+}
+
+src_install() {
+	local std=$(grep 'std' ./components)
+	local components="rustc,${std}"
+	use doc && components="${components},rust-docs"
+	use cargo && components="${components},cargo"
+	use rustfmt && components="${components},rustfmt-preview"
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${D}/opt/${P}" \
+		--mandir="${D}/usr/share/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	local rustc=rustc-bin-${PV}
+	local rustdoc=rustdoc-bin-${PV}
+	local rustgdb=rust-gdb-bin-${PV}
+
+	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
+	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
+	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
+
+	dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
+	dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
+	dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
+
+	if use cargo; then
+		local cargo=cargo-${PV}
+		mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}" || die
+		dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}"
+	fi
+	if use rustfmt; then
+		local rustfmt=rustfmt-${PV}
+		local cargo_fmt=cargo-fmt-${PV}
+		mv "${D}/opt/${P}/bin/rustfmt" "${D}/opt/${P}/bin/${rustfmt}" || die
+		mv "${D}/opt/${P}/bin/cargo-fmt" "${D}/opt/${P}/bin/${cargo_fmt}" || die
+		dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}"
+		dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}"
+	fi
+
+	cat <<-EOF > "${T}"/50${P}
+	LDPATH="/opt/${P}/lib"
+	MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	EOF
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 9dfc987dc422..38ee2a3a2d37 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -7,11 +7,17 @@ DIST rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz 111059260 BLAKE2B ae982976a735c
 DIST rust-1.26.2-aarch64-unknown-linux-gnu.tar.xz 90964988 BLAKE2B 7e5de737ff2b4711e0a5b3085f10c3f2918fc5823dcb52bc5f897a5617b65d648d5e59664dbfaa904ff08923d1bbd11aae21349760fefef6ff18ea0e45391e07 SHA512 b565ec988d3b946dabc8902eba60b446070e77b7c27aa98d981b7ba5e9285bda95565627600e6be057970de5006d9640ef77fa920849160f5cf98508b48d1673
 DIST rust-1.26.2-i686-unknown-linux-gnu.tar.xz 143090096 BLAKE2B 7871fa4e4d0f320ff949cd31cefa116bc7b741927626958e1d10197f05fc9a662b8d6c21ddd4d2910700e6f7273e4fc18738e6ff58cd85b9af4ed25eceea31d9 SHA512 859b5b72c78cca8cd473012599ca12539ef9a5ee38d1aaaad024019fd84220e344e1cd0efd2b027ef333555b158b23529f35ceb5d59d76c35e7946b5fe4a8a52
 DIST rust-1.26.2-x86_64-unknown-linux-gnu.tar.xz 138609432 BLAKE2B 54507a8ce3ab2676e6e66852b6d3f1a47ca07ad4b56383f6247149309a0f60f67fbf0a6ba27d968c24340c07d7d5074942c6eaccbc1207c5e75fd9a6f47b2481 SHA512 29e474b0eab4dd2ffa0b964d83f52ffce530e75c4193e307410ef6d20ef9ad2b300a4f467bdf06b3311157340e9295cb9b1efdcf08dafee66979b076c2afba7e
+DIST rust-1.27.2-aarch64-unknown-linux-gnu.tar.xz 94186748 BLAKE2B 7e8f46128a7638217ef63caf479e1a6d9ebde7a225b7dad55082eb06e0206f0b1a5efa65badb15127a456ddc39702482407bbb9171a11397a31bc7c85d2cbcfa SHA512 84022350f1e8fc34a353a09848333424a557ddea3b9445a1a5fc9d2f2abced942154e80888ab4091174d6d83c6766f583ef240ab2e2233de5d536633d2765040
+DIST rust-1.27.2-i686-unknown-linux-gnu.tar.xz 144776012 BLAKE2B 98883f45637adf0920543da8951f29bf5ab11d1f39e9f4154b77e882eadce26ec5e8ed3e9bdcf560f8009fbaab4b7255ba8eb8eeb8beadad39ec6fa74b6dde45 SHA512 e17960120bdd18a527c0783ce8ca8d76cdc9b436f36a73a82fd2ea709b253f33feeb88310fab7a86305bad403eb5dad7ea43d0e5bc5ad1e3847f29e85040303a
+DIST rust-1.27.2-x86_64-unknown-linux-gnu.tar.xz 144218956 BLAKE2B 40834086f211dd64ec76be37eb477697ff44783f261f0b9bfc10b46cc340cf3c15adf80d39a9df642b4985ea1239ad7f1d1803a44f3bd3d53f073bdc38a1de0e SHA512 14861392dad81d2c040d0deb64d5dd34652d5cc2875e404609a0f13c8fb6bdc38f9bc7b1e309829365a00c42b610f2b7a73cffa232ecfdf0618b5508a8667198
 DIST rustc-1.25.0-src.tar.gz 98639156 BLAKE2B 1408d5dd0611d4830de3b6b3d00e3fad4198a47599b639d0ac0bd05aaba401f743056a942e9df04a4d192c6b12e8cfe9a9cdf8cd26e48b72104ce9b423df049e SHA512 7d8886f4d5a621eb794e814deb60be681fa38cf086f87ffa14e5a3500c640b237c549a632de1331a0f1b71963de41f6d31a4df3866b7e597424002316fed81ce
 DIST rustc-1.26.2-src.tar.xz 54613640 BLAKE2B f361b7a0ed40ccb026750b4a70b99931f1abf52024e907b588e339902de2fbbd15501d237ac048d0537005834b0a2f49935f654a8c75d40ed95c65894f611481 SHA512 a598858ddce0e05d1d431be383400f44fc551eb2e368f37b01670c0b65ea5da6a7d5b2b68bb6ef806d2107cfa0d5007008442ad4d5ddb17d18d04e0ab31600b0
 DIST rustc-1.27.1-src.tar.xz 55458892 BLAKE2B 9c5cec24760afdcee51fb0ba8d2289b92d34de57e97e57f2e5dc129674edab4a595ab5756c789b5de15bdd5107363f12a517169cedc7c3093fa0241d200ca3ab SHA512 4a8c03476ca1867a1130b825724ecb6bd629b889d704fdd6c3de4e188f73e2d1acdfae413f26e37505d76109d23d8e9ab409b31af3d67d244f8552730ada292d
+DIST rustc-1.28.0-src.tar.xz 55838968 BLAKE2B 1ff1f54dbae8c6481a6467d35b7c7dc340eba5e8c34f08ecb7b2300239c98a70c8459dacb8c8932ab6d9b3e2770e5b3508e23db7b01ff6014b7dbc076cf1de94 SHA512 a4885cd42a1006738cca2f0d8c0d5e4fd4014fc4629cbf691935bd36ffb896c553717022e67532359b5f1bd8e5050fc38b9dffed7c45cc76f7089ec134dfb980
 EBUILD rust-1.25.0.ebuild 4602 BLAKE2B ef12c22219b70843d6132e07dc0df131502ba441a750c86f1863bd55c708df992a8d359fd62da11ff473806998673fbe0db11ff8129d4af42295ad6d849be511 SHA512 737a3f8469cac36442f11260de811294ab38faa23c515c78159288f340e51bafbb64b7c6354e8409f5b7093e65907aaebcc787493779f70f56a5bb02535574c3
 EBUILD rust-1.26.2.ebuild 6405 BLAKE2B 42ba958bf51ca06863a7daf33af65edf6ca9a8661403c3790beb0767275ef351c624bab40eec7d6b191f9ff366a00ffe9b9419edf6ad95093adc130e1c3c8c27 SHA512 5475113b82ae3d5406a41a2ad1d37dd0997be401dbe5f61a3f50234b208b23f6b3bb465baffc0e05b3c667416dcd870d61b918f36ef3e41ae30009b600eb7524
 EBUILD rust-1.27.1-r2.ebuild 7460 BLAKE2B 24163e17a44a120b62230b95c4134b181463cfdf6bce19107251e91c1bb9d37a7850c06ba6b1928c1296844902e0dd0454dd07753130cb9f655f55ec95588bb0 SHA512 5a865e7013ca04f12be10031c08aec7f5008e488489bef9bcc7c62aaf06c0b2278aa514054bb309fb73f546796f054e2b801cadc8a2883e01a88980b8a8453c7
 EBUILD rust-1.27.1.ebuild 6502 BLAKE2B 7c00b39b5db8347085ec6060019ce20f0914aed7c1f62da31d7d3114451253a076f11b60c4615f7b5f1afb0cd7bd25e0e89f328b29fe4c041bad242f69e9cb36 SHA512 57c6ac383e47aec3d86b7d1ec198c843b89498c2f2fea17f1e1ce07ec4a9405ec48add0e3e683a378f74650582ded64a3d610c7d1014295ca9e141bd7d0961a6
+EBUILD rust-1.28.0-r1.ebuild 7546 BLAKE2B 01f3f4d5be7a1b6d7e353601fdef18ffdee742d90d1d4efefe7fb76880f54178e655ef04d7d039fe3950aa7a13cdb89b91be1a21d1e4b311dac87510bc60294a SHA512 0be126e201bbff6293ae9ca80abd0305e0ab16dc16b78de68f398e4f4afc3c7907d2637d95a8d2d2b732ea7018c712449506156a29aa467d8b773c6405a15bf2
+EBUILD rust-1.28.0.ebuild 7363 BLAKE2B 4e60865cac7da0a2883e7be90c1077f86adfb61bf63e3458ef4b6d7bee992554c9a460a06c4b166ae04d076d67a743d0860a86eddc9f559c73889e3368d94726 SHA512 a19f7db936df9484c09bccc0fa23a6f9d223681ab403fa92dee8a04edc2ffb76eef6f0d77d0d6169a6cd2494b5ae3f1935965a73fba1528ec3aebe6259a4c675
 MISC metadata.xml 729 BLAKE2B fabcd84f8393ad53a0a5a44d9ec6320d1ff8defa7bca5af818b28571af017739348de98c5b60db6140929f576393e70ddaebc2d255011c22ba1c6e16672b375a SHA512 103448ae7c168a0dc30539f1e747200990ffec66d62a66876c1d186d03eabdded5238175584269472b7fca53bf596b26dc58dbb732751d7971dc0c75ccf37211
diff --git a/dev-lang/rust/rust-1.28.0-r1.ebuild b/dev-lang/rust/rust-1.28.0-r1.ebuild
new file mode 100644
index 000000000000..2595c9c53af3
--- /dev/null
+++ b/dev-lang/rust/rust-1.28.0-r1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+
+inherit multiprocessing multilib-build python-any-r1 toolchain-funcs versionator
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
+	KEYWORDS=""
+else
+	ABI_VER="$(get_version_component_range 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+CHOST_amd64=x86_64-unknown-linux-gnu
+CHOST_x86=i686-unknown-linux-gnu
+CHOST_arm64=aarch64-unknown-linux-gnu
+
+RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).2"
+RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
+RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
+RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
+
+CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+
+SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
+	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.xz )
+	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.xz )
+	arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.xz )
+"
+
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="cargo debug doc +jemalloc libressl rls rustfmt wasm ${ALL_LLVM_TARGETS[*]}"
+
+RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+		jemalloc? ( dev-libs/jemalloc )
+		cargo? (
+			sys-libs/zlib
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+			net-libs/libssh2
+			net-libs/http-parser
+			net-misc/curl[ssl]
+		)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	|| (
+		>=sys-devel/gcc-4.7
+		>=sys-devel/clang-3.5
+	)
+	cargo? ( !dev-util/cargo )
+	rustfmt? ( !dev-util/rustfmt )
+	dev-util/cmake
+"
+PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+	usex "$1" true false
+}
+
+src_prepare() {
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	local rust_stage0_name="RUST_STAGE0_${ARCH}"
+	local rust_stage0="${!rust_stage0_name}"
+
+	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
+
+	default
+}
+
+src_configure() {
+	local rust_target="" rust_targets="" rust_target_name arch_cflags
+
+	# Collect rust target names to compile standard libs for all ABIs.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target_name="CHOST_${v##*.}"
+		rust_targets="${rust_targets},\"${!rust_target_name}\""
+	done
+	if use wasm; then
+		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
+	fi
+	rust_targets="${rust_targets#,}"
+
+	local extended="false" tools=""
+	if use cargo; then
+		extended="true"
+		tools="\"cargo\","
+	fi
+	if use rls; then
+		extended="true"
+		tools="\"rls\",$tools"
+	fi
+	if use rustfmt; then
+		extended="true"
+		tools="\"rustfmt\",$tools"
+	fi
+
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	rust_target_name="CHOST_${ARCH}"
+	rust_target="${!rust_target_name}"
+
+	cat <<- EOF > "${S}"/config.toml
+		[llvm]
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		targets = "${LLVM_TARGETS// /;}"
+		[build]
+		build = "${rust_target}"
+		host = ["${rust_target}"]
+		target = [${rust_targets}]
+		cargo = "${rust_stage0_root}/bin/cargo"
+		rustc = "${rust_stage0_root}/bin/rustc"
+		docs = $(toml_usex doc)
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		extended = ${extended}
+		tools = [${tools}]
+		[install]
+		prefix = "${EPREFIX}/usr"
+		libdir = "$(get_libdir)"
+		docdir = "share/doc/${P}"
+		mandir = "share/${P}/man"
+		[rust]
+		optimize = $(toml_usex !debug)
+		debuginfo = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		use-jemalloc = $(toml_usex jemalloc)
+		default-linker = "$(tc-getCC)"
+		rpath = false
+		lld = $(toml_usex wasm)
+	EOF
+
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target=$(get_abi_CHOST ${v##*.})
+		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+		cat <<- EOF >> "${S}"/config.env
+			CFLAGS_${rust_target}=${arch_cflags}
+		EOF
+
+		cat <<- EOF >> "${S}"/config.toml
+			[target.${rust_target}]
+			cc = "$(tc-getBUILD_CC)"
+			cxx = "$(tc-getBUILD_CXX)"
+			linker = "$(tc-getCC)"
+			ar = "$(tc-getAR)"
+		EOF
+	done
+
+	if use wasm; then
+		cat <<- EOF >> "${S}"/config.toml
+			[target.wasm32-unknown-unknown]
+			linker = "lld"
+		EOF
+	fi
+}
+
+src_compile() {
+	env $(cat "${S}"/config.env)\
+		./x.py build --config="${S}"/config.toml -j$(makeopts_jobs) \
+		--exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
+}
+
+src_install() {
+	local rust_target abi_libdir
+
+	env DESTDIR="${D}" ./x.py install || die
+
+	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
+	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
+	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
+	mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
+	if use cargo; then
+		mv "${D}/usr/bin/cargo" "${D}/usr/bin/cargo-${PV}" || die
+	fi
+	if use rls; then
+		mv "${D}/usr/bin/rls" "${D}/usr/bin/rls-${PV}" || die
+	fi
+	if use rustfmt; then
+		mv "${D}/usr/bin/rustfmt" "${D}/usr/bin/rustfmt-${PV}" || die
+		mv "${D}/usr/bin/cargo-fmt" "${D}/usr/bin/cargo-fmt-${PV}" || die
+	fi
+
+	# Copy shared library versions of standard libraries for all targets
+	# into the system's abi-dependent lib directories because the rust
+	# installer only does so for the native ABI.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		if [ ${v##*.} = ${DEFAULT_ABI} ]; then
+			continue
+		fi
+		abi_libdir=$(get_abi_LIBDIR ${v##*.})
+		rust_target=$(get_abi_CHOST ${v##*.})
+		mkdir -p "${D}/usr/${abi_libdir}"
+		cp "${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib"/*.so \
+		   "${D}/usr/${abi_libdir}" || die
+	done
+
+	dodoc COPYRIGHT
+
+	# FIXME:
+	# Really not sure if that env is needed, specailly LDPATH
+	cat <<-EOF > "${T}"/50${P}
+		LDPATH="/usr/$(get_libdir)/${P}"
+		MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-lldb
+	EOF
+	if use cargo; then
+	    echo /usr/bin/cargo >> "${T}/provider-${P}"
+	fi
+	if use rls; then
+	    echo /usr/bin/rls >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+	    echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+	    echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB and LLDB,"
+	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}
diff --git a/dev-lang/rust/rust-1.28.0.ebuild b/dev-lang/rust/rust-1.28.0.ebuild
new file mode 100644
index 000000000000..41be6dd55690
--- /dev/null
+++ b/dev-lang/rust/rust-1.28.0.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+
+inherit multiprocessing multilib-build python-any-r1 toolchain-funcs versionator
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
+	KEYWORDS=""
+else
+	ABI_VER="$(get_version_component_range 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+CHOST_amd64=x86_64-unknown-linux-gnu
+CHOST_x86=i686-unknown-linux-gnu
+CHOST_arm64=aarch64-unknown-linux-gnu
+
+RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).2"
+RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
+RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
+RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
+
+CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+
+SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
+	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.xz )
+	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.xz )
+	arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.xz )
+"
+
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="cargo debug doc +jemalloc rls rustfmt wasm ${ALL_LLVM_TARGETS[*]}"
+
+RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+		jemalloc? ( dev-libs/jemalloc )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	|| (
+		>=sys-devel/gcc-4.7
+		>=sys-devel/clang-3.5
+	)
+	cargo? ( !dev-util/cargo )
+	rustfmt? ( !dev-util/rustfmt )
+	dev-util/cmake
+"
+PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+	usex "$1" true false
+}
+
+src_prepare() {
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	local rust_stage0_name="RUST_STAGE0_${ARCH}"
+	local rust_stage0="${!rust_stage0_name}"
+
+	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
+
+	default
+}
+
+src_configure() {
+	local rust_target="" rust_targets="" rust_target_name arch_cflags
+
+	# Collect rust target names to compile standard libs for all ABIs.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target_name="CHOST_${v##*.}"
+		rust_targets="${rust_targets},\"${!rust_target_name}\""
+	done
+	if use wasm; then
+		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
+	fi
+	rust_targets="${rust_targets#,}"
+
+	local extended="false" tools=""
+	if use cargo; then
+		extended="true"
+		tools="\"cargo\","
+	fi
+	if use rls; then
+		extended="true"
+		tools="\"rls\",$tools"
+	fi
+	if use rustfmt; then
+		extended="true"
+		tools="\"rustfmt\",$tools"
+	fi
+
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	rust_target_name="CHOST_${ARCH}"
+	rust_target="${!rust_target_name}"
+
+	cat <<- EOF > "${S}"/config.toml
+		[llvm]
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		targets = "${LLVM_TARGETS// /;}"
+		[build]
+		build = "${rust_target}"
+		host = ["${rust_target}"]
+		target = [${rust_targets}]
+		cargo = "${rust_stage0_root}/bin/cargo"
+		rustc = "${rust_stage0_root}/bin/rustc"
+		docs = $(toml_usex doc)
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		extended = ${extended}
+		tools = [${tools}]
+		[install]
+		prefix = "${EPREFIX}/usr"
+		libdir = "$(get_libdir)"
+		docdir = "share/doc/${P}"
+		mandir = "share/${P}/man"
+		[rust]
+		optimize = $(toml_usex !debug)
+		debuginfo = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		use-jemalloc = $(toml_usex jemalloc)
+		default-linker = "$(tc-getCC)"
+		rpath = false
+		lld = $(toml_usex wasm)
+	EOF
+
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target=$(get_abi_CHOST ${v##*.})
+		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+		cat <<- EOF >> "${S}"/config.env
+			CFLAGS_${rust_target}=${arch_cflags}
+		EOF
+
+		cat <<- EOF >> "${S}"/config.toml
+			[target.${rust_target}]
+			cc = "$(tc-getBUILD_CC)"
+			cxx = "$(tc-getBUILD_CXX)"
+			linker = "$(tc-getCC)"
+			ar = "$(tc-getAR)"
+		EOF
+	done
+
+	if use wasm; then
+		cat <<- EOF >> "${S}"/config.toml
+			[target.wasm32-unknown-unknown]
+			linker = "lld"
+		EOF
+	fi
+}
+
+src_compile() {
+	env $(cat "${S}"/config.env)\
+		./x.py build --config="${S}"/config.toml -j$(makeopts_jobs) \
+		--exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
+}
+
+src_install() {
+	local rust_target abi_libdir
+
+	env DESTDIR="${D}" ./x.py install || die
+
+	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
+	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
+	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
+	mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
+	if use cargo; then
+		mv "${D}/usr/bin/cargo" "${D}/usr/bin/cargo-${PV}" || die
+	fi
+	if use rls; then
+		mv "${D}/usr/bin/rls" "${D}/usr/bin/rls-${PV}" || die
+	fi
+	if use rustfmt; then
+		mv "${D}/usr/bin/rustfmt" "${D}/usr/bin/rustfmt-${PV}" || die
+		mv "${D}/usr/bin/cargo-fmt" "${D}/usr/bin/cargo-fmt-${PV}" || die
+	fi
+
+	# Copy shared library versions of standard libraries for all targets
+	# into the system's abi-dependent lib directories because the rust
+	# installer only does so for the native ABI.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		if [ ${v##*.} = ${DEFAULT_ABI} ]; then
+			continue
+		fi
+		abi_libdir=$(get_abi_LIBDIR ${v##*.})
+		rust_target=$(get_abi_CHOST ${v##*.})
+		mkdir -p "${D}/usr/${abi_libdir}"
+		cp "${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib"/*.so \
+		   "${D}/usr/${abi_libdir}" || die
+	done
+
+	dodoc COPYRIGHT
+
+	# FIXME:
+	# Really not sure if that env is needed, specailly LDPATH
+	cat <<-EOF > "${T}"/50${P}
+		LDPATH="/usr/$(get_libdir)/${P}"
+		MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-lldb
+	EOF
+	if use cargo; then
+	    echo /usr/bin/cargo >> "${T}/provider-${P}"
+	fi
+	if use rls; then
+	    echo /usr/bin/rls >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+	    echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+	    echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB and LLDB,"
+	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 09d7022ea7c9..9ee03ab2e711 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index eac6d2260967..bb37b22ebc7f 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -7,7 +7,7 @@ AUX beignet-1.4.0_no-debian-multiarch.patch 862 BLAKE2B 54fb9124832e57b3466c1169
 AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff9457896a50b3323b41a009e039085d2d4aeff14d9d8cf35fca3e4a23bacb3078451c4981b6f806cec4146aec83 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312
 AUX no-debian-multiarch.patch 1652 BLAKE2B 4d112429412a7ada957228aa8e6beb145fbaf04065d6f816b0f13513631211894c57e9999157db5f22d7044f231be65396040efe450d090e3774bd24c9c93482 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
-EBUILD beignet-1.3.2-r1.ebuild 2668 BLAKE2B 12e4ec730bd82c38086c7b6516353c3d884cc6578f9b73a9d671b409ac1ac1e2c575887252c762b2df2323c098e89c134030850a7919acaa4ada20809d303557 SHA512 3e59792f8235d1f659abfff9be27b69384b01c1bd6cfc6fe15bfbc4d5da0860a12bfe13dd3c506d132695ee739631a413e5f4d70ac481f3348e9c4f5d90d1f57
+EBUILD beignet-1.3.2-r1.ebuild 2694 BLAKE2B 97cb62df2e7dbc7647e5a81c1056350f53992715d3904b9b1c55cf78e853124ef9d77f4a1d6b5303039593a8693e668a6de354bd637f781b931b09a093bc42c9 SHA512 696d0b6df900197e4b6b765549f0441ce29afe4a89be86041d5f1ccf984428d84810570a9d2c2d00f501afb977b416ec00aadd9531b8d803aca8efaeb4ed0ea1
 EBUILD beignet-1.3.2.ebuild 2630 BLAKE2B 09a301f4174494e0f8007de277f9c3d888361661631ace7e1858a0a4cfec7cac07f494b2187862e447e1079716b9561bc6526422ce8100df54bdaf282de8cf0b SHA512 823a890987d1c6e3c16f9127ebe20947ea09d9114f9e5e42fe97e212d32ae53d44dcfb37aead35608c8b3c2f2214f9c493c99381073cabd4d6ab8872f49762db
 EBUILD beignet-9999.ebuild 2452 BLAKE2B 91b4102d667aa6e265c725f7e77a5bf66198b75569d15a6ea7ea6e89a064639a5783d7670dd7627e47b6ee90124a076fba3abc8a13aeb7f82d3aaf9a7e4ab7a0 SHA512 def37f0a7884bcf1f87f3ec1da46d499a7cb6f8dc216ce51212f72039490f70746a5ca3fe3ab1bc7da481834b16d54c0bdf11f7834de319b5e978e5b641d203b
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
index c562b68c13b3..7975dc31d3ce 100644
--- a/dev-libs/beignet/beignet-1.3.2-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
@@ -82,7 +82,7 @@ multilib_src_configure() {
 	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
 
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/${VENDOR_DIR}"
 		-DOCLICD_COMPAT=$(usex ocl-icd)
 		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
 	)
@@ -96,7 +96,7 @@ multilib_src_install() {
 	cmake-utils_src_install
 
 	insinto /etc/OpenCL/vendors/
-	echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
+	echo "${EPREFIX%/}/${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
 	doins "${PN}-${ABI}.icd"
 
 	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 3b1307f37d01..d433e4d6bacb 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -22,7 +22,7 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.26.tar.gz 5220231 BLAKE2B 08fe5c1624e7cccb4b5e562f6987fddd047e1221b671cedbbb684d5a2f39e09a438ad14ffcedb5f398c203ca0b6e23574106c87f43a632028d50a69619c54970 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0
-EBUILD cyrus-sasl-2.1.26-r10.ebuild 7750 BLAKE2B 19ec378a1212a5c20c768037e992d62dbf234bde838292f51f4dcfec36d32b0f505dbd5057deb304d40b211590ec67c3b56f19f264f3b296fe506254a4e920c2 SHA512 11a244bc643269e84d4ba59bb43b68622340c9be4c25427a6c5e17083c81f8c6a836322eca05478cde9d12908ead7c0ac94a17e6094865e0fa89771ade1b3cb1
-EBUILD cyrus-sasl-2.1.26-r11.ebuild 8401 BLAKE2B 23750f3f5b6cf63dd1c6e80dc8591ea175c76d4abdf121fcdafab30cae631ae72e10cffb2769b2a8d7df8669d398061abd7a26c0b3d492cf9822b848ece30429 SHA512 ba488a57851285de62c53bb74bc61231660d924783cb354ffbddfa62657f6f8d3b3a3a4d357bd46ed694c1fc006ad9b189bb9456d75cfd2427f640811e6f1c0d
-EBUILD cyrus-sasl-2.1.26-r9.ebuild 7660 BLAKE2B 3a1594ef7878d89065aaabefc5928a9ad4489ccb2812de4adc9fe1979d6861238e26a32d523c6bc63c32a1b83627797416df74d857156425ac8d8aa544dcf1c4 SHA512 c1db771512006137faa09716fd67ac04bf984870a0aca83e393b577d6a6c4b4530796b53c8d5bc91a0bd6963226953f2d2e80dfb4039016d60554e904d57c15e
+EBUILD cyrus-sasl-2.1.26-r10.ebuild 7752 BLAKE2B 3b242e93223a6538e456a96f42baae31fc097cfcd198030d0a2f8da4971a30c6e457f35a78f9cf98ba32c523f5edd5184d201c49ed62b8cf6fa328f68caa8da5 SHA512 d111f3ddf99ec9bb1439e3f3894cda00f257f312778475d20ecdb80d469bba2b91c70c6b9b05df0e2c737768469351a770254976d7db9fa0f44c953e35cac3c1
+EBUILD cyrus-sasl-2.1.26-r11.ebuild 8403 BLAKE2B 6b23212c3187228fc5bba149368ff67313a4ef7e902d4bc2f9d894e645a31f0de2798f45c10a392f093d0221aabde050cadae29ca71b6fb78e36eab35463918a SHA512 796e8c3c834a5add924aecc6fd5b3ddc9204621198b6a20c39286aa719df58ea9ca14f551ef8da946aec1bbb1915fd8fc52072be841a77e7b714389a1eb2371e
+EBUILD cyrus-sasl-2.1.26-r9.ebuild 7662 BLAKE2B 8a7b96ca43d133164a9818727486f2d15bd6f66d66e083dee2ac0a8d83c921a86e3e1f34dfa04689c81b5227cf80f06d1fea3c1da74b48c828e4a31f51b67c9e SHA512 6515a66682bc8c0d18b13a3cc540d00f07d26374a6bbefdcb6c974b3184164cfcce80e965b29bc10e81345e2abb8c04eb7edb21adf4097af741d5df1557ae04d
 MISC metadata.xml 706 BLAKE2B a5682e5daac9c1a7a3a021989ae9ca856bb08c9eb0ba3a71070b7150cccc7ddfcd1d3d0fe1df33e688d0223ab7fb760ae028e4753523b28a4cedcb625c899d73 SHA512 1e7495deff4727296d29b25b7af535c0b36054b9172763ca8634b40f324dbc33697424a7e5565791c3131def3708c9ffb7e3e2362cbd8b334d650921fc2291ce
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
index 714f49875667..a6aab9f3729b 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt
 SASLAUTHD_CONF_VER="2.1.26"
 
 DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
+HOMEPAGE="https://www.cyrusimap.org/sasl/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
index 40f3d8655566..582c8463da1e 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt
 SASLAUTHD_CONF_VER="2.1.26"
 
 DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
+HOMEPAGE="https://www.cyrusimap.org/sasl/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
index 1179bd79125b..023e07bfe40a 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt
 SASLAUTHD_CONF_VER="2.1.26"
 
 DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
+HOMEPAGE="https://www.cyrusimap.org/sasl/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 795da42bfeab..9ab3201ff42c 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,6 @@
 DIST ell-0.5.tar.xz 393112 BLAKE2B c9b718a6b471ef428f563989843281b7b00c1ed382d68e241d9b1f624ef085c554ed46eefac544a8711fe2ec15428eb5b069f60d827e5a363e8c0a539e2fbf7f SHA512 aa84ce99980ada2bd80ac5a479d31c84784bc7b09afd0586ab1672a1227dbe14fdbc3788ccc812b22073e1e55b8902f81f86d9f1350c5c280886a8528d6979ce
 DIST ell-0.6.tar.xz 393016 BLAKE2B ad3a5402eca26a77caabb1d01054500333824c56403c1585c7aaf9ac19fd3f17e4d1dfc226f58ae1303d678e88d5b07c6b6e9c68a643f99b645ca4c4a10f7b19 SHA512 df39c460e781d5fa9838df362721687747148280cb7762dddce6aa35c38db1713b01efff5156d9dc144d6e11d50be7058db1362f4143f7a606bc6fbeeedaf8bf
 EBUILD ell-0.5.ebuild 711 BLAKE2B b2d4c540efc7456c20c10e42e79006ae43de0bd502ff4948a50d098c1eee1016f32b72d705d555a6b5dc6320467de1d962b3c382d785daec9025f1c288e8f8b2 SHA512 26fd2588d3630c874fb0a6ccc1bdd66d175022586b29b75362920ddf3e28928378d1e3c2156ffa6c70fbc57e0fc743ac8496ff8d0ef946fe51a417122f3c0fc0
-EBUILD ell-0.6-r1.ebuild 754 BLAKE2B c088f1e6e25cf5db76d1a6b74af9d059c8c2e5e77b4450d564e0d8ec3f8bc0bd078ee8a08d8db998d8c7bd532c8c66984e33d16d28950da35d2242661353d678 SHA512 f8d8ad907eee487cb02276835e2ac9d46182eb40d2871bcd8f1a82ac23fa0c83dd6e3a4efed43953f763110aa89e4cc2361f654b06dc248d92f60011328b793e
-EBUILD ell-0.6.ebuild 706 BLAKE2B 2ad1313da1ba1ad119013b185f59629e59723eb12cc0796b0b93db7500e96a107bad83eb0bc278555aaa4a58002f824303f2a706116ed01c96767573d1de59f0 SHA512 658e48ce434ed709ceb1c3803cba9aab2002960810d10ecc98aad01629fe50f6a3c02f0a9d3853d3ded652a2a7edc423c13c901f601d19b040a26245548b69e6
+EBUILD ell-0.6-r1.ebuild 761 BLAKE2B adad8b4b8c0691fb5ee832041183f9fd6d48c4bde90e08c706ee41badc394892d77f85cb382d677ae31af34bff8a31966bea341eeda48d15e18144b4a585f702 SHA512 0a971cb5de632396621f3d4854ad33bc529348a8a7aef5625d89886e1984391d4bd5fba05c646b831b2b8734172fef773ee42236cc4ea302b5ac5630381e9f47
+EBUILD ell-0.6.ebuild 713 BLAKE2B 82bbcf1bdff172c0db3d90e1339c2e7666ea21936a4180b20ebaef6515e035f461da3b0afd8c2d43897ce64702dc924c159fdfc21e87c54cd7b1ba2df25d5f38 SHA512 d2ceb939d7f51d3191908b1df17dacec48c48a68df21f6a192818a7d2081e5122b00c0b03b73f612364071a7e901aa56cdad56ea00a7cb7ecde6191ac14b5668
 MISC metadata.xml 343 BLAKE2B 520f23aef2f64a4592c7252ad8a956763fa337b746fa8b968d66cbf94c06e2c2cf435553340ca82720c83b653e7caab95394c3ce20c52cdc53bf7fbd4099e7dd SHA512 0a4654d2652442d1ab324cc2ea849506381d7f250e3c52bceb966a61795a81072d35e9656b9d472725f4ff78a84bd58b3576fcc837b4ec9e93cc5c34c92d6fae
diff --git a/dev-libs/ell/ell-0.6-r1.ebuild b/dev-libs/ell/ell-0.6-r1.ebuild
index 937ba6d0dece..c3776ce019cd 100644
--- a/dev-libs/ell/ell-0.6-r1.ebuild
+++ b/dev-libs/ell/ell-0.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="glib pie"
 
 RDEPEND="
diff --git a/dev-libs/ell/ell-0.6.ebuild b/dev-libs/ell/ell-0.6.ebuild
index 6289d4e1b4e0..5c7f1002ae5b 100644
--- a/dev-libs/ell/ell-0.6.ebuild
+++ b/dev-libs/ell/ell-0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="glib pie"
 
 RDEPEND="
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index b6aa7269d60b..1a622522b426 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,5 +1,7 @@
 DIST libbytesize-1.2.tar.gz 70598 BLAKE2B e136b1274703da7b3596e7583cea1ac773c1594af09c626f4dbb481dfcc23a3186b03ebdc54bba67d0a063c5d6587f6b7f8b610828c461cfd114eea1388dd193 SHA512 a8151e7440d0ec43d10239ddf08a9924827cdf08f20a16dff6177b444c1022fab905a0567384531e7610d854998111adb77f9a6a98e2d9648c02521f84ea2bf2
 DIST libbytesize-1.3.tar.gz 71648 BLAKE2B 40794a38af8ee1fcc03ef8000b20123c0e02e208f329a75e7da3a18b224e4a8456ce5982d72e4eefa2ff9d9dcd90b98142037dd37be6bc31f25e2ff347010829 SHA512 a50f5d4ea07a295909e09168518f8fc25da8dcd52859beca9c9c3b8c8c180b025c774c730d449ffbd4c7fd5aba07b5d071b6d9ad36f9d9ebc96bb06699aa08f3
-EBUILD libbytesize-1.2-r1.ebuild 1121 BLAKE2B adeb34d6a094c98baf2cd24976d9f6c43fd5017487204e3a71cadb5f4faf5d5ae6ae86e03d9cb39c96514f82ffe4ed7951907ea6e415412b5d014e2e2b9c2ee2 SHA512 2bf66f52f179def0671d5e82dbcbf060c729e1cb8927ca166df8095b93d1d741096fbecf0012f1e96ba11758e35fb0c63ea8a0eff18a65673f50beab1914b183
-EBUILD libbytesize-1.3-r1.ebuild 1172 BLAKE2B 1259bfd64dc643e2b0be00996498b8a4cee7d855b8440051aed230c4627e2d456b215286f14838fc0aa1198b633cb7e95ead31872f4e3577c30fd01555bd3a03 SHA512 a38faece39e1efff17024a78508537762bd7cbb650a96451c28897be614fcbfa741c0e6eb7d40bc209fb3bc0b1ccabff2f1d9654eb838eb97683eb3b7a77af14
+DIST libbytesize-1.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
+EBUILD libbytesize-1.2-r1.ebuild 1129 BLAKE2B 23a7f26d0e51ac35b0859656ac1d5db040e29169d6570fb6940bf4598015a1b5da1aa491bdfd26de9e8fe6d39664d50783300a75be1ece2ea02edd28e42eefe9 SHA512 6da341568735fe0a4bfe99b9fe65abcac16f5370af50625eeb5fa41361d67aac80599cb652b5444b0210ef0ca674283316c56b1790ceb588d0b679fed722d1e7
+EBUILD libbytesize-1.3-r1.ebuild 1180 BLAKE2B 74c7becb34b6e8e57e4f2d9eabb8ee593557f6b44be29999ca65d7f81183ad692074606147ad7c27e4dd000bfc961c25ee114c84bdb0a151d1669c11edf1da7e SHA512 eb1d7b1a37b988a41cf01cf922980cfff098d7f1185a259515d90a00b0b8025c91b395235b9bac3579b1b98b2552762f7ae3d9e2c184a4b2ebfa968fab03f165
+EBUILD libbytesize-1.4.ebuild 1231 BLAKE2B e89e69fe587e3612b0f87ba091d2081490071ecc6031aaf9679f7dc816b1710185e74ac3801a4c0c50fbfa8fbf31b196c346bd0002fb06121b0fba7ebe28149b SHA512 78a7d8c2ad3f650edb0c17703b61292819ab06bb028b2476fb13d46bb672b171b6a6a8a36f317534bc06a441569a4a734b85a8c98c3e4ae957a07f9981c1b9ba
 MISC metadata.xml 349 BLAKE2B 3dd4c7645734d29bef7f4224c72284f6bf3583287803ddd3fa94b75f784bb41762d96cd7eb0778f363e9fdbc014b52b93ea86900983553afab993cdba2c68282 SHA512 c54a783eca349652ac007075ff736d1cb53647e702ca8aa12915ae1109e5aee536591afc0b9fe0ac427e41fcf5b86d9d3f47fa5570001c84301c5cba8bca7e9a
diff --git a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
index c916bc16687a..322102f9666a 100644
--- a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
@@ -45,7 +45,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--without-python3
+		--without-python3 #634840
 		$(use_with doc gtk-doc)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild b/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild
index 8506a7a74ea1..3364440fc7b2 100644
--- a/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild
@@ -45,7 +45,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--without-python3
+		--without-python3 #634840
 		$(use_with doc gtk-doc)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-libs/libbytesize/libbytesize-1.4.ebuild b/dev-libs/libbytesize/libbytesize-1.4.ebuild
new file mode 100644
index 000000000000..91c6409d7034
--- /dev/null
+++ b/dev-libs/libbytesize/libbytesize-1.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit autotools python-r1
+
+DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
+HOMEPAGE="https://github.com/storaged-project/libbytesize"
+SRC_URI="https://github.com/storaged-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/gmp:0=
+	dev-libs/mpfr:=
+	>=dev-libs/libpcre-8.32
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )
+	test? (
+		dev-python/pocketlint
+		dev-python/polib
+	)
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--without-python3 #634840
+		$(use_with doc gtk-doc)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	python_install() {
+		emake -C src/python install DESTDIR="${D}"
+		python_optimize
+	}
+	python_foreach_impl python_install
+
+	find "${ED}" -name "*.la*" -delete || die
+}
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 7bf30e75dd38..8b299fd0b2d1 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -5,7 +5,7 @@ DIST libfilezilla-0.13.0.tar.bz2 398773 BLAKE2B e25f15bc4ec6a5aff119352535721f44
 DIST libfilezilla-0.9.1.tar.bz2 383315 BLAKE2B 0cade4316662d64b9a0eb6abd586355236bc2c3d73f3d2ad84fe857a25e593027bbb090f57c8656b8c06ae40d126d93b8310fb0642e2e73d3cace7e560c86837 SHA512 bbcd826675e9c3e2f8cf1cea4da01434a66359ae816efdc5c981fbfebde0b73ce44a6d37546196fc00cb118d9b4d7772b73e30f8d5a78294f97b9899e9ba3393
 DIST libfilezilla-0.9.2.tar.bz2 383522 BLAKE2B e70d23a67a8c365d06692dc27cf76543db75200ebb808e9ad91be95dafb8df2c7603c23e249405b056b7c44bffc527fd84d5a4052e704db63135fb93876d916f SHA512 f825d116e252786801115189f9966ba7ab8663863d921cce530569a172ab33dbc31234d6286b0b3e6edc19ec0a5ba009788382ec5d5359f97a9cb10f30715f88
 EBUILD libfilezilla-0.11.2.ebuild 923 BLAKE2B 5f1d1cc49e6d628f4fcd98dcc128b2c50ebaf418b3d3fcbcfd772a50a5873f03a2691c355b8f15e3d5518d8539598b74f038c4e8b86308b6af725f3564c4f728 SHA512 4eb269acc28260f573e10dc546f8a2f4cbb33d170457d0269ccbe5e0ac8014afb11df8e835c6e5ccc6d37fffccd51bddee7b308e5b47b79de46e148fb3472540
-EBUILD libfilezilla-0.12.3.ebuild 923 BLAKE2B 42d482992114fc7d22bde3aee13d8e2ebd1a634702da8f05b33ab7b26e368171e5509e09662309ef735d760072fde58d6b48d7a1e4c1dbb7875e54274f4af2e6 SHA512 ad6b73746667125d5ef08f0f8ce0efb6d2da3f8c16f8c38fa031627859c2f6858e867e7c2c04ff18401ea98148941a10ba290c38135a963f011fca8bed084917
+EBUILD libfilezilla-0.12.3.ebuild 921 BLAKE2B ddbbfbb499653641009d4ce494b7308bc92d6ffb58ae13888dfe892761c993fe03b5ead34638b238e96a171310d21f794981051d321d01f1d4b64ef63a47afa4 SHA512 7d04b1cd40129c05ffef86da072ef5da8fc91420ebe5444c6e5f8c471c0627502ee0575d19d3de2903e7bf8dc2a256aaaf7369cf165f62b868d35b54baa0f34e
 EBUILD libfilezilla-0.13.0.ebuild 923 BLAKE2B 42d482992114fc7d22bde3aee13d8e2ebd1a634702da8f05b33ab7b26e368171e5509e09662309ef735d760072fde58d6b48d7a1e4c1dbb7875e54274f4af2e6 SHA512 ad6b73746667125d5ef08f0f8ce0efb6d2da3f8c16f8c38fa031627859c2f6858e867e7c2c04ff18401ea98148941a10ba290c38135a963f011fca8bed084917
 EBUILD libfilezilla-0.9.1.ebuild 921 BLAKE2B 4c68ad50f7a65b85281194981fefad1dce5a958c4066312a57f1b492f5c5784ea0636ae32565a343674eba4bd06f389b019329ff9c88a5385bb80efab027b1ec SHA512 73c7ba2f0180dc26580e0e0d9226b1a8dfa70818720e8bbb78c53fada8ec68e690278859416694aefd7fe69178b401485e4da48591da96b4f848cc34b18b6bd8
 EBUILD libfilezilla-0.9.2.ebuild 1065 BLAKE2B 3c19a20507b7fb350bd3332104b51c91201b4e42935a3f93a3ec3cb41ae88f601ddc01c303f9a1a216c21a4d82a1ca780ecd9e2d5f63aa74b98df361e863c10b SHA512 880341a0f71b1bb08b48c9f7e6fe78dbdf8197e62faf9f82cafabf561e675b01f4f084d409eb815ee509c99c4da2ca88acbf92638c88a53dd23cf3456e3e4572
diff --git a/dev-libs/libfilezilla/libfilezilla-0.12.3.ebuild b/dev-libs/libfilezilla/libfilezilla-0.12.3.ebuild
index 28b3e2505fd9..ebf7bc6c8964 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.12.3.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.12.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 2dfc4b6c3bf6..cdb0a42b7e53 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,6 +1,6 @@
-DIST libgit2-0.26.5.tar.gz 4734075 BLAKE2B cdc34a5792576d97d8bc8a8c998e610e9c2caab4899f55bfd11da382d73d3061277ac068edd20c8e31d7cf5c3b26ca688fd67eb43ca7b9e0b82413fb04d04b3f SHA512 7dd7c567ad776db76b3514e6532f52841a4279b58dc51b44d39ab53b6911220cb60ee8f37b4c6ad6f369edbbd43a2591cf5f46aca354282f56735c8b215d533b
-DIST libgit2-0.27.3.tar.gz 4771877 BLAKE2B a15aed24d0391cf8d5c74329f5064d703def5db1cbf132881279d501d1ba31002367e54171e8a341b75862d327eddb1abebdaeeaee6878a14ad1d8abbbc8402d SHA512 e470050b89289908ec64dafaa954ad9bfc8f557ba7dafcab440d9efde474f736c025d8202bfd81a508070d9cf678f3fb1f3687d72a849ce86edd1ee90ad13c3b
-EBUILD libgit2-0.26.5.ebuild 1874 BLAKE2B 5da6902f0c5983909b465a287db11c2ca95192a73bfbf9b76f27b02925c62372a6c90085202cebf76a1eca9cbed828b825abdaca48f767422722ab8bf2ecbeee SHA512 8b7009bd803c553b94c575526dd704bea6c39546ca7a1f9cd8291a11a24dcbb4188c22604e055711ba806b7957af7f5cc461bcc8971969dcda0b020dafa76703
-EBUILD libgit2-0.27.3.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
-EBUILD libgit2-9999.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
+DIST libgit2-0.26.6.tar.gz 4734435 BLAKE2B 0831d0a78ba74b6cd989821f0abb6774f8879f18906025ce02d7c0f7f8f3e7f03b30121f79e370b85201e110a6fc4aca2ae2e608b12f01cd527ab42bf597099d SHA512 6a5a167bfe8696294cf188feec2aad898af52f4c05a3a40a55f48ea3168d200a60fc42b3819a22b1bf472be696f5dafef473d457c08bab164cbf654c4de6bda7
+DIST libgit2-0.27.4.tar.gz 4772254 BLAKE2B 9c0e7b436d8cb07a8f1407d22bcd4c7b161f3ceef9dc4e67f9daec784a1cfb9f8f2e493a78f5ef6b4893e54c1f1b567ae53ead52a992ee10eabe3229195417a1 SHA512 d27db86eb1b9f0d4057f8538ba1985ee76c3ca106e57d417fa9bff79d575f91a07ad28693112b58dc1d61d68116a82e6a145f12276158f2806b6c4964d741f61
+EBUILD libgit2-0.26.6.ebuild 1946 BLAKE2B 74710e5754c400a95e86754ff85a256dcc915cbbfa1102afcf9731ce427d9afc5f38bd559a13f0f6e47d0a6169445ecba65d3b154c6245bb760994897958e12a SHA512 721657b35fff014617ab5aad24b8977ab6117cfbab1e8eefc1d909e992356d9387b528116725501c5b80485626712145bddf5fd08fe29840ed95e619735990a0
+EBUILD libgit2-0.27.4.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
+EBUILD libgit2-9999.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.26.5.ebuild b/dev-libs/libgit2/libgit2-0.26.5.ebuild
deleted file mode 100644
index c94b6bca4718..000000000000
--- a/dev-libs/libgit2/libgit2-0.26.5.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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-0.26.6.ebuild b/dev-libs/libgit2/libgit2-0.26.6.ebuild
new file mode 100644
index 000000000000..fe1356367611
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.26.6.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit cmake-utils python-any-r1
+
+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}
+	${PYTHON_DEPS}
+	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-0.27.3.ebuild b/dev-libs/libgit2/libgit2-0.27.3.ebuild
deleted file mode 100644
index 456ded8f18df..000000000000
--- a/dev-libs/libgit2/libgit2-0.27.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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/27"
-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/' tests/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-0.27.4.ebuild b/dev-libs/libgit2/libgit2-0.27.4.ebuild
new file mode 100644
index 000000000000..d10065358a4f
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.27.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit cmake-utils python-any-r1
+
+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/27"
+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}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
+
+src_prepare() {
+	# skip online tests
+	sed -i '/libgit2_clar/s/-ionline/-xonline/' tests/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 456ded8f18df..d10065358a4f 100644
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ b/dev-libs/libgit2/libgit2-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=6
 
-inherit cmake-utils
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
@@ -33,6 +34,7 @@ RDEPEND="
 	ssh? ( net-libs/libssh2 )
 "
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 "
 
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 2dbec68a9f45..b3c1c202f00f 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,7 +1,7 @@
 AUX librelp-1.2.16-add-new-test-certificate.patch 18257 BLAKE2B 43721265838e3d691215bb638ec75f887a72b4251d8445dd00cb7222f048be818d14ae793b1d8cb4ef7ed9d380f63985c63b967cd1a56bc356390f900f158af1 SHA512 97caf803ca7b75f9a5c08356dbb04d90771c9dcc9015fad20dace04d09a157845dd0704a969fdd966262f1662fd34ea32c74aba2a065a36a900a327b36e00b6e
 AUX librelp-1.2.16-fix-valgrind-usage.patch 988 BLAKE2B 410abca2c3b323a8f896768c3c721e03063506dcee4529553d279aee1f37badfe881b536799ececb82b8390f49d6ba93f3cc3fa25ed8d7ed9c0478080ff050cb SHA512 bb43c8b0b046209bcb649f205537b55cef8393f5a59ecd91520eebc343aac5aa0606194a5fd8f43f1ad007e77c298fc3b02cba3c27ea474f2174dac6a723df2c
-DIST librelp-1.2.15.tar.gz 440273 BLAKE2B dba423e206bdbcbfb351ab691f777d4c78f25d9042ffe2cdac01bc4e7e07eb7c02301ab0d8942a73d688eaf28b43d9f77aa94cc88a258dee1b28dac94a13954e SHA512 9cf52c82c8e61f6970a83ead60da4bc64ab56a2bda42fedf184a1ae60c28f66d565a0c3a8720b55b9a2e5e3ffb7ec35601158f634c8f2965f8c0d3b4f1c15568
 DIST librelp-1.2.16.tar.gz 474456 BLAKE2B b528aaa66e9d52d5304510f86400067e1baea44be487f8cb176aeb146924bc35af24a403e849376e74614fb060093b48a3afe9d6c5da56bbf4dc37a6740478cc SHA512 54c101281c94046e4f8d6f77e73ab52874408e62c77f3dfa29ec0b294f39c216637674cc0bf1b7e04173557b3f21bfa74b7be1aafa3ff2771acd41d1d067d3a3
-EBUILD librelp-1.2.15.ebuild 979 BLAKE2B 8383923df704355300689ee33a1f20d1e82db40b01d75d3ebc2f6c912510738f27bf5434a4c0f7ede684f1cb18c87a8f9bcf38a7754c79daecbba411d1a0d1f2 SHA512 00d1baaf48bb2e1643bfdeceb2af3c735c4e2d1e94e7ce763643d9a9ab730495a865ba02ca7a3e90d9e10bd521090f04affb11512e15db4381cc74ecbc2fc5f0
-EBUILD librelp-1.2.16.ebuild 1122 BLAKE2B 5d046126c8f581f645da00d6147dca6d701a2740d7a11e85f48bb91ff82744030ebee1f62c64fa5f941a316fcaa0eafe56856eb030fc2636aa5a7a1f167b91dd SHA512 eb71c439ad272616e72821fc286768fc9ed53900add918def5fcb388644864ad7dc66af7463141cb73aa8dd328f4aa5caaf301ee8d4aa224f8e8e75f7847f9bb
-MISC metadata.xml 358 BLAKE2B 2b9924cec5f5b08dfaa8df564577e388c620b48db4206c2c37774e7e110c1b3ca695f82eb39913c0f552a59ce30c6a03a2e348aef78ee01a7c37165fd3c097d8 SHA512 8b0638c9c4d4c385dc14d8b3e0300791d181bd08c9476dfe5d881281b8b6d4e7bbd8501c06159602d38db4b037b24ad45615b29377cf5a8989ae850fff8f362d
+DIST librelp-1.2.17.tar.gz 506426 BLAKE2B 998d2845263655a43d0cb002c4538663047f2e07f62d6a870bf93e435c4b2d100a3cc9e4ab711233e9c1f73aedd8771e116b7c7139d2ad6d1baa7c483b2867a1 SHA512 4f69d3e4bc3052c0488a01def49dab16b54fc4a092e06f8776415cb1eca2282702a37497e43baf98fc038853d373116d6b58515c9ad91fae91fb3eb84706890f
+EBUILD librelp-1.2.16.ebuild 1121 BLAKE2B d273b6b565f873de81b7e9f4ef5898b27b9e89a8b6f55f34af56d9a1ec4fd737906124449192ca1a34964f1f83392d8f31260bda8788f408fed0f21698d13a5a SHA512 1c97eca0f18370667f0d9efd30d42e8d1e047cf146c505731a6005da2492a10e1cb9dd5c26e210e76018c0763f6be2ea5996ec8d7b3c0277396b81f44f772df8
+EBUILD librelp-1.2.17.ebuild 1453 BLAKE2B 0340264d4d63c0b46fdc82716e3232355131121204108f247ade16c6ff5bc194ca0b9fa2e5d69b928c8793af537310d19fcc31e8b154226ff7bdde14bbde8f74 SHA512 0aaf5db558d22b5b79b36df0a32cc88c9b649a6d0457002e5553a414b8c058af68efe18570c0822f95708f69acec2fefcb131957e40bb775b55570c376ec29d0
+MISC metadata.xml 503 BLAKE2B 987b40e4f9b5e33e1f293023237b7d0cb614ea36113d6d5becb780fddc729a2a2a033cab8e41b64a0465d0f14e220c96787e30b7b133979e36ad86a1273ad0a8 SHA512 31f5e4ece41aab561a70c7b9af6119bce8c3cb7fb6720be754dd925ee656faa75ee953cd3d296d1b8bb5f48368d015ec5d2768d217b349f1689e767424786e3a
diff --git a/dev-libs/librelp/librelp-1.2.15.ebuild b/dev-libs/librelp/librelp-1.2.15.ebuild
deleted file mode 100644
index 84d265125a20..000000000000
--- a/dev-libs/librelp/librelp-1.2.15.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="http://www.librelp.com/"
-SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ doc? ( FDL-1.3 )"
-
-# subslot = soname version
-SLOT="0/0.3.0"
-
-KEYWORDS="amd64 arm arm64 hppa sparc x86"
-IUSE="debug doc +ssl static-libs"
-
-RDEPEND="
-	ssl? ( >=net-libs/gnutls-3.3.17.1:0= )
-"
-
-DEPEND="
-	ssl? ( >=net-libs/gnutls-3.3.17.1:0= )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i \
-		-e 's/ -g"/"/g' \
-		configure.ac || die "sed failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable ssl tls)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local DOCS=( ChangeLog )
-	use doc && local HTML_DOCS=( doc/relp.html )
-	default
-
-	find "${ED}"usr/lib* -name '*.la' -delete || die
-}
diff --git a/dev-libs/librelp/librelp-1.2.16.ebuild b/dev-libs/librelp/librelp-1.2.16.ebuild
index 14405d27f2eb..1e8dff837fec 100644
--- a/dev-libs/librelp/librelp-1.2.16.ebuild
+++ b/dev-libs/librelp/librelp-1.2.16.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.4.0"
 
-KEYWORDS="amd64 arm arm64 ~hppa sparc x86"
+KEYWORDS="amd64 arm arm64 hppa sparc x86"
 IUSE="debug doc +ssl static-libs"
 
 RDEPEND="
diff --git a/dev-libs/librelp/librelp-1.2.17.ebuild b/dev-libs/librelp/librelp-1.2.17.ebuild
new file mode 100644
index 000000000000..ccdcf011fa23
--- /dev/null
+++ b/dev-libs/librelp/librelp-1.2.17.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="An easy to use library for the RELP protocol"
+HOMEPAGE="http://www.librelp.com/"
+SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ doc? ( FDL-1.3 )"
+
+# subslot = soname version
+SLOT="0/0.4.0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE="debug doc +ssl +gnutls libressl openssl static-libs"
+REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )
+	gnutls? ( ssl )
+	openssl? ( ssl )
+	libressl? ( openssl )"
+
+RDEPEND="ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+
+DEPEND="ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e 's/ -g"/"/g' \
+		configure.ac || die "sed failed"
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-valgrind
+		$(use_enable debug)
+		$(use_enable gnutls tls)
+		$(use_enable openssl tls-openssl)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	local DOCS=( ChangeLog )
+	use doc && local HTML_DOCS=( doc/relp.html )
+	default
+
+	if ! use static-libs; then
+		find "${ED%/}"/usr/lib* -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-libs/librelp/metadata.xml b/dev-libs/librelp/metadata.xml
index 4fca09fb7334..17b00e2ac3e0 100644
--- a/dev-libs/librelp/metadata.xml
+++ b/dev-libs/librelp/metadata.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>whissi@gentoo.org</email>
-  <name>Thomas Deutschmann</name>
-</maintainer>
-<maintainer type="person">
-  <email>dev-zero@gentoo.org</email>
-  <name>Tiziano Müller</name>
-</maintainer>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>dev-zero@gentoo.org</email>
+		<name>Tiziano Müller</name>
+	</maintainer>
+	<use>
+		<flag name="gnutls">Use GnuTLS</flag>
+		<flag name="libressl">Use LibreSSL</flag>
+		<flag name="openssl">Use OpenSSL</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 7de194fd11dc..51bac84d0a2b 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -3,8 +3,10 @@ DIST libressl-2.6.4.tar.gz 3227935 BLAKE2B 48e865448a9e5b0b604b06060091073276aeb
 DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec3407abc6c1bf8d474c4424161c563667ca1fb26c45dd20a0e895457e9210b7bd0539581472b94d594cc32a68191 SHA512 0601c73bb5c3d149df7eca3566831f1b35713aa16a15788a291922fce0bffa1ba0bc6ea9cac1fcecfd980009f2292b08b2a57d66b517fc1bc8c7364a24dbbd9d
 DIST libressl-2.7.3.tar.gz 3364724 BLAKE2B e245cd0e3c4819e12f3f05898429c10894959d9bbe27bfca38543ec304a84abc8edda7c968eb8d25e5c589011c5482060d05bd1e5aef71c13708ec804cd05a72 SHA512 5fafff32bc4effa98c00278206f0aeca92652c6a8101b2c5da3904a5a3deead2d1e3ce979c644b8dc6060ec216eb878a5069324a0396c0b1d7b6f8169d509e9b
 DIST libressl-2.7.4.tar.gz 3359012 BLAKE2B 07b98fdc6bcdf9d888fb1b1d301c95ab6f998fb7ff2c6dfd2ecf4558768e200dfa96c394e5b321bc27ba390e92646c319ef5be5915872a7c086de8017ff8f855 SHA512 1cd82a1bff4f655251b5feb0c850f4164e0fd548e4b404407370f74dcc75c205f42efc7787a157eecac84cbbe46af48cb63f46b3fef75f4a0a9ea19a5863a691
+DIST libressl-2.8.0.tar.gz 3377310 BLAKE2B 2a2027d86e99a09a349f3f123223a8544f49410ae53dbf4b97f898895758d00b1e8f73889f0b0ad8cec6f7ba5e85f033080d0e4af92b0fd10d048136337a0213 SHA512 3004cd78a9d52dece9f24272389778d6afca549de245852004ddd57b01a0c3a6fa1cee2d56980d067d23b3ead7f7a4aa6bcf4e0c57a56f5f7d9fd3f8d23f3ca2
 EBUILD libressl-2.6.4.ebuild 1454 BLAKE2B 9c0b73409f09cc0148f30c1b5464892f5ec66b275c571163c79798af7ca20600d4a1803870019cd5f3d80f31edd408c92db70129a74fcbfc104689ac7a749f24 SHA512 ad98eb1ae5dd53874030af1ddf9b813ff42fe07f3158987f314e5faecc1cabd83c5d454b0c4d5eb4fec2645959fe0eb37912046045c21b65080a4d99d1ed4190
 EBUILD libressl-2.6.5.ebuild 1456 BLAKE2B 2570ec4a9bb5ecd1e1edc1be5d3cb8df2a8aded439f013d96cd03dfeecb03b5407113430a4226512603d44b991d6408356ae72e3669fe3ebd483faa375fdc764 SHA512 5765995fc84dfe51631844789250241a81bbccf0c72cea7afbd91d0385f7fae28be8a8cef76cdded1760746caa78735de67b42030ce5cff727c8d745c91e936b
 EBUILD libressl-2.7.3.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 EBUILD libressl-2.7.4.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
+EBUILD libressl-2.8.0.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.8.0.ebuild b/dev-libs/libressl/libressl-2.8.0.ebuild
new file mode 100644
index 000000000000..1c15a09a5faa
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.8.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
+# we'll try to use the max of either.  However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/45"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	eapply_user
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/mini-xml/Manifest b/dev-libs/mini-xml/Manifest
index 71256d585036..9b4819f17eec 100644
--- a/dev-libs/mini-xml/Manifest
+++ b/dev-libs/mini-xml/Manifest
@@ -1,3 +1,6 @@
+AUX respect-users-flags.patch 762 BLAKE2B ccce0e60b4f3edc18b5fb58215f6f0cd677a91db470a48e67a996f1ce6ba622f2cddb8e84e7ee756c3cab9da167b3fba6cc4e46be874d06887028bb778c07004 SHA512 31cae98c5802e2802df7e6a90275b28a14c1c0c453e456a40ddfb66ce418c34eae8a32eafb3579d4dc7622670f12381232e2ac1eedd1a0509198e691c18e0349
 DIST mxml-2.10.tar.gz 265398 BLAKE2B eb3edec5615d727dec9285e2b74f4c877e8332be8f8183483e85a91d92ca1f48e5fc6d06afa3650c133c9762998abfdc8e846a9961ce55251d0c5bbcba0a970f SHA512 c3838611979c4228df476166e4e987fc1ff8f9b8bd30139066b475dcd99e25be81ecc5171235bc80b1c2291c9d78c9ceae9a1dfc928272a983740d6a67372f5c
+DIST mxml-2.11.tar.gz 9164003 BLAKE2B d124b7d779e7ea9609a91b823fe7f6b45ab4049e79eb72729ca2ffec93a83479d5fed1ef21efc76881a11de58be71b1f3de79fc3e4f07c26f35d3f68e25c017b SHA512 046421f91eea16f0ca99fbf611891c367ea9c3c54d04080d08acf108d7749ad9bbf2f4b3ef234a5130f00f77618196e2c5a245f32230daf645c1f775e961d378
 EBUILD mini-xml-2.10.ebuild 1338 BLAKE2B 3c61f9345cbcbd53d045f391b81bbf177622728da6f340cdc2798d32354cd05fca221fdd4cadb9eef6c45222bad0f92bc3484d5660e5e61623b8dd25b86153b8 SHA512 eddb5ad74946de41caf859faa624e7d7f40c49ef1e2abd21ddd25503a29a940969783a65efafd0cfa48b47e428260953dafaec56ef3148e5d91f126f1baea8c5
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD mini-xml-2.11.ebuild 1010 BLAKE2B f19a2817893162d7b9260eadd1ca418d41542b4d6696eb8c2e0f1d8803e299734c87b21df9c97a2430cf2aa135368ee269d99465708524cbe8478c7b5db3c320 SHA512 62cafdae355f84775e77f494fdf506e8f0205f6ead1d708d0332042327da14f5a4999f93d0d7cf86e3b4a57ac2c326689e33b70b343f54ce458d7d3556861d2f
+MISC metadata.xml 1498 BLAKE2B b0ff99450cec828ef5614c2b3819d02cc97e402b60ce7b9bca20962166c47a9e3053e2457eb7b29210886aa7b0297e97340b55cf74a0aabc20ecb4c451d576c6 SHA512 5ead3d76daa42879139a96cceb0a12a84a23df8372a8e2e9e9d1e38ede0266b480ca404f03047f4e66ed7d989171d37333051e2a111dfa0900b9cbba703b22d6
diff --git a/dev-libs/mini-xml/files/respect-users-flags.patch b/dev-libs/mini-xml/files/respect-users-flags.patch
new file mode 100644
index 000000000000..90e49cf2198e
--- /dev/null
+++ b/dev-libs/mini-xml/files/respect-users-flags.patch
@@ -0,0 +1,30 @@
+--- a/configure.ac	2017-10-28 18:23:11.000000000 +0200
++++ b/configure.ac	2018-07-13 23:29:39.710622168 +0200
+@@ -255,7 +255,7 @@
+ 	CFLAGS="-Wall -D_GNU_SOURCE $CFLAGS"
+ 
+ 	if test "x$OPTIM" = x; then
+-		OPTIM="-Os -g"
++		OPTIM=""
+ 	fi
+ 
+ 	if test "x$use_ansi" = xyes; then
+--- a/Makefile.in	2017-10-28 18:23:11.000000000 +0200
++++ b/Makefile.in	2018-07-13 23:27:51.101622582 +0200
+@@ -67,7 +67,6 @@
+ # Rules...
+ #
+ 
+-.SILENT:
+ .SUFFIXES:	.c .man .o
+ .c.o:
+ 	echo Compiling $<
+@@ -271,7 +270,7 @@
+ 
+ libmxml.so.1.6:	$(LIBOBJS)
+ 	echo Creating $@...
+-	$(DSO) $(DSOFLAGS) -o libmxml.so.1.6 $(LIBOBJS)
++	$(DSO) $(DSOFLAGS) $(LDFLAGS) -o libmxml.so.1.6 $(LIBOBJS)
+ 	$(RM) libmxml.so libmxml.so.1
+ 	$(LN) libmxml.so.1.6 libmxml.so
+ 	$(LN) libmxml.so.1.6 libmxml.so.1
diff --git a/dev-libs/mini-xml/metadata.xml b/dev-libs/mini-xml/metadata.xml
index 7a38bb900964..a4af87ab4c46 100644
--- a/dev-libs/mini-xml/metadata.xml
+++ b/dev-libs/mini-xml/metadata.xml
@@ -1,5 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Mini-XML is a small XML parsing library that you can use to read XML data files or strings
+		in your application without requiring large non-standard libraries.
+		Mini-XML provides the following functionality:
+		- Reading of UTF-8 and UTF-16 and writing of UTF-8 encoded XML files and strings.
+		- Data is stored in a linked-list tree structure, preserving the XML data hierarchy.
+		- SAX (streamed) reading of XML files and strings to minimize memory usage.
+		- Supports arbitrary element names, attributes, and attribute values with no preset limits, just available memory.
+		- Supports integer, real, opaque ("cdata"), and text data types in "leaf" nodes.
+		- Functions for creating and managing trees of data.
+		- Find" and "walk" functions for easily locating and navigating trees of data.
+		Mini-XML doesn't do validation or other types of processing on the data based
+		upon schema files or other sources of definition information.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/michaelrsweet/mxml/issues</bugs-to>
+		<remote-id type="github">michaelrsweet/mxml</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/mini-xml/mini-xml-2.11.ebuild b/dev-libs/mini-xml/mini-xml-2.11.ebuild
new file mode 100644
index 000000000000..6a29195944da
--- /dev/null
+++ b/dev-libs/mini-xml/mini-xml-2.11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="${P/mini-xml/mxml}"
+
+DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
+HOMEPAGE="https://github.com/michaelrsweet/mxml
+	https://www.msweet.org/mxml/"
+SRC_URI="https://github.com/michaelrsweet/mxml/releases/download/v${PV}/${MY_P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="Mini-XML"
+SLOT="0"
+IUSE="static-libs test threads"
+
+DEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"
+
+PATCHES=( "${FILESDIR}"/respect-users-flags.patch )
+
+src_prepare() {
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	local myeconfopts=(
+		$(use_enable threads)
+	)
+
+	econf "${myeconfopts[@]}"
+}
+
+src_compile() {
+	emake libmxml.so.1.6 doc/mxml.man mxmldoc
+}
+
+src_test() {
+	emake testmxml
+}
+
+src_install() {
+	emake DSTROOT="${ED}" install
+
+	if ! use static-libs; then
+		rm "${ED%/}"/usr/$(get_libdir)/libmxml.a || die
+	fi
+}
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index f6ba1f9c26d4..302367966a7a 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -8,4 +8,4 @@ DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f3
 EBUILD newt-0.52.15.ebuild 2009 BLAKE2B 60893c4f48b7e26939b65cca8f47047fb4d13558b363fc2ce7be362b77c9c3a2bbb0a833b15c3bd3a44e93a75f6bc3e8bcd2529aefd78e28c5ffc1b9dff2cf01 SHA512 342cc64da9f59c34785897b768e48687dc700e9f66c4bbf9ec0ddff1ef53eafd7cfd90971df67d2cf1c668712f793a75583ee61ae07d4dae5fbb44c2fa5c1d4f
 EBUILD newt-0.52.18.ebuild 1946 BLAKE2B c94b8d8ea555381f8a5561a983de9dedbba63eb36c76bfb7550351947f044ef4df7b3bb7316e213adda862a235ea816a5450fe1ec06a28f6f7e7689786327465 SHA512 8914e08dce91d768dead676763eccbe41ba6cea208d28348e80bf0b5e7bc5f1cb70f54c382f14642726ad64d2512edd661af18172e37577c2fb1176a76da5a30
 EBUILD newt-0.52.20.ebuild 2039 BLAKE2B 1ed4352d9265012f2c2a449a804b3a722a2dd11d10d966eb673e6cba6367d7942e611e8d67d12a266436d2b4649f131541ba82ccd5a8ef499c664af2ab23c2eb SHA512 1674fd43412df57dee87d1fbe9dd9914e1dc3afb14e6725ebfc2afd8a5dabd7f7dc64a0a23f4d3289f3f5636d02a86fc7c43d3b98c84c9c9c6eb31e68d9d5ccf
-MISC metadata.xml 220 BLAKE2B 11380346d91090dbb55d040eccb10aa6370a3c71cdecb1930d6a0ca0873d2d3d5c9edd704011e478f635e97c7b7aa4e03e485475e9d2d3acdd87a6545e86735a SHA512 92d5a05e3acc3e5910f8f0948c3cb31126a5aec7042421c0aed7b4721bd1fc83b819814a1772fe7ad0ddea4e0e9f485bae74cfea2c116dbca13994b05854da91
+MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/metadata.xml b/dev-libs/newt/metadata.xml
index daba5dd84a30..95c74e676f59 100644
--- a/dev-libs/newt/metadata.xml
+++ b/dev-libs/newt/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>naota@gentoo.org</email>
+    <email>bkohler@gentoo.org</email>
+    <name>Ben Kohler</name>
   </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index 929bd80077fe..74035d3eec9f 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,5 +1,7 @@
 DIST pkcs11-helper-1.21.tar.bz2 417527 BLAKE2B 39b2b405ada79e0077c810b3537853051bbaf1cb4d79bedaedf04156066b573c9186ee587c869ed49053a0b471fa239447edef71184d421fb6ac2e65e3a58830 SHA512 064b04c1ece2db0757e14263955c0f7488edde5f5f4415ebda9c4370e608d7df681706ddefcdba2392e5642d00ebd4c211f15266bb39baf8da46ffaec4f3e572
 DIST pkcs11-helper-1.24.tar.bz2 425627 BLAKE2B 2489af89dc4be6d056facedecf38fc42079c18ee74ca4f9621cf11b1060e2f463318d0efc263df5009eab01771c98e44a3efe7246ccbdc8982a130592327beca SHA512 28e9b53dd36e4e3fa8e30b7ad76af3bcfce1947d228f07e607a26aa6b06ee3bf1fd6f5a0ebf8ec581a16074de7b21e53f3b225e1cb1f58d4ded7bff2c50a6376
+DIST pkcs11-helper-1.25.tar.bz2 425599 BLAKE2B 6272b5ff2d3eb2ea366ec2b9a6772f93877455b3349a51d696e0450ebd6c6947ced9a2565b2d11a4407abb80348aafabc8e56eb95bce720e3d01bb339fc2f8f7 SHA512 2b425d010cd0a7d6a21b3189f65d2db93d904e1634fa4b23df9a1417521d72fda7bcd595951295bbcdec8151dc5a167fdd7c4310a16474e404f578e2d20db69d
 EBUILD pkcs11-helper-1.21-r1.ebuild 993 BLAKE2B ab38240b1b8872fc624526b86b28efe4b947f586f36bbac74468e3e06b9bc640f2a5f82d7e419a2f27f74bb4595043a11f20c3bb3a78972ef76bcb45bf53218d SHA512 6c1b9cfc5ce449010a0c7fee9d7fcdfd45821b582aa68bbcb70aa0ed211528aafd6ae434388b16078663911069b014f6fe7cd2df79f71a93489410226b4e8272
 EBUILD pkcs11-helper-1.24.ebuild 1002 BLAKE2B 72f811926ec93cd90e805705b8642faa93150c13b9f1ecf6c0c9243375e2903e41642ef2463846ebd10aa7bd8515dfbcc295291b585833c7b0f8257960b6543a SHA512 884b85e55231f025b8f55e5b74b82eeab5d1803755b63dd767df7e336e7a9584b94aff1c4f71eaf9e8d5c8f1cfe5429d5beaaaa4856cf1d6aee49ba6617bbb25
+EBUILD pkcs11-helper-1.25.ebuild 1002 BLAKE2B 72f811926ec93cd90e805705b8642faa93150c13b9f1ecf6c0c9243375e2903e41642ef2463846ebd10aa7bd8515dfbcc295291b585833c7b0f8257960b6543a SHA512 884b85e55231f025b8f55e5b74b82eeab5d1803755b63dd767df7e336e7a9584b94aff1c4f71eaf9e8d5c8f1cfe5429d5beaaaa4856cf1d6aee49ba6617bbb25
 MISC metadata.xml 442 BLAKE2B 83c40281896d78612f6e624c6335ade3b04be710debd1a8a40da1c569c84a66f6b61eceb07bc4f31d659d2ccc2d5c6fb6fa5ed3a22e5839656e210147a8ddc2e SHA512 ec42c4dd8aaba2001a76530f2cbe2869791f2d88c8ecaa323eb418ed6156751bb5cb143ecc1ba3901afcff42ba78ea099c42a3a2b3b8ae258bbaf9c8990116dc
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.ebuild
new file mode 100644
index 000000000000..02e44a3a603b
--- /dev/null
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ltprune
+
+DESCRIPTION="PKCS#11 helper library"
+HOMEPAGE="https://github.com/OpenSC/pkcs11-helper"
+SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc gnutls libressl nss static-libs"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-0.9.7:= )
+	libressl? ( dev-libs/libressl )
+	gnutls? ( >=net-libs/gnutls-1.4.4 )
+	nss? ( dev-libs/nss )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( >=app-doc/doxygen-1.4.7 )"
+
+src_configure() {
+	econf \
+		--disable-crypto-engine-polarssl \
+		--disable-crypto-engine-mbedtls \
+		$(use_enable doc) \
+		$(use_enable gnutls crypto-engine-gnutls) \
+		$(use_enable nss crypto-engine-nss) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index d69f524bf58b..78571c0a3d9b 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/asdf/Manifest b/dev-lisp/asdf/Manifest
index 7623fdaa9987..396c0d48bc69 100644
--- a/dev-lisp/asdf/Manifest
+++ b/dev-lisp/asdf/Manifest
@@ -5,5 +5,6 @@ DIST asdf-3.3.1.tar.gz 479255 BLAKE2B 5161b79741a52721eaa4da80a61bbe51e924967ecb
 DIST asdf-3.3.2.tar.gz 482616 BLAKE2B 860728720ccb02debee6a826d8b27bfd8f5fea3daa529ecfc8d2f5564c77340a38582ccbccf4f311c644bdeccd7348004690929185aa70c3dc0f6b4124616df8 SHA512 f8e065383d6e82754c87d309a8b500ad213e09d1375792fd475eb169d9f880d97b26072e608046d61c83512645781cded09dcff22052e214e8e3639f2a978c74
 EBUILD asdf-3.1.5.ebuild 1136 BLAKE2B 983ecadd2a3d49d523d20ccc91a311fd634663c54e240802e88280711b1e83bc40cf2d5a8a5ee9db6ca339d23e78abe64be23a3f53ee44000f30ee843184f5b0 SHA512 40f2823eb5bb0d54907b10f5cd9b3b9a73afea614ff49f9f1ea1c3bb3c350f092bbbffe85e051c2e21bf4c4ee2186889c2e3876a12a9d47cc5d44190ee12ba47
 EBUILD asdf-3.3.1.ebuild 1308 BLAKE2B 54b301b57efd26260595832c141837aa3dce1a6b7fd6a0f40338b756801401e161694f1194be0f94f79ff2bc7f3b449df6e159a84fbf6e4d8e1bf2f7b1689f6c SHA512 1455ea2aac7af52856c84f19646a782ef469e68999746ad0b83d207aaa33b97c2d21be67e28939ce9a87da7d7a8b72da5db3aacf4a856b00f6dafa4467a3646c
+EBUILD asdf-3.3.2-r1.ebuild 1357 BLAKE2B e8cceb2c5916ef5a8a56ca8588caebfdbc186511621ca204ab90b3d4dec6c8f72bcf43a23f42b6c732559944701eaee441de7fe9f482881521d14411adcdefa0 SHA512 d49565fb6aa92933af6e52343ed8c014a680373499c802ecb2ac15e1bd18c34dab5afb55c8df62c1b34a773cf57f581c4aed30acc35f1eec8897f0b1402742e1
 EBUILD asdf-3.3.2.ebuild 1321 BLAKE2B a35727fd7619c5ab761bb034a5ad839eef0aee947b1a94eb5adbad099f7724f38d75d31a55bd372d19c5b4d52996f3470802f8a691e254fecff28c4272aa2173 SHA512 e849a7c753d751e82b3d317dd1b77c7225c592e86d8e21e6245b27c88beb564eeef7453048d1f99493609ebe80501fe14509d8415dee1d4fb3003eb7914ea9d5
 MISC metadata.xml 261 BLAKE2B 161dea7ab371cbcbc08b8aac63e402f9fe994c08d55f2291360e900bf73e21f2c2ea67b6fcc3cb000f1cef03d1c41c6d2e5e16dd06d6916ec90d4e54a1ba3dd7 SHA512 fb754c4ed3579db5dbe303197a05647b7cfab0a3fe47fd2140d5f77641be752d10ccf49a9c267406a0f3ba3dcda8831f778b9596d723f65aff10142bfad60d3d
diff --git a/dev-lisp/asdf/asdf-3.3.2-r1.ebuild b/dev-lisp/asdf/asdf-3.3.2-r1.ebuild
new file mode 100644
index 000000000000..74e4ab625579
--- /dev/null
+++ b/dev-lisp/asdf/asdf-3.3.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils prefix common-lisp-3
+
+DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
+HOMEPAGE="http://common-lisp.net/project/asdf/"
+SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="doc test"
+
+SLOT="0/${PVR}"
+
+DEPEND="!dev-lisp/cl-${PN}
+		!<dev-lisp/asdf-2.33-r3
+		doc? ( virtual/texi2dvi )
+		test? ( virtual/commonlisp )"
+PDEPEND="virtual/commonlisp
+		~dev-lisp/uiop-${PV}"
+
+install_docs() {
+	(cd doc ; dodoc *.{html,css,ico,png} "${PN}.pdf" ; dodoc -r asdf )
+	if has_version ">=dev-lisp/sbcl-1.4.0" ; then
+		(cd doc ; doinfo "${PN}.info" )
+	fi
+}
+
+src_compile() {
+	emake
+	use doc && emake -C doc
+}
+
+src_test() {
+	common-lisp-export-impl-args "$(common-lisp-find-lisp-impl)"
+	test/run-tests.sh ${CL_BINARY}
+}
+
+src_install() {
+	insinto "${CLSOURCEROOT}/${PN}"
+	doins -r build version.lisp-expr
+	dodoc README.md TODO
+	use doc && install_docs
+	insinto /etc/common-lisp
+	cd "${T}" || die
+	cp "${FILESDIR}/gentoo-init.lisp" "${FILESDIR}/source-registry.conf" . || die
+	eprefixify gentoo-init.lisp source-registry.conf
+	doins gentoo-init.lisp source-registry.conf
+}
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 96eed01a1e1f..762b1025d1f8 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -27,6 +27,7 @@ DIST sbcl-1.3.16-arm64-linux-binary.tar.bz2 11228304 BLAKE2B 7825a53a86fdca32a2f
 DIST sbcl-1.3.21-source.tar.bz2 5901141 BLAKE2B 6c8c678a964595fdc74121e62ce46721c37dc326591a0401fa162e8abd2cd35f4ce4c58d426607239077669609e55277c0d88f3ab26a7fad4bfcd9c5463439d7 SHA512 845f4977b46236b9e018c6c7e5cf5628aed6b75b0ec942cd0c54fb91b6dc7d46369e346cd3c3dbb3f4084e06ef81a168c5f5fec72c4ca649504aeaef4b71c1e5
 DIST sbcl-1.3.21-x86-64-linux-binary.tar.bz2 10633302 BLAKE2B bb427994983d3ba5dc079dfa50188ed7339dee8a1e7ffb571c51b0c727b9d03ecef31f287837a6f3fc1f2dc0bbd4d92b4d4d078fb41e559a540ed6f411a74370 SHA512 a0ce82d35874344e72dd013df835000eb07656f3fcdb583e577f9d6ab37d7f81ab0c8c20e2f809d9d36c4139274fe722bb1e8a6ceb3f47d1f62bc3fc46c5cade
 DIST sbcl-1.3.9-armhf-linux-binary.tar.bz2 9161130 BLAKE2B 0dbfe39803d6e3955124fa1a619da7b6d4ec9e7d6eb78e868508c61bf478a980cb15ba427ef0b38d0f051ce38b881020534c0d37bfbcd81a8d763654283669ec SHA512 309e2ac7ef9ac95bf751432cf243af0de022c5b21054df2bf4e99da4ff087218af72b0ab3be69214eba3df1b6bbe707cc28840508e960c5d2ed2af0e86de3fdd
+DIST sbcl-1.4.10-source.tar.bz2 6161728 BLAKE2B 192f008ec2f488f3f28375e56f5c90e3bdd655522db5f6cbd90a9e0dcb8b948a864bfcf818c7b3becd7b08162842f49cef0695a4ffdc7d7767c3cdffbfbf1279 SHA512 647e4cb61c1f9df6286c6d58c0f71d949aa1e359970ce7134202f00d319961fc0961d597bbdd48f7ebee5c0b8e16e5bddef772bc03b5bbaa19d508b283ef4990
 DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01edc3bee7fe6c2aaf07b7bd1fc55d408dee7ac95e8f3761a194bf9e8efb734179a7eff04cdae2fe5ba4a9ba5ab06f7322ac1550d142cc SHA512 39bbd735b242aa0bbac05c6f4dbe28cb45e01684db7e5b4f1e51f995a9f9d5b484f63cc4243f472f72b3b1e6c4cd2268a7e812b15426eca5cf9a1fede10f44bb
 DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38
 DIST sbcl-1.4.7-source.tar.bz2 6031614 BLAKE2B b98d8c3891e4f3180624ef0ccc1e81146d97e58c577c9efb2b3ac178f81a836f4019111a6c33ec31edb47d41920249c33a87955303c02ffc608ea42747b7f662 SHA512 b6eb749878920bec90f50f19c8c8700f700677ae1a7f7fb1ba1bbaa37f218d36eeee0dea65eb200f0cd09a9694600969f4c15042faf357395715b5390a6fdb6b
@@ -36,7 +37,8 @@ DIST sbcl-1.4.8-x86-64-linux-binary.tar.bz2 10353701 BLAKE2B 5b56f46fbdb87f015ed
 DIST sbcl-1.4.9-source.tar.bz2 6051607 BLAKE2B 8abcaf73233ea1a23d47987b16554636dcf94acfbc7ab731f0730fdb4a8176593fb3ab52d9b25b3dd56753cd984f7e0eddb1585a142eb7ad1aa5e3e03d7b0ca9 SHA512 e0248f460f9737d47653dd520732062d2637813b550df356ecc90aa6d21fbdd74f03182d1e890c09c1da742f7d57b4fbd04a4e6dc36999aca51bb6c2952ac236
 EBUILD sbcl-1.3.11.ebuild 8382 BLAKE2B 7df1cb22c53debbc4f972fd230bd4cef1132f234946a06309d6bedb3bc9a8c51b582ccd2e671895bc270985e3ce82b4aa56ef21a4a31ca1b91e98318e560f2b4 SHA512 d6b00cc75cc3bc55be589d4e7690469e1ae8d8c00174ec67d83eff42f977e0840a97c22550be732ce0335b38d38b0429f0a47d9cf4de25402d91ea7814c3c351
 EBUILD sbcl-1.3.21.ebuild 8318 BLAKE2B ff8e43085524e8e02a5af841962dedc9667a99a9ca4167227eee069957c7db66ad204d2548b64eb0c506719683f6069b62f10c3965737c4291cfa05aeeed35e9 SHA512 4e277a575b10bf4b1ba510bc7827c920c9aeeb68073b2c4e24ec3c354437c0a1eaa9ffeaab12dde5aa46b2a883a8d681aa0726c990911d6b1213c09f2df13798
+EBUILD sbcl-1.4.10.ebuild 8669 BLAKE2B 2d4131570d6646076c2404fcbec93c999dc75f24652ed861bf9f981309066c15f16a4a90701ab19522f93157339cd0228daa466acef7424ec490f1a05e4e806a SHA512 3f41a91f91304b76f7503e2f3796a4536442700b94407e2794dc14874a9b72fdde4c3a1ebab245c7f658aee6fced45345eea63b7df4d36e317e3aed36a3a0e7c
 EBUILD sbcl-1.4.7.ebuild 8669 BLAKE2B c8132a464276020c610727546c1508e9d552d524195ee7e82766e732b90869129b7bf483c42f56b195b8a1873679acaf0f9bd2d99a0b36141b96985275dacd63 SHA512 2c20dd0576b2245ab07d41c83512a7d3a45d4c5f566bc1182ebfab1981c41bd4dce8cb82f84a5c0441a461efa337952bf3fcdb44e8635a24eb1daf7795cecf2b
 EBUILD sbcl-1.4.8.ebuild 8669 BLAKE2B 2d4131570d6646076c2404fcbec93c999dc75f24652ed861bf9f981309066c15f16a4a90701ab19522f93157339cd0228daa466acef7424ec490f1a05e4e806a SHA512 3f41a91f91304b76f7503e2f3796a4536442700b94407e2794dc14874a9b72fdde4c3a1ebab245c7f658aee6fced45345eea63b7df4d36e317e3aed36a3a0e7c
-EBUILD sbcl-1.4.9.ebuild 8669 BLAKE2B 2d4131570d6646076c2404fcbec93c999dc75f24652ed861bf9f981309066c15f16a4a90701ab19522f93157339cd0228daa466acef7424ec490f1a05e4e806a SHA512 3f41a91f91304b76f7503e2f3796a4536442700b94407e2794dc14874a9b72fdde4c3a1ebab245c7f658aee6fced45345eea63b7df4d36e317e3aed36a3a0e7c
+EBUILD sbcl-1.4.9.ebuild 8668 BLAKE2B 94bf998fa8f712c7729df621016edbf35da3b0c5b317abe4188aed86e582d942c9fa591736f20ec5cc292802f15c36557b7a0bc8653bb5e8d380a0315d3819e3 SHA512 b43882d089add72215bd0fe3dec9b4fdbc02a4b936c846311539ca2906d0d702bda7d340c168a6be78a2588001c5fecc017a02be817872dc39de8938f9a1ac2e
 MISC metadata.xml 1545 BLAKE2B 6ac4ec13b49c7cbbeb17685711c51c0cbcfa2be86062380dd72f78c05edf1e61880f41d5ea3c38c2f08f643be40e38e3a63a1da538f2c6f578877811ecf5f41e SHA512 a1099403e6672d31e2769d6e90fafc9f31258daa53f4838c05e1ed6be035a192f3f6357065426f24c34f996ff759e2285b66a6786baaaf725896b37bde66943e
diff --git a/dev-lisp/sbcl/sbcl-1.4.10.ebuild b/dev-lisp/sbcl/sbcl-1.4.10.ebuild
new file mode 100644
index 000000000000..f07d8939edfa
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.4.10.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.4.3
+BV_AMD64=1.4.8
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.3.12
+BV_ARM64=1.4.2
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+BV_PPC_MACOS=1.0.47
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+BV_SPARC_SOLARIS=1.0.23
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
+	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-1.3.15.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+
+	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+	eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch
+
+	eapply_user
+
+	# Make sure the *FLAGS variables are sane.
+	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
+	strip-unsupported-flags
+	filter-flags -fomit-frame-pointer -Wl,-s
+	filter-ldflags -s
+
+	# original bugs #526194, #620532
+	# this broke no-pie default builds, c.f. bug #632670
+	# Pass CFLAGS down by appending our value, to let users override
+	# the default values.
+	# Keep passing LDFLAGS down via the LINKFLAGS variable.
+	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
+		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	# Use installed ASDF version
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	# Avoid installation of ASDF info page. See bug #605752
+	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	if use pax_kernel ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug #174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
diff --git a/dev-lisp/sbcl/sbcl-1.4.9.ebuild b/dev-lisp/sbcl/sbcl-1.4.9.ebuild
index f07d8939edfa..10d6dcd8ed08 100644
--- a/dev-lisp/sbcl/sbcl-1.4.9.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.4.9.ebuild
@@ -39,7 +39,7 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc source +threads +unicode pax_kernel zlib"
 
 CDEPEND=">=dev-lisp/asdf-3.1:="
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ec9e00c8f543..beeb0c50e7bd 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
deleted file mode 100644
index 75f48e5402cf..000000000000
--- a/dev-python/PyQt4/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX PyQt4-4.11.2-phonon.patch 897 BLAKE2B b4834b319d15f96b80e4cb3bc4fe6d3f690df3f1b97d79ee35cd0dcb3a4abb4542c56b84991137ee50a86f1a0abcb6ccddca213d8d50e54e43520f76d2f11eb8 SHA512 e6e0364a24e43682c829da0a3d2ece8fdf54df00ee4fb00927a0530f3d5b62177877452058ab67cd9006ef8902d72f863e69d9ffb3b98b49f407566f96430bee
-AUX PyQt4-4.7.3-qreal_float_support.patch 5954 BLAKE2B ae198e39b05d42aa9be83a4d2bb69ba3705f3bc8e72ebc3e7b6ba7ef650f68f7d2dcb13dfade1dbb6a441809d39f4b9ade7fa3eaa075bc13cc16a0ef20b98022 SHA512 5431778103c333c1f13850f4b5fe982f4fe8e04c6cabb013ab8fff7d6117f9d0d5b8c7bbc6d5ceaceaa84fa8984276dda373e989ef3a8d90d3a1ae2220a97af2
-DIST PyQt4_gpl_x11-4.12.1.tar.gz 11328010 BLAKE2B b1261318eed18faa4eb94b1b3db9d2ba9f4d000f295eab6985ce2e6e39f3c94ab5b524a1d437406b8154d6b9ada1da710d427af0a1c410579eb9194b36aeb4cf SHA512 0651816ed5a371c24827e182eac5b2a2afe67928d95a09f63bd8158117aacd3e835b1efa06d4fc0c147a28038613a5bc088bd736a1348de68199da7952299af1
-EBUILD PyQt4-4.12.1.ebuild 4726 BLAKE2B e08eaefb436e0d72a647b1fab21f80caf902ca556bdafbffcc44da9c391334c5f52d0beb1338555edf6e0292fc2a7116f5185055455b91d492d58655b3205bbc SHA512 140230da20582fb01f50fee0caefb248b9086fd211f5977c381473e8cd54d9314ade5d45784c234ecbd11861f769d9f28e012ac9703db78056b2f2dc82924914
-MISC metadata.xml 1770 BLAKE2B dfb5d8b53c0a5666b0ffda7a9f055eb134f651781e579cd3171ddbcf0a50c3bd5d307a6ff87647c4632b66f5b64601021bb57bf6fb73cfbd504c0aea8a6dc1fe SHA512 6c6671ad8dd20f4d1701facd3b7de794b4eca907ba273f5c6626b691753ea26c0679cd4d91c1847beebcc298341ddf19d71bb4d3eb203e10720c64c54a2ee559
diff --git a/dev-python/PyQt4/PyQt4-4.12.1.ebuild b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
deleted file mode 100644
index aa304f2326a8..000000000000
--- a/dev-python/PyQt4/PyQt4-4.12.1.ebuild
+++ /dev/null
@@ -1,193 +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,6} )
-
-inherit multibuild python-r1 qmake-utils toolchain-funcs
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_P=${PN}_gpl_x11-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
-else
-	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="X compat dbus debug declarative designer doc examples help multimedia
-	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sql? ( X )
-	testlib? ( X )
-"
-
-# Minimal supported version of Qt.
-QT_PV="4.8.5:4"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.19.1:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	X? ( >=dev-qt/qtgui-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	phonon? ( >=media-libs/phonon-4.7[qt4] )
-	script? ( >=dev-qt/qtscript-${QT_PV} )
-	scripttools? ( >=dev-qt/qtgui-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( "${S}"/{ChangeLog,NEWS,THANKS} )
-PATCHES=(
-	# Allow building against KDE's phonon (bug 525354)
-	"${FILESDIR}/${PN}-4.11.2-phonon.patch"
-)
-
-src_prepare() {
-	# Support qreal on arm architecture (bug 322349)
-	use arm && PATCHES+=("${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch")
-
-	default
-}
-
-pyqt_run() {
-	echo "$@"
-	"${PYTHON}" "$@"
-}
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			$(usex debug '--debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt4_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtXml
-			$(pyqt_use_enable X QtGui)
-			$(pyqt_use_enable dbus QtDBus)
-			$(pyqt_use_enable declarative)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable multimedia)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable phonon phonon)
-			$(pyqt_use_enable script)
-			$(pyqt_use_enable scripttools QtScriptTools)
-			$(pyqt_use_enable sql)
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webkit QtWebKit)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-
-		if use compat; then
-			local compat_build_dir=${BUILD_DIR%/}-compat
-			cp -Rp "${S}" "${compat_build_dir}" || die
-			pushd "${compat_build_dir}" >/dev/null || die
-
-			local mycompatconf=(
-				"${myconf[@]}"
-				AR="$(tc-getAR) cqs"
-				CC="$(tc-getCC)"
-				CFLAGS="${CFLAGS}"
-				CFLAGS_RELEASE=
-				CXX="$(tc-getCXX)"
-				CXXFLAGS="${CXXFLAGS}"
-				CXXFLAGS_RELEASE=
-				LINK="$(tc-getCXX)"
-				LINK_SHLIB="$(tc-getCXX)"
-				LFLAGS="${LDFLAGS}"
-				LFLAGS_RELEASE=
-				RANLIB=
-				STRIP=
-			)
-			pyqt_run configure.py "${mycompatconf[@]}" || die
-
-			popd >/dev/null || die
-		fi
-
-		myconf+=(
-			--sip-incdir="$(python_get_includedir)"
-			$(usex dbus '' --no-python-dbus)
-		)
-		pyqt_run "${S}"/configure-ng.py "${myconf[@]}" || die
-
-		eqmake4 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D%/}/tmp
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
-
-		python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4
-		rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-
-		if use compat; then
-			local compat_build_dir=${BUILD_DIR%/}-compat
-			python_moduleinto ${PN}
-			python_domodule "${compat_build_dir}"/pyqtconfig.py
-		fi
-
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch b/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch
deleted file mode 100644
index e3449b3b4bfc..000000000000
--- a/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e8931ed7f49eb55d6259328a5a78f3fc18472d48 Mon Sep 17 00:00:00 2001
-From: Davide Pesavento <pesa@gentoo.org>
-Date: Tue, 14 Oct 2014 04:30:29 +0200
-Subject: [PATCH] Support building against KDE's phonon variant.
-
----
- configure-ng.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure-ng.py b/configure-ng.py
-index a80cb57..fd2c56c 100644
---- a/configure-ng.py
-+++ b/configure-ng.py
-@@ -2256,6 +2256,8 @@ def generate_sip_module_code(target_config, verbose, no_timestamp, parts, tracin
-         if mname == 'QtCore':
-             includepath = target_config.vend_inc_dir
-             libs = '-L%s -lvendorid' % target_config.vend_lib_dir
-+    if mname == 'phonon':
-+        includepath = os.path.join(sys.prefix, 'include', 'phonon')
- 
-     generate_module_makefile(target_config, verbose, mname,
-             includepath=includepath, libs=libs, qpy_sources=qpy_sources,
--- 
-2.1.2
-
diff --git a/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch b/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch
deleted file mode 100644
index 37e1e69eb3f4..000000000000
--- a/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_qreal_float_support.dpatch by Michael Casadevall <sonicmctails@gmail.com>
-##
-## DP: Corrects a configure test, and adds explicate double handling
-##     to qlist.sip on architectures where qreal != double
-
-@DPATCH@
-Index: python-qt4-4.7.2/sip/QtCore/qlist.sip
-===================================================================
---- python-qt4-4.7.2.orig/sip/QtCore/qlist.sip	2010-03-17 19:29:26.000000000 +0100
-+++ python-qt4-4.7.2/sip/QtCore/qlist.sip	2010-03-25 23:53:55.468631945 +0100
-@@ -749,3 +749,227 @@
-     return sipGetState(sipTransferObj);
- %End
- };
-+
-+// If we're on an architecture where qreal != double, then we need to also
-+// explicately handle doubles. On architectures where qreal == double, they
-+// will automaticially be cast upwards
-+
-+%If (!PyQt_qreal_double)
-+
-+%If (Qt_4_3_0 -)
-+// QList<QPair<double, double> > is implemented as a Python list of 2-element tuples.
-+%MappedType QList<QPair<double, double> >
-+{
-+%TypeHeaderCode
-+#include <qlist.h>
-+#include <qpair.h>
-+%End
-+
-+%ConvertFromTypeCode
-+    // Create the list.
-+    PyObject *l;
-+
-+    if ((l = PyList_New(sipCpp->size())) == NULL)
-+        return NULL;
-+
-+    // Set the list elements.
-+    for (int i = 0; i < sipCpp->size(); ++i)
-+    {
-+        const QPair<double, double> &p = sipCpp->at(i);
-+        PyObject *pobj;
-+
-+        if ((pobj = Py_BuildValue((char *)"dd", p.first, p.second)) == NULL)
-+        {
-+            Py_DECREF(l);
-+
-+            return NULL;
-+        }
-+
-+        PyList_SET_ITEM(l, i, pobj);
-+    }
-+
-+    return l;
-+%End
-+
-+%ConvertToTypeCode
-+    SIP_SSIZE_T len;
-+
-+    // Check the type if that is all that is required.
-+    if (sipIsErr == NULL)
-+    {
-+        if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
-+            return 0;
-+
-+        for (SIP_SSIZE_T i = 0; i < len; ++i)
-+        {
-+            PyObject *tup = PySequence_ITEM(sipPy, i);
-+
-+            if (!PySequence_Check(tup) || PySequence_Size(tup) != 2)
-+                return 0;
-+        }
-+
-+        return 1;
-+    }
-+
-+    QList<QPair<double, double> > *ql = new QList<QPair<double, double> >;
-+    len = PySequence_Size(sipPy);
-+ 
-+    for (SIP_SSIZE_T i = 0; i < len; ++i)
-+    {
-+        PyObject *tup = PySequence_ITEM(sipPy, i);
-+
-+        double first = PyFloat_AsDouble(PySequence_ITEM(tup, 0));
-+        double second = PyFloat_AsDouble(PySequence_ITEM(tup, 1));
-+ 
-+        ql->append(QPair<double, double>(first, second));
-+    }
-+ 
-+    *sipCppPtr = ql;
-+ 
-+    return sipGetState(sipTransferObj);
-+%End
-+};
-+%End
-+%If (Qt_4_3_0 -)
-+// QList<QPair<double, TYPE> > is implemented as a Python list of 2-element tuples.
-+template<double, TYPE>
-+%MappedType QList<QPair<double, TYPE> >
-+{
-+%TypeHeaderCode
-+#include <qlist.h>
-+#include <qpair.h>
-+%End
-+
-+%ConvertFromTypeCode
-+    // Create the list.
-+    PyObject *l;
-+
-+    if ((l = PyList_New(sipCpp->size())) == NULL)
-+        return NULL;
-+
-+    // Set the list elements.
-+    for (int i = 0; i < sipCpp->size(); ++i)
-+    {
-+        const QPair<double, TYPE> &p = sipCpp->at(i);
-+        TYPE *t = new TYPE(p.second);
-+        PyObject *pobj;
-+
-+        if ((pobj = sipBuildResult(NULL, "(dB)", p.first, t, sipClass_TYPE, sipTransferObj)) == NULL)
-+        {
-+            Py_DECREF(l);
-+            delete t;
-+
-+            return NULL;
-+        }
-+
-+        PyList_SET_ITEM(l, i, pobj);
-+    }
-+
-+    return l;
-+%End
-+
-+%ConvertToTypeCode
-+    SIP_SSIZE_T len;
-+
-+    // Check the type if that is all that is required.
-+    if (sipIsErr == NULL)
-+    {
-+        if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
-+            return 0;
-+
-+        for (SIP_SSIZE_T i = 0; i < len; ++i)
-+        {
-+            PyObject *tup = PySequence_ITEM(sipPy, i);
-+
-+            if (!PySequence_Check(tup) || PySequence_Size(tup) != 2)
-+                return 0;
-+
-+            if (!sipCanConvertToInstance(PySequence_ITEM(tup, 1), sipClass_TYPE, SIP_NOT_NONE))
-+                return 0;
-+        }
-+
-+        return 1;
-+    }
-+
-+    QList<QPair<double, TYPE> > *ql = new QList<QPair<double, TYPE> >;
-+    len = PySequence_Size(sipPy);
-+ 
-+    for (SIP_SSIZE_T i = 0; i < len; ++i)
-+    {
-+        PyObject *tup = PySequence_ITEM(sipPy, i);
-+        double d;
-+        int state;
-+
-+        d = PyFloat_AsDouble(PySequence_ITEM(tup, 0));
-+        TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PySequence_ITEM(tup, 1), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+ 
-+        if (*sipIsErr)
-+        {
-+            sipReleaseInstance(t, sipClass_TYPE, state);
-+
-+            delete ql;
-+            return 0;
-+        }
-+
-+        ql->append(QPair<double, TYPE>(d, *t));
-+
-+        sipReleaseInstance(t, sipClass_TYPE, state);
-+    }
-+ 
-+    *sipCppPtr = ql;
-+ 
-+    return sipGetState(sipTransferObj);
-+%End
-+};
-+%End
-+
-+// QList<double> is implemented as a Python list of doubles.
-+%MappedType QList<double>
-+{
-+%TypeHeaderCode
-+#include <qlist.h>
-+%End
-+
-+%ConvertFromTypeCode
-+    // Create the list.
-+    PyObject *l;
-+
-+    if ((l = PyList_New(sipCpp->size())) == NULL)
-+        return NULL;
-+
-+    // Set the list elements.
-+    for (int i = 0; i < sipCpp->size(); ++i)
-+    {
-+        PyObject *pobj;
-+
-+        if ((pobj = PyFloat_FromDouble(sipCpp->value(i))) == NULL)
-+        {
-+            Py_DECREF(l);
-+
-+            return NULL;
-+        }
-+
-+        PyList_SET_ITEM(l, i, pobj);
-+    }
-+
-+    return l;
-+%End
-+
-+%ConvertToTypeCode
-+    // Check the type if that is all that is required.
-+    if (sipIsErr == NULL)
-+        return (PySequence_Check(sipPy) && PySequence_Size(sipPy) >= 0);
-+
-+    QList<double> *ql = new QList<double>;
-+    SIP_SSIZE_T len = PySequence_Size(sipPy);
-+ 
-+    for (SIP_SSIZE_T i = 0; i < len; ++i)
-+        ql->append(PyFloat_AsDouble(PySequence_ITEM(sipPy, i)));
-+ 
-+    *sipCppPtr = ql;
-+ 
-+    return sipGetState(sipTransferObj);
-+%End
-+};
-+
-+%End
diff --git a/dev-python/PyQt4/metadata.xml b/dev-python/PyQt4/metadata.xml
deleted file mode 100644
index 7cc6900ee958..000000000000
--- a/dev-python/PyQt4/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<use>
-		<flag name="X">Build bindings for the QtGui module</flag>
-		<flag name="compat">Install the deprecated pyqtconfig module for backward compatibility</flag>
-		<flag name="dbus">Build bindings for the QtDBus module</flag>
-		<flag name="declarative">Build bindings for the QtDeclarative module</flag>
-		<flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
-		<flag name="help">Build bindings for the QtHelp module</flag>
-		<flag name="multimedia">Build bindings for the QtMultimedia module</flag>
-		<flag name="opengl">Build bindings for the QtOpenGL module</flag>
-		<flag name="phonon">Build bindings for the phonon module</flag>
-		<flag name="script">Build bindings for the QtScript module</flag>
-		<flag name="scripttools">Build bindings for the QtScriptTools module</flag>
-		<flag name="sql">Build bindings for the QtSql module</flag>
-		<flag name="svg">Build bindings for the QtSvg module</flag>
-		<flag name="testlib">Build bindings for the QtTest module</flag>
-		<flag name="webkit">Build bindings for the QtWebKit module</flag>
-		<flag name="xmlpatterns">Build bindings for the QtXmlPatterns module</flag>
-	</use>
-	<upstream>
-		<maintainer status="active">
-			<email>phil@riverbankcomputing.com</email>
-			<name>Phil Thompson</name>
-		</maintainer>
-		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
-		<doc>http://pyqt.sourceforge.net/Docs/PyQt4/</doc>
-		<remote-id type="pypi">PyQt4</remote-id>
-		<remote-id type="sourceforge">pyqt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/astor/Manifest b/dev-python/astor/Manifest
index 1336ce3805f7..1927df099f32 100644
--- a/dev-python/astor/Manifest
+++ b/dev-python/astor/Manifest
@@ -1,5 +1,7 @@
 DIST astor-0.5.tar.gz 10999 BLAKE2B 278bf193003dd9f8f2d5c6a33229e3f4013bcf0618dee1d8cc3891ffea031f63ad4f795a3b66e87986bcf377b5f81eb6992d3c47c2234357487443a049d45d31 SHA512 7c940371a6c3ddbc4a6691edb6ee17eef61436912bb873c5c0cba4f3865c9d4f8e077674b14ccc7e319b749898782aaf87e085eedd9ba7f8638130deb67f549b
 DIST astor-0.6.tar.gz 28684 BLAKE2B 372314e0d92721d3cbb7fe0fe8bc42635e023ca590c4845c8e7c499bc947c3de0a3679fff51a07085d26bca37e83301ef9c0b66548b929a8f018760c8370319c SHA512 4f9598229f8a77901573fa1841716cc810ec8e108b155d8c7c50ab477d794f8ecd1784df66a1272a2739cc968d8eb6632f62b4d6ef067682db05233f127be409
+DIST astor-0.7.1.tar.gz 30633 BLAKE2B fbffcbe9cb372c82741788624674c4397c3534eb2b3f44577174279c38d0c45366b444dab1384a251a74ca87840ce150ab1ce3f0439987ba2a19adca270af74f SHA512 c52fa0b8ec5003c04d978c23361d423283a43be2c027d8d39ce1c45528dbbedb98b2a269ce97152bd9a4c942d95a6ec55720757b7811df4f34bb6744e2fff781
 EBUILD astor-0.5.ebuild 707 BLAKE2B ad362c0b465e650aa8a2278c4f5cb5252d7cd3bd60d80b94b472c2a51cb73b56113e03a56da08e145770b017ec3452c680c530e3b2212504dbe751fbd38cdfc9 SHA512 fb87e5af182b24a425d9e088543bb07ba2ad415c6420333fa4af1911e9d44a042838e86fefcfc775347ab0ba100458dd8f64e4e0d4383d64c9c6ffbc9998304d
 EBUILD astor-0.6.ebuild 709 BLAKE2B 816f3c4db33daad14a4e7f568a8895c6c6ef1ac895c2e263a002e8dbc9afb7a2a21dc2a91fa49cad90a7f7a90b2828ead4bfd6501566c42280ebcfb25923264a SHA512 6bb146ab91dd7e43abd6204f8b349e1ce44f69ff6352a805e32cc2bfa03b09f9e2c67cee8fcb32350b653474f80ff54183d11d2b6f49b9da196a6927ee837c47
+EBUILD astor-0.7.1.ebuild 709 BLAKE2B 4cd8c9b2939565238e1ce5fcaa499343d3189d29b7c111a8c9b7b2538204b0ac8724e5f55088f27dab786cd66e8f831e0a01c78694325f6475cd1d98e0f6734d SHA512 b2626ba8b88e6def595b7c556f8290d4441fbb138398c67249151726db072a34582ba290a5873103e60e4336872929968f82eacfd4ec92a96ac3be2cedd0082f
 MISC metadata.xml 308 BLAKE2B 4eb385f663046756ae848b87d82301e3d2ddf388eae73431024dbf4758c5d4787f879ad167eda72ae011ab41cebc48718fc40a5ed86f3d382dea6165baf1a3cc SHA512 86cbc23c8c077f9849004214ba32c5096e64ea8092ff1940f3fb4c9bf4fd420f2883aed76a7b96774f639cb98ef14429a9e55993db07173443ee16b3ac393aab
diff --git a/dev-python/astor/astor-0.7.1.ebuild b/dev-python/astor/astor-0.7.1.ebuild
new file mode 100644
index 000000000000..39071f8adc5e
--- /dev/null
+++ b/dev-python/astor/astor-0.7.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Read/rewrite/write Python ASTs"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://pypi.org/project/astor/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	#avoid file collisions picked up by the eclass
+	sed -e s":find_packages():find_packages(exclude=['tests']):" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index 073c912cb570..8f1d327b17e4 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,4 +1,4 @@
 DIST atomicwrites-1.1.5.tar.gz 18951 BLAKE2B b0932995aae3ca23c11aace182429f4888819ea542a12b59d5b7ed4621c4759285d0cba306437bd1ce35b1ba32eac8ae6afc6548f2bae61870dbf03927c4fe75 SHA512 4de8ab93dcb226c55e8ae1b0ef883c2e1eeae50ac6596afe036ca51dbf6b094c13dbf2d792972312d4c53551886aaa2713aac54bfab42b85abef4d1146e039ac
 EBUILD atomicwrites-1.1.5-r2.ebuild 578 BLAKE2B ad9188acc6f21a3352510d2efae465d010e763f21f45d6604979b4a48da0e77817746037f8472bc86bdd034163e0c75da40a56784eb0e979e856b5dc86d8eeb0 SHA512 1af57e581631a2cda8f7ee9de709bbd2abb1475d5f25331d9fa2683e5b75892f897e68f092f96b5ffe522a5d2b1966aca0a81a37fe80c38f08b9599d63d2b715
-EBUILD atomicwrites-1.1.5-r3.ebuild 929 BLAKE2B 9efabc3dc2005f270e2352da541da0bb1797d32f7b50cc0f53814e87996111967ce8cdc0bcf6c479dc870d16e65cbf96013015241be44d35edf20c4e9cabb924 SHA512 9e6d6b640e0ef4c1d315cec196ff39540a376938e08f305de02301ec2dfae3b0c06e81fbd9e38f4924e3aeb646a699ed2653acdd0f454408b51e5ee7d844c313
+EBUILD atomicwrites-1.1.5-r3.ebuild 936 BLAKE2B ac546a1f9c7618a107b1a6717853741ebd3f380b5986246da8b3314c23a9fe02405821b038f379045def7c81ead4cffd52ccd95ce2127c459057e76eafdbd434 SHA512 a95abccc96ba415f5ff602e24b76ea2fa757e842e78d979fdc2da22258ce55cc5201ab84c7bf2f87023cf3b6c20f632efa9fe1110261753cb26d8c2213928a25
 MISC metadata.xml 438 BLAKE2B c2a138ede668039b703fdc3e2ca8e1a7a07546e01540fdc502d79a48a8ddfae8dc7a79ed371373d95054731fcb25af67daf75ef5a1c08fafe9976f7a2c30525d SHA512 f38332e752b8bb660d8d8291b897fc96865a134108198e01df2dc4365c0c6e87c6039a907da38080a4d07d7c57750f8a32c6d6c3653b57f5aa193ca5b5b53449
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
index b7da5c5dfb07..506df6258085 100644
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/batinfo/Manifest b/dev-python/batinfo/Manifest
index 8d430a689bfb..421292416a3b 100644
--- a/dev-python/batinfo/Manifest
+++ b/dev-python/batinfo/Manifest
@@ -1,3 +1,5 @@
 DIST batinfo-0.3.tar.gz 3951 BLAKE2B 11360a3322866b084294b930569d3c2e424b8bb56e0484aba81085b68707287ad7be9a65b0bf5188c030384d70fbbefd30886ef73d03e7c29801a0e5ce49a3d8 SHA512 822e8e70f14a7f08713028ebc8b41aef6d9256984a6a381af11e5b36980a355636bc21d8b21753f4dabd20e38becf6152c623134a65109593ccba019afe3f3f3
+DIST batinfo-0.4.2.tar.gz 6497 BLAKE2B 24efbd63f25bbd743e02ea04bf656d24b3132b6ce7e2754359a84648c357fb40967c3bb2a0aa27a3938489f2fb64c9b712718c8a5ede0869f83a19eaa82a74e1 SHA512 c45232cdd79d2d10d814019bbfc167ef54c3d970c74320a5a007d3b603e62fbdfeaf53f88074cf53a7865293181707e2e63e5a565219c094a77be2adc5d53876
 EBUILD batinfo-0.3.ebuild 544 BLAKE2B 868eb84ad3759b54cee32d930ba37b516470d43bc797a5390e5b89d0f28349899af82295a9a18cdec5fc30fa4123a41d4c40f988f6d3c38ff9ffd9e84ba88981 SHA512 bac57c97fcb4c721dc9748cdf37d8ec53ce0baf0ac003d66d3aa9baa436204b8a71254b9b89861156b63ef9790bcbc710a9c8253d3c97b13ac7c615c5ca6ebbc
+EBUILD batinfo-0.4.2.ebuild 540 BLAKE2B e74b2299214a48da96160bd5ae557c4450a8bd431314bad52467f6901bb5d43e3ea83c3e44e43903937ebc5cf845d4f9cc8c3296ba0e24dc626f3fcc0f0c7db4 SHA512 80d35ba59a3af0e664fe2f090a33c6e355f144b1c9b03f069840dbf6d394478edfbac42eedc9df27c46bc5df84a9249c428ef453e7eebace6e776eda4b25b0f1
 MISC metadata.xml 509 BLAKE2B 661b2e2643a0a07f718d81ccdf62b0ff1130181780973ebf99eebd8a98a41400bda49a36400d7f538c6ce6f2fb8a452035b4b2600a10e1cedcb379858dc0de23 SHA512 78a20df6c5c2ff4b32a8d54da4d1c5eb8fa5b4ea8149d3ab5a2fa999ec0b0134cb41d9255517e867ac47e3e4656e76eae926418ec572253c4d0f439d629cfbb8
diff --git a/dev-python/batinfo/batinfo-0.4.2.ebuild b/dev-python/batinfo/batinfo-0.4.2.ebuild
new file mode 100644
index 000000000000..28cd559c9ba2
--- /dev/null
+++ b/dev-python/batinfo/batinfo-0.4.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple Python lib to retreive battery information"
+HOMEPAGE="https://github.com/nicolargo/batinfo https://pypi.org/project/batinfo/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cliff-tablib/Manifest b/dev-python/cliff-tablib/Manifest
index 0c97787ea6d1..d09b3fd2bc55 100644
--- a/dev-python/cliff-tablib/Manifest
+++ b/dev-python/cliff-tablib/Manifest
@@ -1,4 +1,5 @@
 DIST cliff-tablib-1.1.tar.gz 80508 BLAKE2B 11faebcfd01813467850f17f49d9ef18f6d15b8a9d13b58b2a36e115ef17913b8f21cb19709f9938e8cdded2538b5c3affbe548896cbd95f0957eda4f5fb8a71 SHA512 26beea20ca1ba5c96276ce974c24bab572c6efebfe44ef45bd3ee6197593a34bf29843676a4e37fe400272f3ff59f703d60ff1abda22a1ca28c2434c0f224aac
 EBUILD cliff-tablib-1.1-r1.ebuild 786 BLAKE2B ce3f74c1d6d5f87f850f968473fe5c3951e6082cf70cfe1ecaa22035d1db7cde69fd04506941afc98bf8d17296857bdd82ec61706f490066658e219aab8f68c3 SHA512 225e0e5b93a7599717e4428ef9059151173b5ddabd884229f98136821c1c54133c17659f1cfa5ef2366c78cd2c5a11444b7d3fe0a105294e9ac217e5d8a4174e
+EBUILD cliff-tablib-1.1-r2.ebuild 785 BLAKE2B 9db946755fe6c7a7d6c42fa439f6e7892825039ced943700d8bb30909d8fa99de7810448bea3b2fdeafcb299cbb891cb3a42f3f5fcd753404e38d8d8aed834fa SHA512 bf324a8c854bc7cddfecc8961641fc0be34bf3ea44c22529aac183e61d3e08847f15b9cd2772fe31876dd5532d661438b41d20a527ef84720a56c49a9b34ffe3
 EBUILD cliff-tablib-1.1.ebuild 783 BLAKE2B 15f1ca9519d7817edf7f0678d44f80ee420b4f06fe0c8ae874814553b3dcb44620595fbdeb3f9237f71a3a079f072d35c0a36f6e9cb40c892b42cce317e001eb SHA512 a5a9944931fa2e4b11aa06c8661d4ef35c6c064c41d32b41d9526678bd7182c4e31f73412b9727cdd64ea6853c4e1196c7bf239e0c7588ee27b6d6d14b3c5235
 MISC metadata.xml 395 BLAKE2B 875c5346b128d3653e234932bdf62471ad993980ad77006296bc6ad3710fb71089df8c375b42d5f5e219f433dfafe67a389b0a2a04a2f99db0537f89f496bbc1 SHA512 874e5cc1c3b1c7341127ab43fde400a9341d9475f6c32f44b3f0faedd8e422324d703eaa814b9cbb4a5fe0ac13a09320c60f83f236cd51bd6247def77005e71e
diff --git a/dev-python/cliff-tablib/cliff-tablib-1.1-r2.ebuild b/dev-python/cliff-tablib/cliff-tablib-1.1-r2.ebuild
new file mode 100644
index 000000000000..c2af04685f61
--- /dev/null
+++ b/dev-python/cliff-tablib/cliff-tablib-1.1-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Formatter extensions of JSON, YAML, and HTML output for the cliff framework"
+HOMEPAGE="https://github.com/dreamhost/cliff-tablib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="dev-python/tablib[${PYTHON_USEDEP}]
+		dev-python/cliff[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	# Use IUSE examples for installing the demoapp
+	use examples && local EXAMPLES=( demoapp/. )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 24f3214a4a54..13a4d772d998 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -4,6 +4,6 @@ AUX cryptography-2.1.4-libressl-2.7-x509.patch 1005 BLAKE2B 9c01fe0f9c3c8c598388
 AUX cryptography-2.1.4-libressl-2.7-x509_vfy.patch 3419 BLAKE2B 89642459484d42958aec818c4196eff35991ba415c76ee1f43c0765b1a9687c6b405f31322227eb132309439aa8d7ee5ed6df7ed07f640e4eea21c6e97fde858 SHA512 e941b89924d68b1d1dfe8e64a4f7ae363ccb53fd232a3853d9ddba0a7aed1dc27fb8d699e9197bdd7ff0b1780c1f12edd2edd4133f08e2f7f13348b170985a4c
 DIST cryptography-2.2.2.tar.gz 443822 BLAKE2B d0fbaad78d172f1ba1bfa6edd64d2d5a0eac0853a564fdbb9830dfedc5c53fe1b28d8c1878be85ce38b8cd90a0c2e40e6a209158693a88a7053a80f0481e6302 SHA512 6c1b19cdb870d65abad42523697e9a0bebc7a0025b34f10c4bdd30c313333efd7c41bcb4237a29b3a1b270e3fbade75ccb35df172b055b7c075d619f4d9424c9
 DIST cryptography-2.3.tar.gz 449464 BLAKE2B 7485c745f9c6512a5efce42181970deff19bd4420e91230d84b070cd77450a6805c56a2e37cda73b45c90ed969c8fdbb866a7cc9e53a6828a1ca6e45befd9de8 SHA512 75e14020da500fdbbd578f004b22ef3237844185329adf59288b29f1b3ee9dd2005a2c4a933fe8609a59d168012a9f687bab0f31ab39ed6ca325198aa9295e52
-EBUILD cryptography-2.2.2-r1.ebuild 2212 BLAKE2B ea9b70fe4d8e10b7e812a98a82665fc663a90939f04615f9ceb17baf14f4b8c3df327052151662ed5ae2f7bfeddb7caa7839108c36c57be780596baff8cb5985 SHA512 1c819531e989645d64c8742fa1b331bcc0bb733c6deee2a81ffa02dd92a074faf000f29e35db947f8014d3a7425a0f0e1ad722c0e28b9a90df049b482e82532a
-EBUILD cryptography-2.3.ebuild 2162 BLAKE2B 68fefc766e1b98af7623b5c7e6f3ed96a38ba8b23895b24d0d0a4a6d299f5a2180b9707652b084ba67040fc30b03ba781e91d4b3b07a2224aaf006c35c6b88b4 SHA512 44b7b60fd5f41caa0a299069e9bc761725a539cefa6d7b71db031d9d18fffb78f5468ac0da848387616e3f0cce7c78de1544b646bf6e0b1b939925a902ee9a37
+EBUILD cryptography-2.2.2-r1.ebuild 2212 BLAKE2B aa1f0f4adf0d87aef5cff265df415696247a185a82a4827afc4014b1c3b1a9e62da6169179096f724adaf21aae824a9cce3d31a8ea225bdd2eb815020fe37d61 SHA512 bf1241583761b05298449e603e1755d65944c156bac7ac76f955f90e709ddde24538216995d9272e5cd5b5dc43568fb795d026798cf663f3ef126c0a3310125a
+EBUILD cryptography-2.3.ebuild 2162 BLAKE2B b7b99f45e7cae87e2f286e1edc07fd96d79bed983642e2f08500b89ca8f6102596b79a000d1de33316b3ae56e4fab1ebc632db974ba3f4c0a23637e8a53552f5 SHA512 5999a1de82114e5da46ab9bcea4de62e6552c1323e410fe1d829c1ab962153b3b14befc6a60fb6f748c03a4926a332e5e084bea67597503914f0e28283546cc2
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-2.2.2-r1.ebuild b/dev-python/cryptography/cryptography-2.2.2-r1.ebuild
index ffaf2cd166a9..449719f769ca 100644
--- a/dev-python/cryptography/cryptography-2.2.2-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.2.2-r1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 		dev-libs/openssl:0= (
 			|| (
 				dev-libs/openssl:0[-bindist(-)]
-				>=dev-libs/openssl-1.0.2o-r2:0
+				>=dev-libs/openssl-1.0.2o-r6:0
 			)
 		)
 	)
diff --git a/dev-python/cryptography/cryptography-2.3.ebuild b/dev-python/cryptography/cryptography-2.3.ebuild
index 958c0527b8c2..ec123a175ee9 100644
--- a/dev-python/cryptography/cryptography-2.3.ebuild
+++ b/dev-python/cryptography/cryptography-2.3.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 		dev-libs/openssl:0= (
 			|| (
 				dev-libs/openssl:0[-bindist(-)]
-				>=dev-libs/openssl-1.0.2o-r2:0
+				>=dev-libs/openssl-1.0.2o-r6:0
 			)
 		)
 	)
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index 85daf985dd43..2ba0355c6ca7 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -6,5 +6,5 @@ EBUILD dbus-python-1.2.0-r1.ebuild 2210 BLAKE2B 0f475f5ebe65b9880a5a9807f01914f3
 EBUILD dbus-python-1.2.4.ebuild 2228 BLAKE2B 16447af268331e0666b0cb10bf0f9137e466f5bcc53cdeebbcc5cf3ac2f7e80996f124ca724cc775482a98ade16e5b85177233402897cbb4f21116e31faeb702 SHA512 ff39e5618cc8a6704c7e393949370a6fef2d6aacc22172410db6976ab76071220a5b16ebeb901be66f604cdc0440bc9ea1982126ae66730853464b46d8bb1f85
 EBUILD dbus-python-1.2.6-r1.ebuild 2354 BLAKE2B a84ae880849eacd33ac774d3aa9f0b99a1a4a827304e806da5d0508f0850abf0eb79e61a8dff2d36a561a3bf09061d660d24ec45aa8e6a3196482a7019bcb765 SHA512 ca739a3a0a63ef25a260eb62adc4efec39181dadaac3a5feb1cb4887f3620ef45bc7175ac3677f3502e7b2ca695bcf2861694acba94784205e2521a751f6d477
 EBUILD dbus-python-1.2.6-r2.ebuild 1895 BLAKE2B b868d0892812a869f10461bc4317af6d32fe910b304b6cb04e1162f167570819224b6fe70de33b238f9c6780f0048016c06a16de8b27602078981f8bb545068c SHA512 fd4e509aeee20ad804bedc0db431acd8db7402ee57afe53d532a55362113258c57f000710478be9aa3205c30c7e53b6fd1596b7c9dffd092a90f3888b0988baa
-EBUILD dbus-python-1.2.8.ebuild 1638 BLAKE2B 39eda40eddf1f7100de143031d2f272db9375633657fcd89bd7de9997bad3329f8c838d0cb54cdbdf6663f086735ac591dbe1bedb5f3d9a95cc51329440881ef SHA512 5d3377cc756460686412bb40e54794f50b12042e3f51cc6c94795144873bdc1a81f8b00dca3cdd74568a72d6a3ef69aa7155346a7358151d8a101e9b3b1f4e8d
+EBUILD dbus-python-1.2.8.ebuild 1645 BLAKE2B e5151a20d65ba29d4f24df85dc6f754f77d3f9febfffca8fac6dca8d1395d9148f8a38f9403d6fae2dd146fcfde2204a5db3496344ea616b76f86a3bec8255c7 SHA512 38e2d0375a61e77d878a39d2bbe8e93e95d0cee5c966a8af8700e5e75ab06c0f88e4e5c7bcae38e311e3e002b559eeb2368ed745465cf30ecf07c75779e33621
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.8.ebuild b/dev-python/dbus-python/dbus-python-1.2.8.ebuild
index f976f4eb972b..aa9df03fa623 100644
--- a/dev-python/dbus-python/dbus-python-1.2.8.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 384da0e8e5e4..d865014322af 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,13 +1,11 @@
 AUX django-1.7.6-bashcomp.patch 1090 BLAKE2B 7c3a960ade3b450da853175a7ea4afaab267ff96f4b161fecd7abfd0a534b7feadb1d70cae04f4242574653456fb0c8d1b92594e31dd977f68839b97f5be8cf6 SHA512 e7df516ea276eef06c79db2ec3694bbbbbe6724669281bc97311c9386f943f55bf65c4d41d07a4ecf2dc8abf11fddd0d07fc5a08f357365c67274c74280fc532
 AUX django-1.9-bashcomp.patch 1734 BLAKE2B d65bc505e4096fd8d23619f3d76b76d66fc3e68f408906c30a1a8e97a5ef5c0c9c1b352f8c4f4acd1588c639f7b0a489a53e1dbc9763b395ce2488c463e6d5b4 SHA512 d3caa9b77d6c336e131b706411080aa129df83ac60293a2612eb268d08a6c40096b322715766801e16a641134762174ecefcf2b93698f47b022fc31421597403
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
-DIST Django-1.11.14.tar.gz 7850578 BLAKE2B b858ab51d40812979ec04cffc459ce137a5f5604d105e73c2fdf9e36b07fd5cf12a7f31d6f89607716220328313663f4e99dabfdf40f93b5c829efe533efbc51 SHA512 71dbbad22bf0675a5c9aa36bcf69d6de561cf041b744fa37b407cb021ef342c3245b8001025c0492ce20df664e37ed2d7a5ffdc397761065d088ddb0d9fbe6c8
 DIST Django-1.11.15.tar.gz 7843843 BLAKE2B b7713de8136302d8d95929ed449ab01173e28c0d5d20529eaae9d6bd6d323f53b674a4fb6e8398da4b57a223f10ef63e7961accc8fd777313f18b4e2b0f225ed SHA512 4ea18c59f7c74d0b6deb9d292d5de068c6dcc53d9596f321f5a7e823ff5fe423cc8d69c88bf53e3acd9c36c4ecc4447148243a127d5114a4894b0fd4d449f37e
 DIST Django-1.8.19.tar.gz 7359244 BLAKE2B 1c7b857f864527cf5b9cac8e08599e1f4f3306a828bcc253e0e59755da6d464592e627eb3743687b0410d308b3d089359dd79af0146b02e6db7f5eca43f04401 SHA512 cec71f4a1aaa3fcfc43a035e9fcd8d6fabde7aade43491f9205942cbeb251ae394e49ec6b5b2403b74c24b069064d44ae6070b151c0c949b940f2d46aa87774e
 DIST Django-2.0.8.tar.gz 7987343 BLAKE2B ab35f50ce1911cb9603c7ac85e7ab01e6019ce9a2dac4cd733b11f35722368946ff3a130c3c791da4d49cf609b5747b4c5de64e29e27a8e12abb7f9e29cd363b SHA512 ac3cc3f58cb977518c6f549834beb35677c2d5541cfb5723045b98165926e826178cb33737c52a0f999be24bc38b84dde489a5f91d1c8d51b8338aa611acb518
 DIST Django-2.1.tar.gz 8583964 BLAKE2B 92a48bbdd45fa94c7b43961bf22bd5521019bf0c9f37f6685c8916d9d1886b77522fb58d7db27989a713445b51e15858161e5b99e636cdadc23860d2d0a8ef56 SHA512 1c75f0ad8ef353fb38d245034f108df5554cc27073f44ef920576b5dba3d2dd685d8905c0bde1701d43cb01b4c9dbb2bfa7c38c57fae3208af5be616d26d39cb
-EBUILD django-1.11.14.ebuild 3226 BLAKE2B 4fe569a5302e8a35933a4a5059930b2a644657599374db2a693a15e1df41b60d54a0a689e63777e2669bb2abbb2c034ae0eeef7b497b35925fce11513262a9e3 SHA512 549d9198a51d786a028d3defde21a66ab45819127c68422517f82a537ccdde36dfdda34999b228b46dbbd84adb0af3fffb353bca147bf148e0a3f071ceae88c0
-EBUILD django-1.11.15.ebuild 3228 BLAKE2B 4aab321bce708bd0f7054754874783c0d52056ab1bfb54172a3f190fbfce911b7dd1357978e0cdc7f630d42f1e386113d2d6f3e93e3e3030b57ec53376878d63 SHA512 79bb04e301c5a7c114e5df2b5dab43ae4daae9fc36574313779302578602341668cc27a1d29890a2ab6d40a79ef23be50dfd061516e40741327bbcc99e07353c
+EBUILD django-1.11.15.ebuild 3226 BLAKE2B 4fe569a5302e8a35933a4a5059930b2a644657599374db2a693a15e1df41b60d54a0a689e63777e2669bb2abbb2c034ae0eeef7b497b35925fce11513262a9e3 SHA512 549d9198a51d786a028d3defde21a66ab45819127c68422517f82a537ccdde36dfdda34999b228b46dbbd84adb0af3fffb353bca147bf148e0a3f071ceae88c0
 EBUILD django-1.8.19.ebuild 3013 BLAKE2B 41cf956f18ab2bee939c1e31dae3b00a41ab1dcf75d8d8cda1f30d1161f0e9a150594600c2441c7ac4c7ab163666dcc19e09b3f6873380ad88a535286b0fffca SHA512 dcbb4508720fd0a7efda8114b775922b08ca65ae9183870c81870dba644084f8d04a729c99b7efb809dd69f9c0e77ea6b2c9e50142b1a9327ba0457e4f3692d9
 EBUILD django-2.0.8.ebuild 3059 BLAKE2B afe8fad8175ee2abda5be42069a68ea1f15c258551e639395248730175a7a37bf69d958bef7fcc8bb8ca75db772390b364b03f0af87dacd3da8833cd0bf0789c SHA512 25c4497797a4049baf998499af58208cccfa47dc32fd279cbb12c2e4339c46f5a38467c994e7f3ac20667da457c4f6dbe163e8b5e2587fdba398ddc77ab9ddac
 EBUILD django-2.1.ebuild 2494 BLAKE2B 59ebaa530f06a0837f84864b47e1e1ec7dc35422da3dbab3c7988e24469eb9c8a0f7a50e6bec1f0cdf22c0dd73fa80289714c63d57dcd953e316639256da27e2 SHA512 0a56f6dcb2315515c075885ef1cb3697581abb9ec8667e296b82d6fbf62d59e9051203d233d5ad0a34d4bfac5464b77f5670afdf80298fc4243230fa58a99651
diff --git a/dev-python/django/django-1.11.14.ebuild b/dev-python/django/django-1.11.14.ebuild
deleted file mode 100644
index d6a7c1efbc24..000000000000
--- a/dev-python/django/django-1.11.14.ebuild
+++ /dev/null
@@ -1,112 +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,6} pypy )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpy[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9-bashcomp.patch
-)
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-python_prepare_all() {
-	# Prevent d'loading in the doc build
-	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
-	distutils-r1_python_install_all
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
-	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-	echo ""
-	elog "A copy of the admin media is available to webapp-config for installation in a"
-	elog "webroot, as well as the traditional location in python's site-packages dir"
-	elog "for easy development."
-	webapp_pkg_postinst
-}
diff --git a/dev-python/django/django-1.11.15.ebuild b/dev-python/django/django-1.11.15.ebuild
index 0d97bbcdfd43..d6a7c1efbc24 100644
--- a/dev-python/django/django-1.11.15.ebuild
+++ b/dev-python/django/django-1.11.15.ebuild
@@ -25,7 +25,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 
 RDEPEND=""
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 0356ad1f858c..491e1236f579 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,3 +1,5 @@
 DIST dnspython-1.15.0.zip 252157 BLAKE2B 6766c1e69bc4225b08f3b1b3871fac2aba7ae707de5f16718798ce4d6846308500c5341f9ace1b48d3858ffc965a7295ee42cc2c35ff23ac38d71927dcaecfe9 SHA512 942f7cf083d1b0a9f03f040ceca194c38777f2e40862c388051986112b3f2a4a8426733ff46ec5a155319776e4a856412c3430b052b2f92f251f0e3260eb9bc1
+DIST dnspython-1.16.0_pre20180731.tar.gz 182538 BLAKE2B 3a472091fccc4f37d65681727643677472837fd6be0c4fd6aaa13afd1fd4362eb27a5ba4ff6babca46fe15c2f5318ddbba22ce058b522f763baa797e1e2d1ab9 SHA512 67d17ab7cb48c370c3c2dd5cb935eec5ab7e3ac0c912e179931f395899ad186ba869edd8b870c043ba9fb3545bace18549d2a377f2ae2c278660fc488e68a20d
 EBUILD dnspython-1.15.0-r1.ebuild 1035 BLAKE2B 799aaede1fb8078df7632674da6c6efa26edabeaa13e6fac1d41624edf27219e4b28bd54e3dd32429b92c856e040a05e3f05e88638a0320374105a86a242ab44 SHA512 c58f2eb758034ad0e7ee00e3e1ba1012870a624b6ec6f9f7e1d1f215fa75e3cc6c00783ee15cd58b7306a30de071b8caa1f36b824f015a8c8b3995c86f93dbb6
+EBUILD dnspython-1.16.0_pre20180731.ebuild 1227 BLAKE2B 298c5d44a2ccf52eb6d5c85206d5ea6c4c500a5fce8d6237213c3ece9fafdbf9e605c5617034c6de9a56f6b82f16b0f76a4ef094076425857ca73f496c59a63a SHA512 eb56ed381aeccf1df544f1cfc389bf30f326e0f55a4dfc9ac9d6f7e2439dc782e3626ab449caeffd1470a7b74fb31b1af861fa36e927ca226dcb49f699ea2d4e
 MISC metadata.xml 1458 BLAKE2B 9a04546a3cb62f7ed6a72a8416e7f38aca15733a444970e84fe0134d0097eca4ae8fab9433f66196539de66a4b6b92103a4531f9248cf508a2e0f4d16c85c172 SHA512 40c86234936ba4f0c01a98266e74d49a80a8a48d4761b887ec84fe3ff9b534e7b6daf3c317d299b1333132a6025e49abf63884e7d6d0634c876dc74b470e0a7d
diff --git a/dev-python/dnspython/dnspython-1.16.0_pre20180731.ebuild b/dev-python/dnspython/dnspython-1.16.0_pre20180731.ebuild
new file mode 100644
index 000000000000..1d9163245a63
--- /dev/null
+++ b/dev-python/dnspython/dnspython-1.16.0_pre20180731.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 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+GIT_COMMIT="be7e71e54a6edc87ead1b15af8981b8921e0e83d"
+
+DESCRIPTION="DNS toolkit for Python"
+HOMEPAGE="http://www.dnspython.org/ https://pypi.org/project/dnspython/"
+SRC_URI="https://github.com/rthalley/dnspython/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="examples test"
+
+RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
+	>=dev-python/ecdsa-0.13[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+	!dev-python/dnspython:py2
+	!dev-python/dnspython:py3"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# For testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	cd tests || die
+	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
+	einfo "Testsuite passed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index afc35d8bee79..890514b7ec38 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,3 +1,3 @@
 DIST docopt-0.6.2.tar.gz 25901 BLAKE2B b44308bb4a6571ddd092de63401d16e31a9d9b93be9b132fb45503eb9d84273d7c1f20bc5b2e3e2d969506fcf760fff142c37197e0b92dc9e7f6f431fb0abcc0 SHA512 af138feccf8c37b374ee44fcda4938a88107d434df13c173214021b1a3348b152a595095a86982b66ac03a11db8e0f1e9e6a3a65c98deea92330311daeb831a3
-EBUILD docopt-0.6.2-r2.ebuild 769 BLAKE2B ee54d5affb3a90f55259116e942b6a3801f2d99bf5a39beb5cce22950dba9c697cf75cb940906f169f23180d080016dfe7a23a616c6d6072a413d760b4696acc SHA512 157aec151467a1c9e6500546c34ce862d68be162ef07d08788346e279a9dd9c5622eea0ed15e723cb9bef0392e3ca5a2cab728ac0be2dc245a15c4d75e3c1336
+EBUILD docopt-0.6.2-r2.ebuild 776 BLAKE2B a7ed4e78008b95a4b924900e40da06d83dcd41db08e7ed820d05b31ee96bb58ae7af0c4ec17194e68d07a6351537a082018844b68ee2d19d1fcf4fe2fb7adb0f SHA512 cf7f86d1e02e323313773f706859358934e03329dc27c9781167ee8fefe288dc983c2c081fa546ec5c52610e23e731674b63eb98e0f16b3b7a21f22c51a9e9ac
 MISC metadata.xml 374 BLAKE2B d1c77e8ce90431f3d8ddfa1adb0b016713e7f3d18feadb25126333973e0cd7341838a2082fbc99f0dfbb23a3d3416887211e3f7ead69eb3c7ec284b23e7a010d SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5
diff --git a/dev-python/docopt/docopt-0.6.2-r2.ebuild b/dev-python/docopt/docopt-0.6.2-r2.ebuild
index 51c42a024d9c..2851613c91a2 100644
--- a/dev-python/docopt/docopt-0.6.2-r2.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-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
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/dpkt/Manifest b/dev-python/dpkt/Manifest
index bcb7f3a82aac..c704918d6f2a 100644
--- a/dev-python/dpkt/Manifest
+++ b/dev-python/dpkt/Manifest
@@ -1,5 +1,7 @@
 DIST dpkt-1.8.8.tar.gz 102074 BLAKE2B 71e33118675b8e2fa6aa59a207a78d96affaaf6c9642849059a3021d68ee92477d07cbc8a4c261bd4af0b1a55ed2f2342691611c6d5f50ac0e5b98d7c6234147 SHA512 c557b3b22462273ce40119ef045a2b15df1b87538de13de9b2183545e16cc4200545e08f2efe42a5af01d820cc48fde28e1155cc78b1d06a44482706ab485392
 DIST dpkt-1.8.tar.gz 76311 BLAKE2B daf3f02ae1954ce0861c35ee43c8cf58c4f9ab9c4387a34a37560815944d72c2ade43bb64caf754283c0238a0317ad5e53e59bb76dbf751575d53782a02a2f6f SHA512 25af49a7b79d192382103e056e762e2933f37b6c72f490c9c6740883e18fdde6c983d640aa27514f15f77ac27e2f037b1943adcaa6046872f53d92e08de73cb3
+DIST dpkt-1.9.1.tar.gz 115253 BLAKE2B 981bea849e088f12dde4091e84331373d6f6655f1399027efa84d58b567f3d0cf0c234b4e8f5093da3ec272534ef9e51d118da624dea788e23cbdd57827c7a0b SHA512 fc18907e4420249c5e8da21f630a24af6bee3e96545a58866170811c15802591a3bd6f7cf816ccb65e3437c0f451a1dc321fc46ac8a63cb8e8a06e0021e15f7f
 EBUILD dpkt-1.8-r1.ebuild 605 BLAKE2B eff8551ec65a8f37bdf266d678c3c01cae4c21bc6dd4de50ed955e7ba6459115788d1cdf39f741260aa374bf3855c569c4ed93ea86390d11656a5aa83021b372 SHA512 cbc390676a7aa4a70128606136b351afa6e4938fa200761b728247dda25a2860ea87fedc77d78e4ad1167dfed248c70502a650f7aa19d266f2cc2ee3c3a9b130
 EBUILD dpkt-1.8.8.ebuild 366 BLAKE2B 787e8cc1d0ea288a3abf68aee8a7b5270841d3ca98e7a0f85b28230d023f067460cedbf66948483270a8a0285af1fa2b535ed91eb67ffc3f2c301e8b8fd97809 SHA512 13b20c29fc935f64323f1ff40291facc4d52be6f2774505e63f7b5007e7242c6565d43711cf3cf3fd4d6e546c2d49503d1c81be2d26b31fbb3f0f3bdf74c3b26
+EBUILD dpkt-1.9.1.ebuild 366 BLAKE2B 3034c11cbaa424ef700de4a5ad15be0e4e713ecfd52cc1198fa757b621ccfd986000d252ae3e5f131879806a9358ff1add607c9ab6ba56848963f95dc3e3e910 SHA512 83f982e9e54b747c9cbac373aaeba744a623d7d55986606d1bee9e1fec17181c2386feeec862e619e1eaf1ee745d3e77c083e47dc69dd1bc2a755f8a926eb3ad
 MISC metadata.xml 359 BLAKE2B e1f303fedc0048dad7609771ae696db497ecc81609aba2aa30a3e6b596c8848dbbbd4acbf743ecee6b17cc05ca85bd4518a9cc6a98eeccfd15a06aaf7006c528 SHA512 af89531dcefb76f23847300ab5ca0ccafdad16cb2c7fcf74b555165c7654536de7d232b027d6fde02f793a8daccb398643887329cecba7e6e1420bdcc02e14bb
diff --git a/dev-python/dpkt/dpkt-1.9.1.ebuild b/dev-python/dpkt/dpkt-1.9.1.ebuild
new file mode 100644
index 000000000000..2bd9de036d1f
--- /dev/null
+++ b/dev-python/dpkt/dpkt-1.9.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast, simple packet creation / parsing"
+HOMEPAGE="https://github.com/kbandla/dpkt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
diff --git a/dev-python/empy/Manifest b/dev-python/empy/Manifest
index d62e0c93a781..d117e94eb8f5 100644
--- a/dev-python/empy/Manifest
+++ b/dev-python/empy/Manifest
@@ -1,5 +1,7 @@
 DIST empy-3.3.2.tar.gz 138168 BLAKE2B 0afbe6f7939898013770e18a0296d45a7a4121a3b8deb66a40b6fe37a311f9c4df1f864f4d975549cf4f198494f6f069d7ec186dfa5b99e19960b0c52a7aff2e SHA512 d9098823bbb26e4447aae9042e389e000f893615117512f9b786eedbc6875dee6b7f6be50021f68a4bd6e200b364852206b36bff5c48ae1754c8f0d49682d5f2
+DIST empy-3.3.3.tar.gz 138429 BLAKE2B ed2ea352161bcd141620253e059255c6d6437d72d8e72075e1abc01efc496715ff07eb1e9baef70a631e752761f828f2f4750087da154c0a6df1434e47a8f0b7 SHA512 74c091d6dac39ad9ddb6f46963066dab1f8846565f77b1b0ad4352eda3534d4312b0e95d3682387d75c2f5553d678c6d3112471eec032e2bdea0e891dd8217b1
 DIST empy-3.3.tar.gz 137144 BLAKE2B 393f9033125459d6f3d5e9484d174980a00627508d083a32582f85eca9a294394ff028ee9df85ed73b8ff61174ae2068b0b943583fc86efa741bd2def63c215d SHA512 36304577839f5e6b2fb9bb2c2d72880e1f16886b2afadbcb38fd31a85620bb0369e837b8a1d74eab09a074bfe1f7be199b38842673106e0d26f1d9abc53987a7
 EBUILD empy-3.3-r1.ebuild 1136 BLAKE2B e31a65fac96c89e677c215af0dd7a139b8ebb8930252985d107261fa467d50e43f0743c52def437c60cc5600c1cc464206c9215a103135648208d219d1d297a2 SHA512 99a0cc0f4d40355769b00bb34af5f69e8c6eecc8dc653d55bd90202cf646c62e03c4e4207357f114b0d586ce9e27ac817c2fd5345687f14581c0e8b0bb882b84
 EBUILD empy-3.3.2.ebuild 1018 BLAKE2B 3ee8845ed0bd4bec8ddcf068d61793f8f6551cc19e44c7e5058dedb65c6e0a705126eb945b8dffb23fa641055488ee103449212e53e1a5d3bff949ec16c5b7e9 SHA512 773e801af6526febccd4432dae5a819ece6064decf7370281ee4f7716569822ff9475c750d370c6cc2e6d59120386536c7b52c773e58e2ddca42a05ea7cad991
+EBUILD empy-3.3.3.ebuild 995 BLAKE2B 8e44e56fbafeab11a7706d48031aace6b2d9da3c0f8fd1ad87704f411715cea4d40aabb8448727c57f97fb6775f1e900cca2c0774d7114f2e92c2fb55b8070ed SHA512 8b81c7f2d883e72cdae0d655b2dbda296b952c476a30dd2153288f1e6eae9f7f5d46cf2f7a1b9766b68d600f51549a42f3aec08cfa03cb8cfa8228390f1b032e
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/empy/empy-3.3.3.ebuild b/dev-python/empy/empy-3.3.3.ebuild
new file mode 100644
index 000000000000..650a3ba60f9b
--- /dev/null
+++ b/dev-python/empy/empy-3.3.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 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} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A powerful and robust templating system for Python"
+HOMEPAGE="http://www.alcyone.com/software/empy/"
+SRC_URI="http://www.alcyone.com/software/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="doc"
+
+python_test() {
+	"${PYTHON}" em.py sample.em | diff sample.bench -
+	if [[ ${PIPESTATUS[0]} -ne 0 || ${PIPESTATUS[1]} -ne 0 ]]; then
+		die "Testing failed with ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodir /usr/share/doc/"${PF}"/examples
+		insinto /usr/share/doc/"${PF}"/examples
+		doins sample.em sample.bench
+		#3.3 has the html in this funny place. Fix in later version:
+		dohtml doc/home/max/projects/empy/doc/em/*
+		dohtml doc/home/max/projects/empy/doc/em.html
+		dohtml doc/index.html
+	fi
+}
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index 8623c4ec10c8..5af9096d5cc6 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,5 +1,7 @@
 DIST fs-0.5.4.tar.gz 231333 BLAKE2B 2211aedf02a3eab809b7bfeabe346ed147465db52ef6a069ab3cea6f62e3b420d52b9a58868c3eaab55bd9a6c8c071c5c090e28e9dbfccd182385beee3e246c8 SHA512 d67c85f2816cf1a84c25664a6cf71dac551c3eec4eb34154bc92d52eb0efa9739adca6d0ec86b9978ff6af408cfa17b913ee8fd4c143cd2adf862ca0a1dd4c5d
 DIST fs-2.0.21.tar.gz 115844 BLAKE2B 0f7b3fa087c89a68c27d350233e3e73fa54b761bad7799a895fd79fb5a7df898df381e82bd160ccb782e7e814b00041d3cd309860c96b4ea5dc3078e6d33430b SHA512 d16e02a6ed78a26229b12e71f6286db0243774ae13f6f3d0a6c4fb9240fe65656e4f10cb2b385342fb48d12a163ca33a0b746854ab5ee240eae0ff8f6644ed13
+DIST fs-2.0.26.tar.gz 118831 BLAKE2B ce9be9d52882916cd73262556936d55c78fd245f20bea7e7cfbe314d6b1e7a43970ed3758bbd781736b344b65ca03c53ef7b3b5957e93c390b733b7e6ad5bc70 SHA512 2efd77ed968a6d711f6020c84a4418aee32f2273dc246fc4cdbf5daed9d4b5ff86b1c22d2726b637031c398bd1d3b03216c70a47248c793fa3b72c678c007d6f
 EBUILD fs-0.5.4.ebuild 992 BLAKE2B 28cc40563f00489241fe57230b279e6ef02ff694e08351b89e01ac986eddeea2c1c12f829878f2d7333ff0f1661bb1fe80f65589bb485028aee5868c836c6f99 SHA512 543331f3bf18257f197b60d548c5e6a1a579a596bc61bde093ac5f1393eb525fbb78ac603249dc5f360e826964b4c25ca194bf3b5e75a28d21425d5d5a40ef22
 EBUILD fs-2.0.21.ebuild 992 BLAKE2B 28cc40563f00489241fe57230b279e6ef02ff694e08351b89e01ac986eddeea2c1c12f829878f2d7333ff0f1661bb1fe80f65589bb485028aee5868c836c6f99 SHA512 543331f3bf18257f197b60d548c5e6a1a579a596bc61bde093ac5f1393eb525fbb78ac603249dc5f360e826964b4c25ca194bf3b5e75a28d21425d5d5a40ef22
+EBUILD fs-2.0.26.ebuild 992 BLAKE2B 28cc40563f00489241fe57230b279e6ef02ff694e08351b89e01ac986eddeea2c1c12f829878f2d7333ff0f1661bb1fe80f65589bb485028aee5868c836c6f99 SHA512 543331f3bf18257f197b60d548c5e6a1a579a596bc61bde093ac5f1393eb525fbb78ac603249dc5f360e826964b4c25ca194bf3b5e75a28d21425d5d5a40ef22
 MISC metadata.xml 486 BLAKE2B 69d62d79b3d0e05fb12bbf8a4d4f703f82488cace87e8f42aaace9319c18f564c3c841b5b69a189530ffb760bceb1acb9fce38472af659a6c4ce24b1bddc16c0 SHA512 48e48fb5f3c868fb8e1b9dce7c483c13291659c99e0f19e096204451e1ada83fb0d2334d89a3beb45de11b7e710a3deb9e5777e5c8f905312efe899cbee02d07
diff --git a/dev-python/fs/fs-2.0.26.ebuild b/dev-python/fs/fs-2.0.26.ebuild
new file mode 100644
index 000000000000..c657c5f97cf5
--- /dev/null
+++ b/dev-python/fs/fs-2.0.26.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Filesystem abstraction layer"
+HOMEPAGE="
+	https://pypi.org/project/fs/
+	https://docs.pyfilesystem.org
+	https://www.willmcgugan.com/tag/fs/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/dexml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+# Tries to access FUSE
+RESTRICT=test
+
+python_test() {
+	nosetests --verbose || die
+}
+
+pkg_postinst() {
+	optfeature "S3 support" dev-python/boto
+	optfeature "SFTP support" dev-python/paramiko
+	optfeature "Browser support" dev-python/wxpython
+}
diff --git a/dev-python/intelhex/Manifest b/dev-python/intelhex/Manifest
index 5c9530fc4d9b..60a0a5125f47 100644
--- a/dev-python/intelhex/Manifest
+++ b/dev-python/intelhex/Manifest
@@ -1,3 +1,5 @@
 DIST intelhex-2.0.tar.gz 69410 BLAKE2B 190ee5c4cedb8bd84983ea9534dbe7c07b9c536f86e2033f4496a8df0275ea86904cf6c3d0a5b602c8f19bfaace8f3abe7e69e008442224e6bed203780215acb SHA512 3b3d70bd758e5780922277a8f153467568d7d7d2517528848c7f6d8c137ef5e75612f0b0653f89b277c68e421785611cdddd9a0c924061780279f1fec2319c86
+DIST intelhex-2.2.1.tar.gz 41191 BLAKE2B 2c35ec5fcc9d4fa99f7ab3c76f2d0d6055ca0b1812dbb77c6bbc33a1d48df77e8477db6cabd61afeaaa41503cb93d919b0fcb47ceb247409e2163c3f101b611b SHA512 50a08ab65d7d7d6d6aa49c92ac0c339a71d62d546cc922b006eacabb04630b74bc1538f2e461982d0ef1d613ebe43bc25a3424934d84029cd713773c08f57ed8
 EBUILD intelhex-2.0.ebuild 437 BLAKE2B ecf28b68828cd411752b8cc6b3a3e8787ab0df8ae8b523af8e8e14644eb24cfb2632acbce8125953dcd645c57b66f100836a28689a3e90d884afa1542f967494 SHA512 23577327047bf609d44768b8f28cc4a1bf8127ff981d5f1cdb086024c3caf2616fccb10f7789361ad9b2ae0eef1a3c728656e6ee4b9ece3d9066073547494cbb
+EBUILD intelhex-2.2.1.ebuild 429 BLAKE2B 8a0ec310da9e3f87c5af7dae4607dd4af5af44b5e3ed3d99ab2bc5a66ea9199b8d7d47689cbad2d03c8b46f7c05be561f1e6ba3f2960da1140c15a671eb26716 SHA512 e3d536481fde8da756e43c5c028d8f2127bbbb29ae41769ff9b5ee9aa36eed49aafe7928f3d308ef6289d9ca0bffb5eef3766af5f49fc32e373f2b27e7331fe7
 MISC metadata.xml 358 BLAKE2B 4ce62564d3b3d112f1103655cacb01b74d4c4c6b2b9a37f52166be12d40e3c8549e7dfb7fa93aa0e2c42a920b21b5a0832940cbc5d987b74f93b065514ac0c23 SHA512 1861f321df055b65260a63d65807468a38823cae9c51fb159c836333c2db3715bd75e1570b896cd0e15130811aec691a326702540055ed7dfdef5bec260fe96c
diff --git a/dev-python/intelhex/intelhex-2.2.1.ebuild b/dev-python/intelhex/intelhex-2.2.1.ebuild
new file mode 100644
index 000000000000..89ef9408b5bd
--- /dev/null
+++ b/dev-python/intelhex/intelhex-2.2.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for Intel HEX files manipulations"
+HOMEPAGE="https://pypi.org/project/IntelHex/ https://github.com/bialix/intelhex"
+SRC_URI="mirror://pypi/I/IntelHex/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
diff --git a/dev-python/ipaddr/Manifest b/dev-python/ipaddr/Manifest
index dab565d3bbfb..4e92a4d9bf00 100644
--- a/dev-python/ipaddr/Manifest
+++ b/dev-python/ipaddr/Manifest
@@ -1,3 +1,5 @@
 DIST ipaddr-2.1.11.tar.gz 29046 BLAKE2B 8196898209d580ce25bc2ccb05b2e772c42c053116749bb5137a87b6648472c4fab522d76405510cb2304859b4179c593b213739e9294a1af1d9894cac7040ab SHA512 a97b0f760f0d7fac549e5edf17b644c966a8858c145b8f9472ddc8bf4805c9d537f6f8755e3716d78b729b87e84149f8b73c7f98c0deee4fbf266ccb7a206bc6
+DIST ipaddr-2.2.0.tar.gz 26266 BLAKE2B f12807beb52c5cb3c7da2afa4b61b264fb58f0100900e5ca062127ce218f9f5710f38ac7c7183a7aa08b77757c39866d169e6e39c3bc5c6c55df003a9b414ec0 SHA512 5adb117c44e6e5dbdb9e96543aa7a34f35b4a4ec9baa163a25448058c34091bf4019d24f0250928291e4d4bc97dcdf75865daef739e2d94f98cc584e6e6c50dd
 EBUILD ipaddr-2.1.11-r1.ebuild 719 BLAKE2B 4726df1755dcb456c729d7fd05fb471b454c691f7519c2c7e4772426e0ce5dacdfef95ffb7d70bcd202a83690847afe87799e95bcbe9d9b8841e7b688eca194c SHA512 f6078fbfb54525f611c718c371a52b7c3c49dc0002851e39a415c02e6a0e33f37614d655dc57c369963eae117e65fbb6a67e86f58648d44935ea1b5329c165db
+EBUILD ipaddr-2.2.0.ebuild 692 BLAKE2B 0a96bfbfc950163bcfe11afa53b8e924f263b478154d9cdfa2e5a70f2cf79f3798ec99fae40d86057cdb24540517d283addd5390843c3fc19bb6e94881a33fe8 SHA512 785eace219ddf6244ed434acbbd6a95929b1249fc630a3cd207882632c8ccd3eb2a9dd4ac825f99b9d22a4a81009c5873895d086bff10e8ac88a28280230cdae
 MISC metadata.xml 490 BLAKE2B 53a6608c229686c6cc8b3b3c225aaadc4d504781c0ae48db832dff28294101463d3ffa36eb9da1f76c8b419bf422dda668e278eb85e1300e65256ca5aa13f63d SHA512 e1b60dcbd70386a4adc9d65c4e530c38c4477611739baa8c82812ef77373319016d1d41bfe564745b535de6ee5d2ca7665825a455a72ef4403edcb17b26447fe
diff --git a/dev-python/ipaddr/ipaddr-2.2.0.ebuild b/dev-python/ipaddr/ipaddr-2.2.0.ebuild
new file mode 100644
index 000000000000..ed6a948969e8
--- /dev/null
+++ b/dev-python/ipaddr/ipaddr-2.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python IP address manipulation library"
+HOMEPAGE="https://github.com/google/ipaddr-py https://pypi.org/project/ipaddr/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare() {
+	if python_is_python3; then
+		2to3 -n -w --no-diffs *.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" ipaddr_test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/json-rpc/Manifest b/dev-python/json-rpc/Manifest
index 52fca2e0cbfb..bd47a7a79858 100644
--- a/dev-python/json-rpc/Manifest
+++ b/dev-python/json-rpc/Manifest
@@ -1,3 +1,5 @@
 DIST json-rpc-1.10.1.tar.gz 25410 BLAKE2B bb543dc9987d7aa4880d1981fad888ae9374f51958a2b7934e2779fc835705c03946cb3378ca60a914a130ae78741cda75da40ee8ce76e6b4af17a2e98498089 SHA512 bb69cbb12c0a64286fb1e98db21ca75cb19daf20c6d6f5721f82891a17e44d2cda172e73bd389a02077d094b8f6deb0959952b0498b0c1b4a0acfaa5e3ba3922
+DIST json-rpc-1.11.0.tar.gz 29442 BLAKE2B b2a77bdcc2f5efe64527feb29b28c0add90b9fdbd5aa73dce18c33e9a10342c1e6b04ed5d53c110e3f1b6287cf1fdca9db77e38a04651e0a522b76c0351ec993 SHA512 aa5a467ef0e6e556612f77855d38f0dfb76b22556490fac5f0989d27b7608aed8389042ded1a0d8fcbee1f20294c78a6af3c030f41c4e30ec1effae8e51530fb
 EBUILD json-rpc-1.10.1.ebuild 809 BLAKE2B 42983942abd2fc960871292c0f87553ebb53d0f0ca34ab25b55d6bc32e66770f8767d06efb75b64ae8f9d2ff730daedf05fd7fc98a65e309221fa90811ec5f42 SHA512 9ce22bc24d9211288274e21aea3a987b333215cf25db80626e77a626fa86a8fac06a76857edfcd8e060df306702c7ccce4af3b7402ca384163ee21adbf8e92d7
+EBUILD json-rpc-1.11.0.ebuild 813 BLAKE2B fd3d5df067dfffc5401706de01c93ae07706b4cc2f63feeee67221075dbb9a0dad723594cfcccfb40b1bac9991b31a230bf590329f1e77015ed5d9b3d91d7acb SHA512 3da898d9eaece814c5c34a258328f582970c6415351a29d9560c548013971d2014025fc685a85f5d28f9766489dc98bbac137b2c11d9d5003f2b28d3dc9e485a
 MISC metadata.xml 794 BLAKE2B c3611b6095ddf17e030c993775e3fb0b9a7c2c7ac22f5486151f2b9ad03f73bf6b0f6e467cd6440e4a6b726f4cef597cc48dd35d8973c4be941f2615b9c2b208 SHA512 68c309e9fcd29a2182d6eba1e9e758971edc2293cd3c044852de9c938ae0bdbe6ea8805b32e76656d809d6ab3d636a274cd2e65dfd21ce3f026bde5e9ae02266
diff --git a/dev-python/json-rpc/json-rpc-1.11.0.ebuild b/dev-python/json-rpc/json-rpc-1.11.0.ebuild
new file mode 100644
index 000000000000..b46a3f9f107e
--- /dev/null
+++ b/dev-python/json-rpc/json-rpc-1.11.0.ebuild
@@ -0,0 +1,40 @@
+# 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
+
+DESCRIPTION="JSON-RPC transport implementation for python"
+HOMEPAGE="https://github.com/pavlov99/json-rpc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	cat > jsonrpc/six.py <<- EOF
+	from __future__ import absolute_import
+	from six import *
+	EOF
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/jsonfield/Manifest b/dev-python/jsonfield/Manifest
index d2c13d8e0922..bf3541bda165 100644
--- a/dev-python/jsonfield/Manifest
+++ b/dev-python/jsonfield/Manifest
@@ -1,3 +1,5 @@
 DIST jsonfield-1.0.3.tar.gz 7950 BLAKE2B fefaa4f2d3b6abbcb291394baf6147444a6829b15303795856156668a4dc86d4df7a31f7d684783c81467f30de6ca3313b5a86845d088cbbf0ed00bb1cb5a30e SHA512 b69b783266f593d40b588f8deb42828b36fe31f62aba0a80286a24fd788bbea543c74b0566a70fb336fb80105f488a16932bab417a01d3730fa89201f542deb0
+DIST jsonfield-2.0.2.tar.gz 10806 BLAKE2B 67638b380f3356390d93a10b2bd432016ca46d525cbac17c4cc4d1ec901b92d7de00e7ddb6610a97e547728e2c60ddab757e705348b8a8f66ff443b34550f0d5 SHA512 9d4a8a483ea7be4c13c272a959666ca73fdf662ca91373ca5787fc86c0366d074e90fccd61d371898f85e5bf6a1a265820bd9b971e5056c800a27c099835eebf
 EBUILD jsonfield-1.0.3.ebuild 604 BLAKE2B 6620d40ede1732e368ec8a422dfd28967be77dc934039ba4b169218f07066ef0577a5ca7018bcff3e4c692da82674313668637c667a4eb4673739ac7af6c68f7 SHA512 ebccd2e74f35904900c5a1d4e31d13965b84a953f33c22b193b16eae0c3d2d89d26a07d7f034660d99de89429024a1b699c9dec6eadbf24feeb601e9f89c2162
+EBUILD jsonfield-2.0.2.ebuild 593 BLAKE2B 9c5b7a73d814d52faf145265108f7d5b7bcdf27624ff3f0d3ac0cef896213f803ceae4ae1f6647723b8813b8aa33c85f49eaefc61c2c7128715b5ead15eaa89d SHA512 e86b18397763902dd56cba82c5244d38d941d891dc8bbcc40b00d3a19bf5d224d49d21323da75da7e816187413b0c00aa3eaaab3c31f74c9082f67e56f801454
 MISC metadata.xml 391 BLAKE2B f4611fc3866309efba92f59238f6ef02893fcd913dc286d0cfc0ab8afdebcd89cbec7faffad4ba28e291d44772a32fa49c004a51a4184442bbe3979f7b2c7af0 SHA512 405fa8acbb46234295ff3a93441b99ce699bd61789fef4730b9ff0b170b18d76b93e1eedb36fd6c9fdde2bb08e826d013e319d6748f91d058b25b13ab197fe28
diff --git a/dev-python/jsonfield/jsonfield-2.0.2.ebuild b/dev-python/jsonfield/jsonfield-2.0.2.ebuild
new file mode 100644
index 000000000000..4ea2a180e0b7
--- /dev/null
+++ b/dev-python/jsonfield/jsonfield-2.0.2.ebuild
@@ -0,0 +1,23 @@
+# 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
+
+DESCRIPTION="Reusable Django field that allows you to store validated JSON in your model"
+HOMEPAGE="https://pypi.org/project/jsonfield/ https://github.com/bradjasper/django-jsonfield"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="test? ( dev-python/django[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index fa385ef262b8..f9f31d72fe26 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,3 +1,5 @@
 DIST jsonpointer-1.10.tar.gz 7577 BLAKE2B b4472cd9ead51fe75f2e53690d4c0378cb6b5dccae240bc1bf264bff9df15bdfab379b1043221e66074e08c3393ecf729e4f95721fcb324fe8b710cd49d7f064 SHA512 b2df5f19b14b670825b18f7da4ca50b089beb2ccbb1c69acfc904eed82b5315ad19940b4aaa8f8504c2fc7d477778d65e31f492dd30ee8b5ba95ccfd0eaeb9b1
+DIST jsonpointer-2.0.tar.gz 8699 BLAKE2B 7b52955aa691a1bba327df6674704503b009101d0dd94587620a684ca9310128e3afcc62cedabd92106deffc3a6a3434a72123fc804224ae68ade8751462bf14 SHA512 e8e2b03c12c3fc5f65816fc71d1c07135ef74a0c912286f5b8bef2d9e21b8ae6e766d1aa2104b3eeb0e53928034321f25b203386ac3f5641b54b0641f6a08137
 EBUILD jsonpointer-1.10.ebuild 643 BLAKE2B fc25db9393b2624bb0a2e0dae47bb968f58761cc02655c142e083317c5e2a8df8ec080dbc4b4e9e1243938c78eb46b3ae9e6dea1ea6df68e24fa27ad43850ca4 SHA512 f14a50dd7aba6fcce891345b1918aef3b7e223925ed7d096406a06a190d5402d8ac5b765d7217aa512626a7b333528ac3932fb676a2887a3da666f67a2858a01
+EBUILD jsonpointer-2.0.ebuild 639 BLAKE2B 3151f2b07eaae6cfb9feca80774b8d4d12cb2b86a20dd80bc9c10c46af7665233401c9f5ed85f7b55c66789907e4dfcffd3b368cb392044b8874a835ec9df12f SHA512 1e4106dd20e16fd7fd3974b8decd375a82272ed3f010e8b7e4df28e788ba99d2be721c21f267ce008e40f9798ebaab469e9d50ef3c166e21a7b3940ba9581048
 MISC metadata.xml 702 BLAKE2B 20a9bbb2163d360f6797170b59d71a8233c7e7bc9f66f1809bd5c70d4c460a464fc0d8ad831f4ff08bb28df0c2ff77c0a0fd483a6295a7090fa73d1a3a4902ec SHA512 0f25c1d5667c07fc6382d958c6f150412de3208a9f21218bcff55c32354e86e17338d3b2480dbb8c7633f1b0d95211c9510aa4cbc9e5392490b6c3904babb9f8
diff --git a/dev-python/jsonpointer/jsonpointer-2.0.ebuild b/dev-python/jsonpointer/jsonpointer-2.0.ebuild
new file mode 100644
index 000000000000..7a038f0fa5b7
--- /dev/null
+++ b/dev-python/jsonpointer/jsonpointer-2.0.ebuild
@@ -0,0 +1,22 @@
+# 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} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Identify specific nodes in a JSON document (according to draft 08)"
+HOMEPAGE="https://github.com/stefankoegl/python-json-pointer https://pypi.org/project/jsonpointer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index eaff6d26c20c..6c374e497a71 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,5 +1,5 @@
 DIST more-itertools-3.0.0.tar.gz 37622 BLAKE2B dd1806f4359406ac0a57a8eefe8d6c31033177e3f1b4fd297dfcdb525df6bd5725ff16f25abb1957dcb1cacb21bf1d037a3c9def9e9469904efbe2fd336cf5b4 SHA512 575de991b6337e6416489d92b41201536397d84ff41030a2cf09ea57cc994e03dcb4dd19eda321243ceafd49c11271da43a4c4ed5a9261cf771f0b7f8e40345c
 DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 48cdba3eebea94483c5cfd9530d4bd2cacd02e893b87482a01ff1fdf10336f3c2a40d32fbb935d38320c9c47a1fd1942a48ea12ff07ae56793ecc5870fef2452 SHA512 7e205a575fb1d17ed3be9225c5c60139db41cc4b866f6d6732c955536b1d606bb7ccd92ad77e41159965abbddec3a85761d3649c28f06d52afa8476160d70e77
 EBUILD more-itertools-3.0.0.ebuild 940 BLAKE2B ecdb27a57e7ee9ee08e84e64fb8ac37f873c41e4dd38a1dd73679bb6eabafbc2e27e20e343228e29b2d695b9de865c42f99be874842bac32ec4464f444179587 SHA512 370654b68c809bb5745c0ac0329aca6eb4e9ff620079082af53c4c85f43c8d9bd1a4f6a0fb11d5913d7c0c20a35acf57127be0e704df8295066a63875aca12d3
-EBUILD more-itertools-4.2.0-r1.ebuild 1031 BLAKE2B db6f012867773f945210a41ef5a2a292993869d935a2ae5bc77671e577aaf43f61614af457d622e27f6f0605a912eeae3ba46bd445a9525061489b84422164c3 SHA512 973805b51ef5ac9e3d1c3912e6b0de5196a57926db9e863c8c58117120ee2f38c69fa78d0b9016c757e6ea7468d45725b5c3a0c1cbf06651ddc77659142c7463
+EBUILD more-itertools-4.2.0-r1.ebuild 1038 BLAKE2B ba20b932b67ddab3bd4a5d73fd263a77e17264880dd68738b43722054b834fe96641b55b3c5d00aac064119e48c7c9255db58bd3379315988291f4270e699b25 SHA512 b20d40ee70b6c14803bb1098faf5a3d4d772429e7e0e8a6fdacd17a7cdf1ef9107e62724b75f4d8f86fc43f9213932a26c962641a4c0576c23881a3c4164c822
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
index 9f03c2aae583..dc43bfd7f6b6 100644
--- a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
+++ b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/odfpy/Manifest b/dev-python/odfpy/Manifest
index 1bb4599d4a73..66b67bb9e154 100644
--- a/dev-python/odfpy/Manifest
+++ b/dev-python/odfpy/Manifest
@@ -1,3 +1,5 @@
 DIST odfpy-1.3.2.tar.gz 479554 BLAKE2B 3b9d2d144f11727471002dd1dfb9289028423d05d65fea040041dbd43a674ddf6c893fa8895a2e198e6a82e79aa2af92f21a6381cfd67233b4fe57401370121f SHA512 c5be79c4077f40a56821790d4b6062e3715f8b616b1e9ead79977ad00ecf3f506ebbe73790f215bb835a233833fa471af7f619cfcd88320cf8238e4c9502e248
+DIST odfpy-1.3.6.tar.gz 691122 BLAKE2B aaaf2c1613beb6775d22e4d1739b7c144d8046e687f0dc8f7b7b1ea7400cc32dd572ed5a1cd12cb01c5fec27b5c37950b710b279a46d60da8735154d2b2d7030 SHA512 09f3fbce633949035842cff16d2e016271b7f6abf04d74fcaa712c9b3afa18943dd566a2d88a7256a0a52d88ea689d6ef8262f6d8d67d6ea1025aa56e10300f8
 EBUILD odfpy-1.3.2.ebuild 1087 BLAKE2B bc285573ca2b541623371ff7f7de62e7c5444a777f7fdb69008a59ac848a8889dd339657e17345d2f6eeccb81791dac22510512d9eacbe400cb303ac03acb9e8 SHA512 82b609783b919de843845c2c358c1fbe5e23701ee960fa0e7445f5d98deec87a3cdbb774fb90241460624719efc0e3ca3539e50073266a62e9a04c7af5029ab6
+EBUILD odfpy-1.3.6.ebuild 892 BLAKE2B fffa9347f451e7b899e797b6767dc18919c59791c2a5aa44407543003d2bfcf8c10a8ff5ce582e5ec186cb43c755a39498e86786510a9c3ce5994af9125b574f SHA512 a42fade914429e04f2d688f047d1e6e1577cdc1c426548016ddd8302da2f0169bf90b48eae58e47ecb93d0f78867817412595b7346a0bacb2c3f7266a3254865
 MISC metadata.xml 308 BLAKE2B 4d370440c480d97acc4b9b2e51aeb78f27227e8dd2c5acfdb99747b6b2eabdd624f8a8f90af28287849216d874bbcc81bb9ca8cbf78c1221e947fd479476b1db SHA512 919a3c6c182828bf99396da71e83f0b982aadcdf0e0c5e6e7f29e15cab19e2d3c6d5afc26864a324055e97be9563cc30ef10b701716678c7cd44e8403adaccde
diff --git a/dev-python/odfpy/odfpy-1.3.6.ebuild b/dev-python/odfpy/odfpy-1.3.6.ebuild
new file mode 100644
index 000000000000..35d1e10f5509
--- /dev/null
+++ b/dev-python/odfpy/odfpy-1.3.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Classifier: Programming Language :: Python :: 2 :: Only
+# py3 fails one test, pypy anpother.
+# Notes on page of home repo reports support of python3.
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python API and tools to manipulate OpenDocument files"
+HOMEPAGE="https://github.com/eea/odfpy https://pypi.org/project/odfpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	pytest -v || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 058a58a998dd..ecca270a2f07 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,5 +1,5 @@
 DIST olefile-0.44.tar.gz 57903 BLAKE2B 2df4078c147ff737b845fe4ca57b6520c39776efe6bac399b0b8acb4ca62f946a653f85ad0511f5fa42d8b544d539474d226fe144bc2604737f3b16e5edd5ff2 SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65
 DIST olefile-0.45.1.tar.gz 97969 BLAKE2B 246198e69cde316f24a183fdf07872edf9b1db2a168571eedb7efdb91166d4ad2658acaaa90e733950e437ef5c6ab8d1bb275cd1b24283b95497e254a39c9b26 SHA512 72d40056cac1d9566aa8e32b7b5484f61958a689130e71fa86bc0b9fed98f27a8cf34b824971357d42ec3dfd2d5bfa86d0f212727ff91d8daa3967969ff576e9
-EBUILD olefile-0.44.ebuild 656 BLAKE2B a007182e3bea9a28a280b96febdb4fcad524f230c1ae96894cd93c181c2556b9259f60f026fa2aa99ac6ac2f75c1a83ba9bab58dfe3a813809da73c40e1859da SHA512 d3345f66d82734d7537cb02f5ebfdcf78a90239d13aa11468a853e029cfc43751cb729ce2387a475b2f48c5d7b1e7a2e62431c55923164f85d111284d67ac01f
-EBUILD olefile-0.45.1.ebuild 648 BLAKE2B 120fd92de6aa614af987790b59a75ca97945911105edaf4c30f4a76a05567da0335310b4f374421b2abae97180bd9bbd564df49a724c4f92ea5bcecb68cea94b SHA512 905a537a5f57cd2558bc4341876de83efea83e73ba6be3b4ad94390ba88929d6c910b5a778c26f1368629ab1b65a94e9608029193cb48cd70695a559d7727b1f
+EBUILD olefile-0.44.ebuild 663 BLAKE2B 9a3c2d012281294c8681881642c24720fc7802ca62978ba676f44851ffc19727c0aa8af08dfd1da7f869c190fd0ecbcbb28760316b4ae69daf52aedc8adcf44a SHA512 eb06cc9def33bff756bbec000da52b9189d935f6e8d07512a84c95abf2119a72eba49e8e51b14cecf98d6854c3025ad7fe52c8ae80d27e5eafee7d078b8cb96a
+EBUILD olefile-0.45.1.ebuild 655 BLAKE2B 462d6b3affcf05bfce39ebdd90fefc9bf77269c3cf261846937d26e6a8bb67e57e9a461f9752b33a00cf41e7968918a3c5298bc914dd7a7744069544e89458d9 SHA512 28033a2432870f33d9892dbba3b8138eec7ff4d9b38b92bee1d962e78c96ef54a0de020b94f6b34a5b0891358b65d5c90799c8c463843a93db201a3d93e70172
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.44.ebuild b/dev-python/olefile/olefile-0.44.ebuild
index 38302eb2bd37..e48572bd0a32 100644
--- a/dev-python/olefile/olefile-0.44.ebuild
+++ b/dev-python/olefile/olefile-0.44.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/olefile/olefile-0.45.1.ebuild b/dev-python/olefile/olefile-0.45.1.ebuild
index 243f264d315f..f26085310c90 100644
--- a/dev-python/olefile/olefile-0.45.1.ebuild
+++ b/dev-python/olefile/olefile-0.45.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 91aa9fc92806..877bb24d1ef4 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,6 +1,8 @@
 DIST openpyxl-2.3.0.tar.gz 138746 BLAKE2B 74a6ebcee9f7c235a4e590de18b39fe04eccf4e37caad64f727a19317b302649821b2ce42bd4ae8d2f192e6cfbe284b2b07b452f28ec4c52850ad32de3c9025b SHA512 e0d438c753628618748af7511366936681e63046fdb9dfb8509db8701194dc2875394892392e6871a367a68c08b730efdac29a88db6b0589fd619066145fff9f
 DIST openpyxl-2.3.3.tar.gz 141530 BLAKE2B 5efb845e8a208a8214380c8766db0c448a59dc5976b23ab8ca8d88481390ac6fdb250a629389eff7f2072566ff640ad15b5d5969218b49f0fe44a2da806e1682 SHA512 b5fb65acb711affe40e466c91d58a8dc989ada06cc58cee046311b6e65073e49ebddac8912f1b5642eb2be36ed8ff4f9a8b07acd75cdd067807fa8898b47c065
+DIST openpyxl-2.4.11.tar.bz2 2139621 BLAKE2B 44fe7e471b50deabdea10e677e3b30f2eee62c661203517321e32442639e884c93ff3c4b6e7a0e5c5186bc8320c53d912832d955882b8cdb29c81d8319077c7c SHA512 9d1f9a3cadefec42bd7b6301bc3a37045e59e567a9f74eed3467547e81f060cf1c0ce2fc7f517911cd7f5716a42135a8567a0e0edc42eae0cc0c7a2370b320ae
 EBUILD openpyxl-2.3.0.ebuild 775 BLAKE2B 395e4676e98d33abdf8a12eb10b15b8b3e2a26e05404b7bc3d9f3649d2b937e4896ceb6a8a3b878fbafda6126b8f32805c8e6faec8987b3f18103c93d74010a4 SHA512 97b0e3e612c7e9b8b6d0ec7756553f8d5c871c89f69c9b4ecb549906f227a7edf1392ae6fce90d7e7c721dc799cf1147c117248dbd939f32adbf6d86b0908c79
 EBUILD openpyxl-2.3.3.ebuild 777 BLAKE2B 2b007a8e66710358304fb1c15749332b2b2ba62f3f16c416057d04dadd6cf0261ca2d6b26eed21376f5f7d1e00c08909d1dd5e4c91be38159bdbaf11d2c2bbf9 SHA512 bc248245f090f258fd23693f4019d0ac6e685e856c68ba5d85b08e2938eb89e1997195f7db311adb0f69614fbc70c77ecb723c66de0fdcc6e4d5371d7e6d1cb2
-EBUILD openpyxl-9999.ebuild 695 BLAKE2B 69ed8a8e5846e65781c5cbf393d98a341295910f0f3c50065d815d1def0a49dec30d3a4f9de3d2c83a6ff2088a3fc0af7477d6565244cbfc5e0da7b24329157b SHA512 9ee22333f44bf662c8664f1b1a3f7ed291254b192837dc432f8a9baca1e706c55e0dc3e486931abce877a53b22a7d193bf9aa8636852e3278b68d33dfc516fc1
+EBUILD openpyxl-2.4.11.ebuild 787 BLAKE2B 6c873df2c8338ca76323e50ba5564152a99da56624ef3dd1d3ffee79eb1dffbe8f00a5b0920299f5340404e2714b9dc56fa4176b41976bc5f272e24afeadfc5e SHA512 91888a75275ee9a9e43370e764ad108ee52b5f568980be72412fbdc4c746919423647f7d9299bec86d82d99ec6c2278ed78ca0eb98f347da7865470eaf4a5d6f
+EBUILD openpyxl-9999.ebuild 730 BLAKE2B 0004e3721d7030a39cc868ef38b33a8b9d99698797790216f0fbebb1e19d935a2b2c6c93934ad0de8bd09b151912e21934ca59761f09d0dc0a3116b996b376a9 SHA512 bae05045073de77d0c358f65c1b77fb22d8fc2aefcb60c6c3253114402e38044447d6dca308132ec780c336fca800c5593f6a4041090dd5906edb99518efdb41
 MISC metadata.xml 449 BLAKE2B f5d81266618fbf1f9b74005ff4b9cdb22fa7d059dbbecdba18dab50b488e48b27ba7d4eb814c1e3baa9a8bd92b232e28f00d21f25c18bea58790c1af5e3a5275 SHA512 c9aa0ab803cc15b6ecbcdcb01fb4c224ee32a53b9054b345329f9d66e2aaacece4b2320878e4f09c0bfac1631b6656bc93c6036d3cec84c1fee27d4737aacee0
diff --git a/dev-python/openpyxl/openpyxl-2.4.11.ebuild b/dev-python/openpyxl/openpyxl-2.4.11.ebuild
new file mode 100644
index 000000000000..3d62292acd11
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-2.4.11.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
+SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/jdcal[${PYTHON_USEDEP}]
+	dev-python/et_xmlfile[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	pytest -v || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/openpyxl/openpyxl-9999.ebuild b/dev-python/openpyxl/openpyxl-9999.ebuild
index 5202a8eafd18..689dffb52654 100644
--- a/dev-python/openpyxl/openpyxl-9999.ebuild
+++ b/dev-python/openpyxl/openpyxl-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 mercurial
 
@@ -26,8 +26,9 @@ DEPEND="
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
 	)"
 
 python_test() {
-	py.test || die "Testing failed with ${EPYTHON}"
+	pytest || die "Testing failed with ${EPYTHON}"
 }
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index f59334fe4025..bab45a5107da 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,5 +1,6 @@
 AUX pillow-3.4.2-no-scripts.patch 411 BLAKE2B 79a798be9c7fe578a02f25f86cd658c10be36aee581c5d285f21081c17d48cbe0dbacd1098f65f71c4cab147ef77d18b334780810ad8a6c4534f53da2db83345 SHA512 51ac7df4e9c6b76bbaf20e243cb171f9d824c94e183f4bbe5047c6932efe6913527a0a4d328266a8984d51d07aaa18cbdbb98de92dc8f027a3d392d0355cdd70
 AUX pillow-4.3.0-freetype2.9-test-metrics.patch 553 BLAKE2B a5bfdf7789237b583c464f2cbb7cfdf645a272587337da227eeea98e41312bd2a7b3a7f22c182856577350489a849f52271a395f9799410a7a07f77654629197 SHA512 291ced301ee1938dfa19afc7b57285c57e6722e28f3adca492e390b1ac7a0cda43c58fa19b97cac81d2ed6ef928ccfb51de87e60b035e35f923c1a006e80be64
+AUX pillow-4.3.0-no-qt.patch 893 BLAKE2B c41d8ff63a3da5aadd0c7ebdd0c102e2a136c5feeb2bdab9b4a5a0167457b9bd51b617da94e236179bcd07762359c8692477db3af1f26aa8b373c5d19036cc7c SHA512 e67e670fc26ed438c3d00be91f0549e210692934bbaa3c6789b35178ea6c45412a69ddebebe9ea5f38bd748f7d20e4b6bd4f56277133bb470e44756168808582
 AUX pillow-4.3.0-no-scripts.patch 392 BLAKE2B 1443119f49b0c76c75d17414851e7f54d673b804d8d268fea79fe9fcc4f6361d6d2e70cfc6d855c8c374bcc28b67672778f310f38442502bf5c7096e26bf0bc7 SHA512 500706b3736e17bbfdcf18d2e3038a96ab16a5ba1015fd2ee9332ae11d8f98594ac4c50dd0f7cfd5288703970d20d0a4f3174a8071442893903888d828a2d2da
 AUX pillow-5.2.0-no-usr-lib.patch 446 BLAKE2B 98a026f1fdf2e44fa20043aaa92ea1866b77abb244974f9c827dcafcab20c3f7f4a33a6582f3fea11416413576e4befeb0e79d57ff529dbf34937ae798ab3f59 SHA512 1bef741f5d1b12109dbe27afd360ee2d8c5d7c8a1d4a177e017bb9a789358bb0c7936e354f357cfa3817077eab21c831ebcbaf2730f63ef68541a380ca655598
 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
@@ -7,5 +8,6 @@ DIST Pillow-4.3.0.tar.gz 13874155 BLAKE2B c2258efe2727adeb7ba370fe30ef9bbabe952a
 DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c
 EBUILD pillow-3.4.2-r1.ebuild 2498 BLAKE2B b91e53211dfde64340575814d273d6d7afff29ae15689d4f98d411cbfa50b48594b79c0e5faa692c7630dda7955f6cddb3918227c4eaec293e065d28dc98e9e9 SHA512 37f491ebc17403dedeb9a48444ce49c5851a0d6b6a9fc24ba3bd81377133e6671df7b03fa7126d53b366ddd18e2952a445e7ca7b94a93f71743e769a5b1a30c9
 EBUILD pillow-4.3.0-r2.ebuild 2335 BLAKE2B 927d5247c0146ab1a304bdd2985f2606e336b766ec6bcd5718508f0f51b583c27cd8256ce836e7f6100625b36c53ffe11c63cde624d682bff96c45eaa49fa5cd SHA512 4e387bf4d17babe9b33856391a7f66d0849e6d652685faeb8e6afb8770514502ebd5dd10dafd98855891ae1802583b0f8cc51b9a012cc9288146c281eac60d4f
-EBUILD pillow-5.2.0.ebuild 2701 BLAKE2B 69e75f027ab441da6b8843322ceef55edb999da8b6dfc854998026aedb59b919ac661c3bfc6525b3673a534441b4fc9e830de2997df56df961adb234cd469a44 SHA512 f2e7ea59baa9383756acdccf9f4153b4f589356795945bb5b4895f285c20a4e8e0c8d5a57909d05e113f65780fe974d49f2e51dad793238cdcaaa849cc0dd205
+EBUILD pillow-4.3.0-r3.ebuild 2656 BLAKE2B a5134151a03fdcb4ae3f5e5c5daaa0ec251556ac18fe3b66dc1f8d8ab0be6bfcd571b28f12d98c5ac6740e83941912474b5b5795d9e44b889f9d4f2bca9385d8 SHA512 d32e85250fa166d4d03b437f3ac801d38466878626f6a743e6719295343c6271f067467a78891f8d16c95023851d8e17cf646a9cdd4dfa34bbd2eec54c681023
+EBUILD pillow-5.2.0.ebuild 2708 BLAKE2B 2865699afa48be13841cf08df7538a17ab7455d9b3a0bf1d9a6044917e638b9e973a4e2859cfa6bedd15b4cc8c169c3f556b431ccc7a3499303dcfee4f6ac2ee SHA512 a7e74e4a53aa88e7cc3191db0101a3323a102edc068e04ac931096be901e048a7a2eef7c7b9b96afbbeb7d839cf63330fa4ae6aa6197160d39f6b87f98b37820
 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
diff --git a/dev-python/pillow/files/pillow-4.3.0-no-qt.patch b/dev-python/pillow/files/pillow-4.3.0-no-qt.patch
new file mode 100644
index 000000000000..231c605b8347
--- /dev/null
+++ b/dev-python/pillow/files/pillow-4.3.0-no-qt.patch
@@ -0,0 +1,30 @@
+diff --git a/PIL/ImageQt.py b/PIL/ImageQt.py
+index 36b4e1eb..ddde2cd9 100644
+--- a/PIL/ImageQt.py
++++ b/PIL/ImageQt.py
+@@ -20,24 +20,7 @@ from . import Image
+ from ._util import isPath
+ from io import BytesIO
+ 
+-qt_is_installed = True
+-qt_version = None
+-try:
+-    from PyQt5.QtGui import QImage, qRgba, QPixmap
+-    from PyQt5.QtCore import QBuffer, QIODevice
+-    qt_version = '5'
+-except (ImportError, RuntimeError):
+-    try:
+-        from PyQt4.QtGui import QImage, qRgba, QPixmap
+-        from PyQt4.QtCore import QBuffer, QIODevice
+-        qt_version = '4'
+-    except (ImportError, RuntimeError):
+-        try:
+-            from PySide.QtGui import QImage, qRgba, QPixmap
+-            from PySide.QtCore import QBuffer, QIODevice
+-            qt_version = 'side'
+-        except ImportError:
+-            qt_is_installed = False
++qt_is_installed = False
+ 
+ 
+ def rgb(r, g, b, a=255):
diff --git a/dev-python/pillow/pillow-4.3.0-r3.ebuild b/dev-python/pillow/pillow-4.3.0-r3.ebuild
new file mode 100644
index 000000000000..a799e79a1d3a
--- /dev/null
+++ b/dev-python/pillow/pillow-4.3.0-r3.ebuild
@@ -0,0 +1,106 @@
+# 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} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples imagequant jpeg jpeg2k lcms qt5 test tiff tk truetype webp zlib"
+
+REQUIRED_USE="test? ( jpeg tiff )"
+
+RDEPEND="
+	dev-python/olefile[${PYTHON_USEDEP}]
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[png]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/pillow-4.3.0-no-scripts.patch
+	# can be removed at v5, patch already uptream. See bug 593816.
+	"${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch
+)
+
+src_prepare() {
+	if ! use qt5; then
+		# When we don't use qt5, we want to forcibly disable it by patching it
+		# out. Otherwise, we might encounter unexpected problems like in
+		# bug #662236
+		eapply "${FILESDIR}/${PN}-4.3.0-no-qt.patch"
+	fi
+	eapply_user
+}
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	mydistutilsargs=(
+		build_ext
+		--disable-platform-guessing
+		$(use_enable truetype freetype)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jpeg2000)
+		$(use_enable lcms)
+		$(use_enable tiff)
+		$(use_enable imagequant)
+		$(use_enable webp)
+		$(use_enable webp webpmux)
+		$(use_enable zlib)
+	)
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	virtx nosetests -vx Tests/test_*.py
+}
+
+python_install() {
+	python_doheader libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc Scripts/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild
index b4f435d0425c..76aa787e1a4d 100644
--- a/dev-python/pillow/pillow-5.2.0.ebuild
+++ b/dev-python/pillow/pillow-5.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg tiff )"
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 611d47d29217..03a45e16f995 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,4 +1,5 @@
 DIST pipenv-9.0.0.tar.gz 3859618 BLAKE2B 138e53b1ef08d036f4ded6b4ca9da1a88084ad3d987aea1c6783181de414f7b24a54d46b26c2171f0918a1b1c22e2dac983fafad8a80f4aa95f93979bebfe2df SHA512 ea2d5ada73288a5d20473d769e20d6d195f65c3d3aebe2e52a43e1641af916295a18810bdb74a611751e773bfdfbc0ea7190d61358dce66d4aa33fa4a6f6131f
 EBUILD pipenv-9.0.0-r1.ebuild 892 BLAKE2B 125ec57e5556590ee4dcdc32d35f86f2b8b07d8f09d98f18ba96b3393541cf407010c7f43c8692865e9c1b721a8bd8f03c985660b43306196f2f9bf7a0ec14b3 SHA512 0ac8571ac6fafa820752f6e469f4641ff247b8655c2fdcfbe533992e2f00177a8d9b5fafe6ff7bbc3598e32bfd15844d41b5b9bd41dcae458ae4f2da92b651d2
+EBUILD pipenv-9.0.0-r2.ebuild 1071 BLAKE2B e091f28dea632a1c7681f5e85585ce1fcc20bb664e03b8fe716a62b1658cecabf159d5508ec4a6fd3a21c80f3474c14b1de204691f806498e2649773917dff3e SHA512 6180fb88f4c0537a89db07fa024d4098c55637d12342fe6d9350588d981f6bd81aee44d1113c55722f0feb70693c018e7c2b8c0cae6b3d10d945b3b1f3af51f9
 EBUILD pipenv-9.0.0.ebuild 904 BLAKE2B 2e27520e451f2c4a4dbeaaa274a0c8320c457c395cfd937ecba35635aa34ef00543e99ab804f01e02168c51e02d01c8e6be5976eeab07f488aa34c25baca129f SHA512 b3912f68a16b99c5beee665cbdc233f33448a0da0b9cc573dead90ded93ca58be7ec5dd43429a9f27da9f0db24c861cea7a40eeb5cb374da029fac1ab28b672e
 MISC metadata.xml 445 BLAKE2B 71ce759695adf862ea00805dc1865487ae2b4bccd94af567240463b8935463010c4c8945fe3ba58a216afae1066de9b8659ea0ec216128c9017ec42e52bed3c9 SHA512 15d259d0f38fbee2fb0d9765934eddc46c8bb1a6da7fc656f3b2b006c74aa1b0ffd8211e9d9c23f241113a8ae3a333708acbf351fa1a150084b127b4eab88795
diff --git a/dev-python/pipenv/pipenv-9.0.0-r2.ebuild b/dev-python/pipenv/pipenv-9.0.0-r2.ebuild
new file mode 100644
index 000000000000..73a98b4733a8
--- /dev/null
+++ b/dev-python/pipenv/pipenv-9.0.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Development Workflow for Humans"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/flake8-3.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pew-0.1.26[${PYTHON_USEDEP}]
+	>=dev-python/pip-9.0.1[${PYTHON_USEDEP}]
+	>dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pathlib[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2_7')
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+# not completely packed
+# requires networking
+RESTRICT="test"
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
deleted file mode 100644
index 326fb79c258e..000000000000
--- a/dev-python/pivy/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pivy-0.5_alpha20110303.tar.xz 6289744 BLAKE2B a72c7bf10ab9d6c7fe2613aa15bc8bef60b22e10e9dd00d67b43231df583343e4203ab603a82a984471756ec95d2837f0ef3618bf4dad7f8d722d7cefd5d629a SHA512 fd0e90daa3efb3edcbed2a29dc218dadd45b728529de1ba278b3be11c3b4cf39832200babc426ca7ba688440e25a6865d38a04f3470dc5f220700fd3fef9f47f
-EBUILD pivy-0.5_alpha20110303-r1.ebuild 573 BLAKE2B 8592f7c6b26c75825226c9f53e3e2259838fc802d0dac7ebe83c96c7eba3d6a6dce3ff6d4925e81a74c8143329d52611e28ba17bc27d3a419f0b70c962ac4503 SHA512 24d023a84f6479d233b96efa5e77f1064fd89545c1a4e0911bd182b6d9e325bd5dcf88718b05d69a3750977bfe08c63d8d790ff8b2a777d9c61bc29e84d8342c
-EBUILD pivy-9999.ebuild 430 BLAKE2B 6749a1d41fef37fa8efad6e43664c3ac2d1fb08f023db1642b9e0d9e5c5211ee15b31b8ea3fadddfae533198672967e59fba27b6c02ca991b0b9275901250282 SHA512 3554ab7e75770895592860455cc4cda7c814e10d09c18e5d206f284bdbfd9e762186aab738b1b067a12144645f4d5cd9767d51b67ea6d66a18da0bccf4340997
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-python/pivy/metadata.xml b/dev-python/pivy/metadata.xml
deleted file mode 100644
index a535b8852829..000000000000
--- a/dev-python/pivy/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/pivy/pivy-0.5_alpha20110303-r1.ebuild b/dev-python/pivy/pivy-0.5_alpha20110303-r1.ebuild
deleted file mode 100644
index 9994c5edbac7..000000000000
--- a/dev-python/pivy/pivy-0.5_alpha20110303-r1.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Coin3d binding for Python"
-HOMEPAGE="http://pivy.coin3d.org/"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
-#identical to latest debian tarball at
-# http://ftp.de.debian.org/debian/pool/main/p/pivy/pivy_0.5.0~v609hg.orig.tar.bz2
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/coin
-	>=media-libs/SoQt-1.5.0"
-DEPEND="${RDEPEND}
-	dev-lang/swig"
diff --git a/dev-python/pivy/pivy-9999.ebuild b/dev-python/pivy/pivy-9999.ebuild
deleted file mode 100644
index 91ca8ff44be8..000000000000
--- a/dev-python/pivy/pivy-9999.ebuild
+++ /dev/null
@@ -1,23 +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 mercurial distutils-r1
-
-DESCRIPTION="Coin3d binding for Python"
-HOMEPAGE="http://pivy.coin3d.org/"
-EHG_REPO_URI="http://hg.sim.no/Pivy/default"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	media-libs/coin
-	>=media-libs/SoQt-1.5.0"
-DEPEND="${RDEPEND}
-	dev-lang/swig"
diff --git a/dev-python/prov/Manifest b/dev-python/prov/Manifest
index 37ddfcfc2d3e..1efc0b6a070d 100644
--- a/dev-python/prov/Manifest
+++ b/dev-python/prov/Manifest
@@ -1,5 +1,5 @@
 DIST prov-1.5.0.tar.gz 125045 BLAKE2B c378c665b78f4b91b612e954e51b517a6c2e293297afea7482fd4fc7362e7f1255e3b4b6ebc18232bf2014f86f2f491c12e781d7b7553d18b724f72e077d95c5 SHA512 d08b924385f587814f6094679649e746bc687e136ddebe1194c5d97921a081b960a5531f13cb8f83d167dbd1cf7114d2e55478431feaf52e547db24a181a2ad2
 DIST prov-1.5.1.tar.gz 123725 BLAKE2B 80816d7a78c881e48b89adf0fe2b9579fb3bb5ebca55220ae449dca422c069cd6c469a547d025600944fedccb82c20e4a7571f336592c3f5ff5b5a0bd0835c1c SHA512 71ff149f7a015a36299413b7fc98e0965684aaa0ece86ff865be1c1ef404a3b24489144d9f8299dd48c2f13b377d16679b26fe93e3463455192a054897af52f7
-EBUILD prov-1.5.0.ebuild 941 BLAKE2B 3b42bd668e258331bd8bbbe07101976a1d978decf6ae540f769375051d3ccb81dcbef8fccf718d2ace523950a195776ed507708e63e6a34e406a2ea8e4400e4b SHA512 286850d903bf37cc311728bc5926e758915baa575bcb9f60a65c449ee3bd9bd608d0b57b17835cc62a22db599eb48c1ef4a07e42ae7fff81089668fb0c9f312a
-EBUILD prov-1.5.1.ebuild 761 BLAKE2B 1cacef6f1c3247098ffe5027cd0e267adbab6e1fef10d132fac32169907fd84b29c9fe13d77b10d97192c4c932a294658569a1381cba26cb362f984f6beee357 SHA512 1bbcec880c3e3c161fb24ed2231d7bba6e59bc10bed3cf488be208f06efc4d44b517b102ef7c7e3db3d40954bb1e855a3244503ca3dc3246b0b8e08436337d10
+EBUILD prov-1.5.0.ebuild 945 BLAKE2B 57cd6b6592e62309070fd8910fef43104bfc04a623d66d1b526915e00e8eff13e88ee8d72f8fa05452b86430eb0d4d80fd621f9955fdb4fbf35e7a38a1e3710f SHA512 5dbb62473e47090e1503d33dfda7bd230445dc9852ba2ef1f98386409daa860f29c64535a404b5b5318d0eb1fab76da971ad0290217e478a8217923262ffcbda
+EBUILD prov-1.5.1.ebuild 761 BLAKE2B 625a0a54c01d2c907c9abaf7a44cb12c350822c47d9668462ca588e837a0465b69c32de82688bf0539fea6b6a2550f10d719eb6a2f4fbfd8fbcc82e1b948f896 SHA512 b9d68a06924f7ab80350844e6198325683461177aead73c288c1befc91341c4ebf3ae89438bae2d201d4159bcb873695a818a9bb9be6fef040e881e29be8ff01
 MISC metadata.xml 632 BLAKE2B a13213d0c3f132bada05993e9e392a744c33a178f576d712d8d2ec081283543519871182ca53b7c43d7dc10d95f22b76e56946afb73ff77c84ae96be75692c03 SHA512 ecc45c96e15df53bf48de473c0553b3fad1ca42b89b3f1f9059f49f5877e7f3dfdcb725c25b54fb64db910acb657c88cbead3a36ed60be4e4f8068ecafbd52a7
diff --git a/dev-python/prov/prov-1.5.0.ebuild b/dev-python/prov/prov-1.5.0.ebuild
index b3936572877b..ab392c1cbb9b 100644
--- a/dev-python/prov/prov-1.5.0.ebuild
+++ b/dev-python/prov/prov-1.5.0.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=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/prov/prov-1.5.1.ebuild b/dev-python/prov/prov-1.5.1.ebuild
index a9f32d021836..065a731d1acd 100644
--- a/dev-python/prov/prov-1.5.1.ebuild
+++ b/dev-python/prov/prov-1.5.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 64d17c770f19..4e4e3644bea8 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -2,6 +2,6 @@ DIST psutil-5.4.1.tar.gz 408489 BLAKE2B 867dd9b535134ff2ef5960f774891eb4743afc58
 DIST psutil-5.4.3.tar.gz 412550 BLAKE2B c12a8418e7a7573d23a2599c6a4df9a3aa3bbe6b9cbef9e0f48b0379944e2aa06ed498adfddc30e8d9ba8e02a08f79d4867dc1e313a62040ad3550d69d62664f SHA512 f2a0f3089c3436df52d509576795e1de14c4127918fbe63b8f116f7c097ba4d67e3b55a8da167a88c6ffd340bb443109d4887c03371810997ced4478b295f960
 DIST psutil-5.4.6.tar.gz 418059 BLAKE2B 84141bc30c4f8b9316f3dc1cd86409272af62c8b2d9269f6b4cb406ede59ba147cd7a1b78f7d176c5f98a4544a74c375699e44be36fb862219fd97d7b3efaa15 SHA512 7aefb2c1759a62fca21d1bd07f7f3aeddc368b972ce831dc6e52cda5effaee2798c6bf0aece9732dedb7fefcd8e9e3f03760d6e715be8ea1479b282150a585f3
 EBUILD psutil-5.4.1.ebuild 785 BLAKE2B cde5934a3398e2fccbc88f3001d7506a4ed0e6065c92a6d9dae96c54f6e27f93d455725504cec0a9f062f83f5e4d345873616588e5a3291dbf0f03b1fa13c154 SHA512 19a1193a10f25eb496e70d04f187d27af5260f7ca40316b1318c88133cd43bc05ccdacf45e424c167ae0fcb3543402ba15dd7a586444c62b1277e894e1925b7c
-EBUILD psutil-5.4.3.ebuild 796 BLAKE2B 16153d9a9658118a5fab1a6545222c64c1e5cddf259a687d8b5cf751939e8f27728dbde8d92f8985760955872157cfbec853f373eb8c3b668d64868a84f67c59 SHA512 c9397c3776f7aedfc615b4b1412a98e6dca9a2f157d0131cc1ca8d523939213ba0b8e636e4fa592d131593d368e05c004657109ada7bc739f3014eae2aae60ee
+EBUILD psutil-5.4.3.ebuild 797 BLAKE2B 0044cb1cc02e6fd6faa6f5608aa718810bd78c891e5794ee9abaff5efec7ec2b9945d562d2360a3f3845b80a2d2c0990a721b8172ee01ce1e78d1e33c9ca2c96 SHA512 b7449a7a99f7e522a24fff8d7c1e236e0870881f23f49de79f1a3f3a33a10fd1c87928828a7a925050609fab0d6daf38e0a2fc4e681b7d4fdfea12d452a00c59
 EBUILD psutil-5.4.6.ebuild 796 BLAKE2B 8d89ec0f9df2a222b1f8b4ed782ce834c1e17f528a04be7711fc62db8f2b120201ee34908ef686f6724510b5b97bbc42da59fbce5ecf5ac0dbc0c0425121f307 SHA512 a89e412600f2f04c0aab18ef987a14f10801fa9f90d73107f29f0532920615b5adb4b187b915ea33831b7608e06394549944b5d914f558e7555d59b6e7fa914b
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.4.3.ebuild b/dev-python/psutil/psutil-5.4.3.ebuild
index 6241bc775c7c..a72c036d6003 100644
--- a/dev-python/psutil/psutil-5.4.3.ebuild
+++ b/dev-python/psutil/psutil-5.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
index 572535064759..404d54a9145f 100644
--- a/dev-python/pydecomp/Manifest
+++ b/dev-python/pydecomp/Manifest
@@ -1,6 +1,6 @@
 DIST pydecomp-0.2.tar.gz 9819 BLAKE2B fc2078b00f152e598599b1fc4b1239035d1d21789689fb49605a4c3afb6d9201a1b1635d6f1971edf98fef8de02caeb6ea5e6bae1fe2b21f546e8a712ca94949 SHA512 1cec8ba501cf6223740c50751508a83f474a9acbce811c82f6d8beb5536ea8ce9c1d04a218503acd13b6eec8d9a68ef4b712049a7e0ae94ff34ba05c6f50ebc9
 DIST pydecomp-0.3.tar.gz 10009 BLAKE2B 2741dc776ac265a84daf4c68542e652c7e2663dff1561297057f3ac219805136ece32af3f33e0b03df0a9883663692fc3855490478c538a0edec838c90c1c4b6 SHA512 7935111f9d0629eb74f529a6427b9db3cac4c9c205f80b28380ab9c323ca9ad7b78b40f69a7760a5a69ed065e9d6ddd42d08fb8f2cb787f15d2ec6e88e20221a
 EBUILD pydecomp-0.2.ebuild 973 BLAKE2B a83d018c4cce344da3aebe2510497435f779ec19dea46693a87cd881d1232a20b70cae241bedf279ed9fac89332e1b7b0f6d7f8cd4c34d56060d7c452568673a SHA512 e936a0480345bcf53574250c1c6854d70a288c59f97d0d9ac136fc61d3377cf1899852db8fe2791758b50d45ea6a534a92c60befeded03a987ef7b92a2b5a6cd
-EBUILD pydecomp-0.3.ebuild 973 BLAKE2B 1815cbc724a88348a74672ced223ea2c82ca031486a37a4aee0eb48907eb02a6cb2016500423c4bb3c0ced1a6332b865c52dc3033e2b2081a986d8f9d6e192ff SHA512 3dd344415e65c8c1a0003f08126e27bf41fc2e45d7d2137ebc21922d6ca6bc0c64ffc892eaf307f35c1a6ad9be5f697a31af8f700af69589d39f607249e8f404
+EBUILD pydecomp-0.3.ebuild 965 BLAKE2B 7f6fb677a26173635b8cced81b31b369e742d683bf91d2a21ff61fdb94c07baf3324f378862b224f57b995276bd7f95fb7fbefe4b5cef3ac37583172ebd058f7 SHA512 46cdc2038ceb2350e0bd12d00c33011fe1748e4f32d932d82ac9cb662f922c568c4ecaaab31cc835af08fbfd7b9484d192e8ade3c97f03ec906ac0be0a4f7ea0
 EBUILD pydecomp-9999.ebuild 1245 BLAKE2B 5c48b6b1fa33d057cc201b7999a979ce7f35aec58200687f517ec2da8d8deb68b12c0da261b05e85de0b1ebf71aa94604e5d231fe561639cdedc4e0186137691 SHA512 20a1c836d6ae72ac091dcc801aa9f08916a53e94cd62c19c4e0c86b3fb3d621806e7f5871158d9e363bd7806c23e12fb4cc89cbab7c025e0a8de9a82ae83ca06
 MISC metadata.xml 796 BLAKE2B e83d6be3e1700f9be8b80c72d0d30868757a53d225df068d58991f945d7089a0769efe1fc7984f1a8a218e54d4a25b81c4a9ce7d2fbe28f2d65f9419b49a0d64 SHA512 ec96d316559404d556dee6f64807d44a4b201028000d4ba527743b2f6f18fbd3354e4dd5cf811512edf9bfc7cd1ea176bdb7c6ce1e04efc154b0f8f564c675c7
diff --git a/dev-python/pydecomp/pydecomp-0.3.ebuild b/dev-python/pydecomp/pydecomp-0.3.ebuild
index 415930a122d4..939c8f01532c 100644
--- a/dev-python/pydecomp/pydecomp-0.3.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 	S="${WORKDIR}/pyDeComp-${PV}"
 fi
 
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index ce7ba1d45d12..b026092bc162 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -3,5 +3,5 @@ DIST pyftpdlib-1.5.3.tar.gz 183189 BLAKE2B dd563f59ff21b2059e1c6d6ac6015561d5e0d
 DIST pyftpdlib-1.5.4.tar.gz 184986 BLAKE2B 6973b1f7e0fc0c89eb5d79e082690a706b56553ad4b2ece68a8216bb99c185d770475e349402ec71baf1bb06e5ecca5be2a3c52512f0d8283c4cc249bc28a949 SHA512 6eb308021dad28c1c51a88b366947a71b7bc1802571dc14cedf3a264bd0cb8504ef990d7e3110d10709f971d4d5b0001bee859b58fb4d02a1b0d46532acc9295
 EBUILD pyftpdlib-1.5.1.ebuild 1298 BLAKE2B 2b6ff8c9de74fc7e94720c6deecc32ac2303674f80230b7b2823f43c84755153f69d6c3254264a5b1f41ead167227b71fabca1341549765b045679686d9df1f8 SHA512 5c44d3dcb62a9b72e4773bb5eef46b69576924367db85de5a73977f187d0cf5c8023c0756b913dcc238d6e3ba16f62a06355fd74463bfbe716a900aa3eb86468
 EBUILD pyftpdlib-1.5.3.ebuild 1556 BLAKE2B 06acd30f37ed3409d5919bdb11cd0b85a38714ccc2c1cf87ec9af1565f848a80f7fe0bba91529b0719a19303073c75fd855e48e66ba46bc8eb704599225f9cd1 SHA512 dcc8187355c079c8d6f6e9ba485b2b07a4f1f0e0f6ff8bb22e0932d953b55b7c01f2dfde5f815dc868fe8e826c163a72d2c300d9cbb0c1aa48b39cc175a399d2
-EBUILD pyftpdlib-1.5.4.ebuild 2532 BLAKE2B b1e22c0efc70372050f63d95327596783599b166a140c55ffc715dcde3ecda41a57858124650cd6e63ba915f552db4cb4c4d2694bf4ee13bac917efac14b601d SHA512 1de4f111d69655019c6f4469f4e9ec2dc0ad3b077a55e09138c4721942494ae1c47e0eea77507516e11500dd7d3ea3f6f21f4472634c0be2a4b9c3891d5a1232
+EBUILD pyftpdlib-1.5.4.ebuild 2537 BLAKE2B 7489fe4ecb3af8814dd27c6a6ac27f4af84c72446b72e450aeccacd91fc7fad6d49567e3c45a32b245a975271b521d4b71414069ca94598ec6956a8b775de23a SHA512 abd0f037a7a135c6b186c3e9cd320ff11140e52b5a7104f4d3924a729dd8676fdb08bb6d183a8dd711a0ee986ebaf97105364c81ad4a279bcb066058a6074b77
 MISC metadata.xml 438 BLAKE2B 0e0860eb9d885ec9b432b504bef6a9394cf4a2d6d99751c80fec8441d8910f8a17364e5f32782638ac689abf5cdd3ebcb5fa20e7da3d612a5e8844e8c8a34d76 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
index 42917afc6ff8..aa9e67dd0599 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ia64 ~m68k ~mips ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="doc examples ssl test"
 
 RDEPEND="
diff --git a/dev-python/pyinsane/Manifest b/dev-python/pyinsane/Manifest
index 65dca05d7135..50f5fabaff73 100644
--- a/dev-python/pyinsane/Manifest
+++ b/dev-python/pyinsane/Manifest
@@ -1,5 +1,7 @@
 DIST pyinsane-2.0.10.tar.gz 327159 BLAKE2B ae63e08fc557513ccac0633fac47bb29b3c8a023c481289ec60724f5fcdae0827e02d5f37d3f104d454ebcb1d1a7681248866461bce6201f056c988f858aa0d3 SHA512 bb882ab51c1e6cea7cad75851ffe5918ee08467d4772d27c23a0c5ec9f2dea3ee7d83601ae35e56e2f717ff7683cec5a45aa47b2a4e167fe4dddb9db3229a3b1
 DIST pyinsane2-2.0.12.tar.gz 56107 BLAKE2B 81085e414f162c4fe3623e05b904c35864b95c8ceb5aa25cb92aa87086d4ee44f9f1bea58239373217e93793bfba0d8bb894ab75d69d6c213741cf6e53721284 SHA512 72fc87d5c7eab078f4a9694569c5759046587a8439820fadfe1b8899b7445e063f9fc2f3e93a86b1f9329f729466a5e19b86e46c128caf9ac8b143cfd9e17817
+DIST pyinsane2-2.0.13.tar.gz 57172 BLAKE2B 26081f7df1d4077f2580f8968c20a88092446136f441fab16a8bc1e34ffc9d5e11221c6a3f74a111f66f839d3cea5ed7518ebe4321b563cba1f3cb3a6053bf74 SHA512 613ea6aae00df550089a691ef6cdd00ea00324ad3a02e35bcb1cd1b0723e34afe9692828100115432e5df9c7bef09f861ce3e1d06915c02c007f92bc8030a91b
 EBUILD pyinsane-2.0.10.ebuild 851 BLAKE2B 2ec7f8ce75cc7cdece605e1f3dd68dba4e445f4958da926c1f5659d6381db94262f8020c3ab8c9c8d48035a120eb2a82ac59ede1d9f761d4dcbd4c3cf232f4b7 SHA512 14f5240f6080be599afe2cc902f4ee133adeb21292978024f132af70cffe69a069fff6527db1f4fc4fe5204425906e708f51f131dec38de74ad8a3d36ac9e649
 EBUILD pyinsane-2.0.12-r1.ebuild 804 BLAKE2B 6145e68a8b44d0770819b57a0e560193ac5c9b4d4924b83e4bf186d920f95aa5df26bdbb01cf152d43af7707e454e0b09ab31c9f85be3147fceb7f992e98881d SHA512 dfea1a0425b758da888a7949db79b646246104aabe1c4e94369a517dd0fe1b8c36a8fc30e9aa5372ab581c878e5d13809682284d2831e7d30599164b9b1fc46e
+EBUILD pyinsane-2.0.13.ebuild 806 BLAKE2B 9ad9902bd71e5182234fe06e93be47b6f4a46bcdff33b5b58ea35bfe130938ebad3055d930310433f2fbec35d15460c38eaa799a4bdbe808d7ce2e2c4bd87b64 SHA512 114ad968e00c4851d52e1b379dc2c4b93c85d992b534bf86072afbcc83b81ee953b51ec882859c4c16fa61e114e3a9b5c5ad5187081b2581f35a82e74d53a718
 MISC metadata.xml 970 BLAKE2B 66f9e22270e1f6bb94091085d49b6ee20aae2cc8c32e8e89b8325190b21932ce2431545b7bc72384ea2f82d9c71577d5ce08434dd2c9b237de9c7056307fc99a SHA512 1b5b839ca3e96ea99a6239cf6d5989710484b595405a3ce06192587984a0a5552bfbf0df770a3b986e078f4bbd27338d378f775cc0afdfa5bc4dc17190bf1e87
diff --git a/dev-python/pyinsane/pyinsane-2.0.13.ebuild b/dev-python/pyinsane/pyinsane-2.0.13.ebuild
new file mode 100644
index 000000000000..5048615b8a4d
--- /dev/null
+++ b/dev-python/pyinsane/pyinsane-2.0.13.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+MY_PN="${PN}2"
+
+DESCRIPTION="Python implementation of the Sane API and abstration layer"
+HOMEPAGE="https://github.com/openpaperwork/pyinsane"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="media-gfx/sane-backends
+	dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+RESTRICT="test" # Tests require at least one scanner with a flatbed and an ADF
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+python_prepare_all() {
+	sed -e "/'nose>=1.0'/d" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pymssql/Manifest b/dev-python/pymssql/Manifest
index 32517f7c110a..03410d83e69c 100644
--- a/dev-python/pymssql/Manifest
+++ b/dev-python/pymssql/Manifest
@@ -1,3 +1,7 @@
+AUX pymssql-2.1.3-DBVERSION_80.patch 451 BLAKE2B e9ab70a24db87e2f69eb502c491746ed3b83d5b50c8e87330c5e209c4f0b89d889fbba980721958db0fea2c2e0d944d7fd1692f018089946c8dd7c0d6f46ff58 SHA512 e596231f5d2ba6354b8e942d270079bb6ff65ff362640f99e631407107ec11e1f8c20097f9fb614066fde83dcd89d5c64181dddb9bf8c52f12b355e68f248f28
+AUX pymssql-2.1.3-remove-setuptools_git.patch 243 BLAKE2B 51f598a199867a6278518a0d204a3bfffcba662e22377d0b927e404a420a32a771a56ab23c99b8fa819b216e95efd8efdb8f61955da1ed79e64c84cb6b6634d1 SHA512 e8a24dfd4e4c6320ef854592d890a8e34870884ac05e0e60a52bd4e05f5eb7fbac86311da98d1ba8be2a55233788e070f7dfc529570c1cefe25471abbd22fa20
 DIST pymssql-1.0.2.tar.gz 175469 BLAKE2B a88c04be044478c2bec76a15e05ff751b961d253ca2e071ee8293c0899e091f96206a87486333f2543de609c7b38ff9e8a1a4ba7686625489bb9ed5c56e3cf19 SHA512 6e9a2d26f2cc33bac093f2a2a41771aa41ba336413076c793137558c05e48cea7409f74f35530939b36a708cc47c66ec0dc765a768bd5f857642553568fe859e
+DIST pymssql-2.1.3.tar.gz 897987 BLAKE2B e105dd8d5dbbad5de566b9179f799ad66eb420f60464e8061470b1abb6ecf38f35ad7992ded40f2cd62c76a8e04255eb647e30df5c9bc4059334a1d5d4677e73 SHA512 a659cb8f077ddbe5e8de0b9b118d8bcc0c87128c0be4ff14343983e7029594e63ba6fb8a88992dc1f058df3c1ebbbd69cf371bf95a0918954cd0cec14c1cb5cb
 EBUILD pymssql-1.0.2-r1.ebuild 627 BLAKE2B 033a138c490f0373131cecd00a81f4ac042c5ea437af90e42d391b44b7a8d93436fff830a2e0759bcad174f1d2b5bf024f5f3935cfb0aacfa47503cff86d056e SHA512 0cad3e6d596fb53a39be2560569fcca399d2fc26e171996d1882883823a219ce547f851c6883610b34b65dac90d89e2131b9b7b667ea1093f62668d500b45232
+EBUILD pymssql-2.1.3.ebuild 1105 BLAKE2B faf508613dfe959006d9a206c50c46a5db9619eb72e5619b7d6630413de40517427bfe2a6d6cca90960a4cd77bfd9a6e1f6b526a3c28420e429dca9241362e52 SHA512 8dd849c3b0ae835a401e670603e40809046a81cc67d243cb8d8c7c51d9d7c06ed7ad5be3ed74587fb3211a855229d46b23764869953ffcd5393d4f01038c7163
 MISC metadata.xml 396 BLAKE2B bc47cebbbeecb1c410ad5ffba2ebd275b9463e73f984ed9bac84720e3993365aca52a7b32a010c61a7e4e98e14b17aa3fdccf74692e327717fd1113ce087e263 SHA512 dea6de0ceb2f3661fad588992687c8bcda6204b731756390ad5d1a0f2ca2bcee77075e72b80f72a31ce681b57aafd830ffe984279cd8cfc96f520c04aa2e0eed
diff --git a/dev-python/pymssql/files/pymssql-2.1.3-DBVERSION_80.patch b/dev-python/pymssql/files/pymssql-2.1.3-DBVERSION_80.patch
new file mode 100644
index 000000000000..9d72a9817358
--- /dev/null
+++ b/dev-python/pymssql/files/pymssql-2.1.3-DBVERSION_80.patch
@@ -0,0 +1,13 @@
+--- a/_mssql.pyx
++++ b/_mssql.pyx
+@@ -34,6 +34,10 @@ DEF EXCOMM = 9
+ # Provide constants missing in FreeTDS 0.82 so that we can build against it
+ DEF DBVERSION_71 = 5
+ DEF DBVERSION_72 = 6
++# See /usr/include/sybdb.h - DBVERSION_80 is not defined in FreeTDS 1.00.13
++# (cf. http://www.freetds.org/userguide/choosingtdsprotocol.htm)
++# 8.0 was actually 7.1 so set it to the same value
++DEF DBVERSION_80 = 5
+ 
+ ROW_FORMAT_TUPLE = 1
+ ROW_FORMAT_DICT = 2
diff --git a/dev-python/pymssql/files/pymssql-2.1.3-remove-setuptools_git.patch b/dev-python/pymssql/files/pymssql-2.1.3-remove-setuptools_git.patch
new file mode 100644
index 000000000000..1a35cc064f78
--- /dev/null
+++ b/dev-python/pymssql/files/pymssql-2.1.3-remove-setuptools_git.patch
@@ -0,0 +1,10 @@
+--- a/setup.py
++++ b/setup.py
+@@ -472,7 +472,6 @@ setup(
+       "Operating System :: Unix",
+     ],
+     zip_safe = False,
+-    setup_requires=['setuptools_git'],
+     tests_require=['pytest', 'unittest2'],
+     ext_modules = ext_modules(),
+ 
diff --git a/dev-python/pymssql/pymssql-2.1.3.ebuild b/dev-python/pymssql/pymssql-2.1.3.ebuild
new file mode 100644
index 000000000000..2f0c0f3a690d
--- /dev/null
+++ b/dev-python/pymssql/pymssql-2.1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple MSSQL python extension module"
+HOMEPAGE="http://www.pymssql.org/ https://pypi.python.org/pypi/pymssql"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+# tests need a running instance of freetds
+RESTRICT="test"
+
+RDEPEND=">=dev-db/freetds-0.63[mssql]"
+DEPEND="
+	${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.3-DBVERSION_80.patch
+	"${FILESDIR}"/${PN}-2.1.3-remove-setuptools_git.patch
+)
+
+python_prepare_all() {
+	# delete stale cython .c file
+	# this can cause issues with the patches
+	rm {_mssql,pymssql}.c || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
index 40e56a4774da..b11308e9024d 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -1,5 +1,7 @@
 DIST pyocr-0.4.7.tar.gz 1283774 BLAKE2B 0c4958882c350ee9e71f956694c180097607ca1c9e75b2886185361013f6038fd584a73de63de80546354de4023c6a8b1a589205f2e0c9165904d4fd3881b9f8 SHA512 ee4433c34058e0c79478dbf4276f55dabadcf5c841e86e1988e574bf91d96b96a314ef5e15047fb510737c956b4deed200eb47799de6fb1c021e407a6d49c192
 DIST pyocr-0.5.1.tar.gz 17525 BLAKE2B 0f2d6383fe59fae2f3f0c7abb185e8a1c4ddfab7e5cd219cff56fa8c2b9b690ab696ea2fada91ea66060ea8d8e71a7d0cfa38a9ddc7bb8fc3ffc05ae0b1a304f SHA512 829c4d4591931a4823e5d328df05a950bf65b4ff38a899ffa1c1f8e57fa031bcf68e22e18828681e285758a4be14097f7344b95c169e64206743c2521a81776c
+DIST pyocr-0.5.2.tar.gz 17532 BLAKE2B 0bd47a52379cbdf5d2a7c1a5a966596101101a7750458e317287835a857bfd2ff18fec4b6648a62a78db138038f4aee047135909a4486fd6b720c4508972cc5d SHA512 81f66e9c98b934392bb847b18bff88843fe43212499bb550894264aaef810312bc097c5cfa898e06323ce320cc73002ff632fa5767d36704d28b27eb4d0ace6c
 EBUILD pyocr-0.4.7-r1.ebuild 761 BLAKE2B 92b5e1aada2a0c2f61e59ef14539df4469685ceeb0e474d1f1f155580b6df47f4b0720b7a755648e176d5ae53969ebf800f16c6526cb8ccf414c5b3bcf917f91 SHA512 68050ad1419fce72d68b419e3d0a0ef8a14acd330408ddab125bffc144d30710de49f3603cd0a3079f2b74fda0956d6d62e56137e9f182cb6d1163960e122d97
 EBUILD pyocr-0.5.1.ebuild 677 BLAKE2B d8ee6981fa35467a4b2eee7d349c25f13eef3a8949bcaf82fb9331047cf692715a9072b9f7867bd5e62c57f2a53ec385f90e0ad5bbaf5212a475c89edcbb4f91 SHA512 b83da4ea5d3ecbef645f8249af4162a70441a9c2f4ce928e0b62dd897aaf5c81e3961f4c2d84c793be3e7c5c5f9c07b1313cdb736a9b4b1c21613cf2acde6233
+EBUILD pyocr-0.5.2.ebuild 679 BLAKE2B 8c7e4136251eac927fa72d7d12aaac341d6c77568cbe7a6a95123a8ae36a5646388fcd1702ec973fca97a95212734eb0f98d1769f905971a294e78cbd5a916f3 SHA512 8dc96807a2f6402f58dafde3f55ffc1b111426439aa1a29066c3439c1b30f126decd755217f245f41ecade68f5648cd8fd32cc48dbfc918e98ce8019c3339a7e
 MISC metadata.xml 1111 BLAKE2B 600c0dd7b6bd10906b03db7aa0963b440eb5cd8f2f06a4a8672e0f63960838881d735fb2268f652dcc1a4bf865fb71eef6bba888c0ee72c88d472c0184c80889 SHA512 ff3ac9646095f8434423a5fe098563c7662dc447be9ba395879d5b66dc76236898e94964cfc2f5034b2bbd08caecc3635adec65369dbb5c21ce1ae2e23fb7cbf
diff --git a/dev-python/pyocr/pyocr-0.5.2.ebuild b/dev-python/pyocr/pyocr-0.5.2.ebuild
new file mode 100644
index 000000000000..f08810e858da
--- /dev/null
+++ b/dev-python/pyocr/pyocr-0.5.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
+HOMEPAGE="https://github.com/openpaperwork/pyocr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+IUSE="cuneiform +tesseract"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="cuneiform? ( app-text/cuneiform )
+	tesseract? ( app-text/tesseract )
+	dev-python/pillow
+	dev-python/six"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="|| ( cuneiform tesseract )"
+
+RESTRICT="test" # reguires tesseract[l10n_fr,l10n_en,l10n_jp]
diff --git a/dev-python/pyqwt/Manifest b/dev-python/pyqwt/Manifest
deleted file mode 100644
index aa148d242a23..000000000000
--- a/dev-python/pyqwt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PyQwt-5.2.0.tar.gz 2670893 BLAKE2B bcd0e0c427abcc5713c3c7af8e3cb39511708b7219af99de0bf31c47117f7e5a3a9e45a1ae19ed6b5bd81d279c2332117ebfa5aee689d873320967f4c4164e54 SHA512 8c409ee228d91d625bf9bd8a5704c3d41f70613b420bc8f1527312dd1ebb686b8482bd68c4b3d1a72edd80673533a4f5a39378221967bea70f389c9dde14f265
-EBUILD pyqwt-5.2.0-r2.ebuild 1908 BLAKE2B ad606e22fb8f7a84857f6efa8a68902fbc51fc546c453000aee52096708893788107ce1a580cf4f4e4528802202e1393a5ff75e1d9ea175bf61c1d54978c1215 SHA512 dbb4f839326ebe507a3fd40837a2ad19052e70f5a8c6964c1d07bf99cfd7435d31c6bd8f8b5770f057d8010b724e2055aa53cec515d74c43c09d60f9d78e2f57
-MISC metadata.xml 662 BLAKE2B 62958f01cf277a49926891023f0fd5a693fe6197b4be0ce57d24006bf62239f01fa76281a13e7589f7b3d5addc9143fce46fab0f8018f03f2f5a9d59131a00a5 SHA512 dd9c021d0b2bc9b51d1952643bd7ca475786914fc1ddf125212cfb2450cf1fb930491e47cd0182521a10f975f30770d109f5bdf5c53ae8648257b2a485119fb4
diff --git a/dev-python/pyqwt/metadata.xml b/dev-python/pyqwt/metadata.xml
deleted file mode 100644
index 7f74fabb62c0..000000000000
--- a/dev-python/pyqwt/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		PyQwt is a set of Python bindings for the Qwt C++ class library which
-		extends the Qt framework with widgets for scientific and engineering
-		applications. It provides a widget to plot 2-dimensional data and
-		various widgets to display and control bounded or unbounded floating
-		point values.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">pyqwt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild b/dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild
deleted file mode 100644
index 5f7e7a760269..000000000000
--- a/dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qwt library"
-HOMEPAGE="http://pyqwt.sourceforge.net/"
-MY_P="PyQwt-${PV}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-SLOT="5"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ia64 x86"
-IUSE="debug doc examples svg"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/PyQt4[${PYTHON_USEDEP},compat(+)]
-	dev-python/sip[${PYTHON_USEDEP}]
-	x11-libs/qwt:5[svg?]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}/configure
-
-src_prepare() {
-	sed -i -e "s|configuration.qt_dir, 'bin'|'$(qt4_get_bindir)'|" configure.py || die
-	python_copy_sources
-	append-flags -fPIC
-}
-
-src_configure() {
-	configuration() {
-		local myconf=()
-		use debug && myconf+=( --debug )
-
-		cd "${BUILD_DIR}" || die
-		# '-j' option can be buggy.
-		"${PYTHON}" configure.py \
-			--extra-cflags="${CFLAGS}" \
-			--extra-cxxflags="${CXXFLAGS}" \
-			--extra-lflags="${LDFLAGS}" \
-			--disable-numarray \
-			--disable-numeric \
-			-I/usr/include/qwt5 \
-			-lqwt \
-			${myconf[@]} \
-			|| die "configure.py failed"
-
-		# Avoid stripping of the libraries.
-		sed -i -e "/strip/d" {iqt5qt4,qwt5qt4}/Makefile || die "sed failed"
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		cd "${BUILD_DIR}" || die
-		default
-	}
-	python_foreach_impl compilation
-
-	if use doc; then
-		cd "${S}"/../sphinx || die
-		emake
-	fi
-}
-
-src_install() {
-	installation() {
-		cd "${BUILD_DIR}" || die
-		emake DESTDIR="${D}" install
-	}
-	python_foreach_impl installation
-
-	cd "${S}"/.. || die
-
-	dodoc ANNOUNCEMENT-${PV} README
-
-	use doc && dodoc -r sphinx/build/.
-	if use examples; then
-		docinto examples
-		dodoc -r qt4examples/.
-	fi
-}
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
index 7eee9141580a..d2314ee4e5cf 100644
--- a/dev-python/pysendfile/Manifest
+++ b/dev-python/pysendfile/Manifest
@@ -1,4 +1,4 @@
 DIST pysendfile-2.0.1.tar.gz 19315 BLAKE2B ac5776069de0228d5103053e82786b499478dc3cad57b1f74ede3b8b8724abb780c5b51cf8578ebece7a12ce269b7a9b5bc72f08409077bbce2d4daf63046119 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c
-EBUILD pysendfile-2.0.1-r1.ebuild 581 BLAKE2B 0c5cc1367734424a69a5419947a83fac94a6f37686b4c489570111f91cb55c65da5bb1950428f6b2ec8c0566fa7d6ab2b0c0794367fe18adb989ed7a2ba25b6e SHA512 6f647fc1538ed4d9f4d2f2d00558d386116f2774053d1f225dafa841bc32b9d7d1c56da6dc73584b6805d5f2f168a8db25cf588daaf5bdad41e4b79181c65d21
-EBUILD pysendfile-2.0.1.ebuild 562 BLAKE2B d1c7f2b6b2e424cf0f38f858ea337be3a42aa5c22acf5d8cdf2f9b3065df4030dd83eb84258e9222ebcd745cfd786b3165693efa67fdf31739c21680be5fa759 SHA512 03b5e142c2aa7df7edc17ad986d2963ae7e049216d72ccab470cf605facaef524fd85ec7ab8f0292b52ddfcfe49a32394f297fa56a1de9f6d60a5387a47f314c
+EBUILD pysendfile-2.0.1-r1.ebuild 586 BLAKE2B 882be1f0a1d69baacd00a0ac1ed66be6ce9dd017c32548b6ed7928164b42988012a1dcc23023b06fc1f67f78c850b9f5ac32449d2fc8ca361266b8609268c210 SHA512 1f4735b6ec13e98f72e09af5e542bed6b9a37dd8eb126025ddba439c143dc528c060ef3c71da2b0bf0a33104736eee899b53b31aad00c67c5b0b4c191e2994d2
+EBUILD pysendfile-2.0.1.ebuild 567 BLAKE2B b071915390e5739a591d8703af5b1c4cc8d4e78371b10a1a4d401af7ce4b26c77f0272e95205ba70a20ee2cbef781ef60072e8162ae03629cd2714ccd3ba62ed SHA512 36051d486ff4c95158ee66736b2c7a08b16312dde5a8a585986f2071944b77298aac156be1a1cf18755ac38d46d586d470e1532472d9f5d86b4cfc9d95d51d84
 MISC metadata.xml 461 BLAKE2B 30a174cb9b4196658e94e080e4aad73dbfd3f28bc9c5e0d966672b1d811a6d85cdabf97faa07c89a4a868f2494c46da07f6601c0f08a292f1cd00df3b95e42ae SHA512 1b76475c93a4462264ff4ee5f9b1b3da11fe666f80fbd47322e64f981d3c2ee4d7817fe3d3ef151b991f04fd9353d0b6dda9fe80f732409415fb6d7b0146e17f
diff --git a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
index 6add938cfbae..ee659460f47a 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A python interface to the sendfile(2) system call"
 HOMEPAGE="https://github.com/giampaolo/pysendfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pysendfile/pysendfile-2.0.1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
index a01300668133..f1cdccae5d39 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A python interface to the sendfile(2) system call"
 HOMEPAGE="https://github.com/giampaolo/pysendfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ia64 ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ia64 ~ppc ppc64 sparc x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pyside/Manifest b/dev-python/pyside/Manifest
deleted file mode 100644
index 7974d6229f7f..000000000000
--- a/dev-python/pyside/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX qgtkstyle-1.2.2.patch 1650 BLAKE2B 2a4ca1585ced2341420b4b1857390be0ac462c7137f4ac780c810e853c92e907345d316863ed5e27b200531c40992ebd996cef55c4412b9adf9144aced7ff021 SHA512 ee039cc67bf00ab43d3c6355e7b3e01d753049b2384e23c1a15f78c119b2e85f16b7bb36f0b775bc7d544674161e94eb36265b6590e3b7e593da3b131004bccc
-AUX rpath.cmake 393 BLAKE2B 5e67bc306f6f16b7ea10d223d41f77bd12d4dceae5d7aaa2dfe96caa989412e52accf66061bdf2fe3abf9bed193894f5dffa87280ac13be54a0849a13d3f36c4 SHA512 b9f2d3b34fd31a7e289e3aa1c96110f92bc66f45e5bfaf796f86d52eb832e960caca0e314b87248d0a41c13c95f04402607cbb5ad7d0b3238d5bab5580c3a65f
-DIST pyside-qt4.8+1.2.2.tar.bz2 3765472 BLAKE2B bd28e196b01ddbbe6f005453ec7504d90b3f3789ab17faf1eedd78f5b05cefd1926f8df8261093d4acef429a04fa81bf9e02e83f01bfe2a3e58f18dd07568f57 SHA512 3a1d46c48ac71c3b138e1dc398d1d2a87aff558eace275303e233f78d03e32c6d53cf390db5e7112f44da9b17aa88ed16a30f6f83b2073c1f494e61b962e4c46
-EBUILD pyside-1.2.2-r2.ebuild 3617 BLAKE2B 059869cecc4e9e441d7e9fe5e3b3116cf76b7bd9cccd8418e05ae4b3e6dca98af6f20291d85e690b8d3e9933f2c32976c3f8f9d389e16428f7013cee5895b66b SHA512 81fabb94734f4a4b4f2e51c36fd8f39030a9d1ab22bd1b4f4d94a5943344bde5ed0ab975b8564a054406c75ff5557fcb9fdc294d9fcce3c49342f0afe11cd63b
-MISC metadata.xml 968 BLAKE2B 2bf7a2cd99949a03cc20f02fd9efd971d961d085c96f7ed3271edf827e788344e942440948f33f56572c45537afdb5eae5efb7d9a230350bdfa49f20ec90f6f3 SHA512 9d01808c11a691c0bdaceec69b067bbfe395cc1d1c6491a2cebf9269462c169f5ff2a6c511855fc760563356f1bba65f2b835de663f4ec11fe7eb2e3ed6dd680
diff --git a/dev-python/pyside/files/qgtkstyle-1.2.2.patch b/dev-python/pyside/files/qgtkstyle-1.2.2.patch
deleted file mode 100644
index d782276aba68..000000000000
--- a/dev-python/pyside/files/qgtkstyle-1.2.2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt
-index 6e14706..bd60775 100644
---- a/PySide/QtGui/CMakeLists.txt
-+++ b/PySide/QtGui/CMakeLists.txt
-@@ -71,7 +71,6 @@ set(QtGui_OPTIONAL_SRC )
- set(QtGui_DROPPED_ENTRIES )
- check_qt_class(QtGui QAbstractPageSetupDialog   QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
- check_qt_class(QtGui QAbstractPrintDialog       QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
--check_qt_class(QtGui QGtkStyle                  QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
- check_qt_class(QtGui QPageSetupDialog           QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
- check_qt_class(QtGui QPrintDialog               QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
- check_qt_class(QtGui QPrintEngine               QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
-diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
-index 711d7cc..954aa54 100644
---- a/PySide/QtGui/typesystem_gui_common.xml
-+++ b/PySide/QtGui/typesystem_gui_common.xml
-@@ -6996,16 +6996,6 @@
-     <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
-   </object-type>
- 
--  <object-type name="QGtkStyle">
--    <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const">
--      <modify-argument index="2">
--        <replace-default-expression with="0"/>
--      </modify-argument>
--      <modify-argument index="3">
--        <replace-default-expression with="0"/>
--      </modify-argument>
--    </modify-function>
--  </object-type>
- 
-   <object-type name="QPageSetupDialog">
-     <enum-type name="PageSetupDialogOption" flags="PageSetupDialogOptions"/>
diff --git a/dev-python/pyside/files/rpath.cmake b/dev-python/pyside/files/rpath.cmake
deleted file mode 100644
index b896c8789185..000000000000
--- a/dev-python/pyside/files/rpath.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-# use, i.e. don't skip the full RPATH for the build tree
-SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
-
-# when building, don't use the install RPATH already
-# (but later on when installing)
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-
-# add the automatically determined parts of the RPATH
-# which point to directories outside the build tree to the install RPATH
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml
deleted file mode 100644
index fafc4012082c..000000000000
--- a/dev-python/pyside/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<use>
-		<flag name="X">Build QtGui and QtTest modules</flag>
-		<flag name="declarative">Build QtDeclarative module</flag>
-		<flag name="designer">Build QtDesigner and QtUiTools modules</flag>
-		<flag name="help">Build QtHelp module</flag>
-		<flag name="multimedia">Build QtMultimedia module</flag>
-		<flag name="opengl">Build QtOpenGL module</flag>
-		<flag name="phonon">Build phonon module</flag>
-		<flag name="script">Build QtScript module</flag>
-		<flag name="scripttools">Build QtScriptTools module</flag>
-		<flag name="sql">Build QtSql module</flag>
-		<flag name="svg">Build QtSvg module</flag>
-		<flag name="webkit">Build QtWebKit module</flag>
-		<flag name="xmlpatterns">Build QtXmlPatterns module</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-python/pyside/pyside-1.2.2-r2.ebuild b/dev-python/pyside/pyside-1.2.2-r2.ebuild
deleted file mode 100644
index 317dd053bee2..000000000000
--- a/dev-python/pyside/pyside-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils multilib python-r1 virtualx
-
-MY_P="${PN}-qt4.8+${PV}"
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="http://wiki.qt.io/PySide"
-SRC_URI="http://download.qt-project.org/official_releases/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="X declarative designer help multimedia opengl phonon script scripttools sql svg test webkit xmlpatterns"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	declarative? ( X )
-	designer? ( X )
-	help? ( X )
-	multimedia? ( X )
-	opengl? ( X )
-	phonon? ( X )
-	scripttools? ( X script )
-	sql? ( X )
-	svg? ( X )
-	test? ( X )
-	webkit? ( X )
-"
-
-# Minimal supported version of Qt.
-QT_PV="4.8.5:4"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}[ssl]
-	X? (
-		>=dev-qt/qtgui-${QT_PV}[accessibility]
-		>=dev-qt/qttest-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	phonon? ( media-libs/phonon[qt4] )
-	script? ( >=dev-qt/qtscript-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV}[accessibility] )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtgui-${QT_PV}
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( ChangeLog )
-
-src_prepare() {
-	# Fix generated pkgconfig file to require the shiboken
-	# library suffixed with the correct python version.
-	sed -i -e '/^Requires:/ s/shiboken$/&@SHIBOKEN_PYTHON_SUFFIX@/' \
-		libpyside/pyside.pc.in || die
-
-	if use prefix; then
-		cp "${FILESDIR}"/rpath.cmake . || die
-		sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die
-	fi
-
-	epatch "${FILESDIR}/qgtkstyle-${PV}.patch" # bug 530764
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_disable X QtGui)
-		$(cmake-utils_use_disable X QtTest)
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_disable designer QtDesigner)
-		$(cmake-utils_use_disable designer QtUiTools)
-		$(cmake-utils_use_disable help QtHelp)
-		$(cmake-utils_use_disable multimedia QtMultimedia)
-		$(cmake-utils_use_disable opengl QtOpenGL)
-		$(cmake-utils_use_disable phonon)
-		$(cmake-utils_use_disable script QtScript)
-		$(cmake-utils_use_disable scripttools QtScriptTools)
-		$(cmake-utils_use_disable sql QtSql)
-		$(cmake-utils_use_disable svg QtSvg)
-		$(cmake-utils_use_disable webkit QtWebKit)
-		$(cmake-utils_use_disable xmlpatterns QtXmlPatterns)
-	)
-
-	if use phonon && has_version "media-libs/phonon[qt4]"; then
-		# bug 475786
-		mycmakeargs+=(
-			-DQT_PHONON_INCLUDE_DIR="${EPREFIX}/usr/include/phonon"
-			-DQT_PHONON_LIBRARY_RELEASE="${EPREFIX}/usr/$(get_libdir)/libphonon.so"
-		)
-	fi
-
-	configuration() {
-		local mycmakeargs=(
-			-DPYTHON_SUFFIX="-${EPYTHON}"
-			"${mycmakeargs[@]}"
-		)
-		cmake-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	VIRTUALX_COMMAND="cmake-utils_src_test" python_foreach_impl virtualmake
-}
-
-src_install() {
-	installation() {
-		cmake-utils_src_install
-		mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl installation
-}
diff --git a/dev-python/pysmi/Manifest b/dev-python/pysmi/Manifest
index 44d838bd8a50..77aa88353f4c 100644
--- a/dev-python/pysmi/Manifest
+++ b/dev-python/pysmi/Manifest
@@ -1,3 +1,5 @@
 DIST pysmi-0.1.3.tar.gz 78325 BLAKE2B 8f82d86e096a47944eccbd4b7ef846f3d9ca155f3f6e0790eecad88cf872c20a725a4071c8c2b9295fc348fa20efbd41ae7d0479cbd4ffe054e9956a6b6784f1 SHA512 d321fbbc68e4b6b2b18de5c1215dc450ad2ba2ea6c70cbeee9d981d2e2106b59582eae42b09da72bc02af789f7f58a6fc97712869b74f0137d8f7fd7238b2211
+DIST pysmi-0.3.1.tar.gz 93003 BLAKE2B 91fa382aa693d8849299baf27a2fe10116441cc0661aa553321d9b5584e64751df547172f185e207a7eb0c6438ded60a0acef5aa51263cc1f29219dd8cdef2fc SHA512 b7ffff85689a1f99c53fdfecaed3d9dc1b5c3685388695e715cde9b42eb8511aac8a47b04dcce243c0fb09a4823a799d80a0033ed576637356b991c71bc660c8
 EBUILD pysmi-0.1.3.ebuild 439 BLAKE2B 9d977dd1368370e1549ac36614f38943ede20798e7bc279786d8fd664000ae791f5ee9f2681153fe9be5b0ab6b5de1b467b2fd51cd1789cd2c68b94b03b8689d SHA512 919196ad08b77275338c2851880751a28682c8ce44169c35353a2e5e70510fe37b8d33417fab8999515459e0c0692ac13c65515ec0fb9daea8e92b72ee5ebc1d
+EBUILD pysmi-0.3.1.ebuild 441 BLAKE2B 5c254584b769065c89bcddc09e65a4f1caa64c475292ecf55c8433e8a9920463cba79ae7b957fdde5d0067ca7e56249b4b13fff542ef0479bfc31c840c9ee36b SHA512 da3624a3ba5dbeeec6090d5694e32a2853672590c490c93f3346f17507b4fddf2fc770cc8c41dba6478346151b61cbe76868511bf3895307b464616879392b18
 MISC metadata.xml 358 BLAKE2B c89fc0ed9212d67a3ac2992ec231ee3a26c473e19e317ab3c0bb1002212838299a55ec6db99950d852c6760941e5c698f04db2213544ce9089303519a38e8c79 SHA512 f7a17e837c410ac604a0e1b4493c7219846a8c8cbcd5b4fb84ffc401b98c8eeacba4731dabad6f61bf1e4f172157c174d6a039725174e2f58b9dfbb89998635d
diff --git a/dev-python/pysmi/pysmi-0.3.1.ebuild b/dev-python/pysmi/pysmi-0.3.1.ebuild
new file mode 100644
index 000000000000..c583f95f2379
--- /dev/null
+++ b/dev-python/pysmi/pysmi-0.3.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2017-2018 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 distutils-r1
+
+DESCRIPTION="Python Lex & Yacc"
+HOMEPAGE="https://github.com/etingof/pysmi"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/pytest-describe/Manifest b/dev-python/pytest-describe/Manifest
new file mode 100644
index 000000000000..daa833aca4c9
--- /dev/null
+++ b/dev-python/pytest-describe/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-describe-0.11.1.tar.gz 7226 BLAKE2B 5cbe722d1187fa67424e5c932eee7fc90335e6811d7493372515b44d4210d0de4b4d8f33f1583ac1ae400d91d9fb9795b2952a56fc6c2865ab450af279e45c09 SHA512 0634f17ca36f8fa346a6001338827d70dda410376660f370ba04b8857d37e009c5e33f06baee51d1c23a13094c88850668028f5d44a09c31b40baff0bfdaf1ef
+EBUILD pytest-describe-0.11.1.ebuild 869 BLAKE2B 0323e3bc746e2eef402091fa06db58d2b0c4460d6775f4a938d05942bbc3b61da4117595534d4290023a4d55a5d077a07e616f470b82543b42756b56eb51b9ae SHA512 e0e3f84ff35cde22d421ca7730b075301f19e6f0d89cfaff3acb021f325645c4816a584015678a81f022e0bfe285e109a677af61c0a4aa649d561c17abc203c8
+MISC metadata.xml 379 BLAKE2B 5e73cfba60df9af4e4452172c35e7ba311b0f4adf05e4ea64ad936d33eaa540084593eeae26190607ac6d1e66878d54a79663bfd1a8e67a46fa99ab86f7c8a4e SHA512 3bd074c7380538441d32f94f960f99db2c7a6b3815d22d560d8a973e11eac75064ff687442a92afbfa1282e70ff10570546497e1f4e10996fe836e9858b97460
diff --git a/dev-python/pytest-describe/metadata.xml b/dev-python/pytest-describe/metadata.xml
new file mode 100644
index 000000000000..91c491d48379
--- /dev/null
+++ b/dev-python/pytest-describe/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-describe</remote-id>
+		<remote-id type="github">ropez/pytest-describe</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-describe/pytest-describe-0.11.1.ebuild b/dev-python/pytest-describe/pytest-describe-0.11.1.ebuild
new file mode 100644
index 000000000000..a875b33d9f8e
--- /dev/null
+++ b/dev-python/pytest-describe/pytest-describe-0.11.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Describe-style plugin for py.test"
+HOMEPAGE="https://github.com/ropez/pytest-describe https://pypi.org/project/pytest-describe"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.6.0[${PYTHON_USEDEP}] )"
+
+python_test() {
+	# We need to disable some plugins because tests don't like unexpected
+	# output
+	PYTEST_ADDOPTS="-p no:flaky -p no:capturelog" pytest -vv || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index ab247c1e7d21..7edadd2a84ea 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,7 +1,7 @@
 DIST pytest-mock-1.10.0.tar.gz 20754 BLAKE2B db60bfe6ee9d6d0a6ee4f0df7f5efa6ef05f5e2360945aa86ff6de02fc6a01f1e6715cbb61ced0c1e737c300965835fb08727b926852c5b71c0cc3d56c1171f1 SHA512 b8afba13da3e598b6493459298e395c0ecc06538733916659191bd5c5c22f40b0e296853ad940c16a6d492fcf46b2daf490ee589661d391e2c7cd1deb84da756
 DIST pytest-mock-1.6.0.tar.gz 17780 BLAKE2B 4fbc0cbd951668eb2ce427496c54e958591fe368bd42544eb1d0379adcb3d0e10b223ab044956e4003aac88665b3132dcb9d167442d6d85a5be79edea36881ca SHA512 c3b897be9156d57d7012e95b620c543500b849d7076224e3328d3783311210c57141dfb82c01bb98e5e419125dce0f68f6631bd610f4909f5ac1798458a7949f
 DIST pytest-mock-1.6.3.tar.gz 18482 BLAKE2B 1c0d366e5afd1b247ff454716b6d96d9d68846adfff81adc0ea079a72d3e7710fd9385122723cfee69965588235ec2deb1e0b52328ace5c967652c93b404cea3 SHA512 6857f373728d3f2c6b152d4f89da3590e2e74795695dc9f4f3704a4e0250e49d705ce0de4121a801ac35c83217678a95a5023338124293ca74db406941f5072a
-EBUILD pytest-mock-1.10.0.ebuild 1028 BLAKE2B cbd60a3bcee5a94bd6d665b10e6652dec896ee8b678f07d0e8dcc2629447646a3f2c5ab3607b0b00c023b5f49eebb1825f7e49455280e84921f98400558260ac SHA512 cbbc0dd41de2e126585dec4d5033192e42ea151906dfb05043eb0af54e663134e4b1d62ac455119eb802b7361bb8b7c8c975da028a7e1ea9765971d195c7d8ac
-EBUILD pytest-mock-1.6.0.ebuild 1068 BLAKE2B 001bdcb3d8aa15ae46ccae85fabebdae90cbdc7e9f3a804f05c4984daa0532b39b2d738a36c8b154ff03469b673a3c6d424775de4c277aaac59857671bb831b8 SHA512 712dd100338130ab0306632b7832dee14fffee2de39d3b785b6cf0b4ca2b447fd09fc75fb7c4f714702aa6b8094168178b3a7b71ee7b3e7a42921fe459f4eec4
-EBUILD pytest-mock-1.6.3.ebuild 1028 BLAKE2B cbd60a3bcee5a94bd6d665b10e6652dec896ee8b678f07d0e8dcc2629447646a3f2c5ab3607b0b00c023b5f49eebb1825f7e49455280e84921f98400558260ac SHA512 cbbc0dd41de2e126585dec4d5033192e42ea151906dfb05043eb0af54e663134e4b1d62ac455119eb802b7361bb8b7c8c975da028a7e1ea9765971d195c7d8ac
+EBUILD pytest-mock-1.10.0.ebuild 1035 BLAKE2B b131ad6a83ca92eb5b27e09f9fbb5875ef31f55d3c36aca27c8b4106b0ab8dee99b847316a94b8f9a75879dc4952685823c0ef1ec65e43295970011792112cc6 SHA512 d44cb185efb1ebf8535080c4ae3b819b71ab91584dfc5b6991bbcd9b470e9c55e45f3406e4a24310a1c838be6572bcdef6b818cc6c4eff45be6ba338d8ceca85
+EBUILD pytest-mock-1.6.0.ebuild 1075 BLAKE2B 09d374f8f78814ae45b1fb46373184d1f30113489ad48095f992fcc5dd34560b71428f5e328c8042bfe8df10a62a2a87e5a2045da3e5eee958d07bebbf609700 SHA512 64b7e02473459b1e6073471d160d044dec734d02c902f93ec2aa9ca4b94246906c2cfb08fa84d10225d7265a7f1e0cba3f8ec86ce6fa20eae162a83d8150643d
+EBUILD pytest-mock-1.6.3.ebuild 1035 BLAKE2B b131ad6a83ca92eb5b27e09f9fbb5875ef31f55d3c36aca27c8b4106b0ab8dee99b847316a94b8f9a75879dc4952685823c0ef1ec65e43295970011792112cc6 SHA512 d44cb185efb1ebf8535080c4ae3b819b71ab91584dfc5b6991bbcd9b470e9c55e45f3406e4a24310a1c838be6572bcdef6b818cc6c4eff45be6ba338d8ceca85
 MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
diff --git a/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild
index ca329f1b7442..9d4c6a64c17b 100644
--- a/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
index 80f4d4912349..6f2a5058e022 100644
--- a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.6.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
index ca329f1b7442..9d4c6a64c17b 100644
--- a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index d943eedb105c..4c6e9f777556 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -9,5 +9,5 @@ EBUILD pytest-3.0.3.ebuild 1966 BLAKE2B 50b123408a85c5b283fe1653444472fd467272d9
 EBUILD pytest-3.2.2.ebuild 2113 BLAKE2B 1789686fa508f9629adc37e7fcd26e8a4426214b6335922927bcd8bb37c336792b564ce505c122a729edfaa53af604e4fd1be31f45c5251f0008e14c8cefb06c SHA512 1384082815df0f30e50881c89d81822575509f1333c2d3713b69ff7e3a9113c1a70fa5220d0e10bae0b5f17d844a14501e59af8c944ca4006dfeb9cd0e8616b1
 EBUILD pytest-3.4.1-r1.ebuild 2297 BLAKE2B 52af333554c85fff95f0bffe2246cd7e88a6446ddbe8dc4829600d1a018da613c4aed06e039fbd54d621ca45a3dcf454d24ae9bbe302d97c6084ea37d6641945 SHA512 5c06bedcf6b6f8df4f6bba8f5aace83a72ff530f1f0368a0a5b76f0380d02c55cf64e8645362c63f7f6efef5d49eefcdfff2423734a62acb23799a9e3c567200
 EBUILD pytest-3.4.2.ebuild 2509 BLAKE2B 23b2f34e9f2923a0eb143a341f4dff40e88d4ff1bf52cd7637d9354192ebadb58c39050feb00911993f0067d60571598864e5a85644b0adb33cab722594f9ebc SHA512 1958df6b0567c547bf70789836e12929caf3e1f17ac16ebad88aac081dce949888a08efceaba04649feb8098d4373548a5d4de511a8b94d6f50eebbd1d5d7b64
-EBUILD pytest-3.6.3.ebuild 2393 BLAKE2B 1f641e44a4a807a43b46b6669c69ce6959218b6715bd0f8eaf4b7e71b92ad1e08fc297ff2bb4664b830c0c019a880a65209a2f0537cf814983bb26fd475467bf SHA512 f4327b5dde5ee14bf4c693fb760f36a8246b42d54fb229154f63eacdf1fa4157a9dfbf54c8842469d9f269de1375e59687229740dde41fc2c496af223b1c05e9
+EBUILD pytest-3.6.3.ebuild 2400 BLAKE2B 7fd001f9d146bf0c0b78b61b27adb9915baa203ac9a92e5c17268a00813deabd7e349857f036e606c5a76bc28ddc7d77de6afddf8f9411c57d949c10de74e1e5 SHA512 0d76a48a8d51add40c01aa4bd2e5dab6ff407fb021f472b8af9fe29aae8d85ddeb56786713f35df0564528e3c80512589c954db165b6e73a885185a4bb4650f4
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.6.3.ebuild b/dev-python/pytest/pytest-3.6.3.ebuild
index 51f3d8c2149a..e568d27ebfa9 100644
--- a/dev-python/pytest/pytest-3.6.3.ebuild
+++ b/dev-python/pytest/pytest-3.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd"
 # doc apparently requires sphinxcontrib_trio, not yet packaged
 IUSE="test" # doc
 
diff --git a/dev-python/pytrie/Manifest b/dev-python/pytrie/Manifest
index cd8ca2db79a1..5a53d203c619 100644
--- a/dev-python/pytrie/Manifest
+++ b/dev-python/pytrie/Manifest
@@ -1,3 +1,5 @@
+DIST pytrie-0.3.1.tar.gz 94678 BLAKE2B 12631652ea33d2f1575f86bc8c42982543f8fa146debc9cb86e1139ff089f0657e04e50bad97b9bc344f4a270d102ee98e03fd389eb2c56ba3baac32b2288670 SHA512 72cb4ffff53d01545658b27b6c0b798736404f95013bfe34586c51c8823cc923ac4b3a8e874a938b26e3045784ce98ce2d8e51ab70dc435ff50075ffaf9d6c51
 DIST pytrie-0.3.tar.gz 228709 BLAKE2B 84c415722a724ac668624b3da29bfe29998c2ec8662ad21ab0035bb2a694e94759e9d09de980842887972b5c1690d699e43de41bf9f62e84ef3fbee86477d0a2 SHA512 f1dc6f810e51385fa4dcf2cbec76cf7fe5c184208f8d6dccf6212d43260591580126095e68d28ab6c8b01a631e6e16b275fa088643ae81568493ca231dcc6161
+EBUILD pytrie-0.3.1.ebuild 596 BLAKE2B c5e9b510f75b8369ec45191a79ff6e6435e3a1fc2667fce49380b6f46ea64e4667982090a7f575359dcd592a626ebd07dcadea261f74b62722ebad1bb7c33894 SHA512 0135deac37ba1e68ce5aa3b8e824509aa4d4408a32e36797a6472e41c9b8d5373f339e3e228716fb8f7d37e96f18e7e3099f5f0fc6cb0683b851973a64476e1c
 EBUILD pytrie-0.3.ebuild 600 BLAKE2B 5cd095e80840b12d21a96fc9bebec203127a2be3d60763dd57437891abbeabfd2ec5d7201ade0e01eedc05a8de725f5fc1d748946f58665706c7af5d6591b391 SHA512 5f99702df3fdc777b00ad8d637b501787fe3d964d16348f7a5bca007dbc9fc7eb0abc45306e0678586631d4ca5bc94e86527b2a9a7face2d77c531b061be2598
 MISC metadata.xml 964 BLAKE2B 9fbaa7700117c0416ae610f5f4d15078276cd6beb5fa6064b7a2649b5e1410b3ea957db671a6fbf7b3c387df22493df21246a5dc0ca563fb7f74c4a62d05a822 SHA512 cb64560edf2a771b3bfb856db54b4a6e41831a8ef51e6f2d9e045dc4e01db3a79a670d5c39a3ecedec4ed3c3f57473ca1ba5057b1e45a0d76f22275b888000f7
diff --git a/dev-python/pytrie/pytrie-0.3.1.ebuild b/dev-python/pytrie/pytrie-0.3.1.ebuild
new file mode 100644
index 000000000000..8ebd37d75307
--- /dev/null
+++ b/dev-python/pytrie/pytrie-0.3.1.ebuild
@@ -0,0 +1,23 @@
+# 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_PN="PyTrie"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A pure Python implementation of the trie data structure"
+HOMEPAGE="https://github.com/gsakkis/pytrie/ https://pypi.org/project/PyTrie/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/roman/Manifest b/dev-python/roman/Manifest
index cde6f60b7b0a..b2224c1205b1 100644
--- a/dev-python/roman/Manifest
+++ b/dev-python/roman/Manifest
@@ -1,3 +1,5 @@
 DIST roman-2.0.0.zip 7590 BLAKE2B c733a4e905ebf4ef526afb5088744bde8558314b059a4d8e9f86e914af2657f99b5c4364e9e8f9a11d9a1e4470ba9b1919b19951aab7dc06b55539d27b89ab30 SHA512 d62a95e835232821dbf7a81d0c6b7df63f18c4116cfc7eee0c691a0b31d3d7b69d2dc2e4ea26e0a169a8e24bf080e8bb1e195b853be4adf1491335a5b4d5702c
+DIST roman-3.0.tar.gz 5184 BLAKE2B 0951e15a1fbf0feecc98c4318fa631a535d24d9559d21e800f065923c71d094c387b18c5926ad55322ad8417a2db97626ada1e110549938d73243ca410e3ab87 SHA512 468a4ac7188cdf3155698f260de5ecc5bb2072c120c79d046618ac07b6de6f777cfc69661f2e0df4ca66359bb20169d22599b3f342edaa48f8575bdc17b40c08
 EBUILD roman-2.0.0.ebuild 617 BLAKE2B bace2ac003ea59e33b13791ce75803bcc4265afb405a737099064b3b3882319ef17578538f87c7f464716be94f8bb421a5746a00bc906bd2cd063bec87c2f05c SHA512 507c722019d5607c01d6a2e3eb7f106477e15a9dd9c2e340e332c44c37ae5bdae7489a6c57899306760e9f1dd9028f674c75759a24f832b691dd793345df8025
+EBUILD roman-3.0.ebuild 611 BLAKE2B a527a8a2ec1b748676980c718f95a990d2d731bb3b2f3deb39f68f2f2c6d7bd45645a244bd1c74c0e8e346ff1a0c99d12bacc2269a2c17ee291aeda4e2c95581 SHA512 2d10252321fbe9fbb96db12e1da4eaf64d3249ca69aaae8e8a5953b08a90ea47e899dcad1ebea7803467df7b3bdb52c6381dbff9dff5cf9cc28ac56934ad4869
 MISC metadata.xml 318 BLAKE2B 3a028680f19314e15a2eab93b8bfe5338ef3b351e82f28ba7eb1d0988ffc0f9eeb9174f30c18c0f7e10b865958a5992043525baf6e25732ce85d819c65c9fbb3 SHA512 a2e3ce30465809bbac2a6684207eb0290787a1e2eafebb457a6754e474340f75208dd269f7d89f2fdf25a3529340310acc9c220feaa1be40fe688a177b2741f0
diff --git a/dev-python/roman/roman-3.0.ebuild b/dev-python/roman/roman-3.0.ebuild
new file mode 100644
index 000000000000..deedd46e8b51
--- /dev/null
+++ b/dev-python/roman/roman-3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An Integer to Roman numerals converter"
+HOMEPAGE="https://pypi.org/project/roman/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	!<dev-python/docutils-0.9[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	cp "${S}/src/tests.py" . || die "copying test file failed"
+	esetup.py test
+}
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index df0bd3753fd5..fcf9665dd30c 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,5 +1,7 @@
 DIST scandir-1.6.tar.gz 29670 BLAKE2B ad8c231783c14246341cd23bd79185ee10894bb29107ba7c0bfdf51982bda99fd8ce45ea52ff42687371d56b3e6d43cf1d6cc65bdaecf43da9059e524a801e6d SHA512 d01e0551696787caded787a430eea787a69a27c725505277420fd607b3fcc892218377bb340651fd906bdeb3a57e99879df3c86aeadd2399fcbe45cb2118b9db
 DIST scandir-1.7.tar.gz 32812 BLAKE2B ed80775b5acca85d8829e2fb46df33fdda08d9dad6cc0e175d1270dc51b6eb4d381a5bd813e2dfd2072ac0af0d642d20ae818e569688ffbe5decaf4421f5e979 SHA512 47c6d9642938f374eb03228cdb6c8d77aa2af01a84b7efc518d223851562a615b616e92100bbeb38c4fa7455ef5f7ae4af8d406f5148d1a26a403708b4a27023
+DIST scandir-1.8.tar.gz 33065 BLAKE2B 020789b939f347de49dba6eb35cf53733a34b283a4226d91746dca4f26b0fdcbe708cb48a795085c8887921bdad77c3fd054c15dcf83b1f4624ee81f1735f2da SHA512 9c2c578cc736887e7d1ebe51f62569599e386deeac55363a84cd1abe4f73c60a43ae9849b3570ed99079016908ceab5e3755b014256d1cab535c1677255690f3
 EBUILD scandir-1.6.ebuild 558 BLAKE2B efcfb1c039107ed40ffe1939bd391b068cdf8149bc732a1c43fedba488ef284509501d1160a3d73268d69ac5a99f6ff14891c6ebbd95143e814f8cae64ca6043 SHA512 95d06232bab59651fca2bc25dd7b4d8f21dbc72cc3b41b84dd5585987853f26d72a132131e0a07638690e348573a809f2ccc3d61009a6d46f83e7154deca880f
 EBUILD scandir-1.7.ebuild 565 BLAKE2B 9d08fb18c8277903a9d1f2e38a2d5da42c095ff3c9c4e9919fd23c408d64156651188feed20df5cc03569419e8c1372f0e3653fac168e5b3de85ab0cb572ce28 SHA512 f46a08f4858fdabcdf8b0221b956aa589bffe1c0c82d16540ca1efccb4dd2925abbb3ef57a5a5a53f551023cca7abb8d17d3b630a1c61d1467de0b1cb7cdd528
+EBUILD scandir-1.8.ebuild 571 BLAKE2B 528c6b3487876b93305bcb3fd631ac0bf7cc469b35b72c5b74865a1b6faf5c4aa65f0cda1e422bb94ef6a8cc90081ea969d63720bece9fbb1b1b9d882df7b8d3 SHA512 86ce0e8898cd439682ac0e2eba784c50eea56cb9ea5266b6243dca2ec3b7ccea00abed36813d8f50e508872d7bbf721fa97771dbcae33a16d68877b6c570cae4
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.8.ebuild b/dev-python/scandir/scandir-1.8.ebuild
new file mode 100644
index 000000000000..f355a307197b
--- /dev/null
+++ b/dev-python/scandir/scandir-1.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A better directory iterator and faster os.walk()"
+HOMEPAGE="https://github.com/benhoyt/scandir"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} test/run_tests.py -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/schedule/Manifest b/dev-python/schedule/Manifest
index 4f3f0c7fcd6e..dbee924a1d0c 100644
--- a/dev-python/schedule/Manifest
+++ b/dev-python/schedule/Manifest
@@ -1,3 +1,5 @@
 DIST schedule-0.4.2.tar.gz 10104 BLAKE2B 84089e7dde29587f4044097b85ddf4b9e3639c59c63da2268d6e2c94e94192271a6d0d65c385c9492cefac49d7abee681ebb0f56ff78965b67402306124ede40 SHA512 f088f82a0449350658028b2035c5fbc71bda4d019856fe6ab3363798e9d8d940cce603be544401ecf5f844606e5891ab560c390f5c334a825bf611e6ebfb00ac
+DIST schedule-0.5.0.tar.gz 10850 BLAKE2B b79ceb77d0149cccad4bd12c6fe8f3524a33898039319c411bf202928316d74586626d84e6921595d0c0a79f87115cbc27beb03919c4252b8468dcddf469c95a SHA512 0d89afa3c9d986c53a8c61a92bfda08e23290c6556100d63f2c647003806398b8913c4bfa75a57617aeeda73f8f2eb26490c224ab70d621873453ca5dec35b0b
 EBUILD schedule-0.4.2.ebuild 550 BLAKE2B 4859ece30a55f3571c43c3a99693d4069eba0e4fd093e0104d88cb015a45d45a2636cef72316960d4e1aedfa82e7e837ca9faded6edac8fd0742940c520dbbe3 SHA512 ae5306c39bfbaec7f8f193ab19d024f1cb0abab823cf09b34c04be785dd1b65d7c41309d843a9e696f6c5c85c342bf45eb07f04a58ac8690787db2d020489f07
+EBUILD schedule-0.5.0.ebuild 552 BLAKE2B d795d0ae91d65517b86a4d8c43eeface48df16519ece906018cb5b5124588470a0c8241cf3ee00a7f44fda61441cde5675dc0a9dc81b96b0e3fb924f9a166fba SHA512 140e53963baecec8c5a1a382cd859f293e5ab2003eb70ab5087c71f594f48acb1b9f110ab48ddbfb23014bcfd8e235fe9154cc29f429fa26004117081bdf1575
 MISC metadata.xml 366 BLAKE2B 37e7e51799b9632dd1dce72d1bb9decfb8ba87f310292ae9244fdf243c07222fef4769f9caedaa2a28589d4380d19f194e8d75b14a4403278c212924f64aa48c SHA512 79904ea302d7997cab092bbba036ccece5871ae66cb8623d0a828dc71e00c86d4db1e8e0233aa1ddd2d0bc21129d3afc8be13e0f7c4868472bb4a9fbb734fe52
diff --git a/dev-python/schedule/schedule-0.5.0.ebuild b/dev-python/schedule/schedule-0.5.0.ebuild
new file mode 100644
index 000000000000..c75611808a47
--- /dev/null
+++ b/dev-python/schedule/schedule-0.5.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python{3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Python job scheduling for humans"
+HOMEPAGE="https://github.com/dbader/schedule"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/mock-2.0.0
+		>=dev-python/pytest-3.0.3 )"
+
+python_test() {
+	py.test test_schedule.py || die
+}
diff --git a/dev-python/serverfiles/Manifest b/dev-python/serverfiles/Manifest
new file mode 100644
index 000000000000..dd286653ab7d
--- /dev/null
+++ b/dev-python/serverfiles/Manifest
@@ -0,0 +1,3 @@
+DIST serverfiles-0.2.1.tar.gz 10506 BLAKE2B b653248261f05b20fa65a566e29065e97679383e44d3e8c05d10d1601376de2c39e1690a7ec1b1b3c680f407086294ea0769e030702fd01bff8833cc32889b8e SHA512 80512dfd8381f12aa143a88fb656bc7dca99fbc3c07a0b6cd9c7be8477de984a5121ffdb2f4cfe0f2150b83100b68ee478cfa7f26ea2f29e4a6fb7fe4eb0c18e
+EBUILD serverfiles-0.2.1.ebuild 730 BLAKE2B 65bc0d7cd72cb08cec0fd3e529c1ce853cf9f39bf2e38a07230a444339ba5ee0cc5c39a47cdf481dc8c4a19b17bbc7672c677b7aef980d21d4ec02b1f1a81c6b SHA512 2ed1d2c80e8c5fc28b1a8f626ce8b60af3a5fff551134b2c8e0df46675121323179bdd613c8387cbebf16186753a2630ebad6a49b95ceab32359c9b0c0fbca0c
+MISC metadata.xml 214 BLAKE2B ee4a28a5b07deecdb0f59f382551a5f75712aac4c44a3f1b6086bdc520a5dc1cfaf67982ddeada2044128fcd551b40aba54d463d91142a3c35236cb09e119416 SHA512 e38be8dc636f8d2db14dbf8a5d673224ed83adc030db673cc59ef4c2db90884de5f4e61c3247524d12015486769ee984d1c188acb7488826e659fb36de1b46e6
diff --git a/dev-python/serverfiles/metadata.xml b/dev-python/serverfiles/metadata.xml
new file mode 100644
index 000000000000..007aaf442ea7
--- /dev/null
+++ b/dev-python/serverfiles/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>amynka@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/serverfiles/serverfiles-0.2.1.ebuild b/dev-python/serverfiles/serverfiles-0.2.1.ebuild
new file mode 100644
index 000000000000..5c1263570932
--- /dev/null
+++ b/dev-python/serverfiles/serverfiles-0.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6})
+inherit distutils-r1
+
+DESCRIPTION="Utility for accessing HTTP server and storing files locally for reuse"
+HOMEPAGE="https://github.com/biolab/serverfiles"
+SRC_URI="https://github.com/biolab/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/requests-2.11.1[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test(){
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/shiboken/Manifest b/dev-python/shiboken/Manifest
deleted file mode 100644
index a53b3a002aff..000000000000
--- a/dev-python/shiboken/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 1.2.2-Fix-tests-with-Python-3.patch 1864 BLAKE2B d58b9739fde1b3b4c8f588d500de8009145e2de71ff13384f75827d8b2623f62af599d8d8fa360343cf5fa02eb73ba79627c8a36892db08f45aeec45b6cd720a SHA512 969972ed55360ebaa5db68c81467b71d579ea03a0e1f7a21227bc8e3500289be7f6bcf2df6676a2449e19cf1a28f74a29dcd3c6a26817712814790cfd3a3d571
-AUX rpath.cmake 393 BLAKE2B 5e67bc306f6f16b7ea10d223d41f77bd12d4dceae5d7aaa2dfe96caa989412e52accf66061bdf2fe3abf9bed193894f5dffa87280ac13be54a0849a13d3f36c4 SHA512 b9f2d3b34fd31a7e289e3aa1c96110f92bc66f45e5bfaf796f86d52eb832e960caca0e314b87248d0a41c13c95f04402607cbb5ad7d0b3238d5bab5580c3a65f
-AUX shiboken-1.2.2-gcc6.patch 463 BLAKE2B c7880ffb782aa32a2ab3238116311e2f967c2eacd4fea8548588a2d393156090f8fcf41957194019481739c7e99a06ee53982b9a568426d5333e58b73a99d1c4 SHA512 ebea09b697bba76bc909dc61cfaabc50d2220c0ebbdcc9004b20bc9bf2f088685767f0d105cf07be77283714dfd5ad766239813dd2f6926c5d104abd528a702d
-DIST shiboken-1.2.2.tar.bz2 1073776 BLAKE2B 162e0e6d6bb53d09e4dbe9abf8ac310cd7913ba2e4440681cf98f16b8ee63a577759a1a3669bfb7e37b712a4c1dd638f54d571aadeae07578d377bdb1f161bb5 SHA512 9f5c1219ce699df6b5ee4bd68cf422cb69476bd062346fcc8b4d34d314001ba60dbd52a73d772aec16285a0aabb600034630beba754ca54f5e6a4b744a720073
-EBUILD shiboken-1.2.2.ebuild 2058 BLAKE2B facdfb9b1f5d4697f1fd6a8679c176cbf28618a39dc5e0c5a661aba5856781ae31e093b8824775493227947da9622e08f17e4c75931d73115d202a676214780e SHA512 31d48bc4bc5a0e468246a11adc7c79b8fd6109f631c20431a2eb875d025c71aff50f60fe2aba3ba75e8cba513f67700c75a88689548f39bf0fc757c27b00a3bf
-MISC metadata.xml 253 BLAKE2B 135681de74058b17bbf3526a1ba19e1536ef15e29c9088d5e5981a23a5aec6c46304882a43f00d9ed963af78aeb9c9f5f4eed7339dda4bd9eb10583ed6451aee SHA512 5417d2869e029c2e156185a3263bef4e78109b9306575cfcf072105a61ad2f75ee7bc6401db3564c1ae5c7630aadf551e09234b4448cd64341380f687ee47436
diff --git a/dev-python/shiboken/files/1.2.2-Fix-tests-with-Python-3.patch b/dev-python/shiboken/files/1.2.2-Fix-tests-with-Python-3.patch
deleted file mode 100644
index 48e401d1be1d..000000000000
--- a/dev-python/shiboken/files/1.2.2-Fix-tests-with-Python-3.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 7f793442316599ca25014a3d39c5de56c384990f Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Fri, 23 May 2014 18:10:20 +1000
-Subject: [PATCH] Fix tests with Python 3.
-
-Change-Id: Ibbf54406ba33dd1f645a46d63c04269868288768
----
- tests/minimalbinding/typedef_test.py | 2 +-
- tests/samplebinding/overflow_test.py | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/minimalbinding/typedef_test.py b/tests/minimalbinding/typedef_test.py
-index 089b279..b5535fb 100644
---- a/tests/minimalbinding/typedef_test.py
-+++ b/tests/minimalbinding/typedef_test.py
-@@ -30,7 +30,7 @@ from py3kcompat import IS_PY3K
- 
- try:
-     import numpy as np
--except ImportError, e:
-+except ImportError:
-     np = None
- 
- 
-diff --git a/tests/samplebinding/overflow_test.py b/tests/samplebinding/overflow_test.py
-index 5020872..c294c13 100644
---- a/tests/samplebinding/overflow_test.py
-+++ b/tests/samplebinding/overflow_test.py
-@@ -45,7 +45,7 @@ class OverflowTest(unittest.TestCase):
-         '''C++ function receives an long long argument and raise OverflowError if the value is negative.'''
-         val = 100
-         self.assertEqual(doubleLongLong(val), 2 * val)
--        val = long(100)
-+        val = int(100)
-         self.assertEqual(doubleLongLong(val), 2 * val)
-         val = (2 << 64) + 1
-         self.assertRaises(OverflowError, doubleLongLong, val)
-@@ -54,7 +54,7 @@ class OverflowTest(unittest.TestCase):
-         '''C++ function receives an unsigned long long argument and raise OverflowError if the value is negative.'''
-         val = 100
-         self.assertEqual(doubleUnsignedLongLong(val), 2 * val)
--        val = long(100)
-+        val = int(100)
-         self.assertEqual(doubleUnsignedLongLong(val), 2 * val)
-         val *= -1
-         self.assertRaises(OverflowError, doubleUnsignedLongLong, val)
--- 
-2.1.0
-
diff --git a/dev-python/shiboken/files/rpath.cmake b/dev-python/shiboken/files/rpath.cmake
deleted file mode 100644
index b896c8789185..000000000000
--- a/dev-python/shiboken/files/rpath.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-# use, i.e. don't skip the full RPATH for the build tree
-SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
-
-# when building, don't use the install RPATH already
-# (but later on when installing)
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-
-# add the automatically determined parts of the RPATH
-# which point to directories outside the build tree to the install RPATH
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch b/dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch
deleted file mode 100644
index 65734232472c..000000000000
--- a/dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Bug: https://bugs.gentoo.org/619332
-PR: https://github.com/pyside/Shiboken/pull/84
-
---- a/tests/libsample/simplefile.cpp
-+++ b/tests/libsample/simplefile.cpp
-@@ -90,13 +90,13 @@ bool
- SimpleFile::exists() const
- {
-     std::ifstream ifile(p->m_filename);
--    return ifile;
-+    return static_cast<bool>(ifile);
- }
-
- bool
- SimpleFile::exists(const char* filename)
- {
-     std::ifstream ifile(filename);
--    return ifile;
-+    return static_cast<bool>(ifile);
- }
diff --git a/dev-python/shiboken/metadata.xml b/dev-python/shiboken/metadata.xml
deleted file mode 100644
index a7f1abb3029b..000000000000
--- a/dev-python/shiboken/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>qt@gentoo.org</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-python/shiboken/shiboken-1.2.2.ebuild b/dev-python/shiboken/shiboken-1.2.2.ebuild
deleted file mode 100644
index 038b7b41135e..000000000000
--- a/dev-python/shiboken/shiboken-1.2.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils multilib python-r1
-
-DESCRIPTION="A tool for creating Python bindings for C++ libraries"
-HOMEPAGE="http://qt-project.org/wiki/PySide"
-SRC_URI="http://download.qt-project.org/official_releases/pyside/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-qt/qtcore:4
-	dev-qt/qtxmlpatterns:4
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-qt/qtgui:4
-		dev-qt/qttest:4
-	)"
-
-DOCS=( AUTHORS ChangeLog )
-PATCHES=(
-	"${FILESDIR}/${PV}-Fix-tests-with-Python-3.patch"
-	"${FILESDIR}/${P}-gcc6.patch"
-)
-
-src_prepare() {
-	# Fix inconsistent naming of libshiboken.so and ShibokenConfig.cmake,
-	# caused by the usage of a different version suffix with python >= 3.2
-	sed -i -e "/get_config_var('SOABI')/d" \
-		cmake/Modules/FindPython3InterpWithDebug.cmake || die
-
-	if use prefix; then
-		cp "${FILESDIR}"/rpath.cmake . || die
-		sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	configuration() {
-		local mycmakeargs=(
-			$(cmake-utils_use_build test TESTS)
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-			-DPYTHON_SUFFIX="-${EPYTHON}"
-		)
-
-		if [[ ${EPYTHON} == python3* ]]; then
-			mycmakeargs+=(
-				-DUSE_PYTHON3=ON
-				-DPYTHON3_EXECUTABLE="${PYTHON}"
-				-DPYTHON3_INCLUDE_DIR="$(python_get_includedir)"
-				-DPYTHON3_LIBRARY="$(python_get_library_path)"
-			)
-		fi
-
-		cmake-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake-utils_src_test
-}
-
-src_install() {
-	installation() {
-		cmake-utils_src_install
-		mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl installation
-}
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index 6304ca3800ac..ea9fd5e55ee8 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,7 +1,9 @@
 DIST simplejson-3.13.2.tar.gz 79735 BLAKE2B 5feb87611451054ad8e856e55a4a6bca50470f7f72692de9ce5abddf9eb214e29505124634d4d5a4f825366afe9a97614c66cbe14a73a4e57a5f2f62cac876e8 SHA512 ea29bc615de7fd0eb2a98f5dbeea74ee49b6fed6602396e77baf4480c86f975eff7fd868ac44f62a1c2f3721d4fa5b807b74109e5e28810df70dbad758110f41
 DIST simplejson-3.14.0.tar.gz 80112 BLAKE2B 5866adeba886b4b4f526d4d7fb7ac65f12fa8cfe593a0ac40419c6f04e2f6b776adea49fdee861be54047666b7275bf229db7f7815515a9273878bf0eb68c5f5 SHA512 a81b20a75840566d5985803f35c56ee6957a433f0a9a6fc2f0fb2d46f978925cff0edc2f2c06fe85e7155c8301fbadc962152671c29310c6306f63afede75f98
 DIST simplejson-3.15.0.tar.gz 80963 BLAKE2B affa7da859bc2b2426389d881b53abdd086a2f7082decc9f8968859f54354d50747eb6f1cb8c4cc0151ef1e2cb8ecfb8aabd9f2151eaff2f39c4d08b9430f432 SHA512 601d575a5b8be66a33df28f27292ed12e5aeec39c74aa5a5108d82890dfb45a086e7a3a5072e012031209465c5c518909b4c1fb261fc055e6b9b1523a6bc39b4
+DIST simplejson-3.16.0.tar.gz 81203 BLAKE2B 84b465cad6d78814b13ecf5e75b09cc63a9aaaa12b1412567feabdfa02f9c0e83bbcf8191425c517cea38f6bfccbd691442fae4322957dc6ead6565d23393d6b SHA512 c90da313b21ab862b6132e7bbe4883830c8a26fd36224f307859042852cdb900e36e41cc7c6773a1d4cf89476cdb68e1136642f38864ad6ed398716390122968
 EBUILD simplejson-3.13.2.ebuild 877 BLAKE2B c59d6dfbd246de58f98490255ceeaf018cb0fb92ccf34765f265689a9dc4bea993f11f248c01c3634de4c4b928bd0872143afa9c0419788df8bd3f2455703e26 SHA512 e4ca98af16c511c049c89c64c354ba39d9c299f7670cc33b291126b861013d4611dcf0f32884dd32dd63547f9c8d11c4186a48f22cc9cdfcb378e69ca573d400
 EBUILD simplejson-3.14.0.ebuild 881 BLAKE2B 58e8e1b64333e861bfebef33ef1134f8cbb66cb82e724b489cb72b0b1771c9c5641f5b87b34bd3a346f6ef14905f02cadc6e5cd877d474959ad002f051158a52 SHA512 d1b7cdca473cbfebae39f4b88b52f462cb035fb9a3e7c69fa821158b12eed9515b6fb2ac26f0dc678f57ec24535796300b33ad26ed982c176f512bddce2348cd
 EBUILD simplejson-3.15.0.ebuild 889 BLAKE2B 251df843a7eff9412722dd53cb6e2dfa998586c1ce919183696903dd51dfd64d7cc835760577f45d09bdcf6586f15a77c7994ba0f44ea13a09b8b8d947720cfb SHA512 7a067e64b71904d89dbfd21d06c47ca15a8a0415712c103cd59ca81222b8f14f2bc77e44f089e838e60adb7eff4fab5e878aaab67c2f7f93823c0d9310e12990
+EBUILD simplejson-3.16.0.ebuild 889 BLAKE2B 251df843a7eff9412722dd53cb6e2dfa998586c1ce919183696903dd51dfd64d7cc835760577f45d09bdcf6586f15a77c7994ba0f44ea13a09b8b8d947720cfb SHA512 7a067e64b71904d89dbfd21d06c47ca15a8a0415712c103cd59ca81222b8f14f2bc77e44f089e838e60adb7eff4fab5e878aaab67c2f7f93823c0d9310e12990
 MISC metadata.xml 323 BLAKE2B c21be649394bb8a261a6169a710fd3862f1dd539505381a15f99611f323ea1e5fe4e6e54f1ed73d28bdddc2459812f13e40658ed99c09d0ba0f93f724b4bcfc9 SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec
diff --git a/dev-python/simplejson/simplejson-3.16.0.ebuild b/dev-python/simplejson/simplejson-3.16.0.ebuild
new file mode 100644
index 000000000000..9004215f6c28
--- /dev/null
+++ b/dev-python/simplejson/simplejson-3.16.0.ebuild
@@ -0,0 +1,32 @@
+# 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,7} pypy pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( MIT AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( README.rst CHANGES.txt )
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index d25c0919c04e..134cabd1c514 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,7 +1,7 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.12.tar.gz 1036410 BLAKE2B 11f7df2ddafe0ceb1edd75d3cc5128c32d7aa2e9a77ad4555d69bcafc87f8141384928cdf2481c324998b2e224920b50c0f397d67314370ce30cca6d7a02a15a SHA512 9b9680172357aaf4a1ebc3bf1f4d2badaaa8643e50665fed6e17d27283a499ceac56c4f1db190de4d9516c8f0f794159485cc6f8fd68daafcbe1ccac85161972
 DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
-EBUILD sip-4.19.12.ebuild 2777 BLAKE2B 3f397d60043f2d145b670486535b2d693af7a5590697a25e8ec29d036642de9734d7dd7eb45467d011adb7bf225f298f9a7abcc455288eca3ebd2458f1f26b85 SHA512 67810e0ff05b7ed10d3f8d0d4d13b0c61f783f93af73f46064b3eebb3a923136eaca18bf1b396fef713dec22702c7af68669957fde24d8b0d6e344340ddc29d0
+EBUILD sip-4.19.12.ebuild 2779 BLAKE2B c89ad98b6a4fc5c48440c6ce3bbac9ee1f7924b56fd481d4a5d4c092309634a8cf75e36b26b09d2b60d5b9c9dfcb7ba98507d249c3693c404fa9a0b65953e6fa SHA512 89ac3915fae1296533265b373fe554d704280b4f936cf6362f5f4e43f726b01bb057c813e4eceaf91cc2abe684c6c7684144751c74510660c9ab2af084499554
 EBUILD sip-4.19.8.ebuild 2770 BLAKE2B a2f0bb2c65e93efb40da64942e4230d35626ac44d7c90240ec1e2ffefa7256bb00073882639d72e87c46876a21cba8334dc3b822e089c149ef6f2df4e8f2b961 SHA512 7f88d918131f92a3d5e0dd34b7c70b80facfc603cf9a504de45c9c69944fb15fe836ca6125d95cab4a8fdbb17d43a729cbe13e1aebde0472843d507d97424075
-EBUILD sip-4.9999.ebuild 2649 BLAKE2B 0a6a7647220c538e4d7dccdbaddb57c9619faee0b97d47dd1e295eec6933766e20ca2f3c74ef7268ce48f6885a6b6c442a85e1fd90fe228a0fdb727f7e1bbc97 SHA512 fb065f99c721be6282838c43d647ade9a55ec0a2d78faf3ef9f23c5009cd850b78e6c7b12fc0e1b3f36051b5afde74902157f7258bf8060ca78ddd935a38871a
+EBUILD sip-4.9999.ebuild 2651 BLAKE2B 9d70dd20b5e89a6652fa029e673331ef088d1b19e98a5e958fe453591f4d21420fcbd4ffb103c572b2176359d6cbf76804722983ed9ced2b7c805588af0fa811 SHA512 7157f51e4be926fb6572886f2fafbb0d23ebfaf21233a348a0abdc14400c3f5f52c3fef2e7174664b0a91cf3e33303c0e963b7030f1fb62b56a2550b7f192c57
 MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.12.ebuild b/dev-python/sip/sip-4.19.12.ebuild
index 32d648933db7..6707912b3761 100644
--- a/dev-python/sip/sip-4.19.12.ebuild
+++ b/dev-python/sip/sip-4.19.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit python-r1 toolchain-funcs
 
diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild
index 8231fd8a2a39..3fe2c1981bd0 100644
--- a/dev-python/sip/sip-4.9999.ebuild
+++ b/dev-python/sip/sip-4.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit python-r1 toolchain-funcs
 
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 5082c0c34942..dfdca728106f 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,6 +1,6 @@
 DIST snakeoil-0.7.4.tar.gz 301878 BLAKE2B ec40ba5921e6edd33cb9dd80a284dee0cc8940dbb71f7bb6390d7008c0ca3a657b70be225955d7d6b99aa9e8c9d16dc926560bab17ac917ea8f71f97a1cf4644 SHA512 b3ae2223a267fa74699664470a4c4f6888cf2b68e688fe61d3acca85e00a138c3a037482ef304ee26f326cba252b473d265dcd72d0e0ab5723f4b0ed6e5e04ce
 DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5
 EBUILD snakeoil-0.7.4.ebuild 937 BLAKE2B a69adf1930195a590dd831129b17f20cb80584772bec618793af405bd2e7f1d13f267db3e6634846d5d88db1692e77e3bf5d4c9dba08e5845d9ce228ee501894 SHA512 f47c6e9dc49a0221c082da07d2e69e00bf1a3ddf3ad59afbe82087369bd9e3e9bb4ef0b99c5871d9af6a122ca3b7ee24b10ad8d1f31c52bdb5c356960c65c76f
-EBUILD snakeoil-0.7.5.ebuild 968 BLAKE2B 0f23a9ca7ddd281cffcdfdd09ac5e92dc6b37076520c91a54c6749683a5469212ef51517708ee13c7f79a81df8a6089b3b0aef528702b597e409d93e0134f1c3 SHA512 30a47abfd5d4261430028c92897866894de48cea1cd973190342fdc3fcc300aee24f1579c85825c1aff6ef385ecc3577c61a0e56b6db165773ec38177d872f0f
+EBUILD snakeoil-0.7.5.ebuild 965 BLAKE2B 6bc3154e86e13c3e3e2c007f4827910ab3bc0404c01a79d2cdb7707345678e5acf8e893ea808b7a6c6f2d1ad9e7025802e17cc5125b51d41ed9d315f8df5bf0f SHA512 81a909cc917426efbf4ce6b917036f80b64a33cec4166581efb971ae7714bb329cbe6d229b6ec812e882da06c3590124626ae289bbb085cded97bf53152da348
 EBUILD snakeoil-9999.ebuild 892 BLAKE2B 0e8f5d786e969ea26cda8eeb261af331aee3a085791fa62bca0d4fc44a4da430a754ad7e6ef6a5247f7788701152483ecbd6c18ff11e23cf2671d5b7303cb785 SHA512 e97711f75b09c5e4fce4e9549bb17256e43b5a0c7d13001d13b2b9d79218bc18b9dcd719f6b24b152115bb5668d83c1dda9ed9f02178bc74a2a93d822e806b63
 MISC metadata.xml 385 BLAKE2B 7e7195d4876c5cb5db98288566121559c8bd9208138fbd211edea15b324acb11d09a2bdd96c0200554d7e9c734202c7fd341f0d134f271c82dbfdfe75e5774f5 SHA512 32645380ddb0bd1edca1895714aeaef3e0c61c04cbacb50a414c2fd26b6978c8ea83b3c420538cadebf3a631b5aec2e9e3fc0dab98d1e1a99cfbad33b8d58715
diff --git a/dev-python/snakeoil/snakeoil-0.7.5.ebuild b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
index 38a023db443b..fd6fb2db0f83 100644
--- a/dev-python/snakeoil/snakeoil-0.7.5.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.7.5.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,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 	SRC_URI="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
new file mode 100644
index 000000000000..209b5c0b3cee
--- /dev/null
+++ b/dev-python/spyder-kernels/Manifest
@@ -0,0 +1,5 @@
+DIST spyder-kernels-0.2.4.tar.gz 35750 BLAKE2B 85cc767dc1ab8e071a6c08993b3d8d383e7b9bcf85be704fcd1bc3b321ff7ec532a7ecbb6a30dc2bce2fa7fd8d74812fae07dea5e10eff6309b3ca13fb16e6d5 SHA512 d5b8af3e0b8c5af9e29864912ecd27ee27a605938f36c0a7681167fb782e4b7fb79d5ffb4ae9b77fb82676301be664a1e1dd64f2f206fee2bf047f0ef9e05941
+DIST spyder-kernels-1.0.1.tar.gz 35936 BLAKE2B d3e572ba04823869bf8a602e96195a95c39da3c0e29d6bf17eeb305e21d60d72fb8c6bda9f111558468655759f1319e2d69d12b7a3c4011c18d22570d394d64e SHA512 05a4124e44cf1ba1d56927295dc9a2fea315ffe107d0f835a36d29b0727c2d7abe35e41974d62ece23b2d5ef78baa18c1d29910c0359b6fea900216e8f093d97
+EBUILD spyder-kernels-0.2.4.ebuild 598 BLAKE2B 462781409855b2c782898abf8e33dbbde2c2383762d79489e6f3db640f10aeacb7f5adf7be7765062e073b2fd1c4871b72665488719620eaf252505f81101832 SHA512 61940608d62a29b32a1e572f1e78bf153a4424bf9e7ab839067c70c14e4329254b90a306eac0b419dec1a8cb48e749c98935ca926d583013c68be639a1362b6a
+EBUILD spyder-kernels-1.0.1.ebuild 598 BLAKE2B 462781409855b2c782898abf8e33dbbde2c2383762d79489e6f3db640f10aeacb7f5adf7be7765062e073b2fd1c4871b72665488719620eaf252505f81101832 SHA512 61940608d62a29b32a1e572f1e78bf153a4424bf9e7ab839067c70c14e4329254b90a306eac0b419dec1a8cb48e749c98935ca926d583013c68be639a1362b6a
+MISC metadata.xml 400 BLAKE2B be04b011bd69c34b161a14237cfc5be40028ead99bdb657f5ed565ba33eca7817e9d0199a4eb13df1c61e87d75ff357483ed339623ba5629815e4c8660fa948d SHA512 a1c77c20cf6330059824f513b447d97b08a46ce2a99d2930193b0640428ac7543fc57689fd375968825d5452fbf055ced0b01fa6c797966b35976c4386f75e8d
diff --git a/dev-python/spyder-kernels/metadata.xml b/dev-python/spyder-kernels/metadata.xml
new file mode 100644
index 000000000000..d72ada7efcf5
--- /dev/null
+++ b/dev-python/spyder-kernels/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>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">spyder-kernels</remote-id>
+    <remote-id type="github">spyder-ide/spyder-kernels</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild b/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild
new file mode 100644
index 000000000000..eafa8d2f2793
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="
+	https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild
new file mode 100644
index 000000000000..eafa8d2f2793
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="
+	https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 06c27c790dda..74c33ca56d07 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,7 +1,10 @@
 AUX spyder-3.2.4-build.patch 5706 BLAKE2B 60eea8e3dcb3bd6a5b80e2b30322ad7d514ca4011a6edefb325e468d692f790beadb8598f2d24b20d2015e77c9eb10388c3354b3417c96a5a2bdc5e02f4a0c38 SHA512 41fa116652af0b2a93e25e1c39c450c9bc5cc7bf76afde75e8b53845d7fa8be822c6763ca48ea4cbcb64e72cac927c832233bb681c9950a272da517234464123
 AUX spyder-3.2.8-build.patch 5652 BLAKE2B f4d9fca3670d8c2f3e8dc3e58b00ffe1bb49bdb9ded28db865e1005a8cc86755b32bbf53dcb618e759f116c2cc3a13b58b7c501d9dfaf2723e564372934a4d1c SHA512 e1d758be7b9c5221ec317b9e254e959bc0d6ce6bc01259c4291dcffbc0000fbaaca7660cc3b18a7ee14ea49f2addcde2e00bfdf251dcadb34b6cbb35984f95f1
+AUX spyder-3.3.0-build.patch 2228 BLAKE2B 915d17e7e61d37e1556f6de8aa594a2c338988223e3fc153ddbcbc13509e9b9459b52f1da786a2a0da5537e6ca66bc1ec99359308266c5afe8e78c99bcd307e2 SHA512 f65d34701fcdc4548ae8791c6aa63562dc5048fef7365fc50524e462b55b4e99ad5e71926d760dc326787355357116a89b5db040af59c6651a158593b3555f2e
 DIST spyder-3.2.4.tar.gz 3345797 BLAKE2B 2df946f257fee7e87dd922b6ed3b3c0fa02438560cb7fa4087f25498eb134bfc8c342a0a928be37f08448dfea2917380a8521ead13954091b1854616012ace91 SHA512 46e89c68545695d1e64aaafdd2ed724b152a41088f1bfa645b8c66d8ae6bcc2d86e9830cd3f16edfb8027aad5786dfb67f2a8371839dd515df8ebe34446716e6
 DIST spyder-3.2.8.tar.gz 3414627 BLAKE2B 95f85f719eba20eb9fed5183cfac582b040abc93724df512188d14167a1663c5be9906dfc499feda9f8b0d7a713c093dbf98e4f20f732e0e9669397e1b7c8482 SHA512 03dea90632af510cfc8c4cc684068213a54dac9eef671f04c83663dd40eb480a4b818e2d040efa7a78a0d17044018aa76f2931abbf344eb684094fc7a86ddf5e
+DIST spyder-3.3.0.tar.gz 2782654 BLAKE2B e85ef52109c723d6b1b011f0e81ab3a46d3e0e6ba72fd34a1eda9ed650c9e03532e8fd72e05365367f62035a6f03d6ec32d35314c54438bf639070c7bebfb4d6 SHA512 53a2b438afe245092eda4d202d2453b5b93d6682aafcdb00bf251ddcdb30cee2d81d8adadbe23fa36f64fa5f917b327690cb8f9e2cf5c0da2841b5eda648a26f
 EBUILD spyder-3.2.4.ebuild 1722 BLAKE2B 53d5f6cac29c33a278b93e5577544534f1071a959cf39085d799ede4515ed19fd90dfc2180fe3c3de949e40bbfc65fd3738babf0b810c8fa2c986a7cadced5bd SHA512 ad024167972a309ed3d684839217780deee0956a7c9ee9571158389ee0d28584cb3a819f2bb84e3d6b203cef7cd97dcb0e9514d73260f879313091a120ee66c5
 EBUILD spyder-3.2.8.ebuild 2592 BLAKE2B 8928a6e929bd362654bf6b831b9e910930ff3fe08df8b1eb0cd4b509d0159a3d317d1268728afa4b1aaab5a4d2da6fdf5ed7325f49f7be709f105b1f753d5051 SHA512 bb90f993db737cf969b8e163e2bf00617302d22f9d57539184931071e776a2f18aefdd20a066732ded1a8258d2e9033139fa0a3cbf3ad0dcc46fcd0bd83e48d2
-MISC metadata.xml 918 BLAKE2B f83d61b0af59a2bc6b1a704394eb4d84fef9673ff4c7376c07f7e4540ec82c3d9a7e648cf663c7580813523d7f047ecbc61137e93e73b0acd21a96f80c797c64 SHA512 fa3828504ddb519afc8c5fcae824650b6c03d23b2e3b2cbbaf9ffa74f2c0a0e96b799c5aa342aee1606d39957b316348eea5459abbf3c512503b3f330cad3cf6
+EBUILD spyder-3.3.0.ebuild 2470 BLAKE2B 12646b7007c16e2d925362d3b4a99c9f7a0db09cc107d7b293231f22471228a95b8cd9715fb83bf953c029c9d8b68a76d325cda12274783c163da4e623ec1a8b SHA512 d6cffb9a0c34c75b8cd8555838293719eedb2c9cbed2e23817417a3f27139c4e3fab8aff0d579d5e66f4afb9265726e8a54ffced4fd6ca1c238556377468ce04
+MISC metadata.xml 1371 BLAKE2B 1b79aa84224554c57dc9ba4cfb888a9d18ed1b5fc99b6912de2603ac9c7866a4abb0a43a8a86df516b2b5ef3c4a0cdb18c20ea648e59002635affbdc813e2589 SHA512 8af58f099e6a7d97bd266c2d09b44ef51ec71a3ae51d61caf49968d6ecb8d830e4003171080011d390e9a27fd3010f95f22e9555a702f26e6635a4e1e02db537
diff --git a/dev-python/spyder/files/spyder-3.3.0-build.patch b/dev-python/spyder/files/spyder-3.3.0-build.patch
new file mode 100644
index 000000000000..f6037237e0c0
--- /dev/null
+++ b/dev-python/spyder/files/spyder-3.3.0-build.patch
@@ -0,0 +1,49 @@
+diff -r -U3 spyder-3.3.0.orig/setup.py spyder-3.3.0/setup.py
+--- spyder-3.3.0.orig/setup.py	2018-06-27 11:28:24.000000000 +0700
++++ spyder-3.3.0/setup.py	2018-08-07 23:26:17.609046673 +0700
+@@ -75,12 +75,7 @@
+ def get_data_files():
+     """Return data_files in a platform dependent manner"""
+     if sys.platform.startswith('linux'):
+-        if PY3:
+-            data_files = [('share/applications', ['scripts/spyder3.desktop']),
+-                          ('share/icons', ['img_src/spyder3.png']),
+-                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
+-        else:
+-            data_files = [('share/applications', ['scripts/spyder.desktop']),
++        data_files = [('share/applications', ['scripts/spyder.desktop']),
+                           ('share/icons', ['img_src/spyder.png'])]
+     elif os.name == 'nt':
+         data_files = [('scripts', ['img_src/spyder.ico',
+@@ -104,21 +99,6 @@
+ 
+ 
+ #==============================================================================
+-# Make Linux detect Spyder desktop file
+-#==============================================================================
+-class MyInstallData(install_data):
+-    def run(self):
+-        install_data.run(self)
+-        if sys.platform.startswith('linux'):
+-            try:
+-                subprocess.call(['update-desktop-database'])
+-            except:
+-                print("ERROR: unable to update desktop database",
+-                      file=sys.stderr)
+-CMDCLASS = {'install_data': MyInstallData}
+-
+-
+-#==============================================================================
+ # Main scripts
+ #==============================================================================
+ # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
+@@ -178,8 +158,7 @@
+                    'Programming Language :: Python :: 3',
+                    'Development Status :: 5 - Production/Stable',
+                    'Topic :: Scientific/Engineering',
+-                   'Topic :: Software Development :: Widget Sets'],
+-      cmdclass=CMDCLASS)
++                   'Topic :: Software Development :: Widget Sets'])
+ 
+ 
+ #==============================================================================
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index d43cf6ebe126..b6e901261f71 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -10,10 +10,15 @@
     <name>Python</name>
   </maintainer>
   <longdescription lang="en">
-  Spyder development environment and its PyQt5-based IDE tools:
-  interactive Python shell, Python code editor, workspace
-  (dict/list/string/array editor), doc viewer, history log,
-  environment variables editor, ...
+    Spyder is a powerful scientific environment written in Python,
+    for Python,and designed by and for scientists, engineers and data analysts.
+    It features a unique combination of the advanced editing, analysis, debugging and profiling functionality
+    of a comprehensive development tool
+    with the data exploration, interactive execution, deep inspection and beautiful visualization capabilities
+    of an analysis package.
+    Furthermore, Spyder offers built-in integration with many popular scientific libraries,
+    including NumPy, SciPy, Pandas, IPython, QtConsole, Matplotlib, SymPy, and more,
+    and can be extended further with full plugin support.
   </longdescription>
   <use>
     <flag name="webengine">Build bindings for the QtWebEngine module</flag>
diff --git a/dev-python/spyder/spyder-3.3.0.ebuild b/dev-python/spyder/spyder-3.3.0.ebuild
new file mode 100644
index 000000000000..a6d1a67a4d36
--- /dev/null
+++ b/dev-python/spyder/spyder-3.3.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit eutils distutils-r1 xdg-utils
+
+DESCRIPTION="The Scientific PYthon Development EnviRonment"
+HOMEPAGE="
+	https://www.spyder-ide.org/
+	https://github.com/spyder-ide/spyder/
+	https://pypi.org/project/spyder/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hdf5 +webengine webkit"
+REQUIRED_USE="webengine? ( !webkit )"
+
+RDEPEND="
+	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/pycodestyle[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},svg,webengine?,webkit?]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
+	dev-python/qtconsole[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP},svg,webengine?,webkit?]
+	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/numpydoc[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-1.0"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Based on the courtesy of Arfrever
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript scripts/${PN} ${PN}${EPYTHON:6:1}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doicon spyder/images/spyder.svg
+	make_desktop_entry spyder Spyder spyder "Development;IDE"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog "To get additional features, optional runtime dependencies may be installed:"
+		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+		optfeature "Import Matlab workspace files in the Variable Explorer" sci-libs/scipy
+		optfeature "Run Cython files in the IPython console" dev-python/cython
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/dev-python/tablib/Manifest b/dev-python/tablib/Manifest
index 854aacd5f0c4..5d55565ba45c 100644
--- a/dev-python/tablib/Manifest
+++ b/dev-python/tablib/Manifest
@@ -1,5 +1,7 @@
+AUX tablib-0.12.1-no-ujson.patch 335 BLAKE2B 199bb7440bbae26d0469b5d1963d26584d91ed4cf36e478260722404b6d2f7dd109467943599808a36cec20e792053bd5ada8495436a6f518f4637cd565197b6 SHA512 ac5dd04e07b09d0983f3aa51d9ba3b067eb758cedd67dfb38a443ae4aabf5413e789f031ced1687705a0445b791039af3efd35b4fa1f0a40f08b85bee5c5fa1a
 DIST tablib-0.11.2.tar.gz 758287 BLAKE2B 103ffaa755d7066b19243075fc0069fd7fa256e77f21c5a972a2077633e69064bdb433e3784780d2ac5a439aae62fb94dd128af755714de1fcdd5be46e3cb446 SHA512 356bf308df7c3d7d20800814a945c83fc64e98fb859d180cf5d9455ec2634e0a20f0c6ed788a75117c7c3d7bd4cda319c2049ce760109d102b2cb9a0707fa4f2
 DIST tablib-0.12.1.tar.gz 63420 BLAKE2B a4c4b2cd7f54045480fcac41ae55150ed903810de9f97df1a04ae74bdce16cd7c57027d38addbca8230a05ecd591290f2cdfe7736ccb02597a05cf7ffa0f5f4d SHA512 5207f59dab59f465584fc6c55d6322150f550c50f50a35d6901a39ed05a624a52dfdb5a9a9ddf0d6bc7285e5a3a4972c458895e4cc204a365c3df0d9ada0228a
 EBUILD tablib-0.11.2.ebuild 622 BLAKE2B c175fabd0d303cde927d31fcf594f18837c230c076196d84f6aaf07419b263bce34ec21bde797d4aff737cda373c6caa188294411e55e3a1d4a4a85af38da8aa SHA512 647dcd96e70d026c5f9627cfeb86c1cdd38a04f1fe900d7e10b6c7c88ce758386570320a8ad9661690c8126feb6c30987e6d12146162f64c059082eb5be466a7
+EBUILD tablib-0.12.1-r1.ebuild 1042 BLAKE2B d89ea9697991faca7ece788bf8f00b6b30676f84d9cf05977c70c3d46159ab8bd8088e2cca05620aaf21cb810eb500a48d62dcb97c45153fc73749ae79d46249 SHA512 47b81502e6388b786ffdba84b652764a9db03e0d98e8afe1854f38543f51226093408486f589c63e9c3cc387b61afd93e97ddc67607b69db1cb44c93d4959c84
 EBUILD tablib-0.12.1.ebuild 735 BLAKE2B 7dcd50e3aaab71de9cb4dba6d389ffb43e12ea7687db6abd9484ea46e4bba73b7e94d512f8d0906048cf1572f73b288626a9311bbd89d721c5f5c80b20d37837 SHA512 21be349ec04136a2cc448cdae0a50ab6179f40175907cdd63a26a9c98e63775d0d7956457a2935762552d4a7bd8f3a763d4a7ac081756c5b2ae62ac45d9f03f0
 MISC metadata.xml 325 BLAKE2B 0d538ffb3eded02a3816d40244c9561fbb269b14b2dcf16089ffb41f2b9808d416ab1adfd13329098d20a8887d0c41da5c3ef92a8342b82298dc503155d8a551 SHA512 abe357f80a305ac2f770f5fd7e40a7919abfe477cbebbe0ca36be32d49d630f7941f29d296222e5ed7b1d14482b794ccf86b3c4acaec47cada5fc7005e5dfc7f
diff --git a/dev-python/tablib/files/tablib-0.12.1-no-ujson.patch b/dev-python/tablib/files/tablib-0.12.1-no-ujson.patch
new file mode 100644
index 000000000000..93f6f93b8b74
--- /dev/null
+++ b/dev-python/tablib/files/tablib-0.12.1-no-ujson.patch
@@ -0,0 +1,16 @@
+diff --git a/tablib/formats/_json.py b/tablib/formats/_json.py
+index a3d6cc3..4c2777a 100644
+--- a/tablib/formats/_json.py
++++ b/tablib/formats/_json.py
+@@ -6,10 +6,7 @@ import decimal
+ 
+ import tablib
+ 
+-try:
+-    import ujson as json
+-except ImportError:
+-    import json
++import json
+ 
+ title = 'json'
+ extensions = ('json', 'jsn')
diff --git a/dev-python/tablib/tablib-0.12.1-r1.ebuild b/dev-python/tablib/tablib-0.12.1-r1.ebuild
new file mode 100644
index 000000000000..d720bb4e446e
--- /dev/null
+++ b/dev-python/tablib/tablib-0.12.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A format-agnostic tabular dataset library written in Python"
+HOMEPAGE="http://python-tablib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/odfpy[${PYTHON_USEDEP}]
+	dev-python/openpyxl[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/unicodecsv[${PYTHON_USEDEP}]
+	dev-python/xlrd[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
+"
+
+# Presence of pandas older than v0.23 makes tablib tests (which sometimes tries
+# to load pandas dataframes) fail.
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		!<dev-python/pandas-0.23
+	)
+"
+
+PATCHES=(
+	# https://github.com/kennethreitz/tablib/issues/297
+	"${FILESDIR}/${PN}-0.12.1-no-ujson.patch"
+)
+
+python_test() {
+	pytest -v -v  || die
+}
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index 7f9f634aeecb..67c671ff6876 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -1,3 +1,3 @@
 DIST tap.py-2.4.tar.gz 145440 BLAKE2B 1c6effe086c50cb8b11355db0439207330446a245c42420a948e1c3ff8caf917d9a76ea00f231199a5bd79e7396bcd2a904b764ffa1db611c57947274095a0b9 SHA512 7c843c40f0029bb122fdafec0f5416164b77fac69142c2308a6d815f2f409cddb33c5a08547409e278f06036e21cb2a53cbd3263c23f59c6618c12c201b8209c
-EBUILD tappy-2.4.ebuild 992 BLAKE2B c597c7998eb08596ec0f2336e6c54b5db7716e2b6f87dd97ecd0c16c30e5ebb3d94b3aeb0ecccd2e3d6c65fe86a5ad9564d628c3b3e6cd200cbc447c8be404b5 SHA512 7093caeebbe16d38783036f19a5ea88ab29edab56bb977d34cd099ad7710f7c8269aa1a32a5955c1c5e4964094e40627098f4df32bbf5e2f81bb6ddb3b71dd72
+EBUILD tappy-2.4.ebuild 999 BLAKE2B 967f0595bb01de5066b9468c58789399e35075eba605190cc5449fe73ed6c4fc242f79860337ef86d17712c5649397d5d67e7364e0f2cb614a9b699b52e52d20 SHA512 4e8f2d977ef7795fd71eae348ebaef1d16b7fae23a08b88c7dffc9406d6927816b3c43d7a7dadbd9e80b09f6109571daa2b92ac159cecbfcf88ad6c6b58f8b85
 MISC metadata.xml 466 BLAKE2B e3ae71b2ade021aa7dac05316df1b14e1a483245103cff6aea76b6663735f5f9b2d772a7d75c6bd539da8bd1728f82639e324822fe86e1a5895b6729f455f8a5 SHA512 d43be4cc82a9795c36d9d39b37c92bd810148551a635879b802aee0fa87f833492a4c67c5e12c7b9d2cb800295242faf4157ae0cfa04269261a1b438a305262b
diff --git a/dev-python/tappy/tappy-2.4.ebuild b/dev-python/tappy/tappy-2.4.ebuild
index 7c1e42f927b7..f7c342de57eb 100644
--- a/dev-python/tappy/tappy-2.4.ebuild
+++ b/dev-python/tappy/tappy-2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
 IUSE="test yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index eb7c5519eee6..cac4cc60831e 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,7 +1,9 @@
 DIST vdirsyncer-0.16.3.tar.gz 113327 BLAKE2B 9d293562962bb121b7dc48d7bd7585cd660fd368b70bd7a33d226cbef4a5a5135794d0a3e999202a40b710e7338fb55f5616680dcd4885832643565a3d9ed386 SHA512 8f71cc71527d68836405722b4be03695b9010f72729c1c9b6d0199996bcf6821628a26297ff2d3a45047910618d570566e00edefccc428d29ba9fc9033caddff
 DIST vdirsyncer-0.16.4.tar.gz 113368 BLAKE2B 6d3419456cb16dd10b9af19f7912a2a1e95af6d45e8fb3898f40f3c140ad26023556dd579de236850056cc6b78ffcbb95a45cfb427dc48f5425d0a40863f7aca SHA512 c01bf6bc5144629b82a3a60934fa6b89b0c24c55b09b98c54cba0a85d1e97f1c2ea157e159221ddfe4f11309cd5944eb2696ebc40b9d3ee95ea0801aa1eb9709
 DIST vdirsyncer-0.16.6.tar.gz 113249 BLAKE2B 51b12631c1847d68c5e9839cf8a69d09941a96b2907683246bd200271d6cd49041cb104ed59d01040724d4423cf1695a11dcf28a59c5affbf5fb8aa314e73a8e SHA512 b96467da4aeedbf6c582dfcc31cc6fbb88f8031e0e3c7c2fffc2e921cb927c6fcc937ac0da5ab74861bef34959dc05bd15208ec0380d83e727b3f55a5872404a
+DIST vdirsyncer-0.16.7.tar.gz 112786 BLAKE2B 19b9ce6e3e9de0a626b9562b4d54b270c1532d93169fe2d872f15c6bf6e1ac94bc623c171e51e871082422116636b4945b58dd172cfca527a010906737f1b6a3 SHA512 218c6781139a9e979077308dc732756cc27ecb67966e4b52be31cb1ebf04d224443036102d5c4bad253b9dcf533939f0b72082166f0fe94e042a7e946b8fad0e
 EBUILD vdirsyncer-0.16.3.ebuild 1474 BLAKE2B 3a6ff6382d98277754cdf8d4859e4cb6023b2ef062edd456dc7832e6924c9f2d3b08ef1f0639299bd51a3b2a1f008cc2602812220570db4baff9b3f5d4773618 SHA512 c3b510ce12d91643dfa0caf5f5f5b9b5b0e8d8b28979e9532e5eb7e624f1fc3c3d501fd40ed4ca9448ca19f9a19cd480c0d3024c96795f02937c9acbbf6193ec
 EBUILD vdirsyncer-0.16.4.ebuild 1474 BLAKE2B 3a6ff6382d98277754cdf8d4859e4cb6023b2ef062edd456dc7832e6924c9f2d3b08ef1f0639299bd51a3b2a1f008cc2602812220570db4baff9b3f5d4773618 SHA512 c3b510ce12d91643dfa0caf5f5f5b9b5b0e8d8b28979e9532e5eb7e624f1fc3c3d501fd40ed4ca9448ca19f9a19cd480c0d3024c96795f02937c9acbbf6193ec
 EBUILD vdirsyncer-0.16.6.ebuild 1474 BLAKE2B c2e2bbb9d82d2ebf08e2393c6e91a35957b8c5b10eba7884f95162ab3cb8b88fa072ebaa32180fb5e0becd2984faf0abd6661bca3ce2c43e8e98c2152219e2e0 SHA512 fabe73a645fb9a0daee0a3a8e53c171366085e8de3762ead282c05c7476fe09bf024561d9b426fb638f2a256085a53bd099f63c4bf26f1e0cccaea5ca3692d29
+EBUILD vdirsyncer-0.16.7.ebuild 1474 BLAKE2B c2e2bbb9d82d2ebf08e2393c6e91a35957b8c5b10eba7884f95162ab3cb8b88fa072ebaa32180fb5e0becd2984faf0abd6661bca3ce2c43e8e98c2152219e2e0 SHA512 fabe73a645fb9a0daee0a3a8e53c171366085e8de3762ead282c05c7476fe09bf024561d9b426fb638f2a256085a53bd099f63c4bf26f1e0cccaea5ca3692d29
 MISC metadata.xml 349 BLAKE2B 20ad2ded190f80b37283e6ef064168094e9edeec5ca6ba262e9e6d977bd28d1538056b21efa7fecc090b63424a23f87c54ec1e2e2dcd02a2f4c5ab7b4b82abe1 SHA512 5e2d7f27428065740bdee11e59053519c83054c19156f77ec03fc6e416ca44ea0b74178844ac8ef84d1993927bcf3ba0b80d84296a152a006681ed77e87ed14f
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.7.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.7.ebuild
new file mode 100644
index 000000000000..4f92360de59b
--- /dev/null
+++ b/dev-python/vdirsyncer/vdirsyncer-0.16.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Synchronize calendars and contacts"
+HOMEPAGE="https://github.com/pimutils/vdirsyncer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/click-log-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/click-threading-0.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
+	!=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-3.1[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
+
+python_test() {
+	# skip tests needing servers running
+	local -x DAV_SERVER=skip
+	local -x REMOTESTORAGE_SERVER=skip
+	# pytest dies hard if the envvars do not have any value...
+	local -x CI=false
+	local -x DETERMINISTIC_TESTS=false
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index 5db9a5186636..21c3cc015c92 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -3,6 +3,6 @@ DIST ws4py-0.3.4.tar.gz 65467 BLAKE2B c51e338f3c65e100b55e83cd7b09fb8e4eafec3adc
 DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11
 EBUILD ws4py-0.3.4-r1.ebuild 1789 BLAKE2B 7632a4b805400ee65e170b8ff526b28da8a351a6f2c34a058d423b3d2740b7b3ba74b950a1f0ac63a1e85115560a9839e53c8826e854f3a6d94251c90971d343 SHA512 9b8956dc48ffb144c1d8556243dfd0b5642adf5a8d9f456517607faaf4caa2dea10c7efef5584fb2b95bfa8a043c3a3b455960f79937629f6ed2144f6679c788
 EBUILD ws4py-0.3.4.ebuild 1743 BLAKE2B 5797daa805c311bb89e6ef14ff8b86ec77f8812935e2fd10f34167d829c24d418ab8af04ff416fa62628f83bc33fe7e66728414ac77d4a837ae3c46e835c9d0b SHA512 91d39f5109f2f98409c4a6bc33b55ecc9ae612427b4c434d1df2b75c74846ebc642814bc0b81d958592146ce1777b1dbb47d75d12460a2700139feb1ef678eb4
-EBUILD ws4py-0.5.1.ebuild 1754 BLAKE2B 23013d3a9d80a85c8b7bb8c703882c0e46a3a8d142496d8d890fe90b971eb752310d0b410556a24cfe8f30c60c9995d6172922cdbc4341d77b49383440acf56e SHA512 3e293b53b077228ac4b165b510ba7d3bb48622fef26e0e5d91e2c334682f12b4b6108332071215a8f5a16dd2d943a3be9f0e79c9f929d674ea265ded0f452b9f
+EBUILD ws4py-0.5.1.ebuild 1753 BLAKE2B a67a9a18234fade3126cbdfc08ace53cbe9ca576452a5bda3cf1498a8a93dcde8e04c859415813a96ace696e931091dfc1176b4c27680e1ff43fdc1341c28c86 SHA512 c181d6be5822305510d278c7bd18a99276801ba252b99239b577ae229cbd74e34fdc2f3a48ca2e6110829ba53bc10312e8ca5785aaaf4a6bc7e82bf553f23db7
 EBUILD ws4py-9999.ebuild 1756 BLAKE2B bd83be441081e43d8d304a863b5e65260b4d7da44b925510c19e80d2939e1471a33cf6d6b728fdff55528267f72b0d456fa6d271190646827ddb41298d788851 SHA512 878bdf409ac89a5d07e7b8f2b3c2e76a54985050b843e12f695ec172ec19d1ae1dec8f7c40ea08c6e1a19d8a6a27ec5d699cefeb822ff50e710c5455358ba810
 MISC metadata.xml 469 BLAKE2B 7c2212a53fd485fe5e99a53741f0d828bf09fca7dac40ddd1c0326eebffb1f0fef0c305ac00d61747d6184f3f309e711157f0b715d3fc49694bedabb9f09d513 SHA512 a368692c9de68b711cae8c35305b35e445f47046ecf2226d36d5944be4e8a6d29311c28c6ed74ae794517eb2f20c0b2eeeb0ce33e719029b843c8d23b2e2e838
diff --git a/dev-python/ws4py/ws4py-0.5.1.ebuild b/dev-python/ws4py/ws4py-0.5.1.ebuild
index 2cda31b943f8..58f0a0684a8f 100644
--- a/dev-python/ws4py/ws4py-0.5.1.ebuild
+++ b/dev-python/ws4py/ws4py-0.5.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 arm x86"
 fi
 
 DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 65afafb9d59c..053bbf6b8566 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 1a42123fce2f..081410bd1e47 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,11 +1,7 @@
-AUX assistant-4.8.2+gcc-4.7.patch 500 BLAKE2B 359cb062c9406b9afd8e4a427c5da36952ab7a1d821e127e74667d7752d3393cfce95fe9cd7a7134533eb4a1d6916b8b0f96da7fa0fd3efdee63f98ceaa18c4a SHA512 1948a7b47e5e15da47408af18c518762818542b42f2768a73acba698f23fca837a690be9821974be01662b45b7b3823b314577fa79472cf3f96620c0a1155a18
-AUX disable-webkit.patch 872 BLAKE2B 3856945120fbc7c27a32acc0663e74ec8302012c2c646cadb3467505797ee0a2233d3556646d532cfe1a2d3cb1b8b1fda53ff7a94ad302fba952202baa7927ca SHA512 9c05843197aab2a5e49aefb4aaa8e1ee73b4c410ec54ede9ca958672962713b1949493447a06bf7aaa1733bf22b3a67a77f94e4063b47bb30bade1522d29830b
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD assistant-4.8.7.ebuild 1477 BLAKE2B c722e0a293112ba58f292566de3d3730e5a12430e107f9fe95ed45841e55731340a298b23dda9bbdbfcd29e3b51342077e7fc3f632755ee54fefab72f72dcb05 SHA512 2f01f97502f9990a048b3dc974e6295cdb8f97f2804f0a20a9f515e7a8a04611718d680778ce35ddac45b6406dfb4fcf05a60a7f24acdcbfd3787c3e2961eb6b
 EBUILD assistant-5.11.1.ebuild 1198 BLAKE2B f2b40ee9a585e0a0fcb98b6999728b633a3c9cf3c9bfc767ba2f5d6948156684596bf02aa9e006008f50474def97051562faa6baad271662c33c78095e1c7f39 SHA512 cca326bf91461ef72f110f6c0c23ef13c65eb0fa51eebdce468797e89f5969846dff93ce75a93ed1d1f699044e7dc3a32b0659e922f26531b71702390f6f318c
 EBUILD assistant-5.9.4.ebuild 1195 BLAKE2B 9fd15cfd04a7544046cccdc503169417f53ee3a808aeb58a745063e62acb3deed5d761275c1c9a812c92a38427c447f542a77feb312517556c15b4da7681a2b3 SHA512 9139269fee4450c028b112203655a5917beefe83ef07544c8c129c4efee9815448af5cb59312b53821d0c2fa53214e439f02343b84952207a1f8cb57c3e09ee6
 EBUILD assistant-5.9.6.ebuild 1196 BLAKE2B 277fdd312eeadf0ec2b9a80344a27c02e3afda54c98e461980336548a27754031de6cefd1cd6b68b982e01b1328c59709c76f644a55097388873503159ef444d SHA512 593c31f11c78108adec6a63d1e47369746b48a4a15f4ad8a18930004f4c5f188b314f069fc43431f51415416109b84ce2994b0a4b59cdef710fcd1f1cb69eeec
-MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-4.8.7.ebuild b/dev-qt/assistant/assistant-4.8.7.ebuild
deleted file mode 100644
index 41eb312612bc..000000000000
--- a/dev-qt/assistant/assistant-4.8.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-fi
-
-IUSE="webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
-)
-
-QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
-
-src_prepare() {
-	# bug 401173
-	use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch")
-
-	qt4-build-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns
-		$(qt_use webkit)
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	doicon tools/assistant/tools/assistant/images/assistant.png
-	make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
-}
diff --git a/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch b/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch
deleted file mode 100644
index 1cf70275f634..000000000000
--- a/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- tools/assistant/tools/assistant/mainwindow.cpp	2012-06-27 03:02:37.539564947 +0200
-+++ tools/assistant/tools/assistant/mainwindow.cpp	2012-06-27 03:03:18.843561620 +0200
-@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont()
-     if (helpEngine.usesAppFont())
-         font = helpEngine.appFont();
- 
--    const QWidgetList &widgets = qApp->allWidgets();
--    foreach (QWidget* widget, widgets)
-+    foreach (QWidget* widget, QApplication::allWidgets())
-         widget->setFont(font);
- }
- 
diff --git a/dev-qt/assistant/files/disable-webkit.patch b/dev-qt/assistant/files/disable-webkit.patch
deleted file mode 100644
index 61bca05148e5..000000000000
--- a/dev-qt/assistant/files/disable-webkit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro
-===================================================================
---- qt-everywhere-opensource-src-4.8.9999.orig/tools/assistant/tools/assistant/assistant.pro
-+++ qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro
-@@ -2,7 +2,6 @@ include(../../../shared/fontpanel/fontpa
- TEMPLATE = app
- LANGUAGE = C++
- TARGET = assistant
--contains(QT_CONFIG, webkit):QT += webkit
- CONFIG += qt \
-     warn_on \
-     help
-@@ -81,11 +80,8 @@ SOURCES += aboutdialog.cpp \
-     openpageswidget.cpp \
-     openpagesmanager.cpp \
-     openpagesswitcher.cpp
--contains(QT_CONFIG, webkit) {
--    SOURCES += helpviewer_qwv.cpp
--} else {
--    SOURCES += helpviewer_qtb.cpp
--}
-+
-+SOURCES += helpviewer_qtb.cpp
- 
- FORMS += bookmarkdialog.ui \
-     bookmarkmanagerwidget.ui \
\ No newline at end of file
diff --git a/dev-qt/assistant/metadata.xml b/dev-qt/assistant/metadata.xml
index 22d751f51bd7..32568f62fb8e 100644
--- a/dev-qt/assistant/metadata.xml
+++ b/dev-qt/assistant/metadata.xml
@@ -5,10 +5,6 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
-	<use>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
-	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index ececb5f8c0e6..117349d7c708 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,9 +1,7 @@
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD designer-4.8.7.ebuild 1746 BLAKE2B a6d8990f6498a02e3bc67d420ea5bdf2c942b20167e9ab9856ded2c48c115773464e4f932c7fd4fe5ec39b84055310b2758c4cd8df29f8bf55a75b1f5f4d2eb9 SHA512 69c7c89fde7f2bfb98ee87f0fa3af6bff2a815c0bf71436fc32a5d1d2e8dfa0184f2383b341be942c6581c0c218ad7d2ccef2ca2406da9b046180a7e79aba191
 EBUILD designer-5.11.1.ebuild 1244 BLAKE2B ad0534b8270814a5be1fd476da3a03c9eaaacca6c9188a3fe01237e7fa78dccf2734b5fab06e2a7aa40590229ed7cf18df208dbbf3c9a7bcce1ee5bf0cb34e99 SHA512 892e94e9ed8c3d90462f8141a18ae68304b8d096383a6d5d1dbf09ca439480ca6f289f0b59e16734477a845ae1a742235decdcb3b5f6224e2b2d8f65e7cafffc
 EBUILD designer-5.9.4.ebuild 1240 BLAKE2B 4e9a38c065ef1952e11e1aecb64641713a60158fb871366148b2a14e38f37f3bba3dd851af6785c60c4abb724a3f665a4420b04f6b4b94b0d95d0b2de3f57a6c SHA512 ce7311a632c53fac6ef6203136ca190518e5463f47536aa6bf32cfe9f06b8f2984889c23a0452c5f7c95d1f1e70df5ff20f133b9555c4546faf21b3c68be9a23
 EBUILD designer-5.9.6.ebuild 1242 BLAKE2B 4a1b3272132dd6eaf3e6c1392351a01d36dc56ae284c285f3d928c5e656350132fc960de0952bf4f852e4e7091b02d47d56983081ef4649a02fca13225af668b SHA512 988ade14b503688b4b9e8ed6c06a6022475cf3a4d0cf49cb7dfefb96616443e89cd7d75ee1777bff7ef3e56b96b609b37e44ffdccf1e138f22e86b706e22a617
-MISC metadata.xml 879 BLAKE2B 4d8a4c31c5cb415d18d59f54243bdb9b49bdbd6c374576d7294d2db2ce6505e31fa8da57966b04d9223e9a474d06f7078bab7432051629fa0a5dafdb9ca59152 SHA512 fba36502504141e09462fb211dacbfe43db6cb6e750f699058c757c1fc24072eb5ed50bbbb20e2bbacb831f165a58c20cb9c012ccbe96665969e1fc8fc153489
+MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-4.8.7.ebuild b/dev-qt/designer/designer-4.8.7.ebuild
deleted file mode 100644
index 7fbb1e9854ca..000000000000
--- a/dev-qt/designer/designer-4.8.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-DESIGNER_PLUGINS="declarative phonon qt3support webkit"
-IUSE="${DESIGNER_PLUGINS}"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="phonon? ( media-libs/phonon[designer,qt4] )"
-
-QT4_TARGET_DIRECTORIES="tools/designer"
-
-src_prepare() {
-	qt4-build-multilib_src_prepare
-
-	local plugin
-	for plugin in ${DESIGNER_PLUGINS}; do
-		if ! use ${plugin} || [[ ${plugin} == phonon ]]; then
-			sed -i -e "/\<${plugin}\>/d" \
-				tools/designer/src/plugins/plugins.pro || die
-		fi
-	done
-}
-
-multilib_src_configure() {
-	local myconf=(
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	doicon tools/designer/src/designer/images/designer.png
-	make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
-}
diff --git a/dev-qt/designer/metadata.xml b/dev-qt/designer/metadata.xml
index e72a70897a4f..7f1774a4eb6a 100644
--- a/dev-qt/designer/metadata.xml
+++ b/dev-qt/designer/metadata.xml
@@ -7,10 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="declarative">Build the qdeclarativeview plugin</flag>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
-		<flag name="phonon">Build the phononwidgets plugin</flag>
-		<flag name="qt3support">Build the qt3supportwidgets plugin</flag>
 		<flag name="webkit">Build the qwebview plugin</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 4370b529f61a..b36fd27b065d 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,9 +1,7 @@
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD linguist-4.8.7.ebuild 1156 BLAKE2B 69663d5d63aeb2c60a97fb6fb16124d16683350dec8da4bfd6303d85e4afe0f1c63202fa9ad61c04cb7e18ae2a95ca665f1641124893cd93ccd297ba3af71e84 SHA512 c8468dc810ce46dcc6adbfb0d178b173299ec0bbc19936f6ff85df59759b4e710b6afe270d345653ca209e5c4d541ba03a20fafb596d3c1c83e74f46d152d9f6
 EBUILD linguist-5.11.1.ebuild 992 BLAKE2B 5db73329127034e7a71336bb845b7fe68ed45becabbe1206f24972ac1b4302923c504953198389da8d8021d415498460054c8d1191b1f13bf0c9f8685f3feab5 SHA512 25cac8c8a214be7467b58c73543693cd2165e6055516f74ac64fe6e33263da564b64957fa7c801be7d1ccb70c2673752ca4653c12821247dec56d8e7ffa4551d
 EBUILD linguist-5.9.4.ebuild 989 BLAKE2B d3766d1ec8f65abc86909647bab3e4d28666f8ee11d27aa52138844d0b738bd522154e5f461f6540c856bce00377515caf9cb62035ac67d34e6600f053669be3 SHA512 11a3cad892735e439d1f2851c320bd54e3a2fa89f1b9c4901b0bd445e54709342d4bcb7792e7a14c332326e6e2a6bc1eaf93534298029972e59316735f836a85
 EBUILD linguist-5.9.6.ebuild 990 BLAKE2B e7a79d2026c2f05657d9493fcd20a8450578cfa6a9f3ca82553c627cee26ed9d2f20a98d0b75fd4e99f647b98f607ce709984b582a2c3f0844fbfb1b8b3014f9 SHA512 5680bb60a6226db5cd776044b50796d1d377065868fbbabcd719508afb8c89371d0fa5c789444d86fe084c564946afe827f91679bc4ce87dee56f0c83d2cb9bc
-MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/linguist/linguist-4.8.7.ebuild b/dev-qt/linguist/linguist-4.8.7.ebuild
deleted file mode 100644
index 0c0cce6d0fb6..000000000000
--- a/dev-qt/linguist/linguist-4.8.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="Graphical tool for translating Qt applications"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
-
-multilib_src_configure() {
-	local myconf=(
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
-	make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
-}
diff --git a/dev-qt/linguist/metadata.xml b/dev-qt/linguist/metadata.xml
index 22d751f51bd7..32568f62fb8e 100644
--- a/dev-qt/linguist/metadata.xml
+++ b/dev-qt/linguist/metadata.xml
@@ -5,10 +5,6 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
-	<use>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
-	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 72110d38be78..3f0be65109c7 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,9 +1,7 @@
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD pixeltool-4.8.7.ebuild 836 BLAKE2B c2dadbdf93032d63466f13462c3610a2401effb5884353cce3b53148407a52fa2757d5396a1ee5d8aed80ddbf8aa1e8bf845d82a04234c618f89550c64e96042 SHA512 2ea3e1e6dc5a40b63108785c6e08e59f395194fcf247f8ed77ce8ab874eef04a76384444093a3878ea0d41949344a212a4fa25e84c4dde8e5a26b96a64b94fa8
 EBUILD pixeltool-5.11.1.ebuild 427 BLAKE2B bffe3b0f18b8c401f3a8daeae201c9f43187b515ed2691c938beeb45276bc27b5d24db459f6ae83336775a50733fe41d4166963cda41ec30e9ad451e5728a0d1 SHA512 4efa3fb21649069309421a5fb10f21b474404d02d2a095bd5a978c26d357c62bd45cd8944ddb126a307f849ba5b3490685aa24a88e88b9744b739d35d7491eef
 EBUILD pixeltool-5.9.4.ebuild 424 BLAKE2B f70a57ed314ef84a525eeadef282b1f8b526ece30980904fe79c5bb5a1b80d9cc0fabb79847e1eef9d70d419076c19ebad0a5d23ecd2b9d1b5832df5ed824721 SHA512 420f8831d949332c2f2f4625019476853f3073228fcd5a6e4173240647f340b80bf845dd0526ee5d0be466352d6faed48df3b18c67f59441cca06b81ed3411af
 EBUILD pixeltool-5.9.6.ebuild 425 BLAKE2B e14389e4c4ba0a4ffac6ec27f5e66e2d2eb4d2d89bf8b82daf0f103d8e51fe19f28a414cfff56875a113ea416e24fed8dcd643acc196fe8af15aa1fc688c66f1 SHA512 5316652541f4351407dc7f0fa6b63210fdca0379468be93e8f479b2bda4279ddbdd524fa8e48891441443e21ed216263178baf88cbc5b914bcb7bb35121f7b13
-MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/pixeltool/metadata.xml b/dev-qt/pixeltool/metadata.xml
index 22d751f51bd7..32568f62fb8e 100644
--- a/dev-qt/pixeltool/metadata.xml
+++ b/dev-qt/pixeltool/metadata.xml
@@ -5,10 +5,6 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
-	<use>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
-	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
diff --git a/dev-qt/pixeltool/pixeltool-4.8.7.ebuild b/dev-qt/pixeltool/pixeltool-4.8.7.ebuild
deleted file mode 100644
index 9cf60ffbfbaa..000000000000
--- a/dev-qt/pixeltool/pixeltool-4.8.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="Qt screen magnifier"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	!<dev-qt/qthelp-4.8.5:4
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="tools/pixeltool"
-
-multilib_src_configure() {
-	local myconf=(
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 3b2310b0c463..0a3e7f2ede52 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,9 +1,7 @@
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD qdbusviewer-4.8.7.ebuild 1174 BLAKE2B dda9669b7d58f473f583f5141f79df3175dd4830622761345809f2bfe6177528ac2b33958618ab9c7562a7df76384631a45e27e4cd1e5178c906c2d7d90a1630 SHA512 6f08b895885d8216d15a6ac7d35e8b4dccb504a7b2d9740ada1a48b2672eba530345e2af4bf7cdd4e27d01991d16c84177506f370bbf989680b62f711af828cc
 EBUILD qdbusviewer-5.11.1.ebuild 973 BLAKE2B d05999d018332cf922bb8ef1454b27a7c52b404f50ed2b6e1a3d4d4bc0a55d2ce4965a4c07cf22bcdf2e64a4305c0500dbb54e287bc39a0ecb718e32efd6659e SHA512 e2f468485c030cbbac2cd5532088588eb59ef8a89acea68274317d8f55e84f3aaadc0e80694dd45a202605f40880bd266c885a6527dc296400d12ad8f2d81859
 EBUILD qdbusviewer-5.9.4.ebuild 970 BLAKE2B ef175f6e87bcee9a13ff081c8501ce41317fe0e2a45cc8489593cf79a3298480a1f0e70cf95b507fa56739f364ba53ccfcb5ab215cce8625d4c2a01b7f3c7648 SHA512 5fecd7efe36d0dd9cf956ffe573b2a395d32323c0096996e0afd153af7224094cc74926c3473ead047ccf3a2ab079e0a9c78c82427ddebfe567ae90e1c79040a
 EBUILD qdbusviewer-5.9.6.ebuild 971 BLAKE2B 17ccca76c24fd320f456af7b69d9d97d1ed932e356fbc41e9b0eed2d564c6eb48e2d1d4daa43aaa45d9eaf0e99483cf84938c3a76b160dc1d6d3c0fae8b97c9c SHA512 7cb96d07851f499aa141717338b819573f4bd9bb878a75a3546ca115b02f22e92deb976301417215e3ea095ed323ae727003a84d28c0dd5fa9f46df65f14fca8
-MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbusviewer/metadata.xml b/dev-qt/qdbusviewer/metadata.xml
index 22d751f51bd7..32568f62fb8e 100644
--- a/dev-qt/qdbusviewer/metadata.xml
+++ b/dev-qt/qdbusviewer/metadata.xml
@@ -5,10 +5,6 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
-	<use>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
-	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
deleted file mode 100644
index bf0dafdd0b9f..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
-
-multilib_src_configure() {
-	local myconf=(
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
-	make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development'
-}
diff --git a/dev-qt/qt-meta/Manifest b/dev-qt/qt-meta/Manifest
deleted file mode 100644
index effdec0486fc..000000000000
--- a/dev-qt/qt-meta/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD qt-meta-4.8.6-r1.ebuild 1024 BLAKE2B 7e815d073a1bb1a9a441ade5cd3733103f03e15bf75991c5e0bc4b655e1850407f4e59d58d3fd5211d425bd10f0f4d0dede2225ba39c21394b79574354adfec6 SHA512 d76df60ec4cb5332bdd61508443cba42885629c57762ae588f166f553e0b69682d9c54b98b475712ed5639abe88e06ac6557a1c3e7d590d395a4716dc7b40c56
-MISC metadata.xml 333 BLAKE2B 1b83cc14bc1e211df620ca5780d454e579529097e0deb62fa79fbab896b1db670a2d7d75b2629e42b85878e1779aad7d65c8aae95a4791899244bbe2964ef5a6 SHA512 83cc5fe637917ffcd5563c225f9fadb82e0a5bb7e105f83d7357f915fcc128a6d9b4c9bf80f65fb3cc7d69da3071cc13ec9ad48ee3d303bc1f06340a5fdf4d3d
diff --git a/dev-qt/qt-meta/metadata.xml b/dev-qt/qt-meta/metadata.xml
deleted file mode 100644
index 202b54f3e094..000000000000
--- a/dev-qt/qt-meta/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<use>
-		<flag name="qt3support">Enable the Qt3Support library for Qt4</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-qt/qt-meta/qt-meta-4.8.6-r1.ebuild b/dev-qt/qt-meta/qt-meta-4.8.6-r1.ebuild
deleted file mode 100644
index f3d4853b85fd..000000000000
--- a/dev-qt/qt-meta/qt-meta-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Cross-platform application development framework (metapackage)"
-HOMEPAGE="https://www.qt.io/"
-
-LICENSE="metapackage"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+dbus examples +qt3support +webkit"
-
-DEPEND=""
-RDEPEND="
-	>=dev-qt/assistant-${PV}:4
-	>=dev-qt/designer-${PV}:4
-	>=dev-qt/linguist-${PV}:4
-	>=dev-qt/pixeltool-${PV}:4
-	dbus? ( >=dev-qt/qdbusviewer-${PV}:4 )
-	qt3support? ( >=dev-qt/qt3support-${PV}:4 )
-	>=dev-qt/qtbearer-${PV}:4
-	>=dev-qt/qtcore-${PV}:4
-	dbus? ( >=dev-qt/qtdbus-${PV}:4 )
-	>=dev-qt/qtdeclarative-${PV}:4
-	examples? ( >=dev-qt/qtdemo-${PV}:4 )
-	>=dev-qt/qtgui-${PV}:4
-	>=dev-qt/qthelp-${PV}:4
-	>=dev-qt/qtmultimedia-${PV}:4
-	>=dev-qt/qtopengl-${PV}:4
-	>=dev-qt/qtscript-${PV}:4
-	>=dev-qt/qtsql-${PV}:4
-	>=dev-qt/qtsvg-${PV}:4
-	>=dev-qt/qttest-${PV}:4
-	webkit? ( >=dev-qt/qtwebkit-${PV}:4 )
-	>=dev-qt/qtxmlpatterns-${PV}:4
-"
diff --git a/dev-qt/qt3support/Manifest b/dev-qt/qt3support/Manifest
deleted file mode 100644
index e09a523abc9f..000000000000
--- a/dev-qt/qt3support/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-EBUILD qt3support-4.8.7.ebuild 797 BLAKE2B 415d8a4b36620949187ecc95fd17b96df2e0da02cad849c6428cd7292ad52ae56862807d208e94e27886fa2ba55c4e4fa2ec7ea5a480037e8c7432008932b96c SHA512 a30f2183dd78987115510229dda4b66c746645de0406c2c93e15e164029467f8728d8646d88a298bea1ece27876258547693ee3bfec518b2f79a5062f53d5ec2
-MISC metadata.xml 498 BLAKE2B 6247db9a5f5ba507a0c361a8e6782e51b20e08de265797c2f77d5193aeb0e6a526d2fc9cd74dfb2edc866fede297ba78d30c3143567408e9072ee8de6b1bd9c8 SHA512 c3a9a09447e5cce7d251073785f0692096497a10ba01ae6ba8769d0ac07b829ed6d5dc97daf83da128569346fd1bd679031aafe0f4644d33361e22403f47310a
diff --git a/dev-qt/qt3support/metadata.xml b/dev-qt/qt3support/metadata.xml
deleted file mode 100644
index b92d7448ee41..000000000000
--- a/dev-qt/qt3support/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<use>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
-	</use>
-	<upstream>
-		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>https://doc.qt.io/</doc>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-qt/qt3support/qt3support-4.8.7.ebuild b/dev-qt/qt3support/qt3support-4.8.7.ebuild
deleted file mode 100644
index d6794af6893d..000000000000
--- a/dev-qt/qt3support/qt3support-4.8.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The Qt3Support module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+accessibility"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	src/qt3support
-	src/tools/uic3
-	tools/porting"
-
-multilib_src_configure() {
-	local myconf=(
-		-qt3support
-		$(qt_use accessibility)
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtbearer/Manifest b/dev-qt/qtbearer/Manifest
deleted file mode 100644
index 2fc107f7f40f..000000000000
--- a/dev-qt/qtbearer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-EBUILD qtbearer-4.8.7.ebuild 1448 BLAKE2B 44d810019a05f0cf6fb7cb1162df74863dd80a33d72715022b15e08c66a72c524db7c12dfb2367930d983a12546606502b549e8f315a7533519579dac5a618ad SHA512 c3fb35eee3f74574bda39a17cc7c69b628e07c5893e7ea2890dabfeca2ba067a14fd45949018bb8b6ce4c7306318ff3010aac4d6dde246b404e6390d6a614bc3
-MISC metadata.xml 498 BLAKE2B 6247db9a5f5ba507a0c361a8e6782e51b20e08de265797c2f77d5193aeb0e6a526d2fc9cd74dfb2edc866fede297ba78d30c3143567408e9072ee8de6b1bd9c8 SHA512 c3a9a09447e5cce7d251073785f0692096497a10ba01ae6ba8769d0ac07b829ed6d5dc97daf83da128569346fd1bd679031aafe0f4644d33361e22403f47310a
diff --git a/dev-qt/qtbearer/metadata.xml b/dev-qt/qtbearer/metadata.xml
deleted file mode 100644
index b92d7448ee41..000000000000
--- a/dev-qt/qtbearer/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<use>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
-	</use>
-	<upstream>
-		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>https://doc.qt.io/</doc>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-qt/qtbearer/qtbearer-4.8.7.ebuild b/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
deleted file mode 100644
index 515b3ccc88ca..000000000000
--- a/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The network bearer plugins for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="connman networkmanager"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/plugins/bearer/generic
-		$(use connman && echo src/plugins/bearer/connman)
-		$(use networkmanager && echo src/plugins/bearer/networkmanager)"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use connman || use networkmanager || echo -no-dbus)
-		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
-		-no-cups -no-gtkstyle -no-nas-sound -no-opengl
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 3dbef05a1e2e..e55468f96346 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,13 +1,7 @@
-AUX qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch 3410 BLAKE2B 1a067cc908c762d4e3c8af2367c0c57e6a3150a9372da27540ea5c4cffe64c87f2f2d1440a4001fe5c1c3ef5dc07b7733d6507086bcab36801f6b3510a673525 SHA512 6770959ba01756d6a3fa9e03edd5f6c1df0d8625f4add65f7fef55a93b7b52c555a0ce749984938fb7ab905c2e0875cec0cb5d07f45c1b447fbc9e2d0ec678bb
-AUX qtcore-4.8.5-qeventdispatcher-recursive.patch 4017 BLAKE2B 13b105b166613516a1f86a5eb50317f0c674d2612f0c39c3e46b4f24fe924f953491f1cd56991fcbd693761075500d7c86b45c70ba213e7bd5856f1833bd1fc9 SHA512 bd63961bcb695beebe8686142b84bff7702db4d85d737f5c2da927252b931700d03602f80048223cbbb05d85a5ddb9cb818321d756577f84843690b318f0c413
-AUX qtcore-4.8.7-libressl.patch 2161 BLAKE2B e6c5c494fe76840c0c3d1c7e91c72a825dd595194368af35ed824552e6e851b961a4f7242acc7982cc7b80331e4190d0544052a5aad29c3beea726306ee19c38 SHA512 c84b827fd5f0c504c9ab95352677dc2cfe926c81aa012b454d8260385215b510835ba693830b3a3a6fa374b299995ec14cbb07711f41031788fc6c3bec396021
-AUX qtcore-4.8.7-moc.patch 926 BLAKE2B 1fd7a9b6d7d69aa110761a587bbe1d13910f4537c0dd60e6f681c8242b150fc23a476d2011211565412f855bc1fb90a58e363d349bb18b40e6e299261e0a5a7a SHA512 cb64e3e2271d3031c11d2c8afe1bcfd5263bcf8b8c787d03059b4bca25f3dd2d8a092c80cb396a1a466d2ef667697c31856c7c675aa7c48b5680f5e91db95f86
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtcore-4.8.7-r4.ebuild 2866 BLAKE2B 323682baab556e3eca23f3c31d872fdb0b7d06d95be41b132b76793d4b3c99b983fba67861629a2cbef3f997b6d46c22816a43c30031f3f9fd1a399c72e9cfc0 SHA512 fe03ae3835572bf39090010e9740e3174c0b5eb2d1ea92b5fadc7d498c29c8ebfe21d86bc9b2783ab2c6957a28f0e65f1a57c36b903ce16bdb9e2cb0328e1875
 EBUILD qtcore-5.11.1.ebuild 1505 BLAKE2B ae9f8ad65f4b8eeb433cd2b544f7a69c5aee9beac809f00bf4c3241a37a411deff93f5ce6a5e7ad5dd04cc3ca570529923d5217304c268756f991d3a3a1a6952 SHA512 796e3958162b2805adbc0c227699b423a7ceaad4883b89439ff24468434195053bf3d486c1ae50dbbbf4dc485f2a9fdc4c74a3b36985c9d96dfec08e02789b2f
 EBUILD qtcore-5.9.4-r2.ebuild 1501 BLAKE2B dce6d23557075493060d6899b641e01a30423bc8bf6144c036399c41b2decba8accf17a5e7b0af61f4f85be28c7eda77093fd6b3b770cd097c0c1ecba5130563 SHA512 21d2daaae4b90d677e568e8d7ad9c43582f22fdd2589d45685426b779c5ae8b01aac06996071c317cc5c37601c9a51cb042973f6189a34b23b1af947eed3ca4e
 EBUILD qtcore-5.9.6.ebuild 1503 BLAKE2B 6948e1c6731b5f8a1befdce7cc689eb3e8c8a5fedf563177793ce9fe46545477f93dcbad879991a75c145c7ac61983f28e092c2599cf9e04e2bd5cd8d08798e1 SHA512 e93bb3dcd158eb10b3372f9357a7cc20b3aa95dbdd4536bd313cd303a328960b30b9b4e7ee0b4d14534a7fe1b23909b9be072864f57308430a670f4044c5012a
-MISC metadata.xml 924 BLAKE2B 6be074e378d4e63efe0c6ff55cb99c3ab1318c1d05d8208f4deb8a54a3cc9ded99b63e788336d83633b03eb5d857394e189472a374184d852d3c5851e27555b6 SHA512 c9786a997109a6156ed4879cd94e3e368b7ce095fc43fced168bdc5fbc846411c145318020d0eab7024aa64003403435a6cad222ab3569d838b9450c526c8ddb
+MISC metadata.xml 565 BLAKE2B 3f18dd1accf6b8a781b5d2cc5c59440e31e8e7cd9210b53f19ea7c0f867be0ac3f109e823724e92be4a6b0a9a765869520e417f321a5ec53f6ee136a0b68592e SHA512 7d13e8697d2bca8b220e322b0c961d32e34d5e8fac70027c2eb8bdf2b4cd168f1d86f56e375d9bb78d3f06d1f489f66bcaa35a2074302a849a3af6e93fdfb666
diff --git a/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch b/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch
deleted file mode 100644
index 0fcc1fa6561d..000000000000
--- a/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 267feb2de49eed0823ca0c29f1cd5238537c7116 Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski <glogow@fbihome.de>
-Date: Thu, 6 Mar 2014 18:44:43 +0100
-Subject: Honor ExcludeSocketNotifiers in glib event loop
-
-Implements QEventLoop::ExcludeSocketNotifiers in the same way
-QEventLoop::X11ExcludeTimers is already implemented for the glib
-event loop.
-
-This prevents crashes when QClipboard checks for clipboard events
-and
-  qApp->clipboard()->setProperty( "useEventLoopWhenWaiting", true );
-is set.
-
-Task-number: QTBUG-34614
-Task-number: QTBUG-37380
-
-Change-Id: Id4e2a74c6bdf8c3b439a4e3813d24d11368b607d
----
- src/corelib/kernel/qeventdispatcher_glib.cpp | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp
-index 0b0e308..ba522fa 100644
---- a/src/corelib/kernel/qeventdispatcher_glib.cpp
-+++ b/src/corelib/kernel/qeventdispatcher_glib.cpp
-@@ -65,6 +65,7 @@ struct GPollFDWithQSocketNotifier
- struct GSocketNotifierSource
- {
-     GSource source;
-+    QEventLoop::ProcessEventsFlags processEventsFlags;
-     QList<GPollFDWithQSocketNotifier *> pollfds;
- };
- 
-@@ -80,6 +81,9 @@ static gboolean socketNotifierSourceCheck(GSource *source)
-     GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
- 
-     bool pending = false;
-+    if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
-+        return pending;
-+
-     for (int i = 0; !pending && i < src->pollfds.count(); ++i) {
-         GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
- 
-@@ -103,6 +107,9 @@ static gboolean socketNotifierSourceDispatch(GSource *source, GSourceFunc, gpoin
-     QEvent event(QEvent::SockAct);
- 
-     GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
-+    if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
-+        return true;
-+
-     for (int i = 0; i < src->pollfds.count(); ++i) {
-         GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
- 
-@@ -331,6 +338,7 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context)
-         reinterpret_cast<GSocketNotifierSource *>(g_source_new(&socketNotifierSourceFuncs,
-                                                                sizeof(GSocketNotifierSource)));
-     (void) new (&socketNotifierSource->pollfds) QList<GPollFDWithQSocketNotifier *>();
-+    socketNotifierSource->processEventsFlags = QEventLoop::AllEvents;
-     g_source_set_can_recurse(&socketNotifierSource->source, true);
-     g_source_attach(&socketNotifierSource->source, mainContext);
- 
-@@ -416,6 +424,7 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
-     // tell postEventSourcePrepare() and timerSource about any new flags
-     QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
-     d->timerSource->processEventsFlags = flags;
-+    d->socketNotifierSource->processEventsFlags = flags;
- 
-     if (!(flags & QEventLoop::EventLoopExec)) {
-         // force timers to be sent at normal priority
-@@ -427,6 +436,7 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
-         result = g_main_context_iteration(d->mainContext, canWait);
- 
-     d->timerSource->processEventsFlags = savedFlags;
-+    d->socketNotifierSource->processEventsFlags = savedFlags;
- 
-     if (canWait)
-         emit awake();
--- 
-2.0.0
-
diff --git a/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch b/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch
deleted file mode 100644
index 6d3bf2f2cde2..000000000000
--- a/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- src/corelib/kernel/qeventdispatcher_glib.cpp.sav	2014-03-28 15:26:37.000000000 +0100
-+++ src/corelib/kernel/qeventdispatcher_glib.cpp	2014-04-24 09:44:09.358659204 +0200
-@@ -255,22 +255,30 @@ struct GPostEventSource
-     GSource source;
-     QAtomicInt serialNumber;
-     int lastSerialNumber;
-+    QEventLoop::ProcessEventsFlags processEventsFlags;
-     QEventDispatcherGlibPrivate *d;
- };
- 
- static gboolean postEventSourcePrepare(GSource *s, gint *timeout)
- {
-+    GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
-     QThreadData *data = QThreadData::current();
-     if (!data)
-         return false;
- 
-+    QEventLoop::ProcessEventsFlags excludeAllFlags
-+        = QEventLoop::ExcludeUserInputEvents
-+        | QEventLoop::ExcludeSocketNotifiers
-+        | QEventLoop::X11ExcludeTimers;
-+    if ((source->processEventsFlags & excludeAllFlags) == excludeAllFlags)
-+        return false;
-+
-     gint dummy;
-     if (!timeout)
-         timeout = &dummy;
-     const bool canWait = data->canWaitLocked();
-     *timeout = canWait ? -1 : 0;
- 
--    GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
-     return (!canWait
-             || (source->serialNumber != source->lastSerialNumber));
- }
-@@ -284,8 +292,14 @@ static gboolean postEventSourceDispatch(
- {
-     GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
-     source->lastSerialNumber = source->serialNumber;
--    QCoreApplication::sendPostedEvents();
--    source->d->runTimersOnceWithNormalPriority();
-+    QEventLoop::ProcessEventsFlags excludeAllFlags
-+        = QEventLoop::ExcludeUserInputEvents
-+        | QEventLoop::ExcludeSocketNotifiers
-+        | QEventLoop::X11ExcludeTimers;
-+    if ((source->processEventsFlags & excludeAllFlags) != excludeAllFlags) {
-+        QCoreApplication::sendPostedEvents();
-+        source->d->runTimersOnceWithNormalPriority();
-+    }
-     return true; // i dunno, george...
- }
- 
-@@ -329,6 +343,7 @@ QEventDispatcherGlibPrivate::QEventDispa
-     postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs,
-                                                                         sizeof(GPostEventSource)));
-     postEventSource->serialNumber = 1;
-+    postEventSource->processEventsFlags = QEventLoop::AllEvents;
-     postEventSource->d = this;
-     g_source_set_can_recurse(&postEventSource->source, true);
-     g_source_attach(&postEventSource->source, mainContext);
-@@ -423,6 +438,7 @@ bool QEventDispatcherGlib::processEvents
- 
-     // tell postEventSourcePrepare() and timerSource about any new flags
-     QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
-+    d->postEventSource->processEventsFlags = flags;
-     d->timerSource->processEventsFlags = flags;
-     d->socketNotifierSource->processEventsFlags = flags;
- 
-@@ -435,6 +451,7 @@ bool QEventDispatcherGlib::processEvents
-     while (!result && canWait)
-         result = g_main_context_iteration(d->mainContext, canWait);
- 
-+    d->postEventSource->processEventsFlags = savedFlags;
-     d->timerSource->processEventsFlags = savedFlags;
-     d->socketNotifierSource->processEventsFlags = savedFlags;
- 
---- src/corelib/kernel/qeventdispatcher_unix.cpp.sav	2013-06-07 07:16:52.000000000 +0200
-+++ src/corelib/kernel/qeventdispatcher_unix.cpp	2014-04-24 09:43:06.927589535 +0200
-@@ -905,7 +905,15 @@ bool QEventDispatcherUNIX::processEvents
- 
-     // we are awake, broadcast it
-     emit awake();
--    QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
-+
-+    QEventLoop::ProcessEventsFlags excludeAllFlags
-+        = QEventLoop::ExcludeUserInputEvents
-+        | QEventLoop::ExcludeSocketNotifiers
-+        | QEventLoop::X11ExcludeTimers;
-+    if ((flags & excludeAllFlags) == excludeAllFlags)
-+        return false;
-+    if(( flags & excludeAllFlags ) != excludeAllFlags )
-+        QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
- 
-     int nevents = 0;
-     const bool canWait = (d->threadData->canWaitLocked()
diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch b/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch
deleted file mode 100644
index b838c7a687b6..000000000000
--- a/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2015-11-25 01:38:42.103898399 -0500
-+++ src/network/ssl/qsslsocket_openssl_symbols.cpp	2015-11-25 01:40:50.146247648 -0500
-@@ -224,13 +224,17 @@
- #ifndef OPENSSL_NO_SSL2
- DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
- #endif
-+#ifndef OPENSSL_NO_SSL3
- DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
-+#endif
- DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
- DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
- #ifndef OPENSSL_NO_SSL2
- DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
- #endif
-+#ifndef OPENSSL_NO_SSL3
- DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
-+#endif
- DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
- DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
- #else
-@@ -818,13 +822,17 @@
- #ifndef OPENSSL_NO_SSL2
-     RESOLVEFUNC(SSLv2_client_method)
- #endif
-+#ifndef OPENSSL_NO_SSL3
-     RESOLVEFUNC(SSLv3_client_method)
-+#endif
-     RESOLVEFUNC(SSLv23_client_method)
-     RESOLVEFUNC(TLSv1_client_method)
- #ifndef OPENSSL_NO_SSL2
-     RESOLVEFUNC(SSLv2_server_method)
- #endif
-+#ifndef OPENSSL_NO_SSL3
-     RESOLVEFUNC(SSLv3_server_method)
-+#endif
-     RESOLVEFUNC(SSLv23_server_method)
-     RESOLVEFUNC(TLSv1_server_method)
-     RESOLVEFUNC(X509_NAME_entry_count)
---- src/network/ssl/qsslsocket_openssl.cpp.orig	2015-11-25 01:44:55.235087906 -0500
-+++ src/network/ssl/qsslsocket_openssl.cpp	2015-11-25 01:45:45.194443818 -0500
-@@ -263,7 +263,11 @@
- #endif
-         break;
-     case QSsl::SslV3:
-+#ifndef OPENSSL_NO_SSL3
-         ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
-+#else
-+        ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
-+#endif
-         break;
-     case QSsl::SecureProtocols: // SslV2 will be disabled below
-     case QSsl::TlsV1SslV3: // SslV2 will be disabled below
diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch b/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch
deleted file mode 100644
index 7660dedc1630..000000000000
--- a/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp
---- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829	2015-05-07 09:14:44.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp	2016-03-16 13:20:43.145899869 -0500
-@@ -188,8 +188,12 @@ int runMoc(int _argc, char **_argv)
-     pp.macros["Q_MOC_RUN"];
-     pp.macros["__cplusplus"];
- 
--    // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
-+    // Workaround a bug while parsing some boost headers. See QTBUG-22829
-     pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
-+    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
-+    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
-+    pp.macros["BOOST_TYPE_TRAITS_HPP"];
-+    pp.macros["_SYS_SYSMACROS_H_OUTER"];
- 
-     QByteArray filename;
-     QByteArray output;
diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index 668f6ab4564e..c612265c6f79 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -6,11 +6,6 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
-		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
-		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
-			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
 		<flag name="systemd">Enable native journald logging support</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild
deleted file mode 100644
index 86ae786cc2ce..000000000000
--- a/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+glib iconv icu libressl qt3support ssl"
-
-DEPEND="
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] )
-	icu? ( <dev-libs/icu-59:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-	)
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
-	~dev-qt/qttranslations-${PV}
-	qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/qt4/Qt/qconfig.h
-	/usr/include/qt4/QtCore/qconfig.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
-	"${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
-	"${FILESDIR}/${PN}-4.8.7-libressl.patch" # bug 584796
-	"${FILESDIR}/${PN}-4.8.7-moc.patch" # bug 556104, 635394
-)
-
-QT4_TARGET_DIRECTORIES="
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/tools/uic
-	src/corelib
-	src/network
-	src/xml
-	src/plugins/codecs/cn
-	src/plugins/codecs/jp
-	src/plugins/codecs/kr
-	src/plugins/codecs/tw
-	tools/linguist/lconvert
-	tools/linguist/lrelease
-	tools/linguist/lupdate"
-
-QCONFIG_DEFINE="QT_ZLIB"
-
-src_prepare() {
-	qt4-build-multilib_src_prepare
-
-	# bug 172219
-	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
-		-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
-		qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
-
-	# bug 427782
-	sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
-		qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix failed"
-	sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/' \
-		-e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/' \
-		configure || die "sed configure setBootstrapVariable failed"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-		$(qt_use glib)
-		$(qt_use iconv)
-		$(qt_use icu)
-		$(use ssl && echo -openssl-linked || echo -no-openssl)
-		$(qt_use qt3support)
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 09d6dd41e9bf..9db50469778f 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,11 +1,7 @@
-AUX qtdbus-4.7-qdbusintegrator-no-const.patch 543 BLAKE2B c5db96f9b2b84e8da8ce82646ea8759f8bf39d0c73e92839b9a2bc5465a6e43ecf2a3dc7c7db5c56e3a7b4925368201c214bbc9b8155b37532d7dccfc2a4703a SHA512 1967f1b3f1a834eecf140df39c6e4826acf80fc2f8de85770252949910de357a4303d1c1b3202e2df164e8b1cd74b0ab4928a3b333df0a222bdf21e71696824f
-AUX qtdbus-4.8.4-qdbusconnection-silence-warning.patch 997 BLAKE2B 079b0ce31ab06ab26ac14d94a88ee524ee9459d62e25b5d4e5f16d95a2ded69a1d257de4af8d2f304fbb3eaf5a0aa194aaef7322cb4f65debd283865c5b2475c SHA512 b3135450bcd7ab50e5b559b0e8619606053845852159853498756e50777cfbe8b5871bd7b0c178b3de038dc9229f3564c4827b35fcb67b354f0814ca1b2c58e3
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtdbus-4.8.7.ebuild 856 BLAKE2B 45206407be68ca357eeaab6a5d6cf5e6f614c333bf7f094e54d32468d6dba97cf86042ca2230ad98d71382e35ede4609f1e2fdb2d64a0b4f1c2fec998727d594 SHA512 5e1a3bfa62a290548f111fa9ad6bcda6faf67a718cb689a8420bebc4154d8d7d194ba5de5485219f77e7e844ccce897b5f34fe3bca3d9b0ce8ab87f336ed2a4f
 EBUILD qtdbus-5.11.1.ebuild 695 BLAKE2B b349a7e84ad49448470ca329d51f76268885d26c729193dac37934e37042a28aca54858e14126c7a511d7977fc16f5abcc85c05691004e3c240ec73d1cfe0fbf SHA512 855287b2a6860add78f0c88d8da4f65861d50486c6690a709b04afb8347c5413b88f21a8d2df995d56d31be1749d4fc319a1ac4588fe2e3e3a9046aa268c2f2e
 EBUILD qtdbus-5.9.4.ebuild 691 BLAKE2B 64f68d852a92951dacbb397743fc5f6df49e11a49fd58ee8c9665f571be28133bdde594afe0c874eb80b1dafd65ad926adca7e88845b621d62426645f364baf9 SHA512 f25adcbd53b903dfdeff2fde800419c11b8b42df29d44f40b7b5b4cfad08233ef64f6e467ab65b2610e2415b44d0994f549355d13df306d90cfee6f0bb1766ad
 EBUILD qtdbus-5.9.6.ebuild 693 BLAKE2B 7ab8f11a97ade375cfe86f867cb5df2c724c3d06dabdd76895bd6c723cfb774faeeb8d38f592b477682e383afd9047ae084264246d133c490a746413df9bcc04 SHA512 779021f3d5d1f3bb612b683230bfc9ef8a0c4e7a7e7d4100d2b96afae3548885b94198076c3d2f69e11d0a7917a08b1e4f8578fea8993211ef9c8fd09d919b49
-MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch b/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch
deleted file mode 100644
index 086eb47a071c..000000000000
--- a/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dbus/qdbusintegrator.cpp.orig	2011-03-12 02:11:32.313467991 +0100
-+++ src/dbus/qdbusintegrator.cpp	2011-03-12 02:11:03.795809176 +0100
-@@ -71,7 +71,7 @@
- static bool isDebugging;
- #define qDBusDebug              if (!::isDebugging); else qDebug
- 
--Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
-+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
- 
- static inline QString dbusServiceString()
- { return *orgFreedesktopDBusString(); }
diff --git a/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch b/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch
deleted file mode 100644
index dd3a5a02298e..000000000000
--- a/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp
---- qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch	2012-09-06 02:33:44.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp	2012-09-11 08:55:29.854026815 -0500
-@@ -1109,8 +1109,10 @@ public:
-         // make sure this connection is running on the main thread
-         QCoreApplication *instance = QCoreApplication::instance();
-         if (!instance) {
-+#ifndef QT_NO_DEBUG
-             qWarning("QDBusConnection: %s D-Bus connection created before QCoreApplication. Application may misbehave.",
-                      type == SessionBus ? "session" : type == SystemBus ? "system" : "generic");
-+#endif
-         } else if (QDBusConnectionPrivate::d(*this)) {
-             QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread());
-         }
diff --git a/dev-qt/qtdbus/metadata.xml b/dev-qt/qtdbus/metadata.xml
index 22d751f51bd7..32568f62fb8e 100644
--- a/dev-qt/qtdbus/metadata.xml
+++ b/dev-qt/qtdbus/metadata.xml
@@ -5,10 +5,6 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
-	<use>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
-	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
diff --git a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild b/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
deleted file mode 100644
index 144c5dd6cad8..000000000000
--- a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The DBus module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
-	"${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch"
-)
-
-QT4_TARGET_DIRECTORIES="
-	src/dbus
-	tools/qdbus/qdbus
-	tools/qdbus/qdbusxml2cpp
-	tools/qdbus/qdbuscpp2xml"
-
-QCONFIG_ADD="dbus dbus-linked"
-QCONFIG_DEFINE="QT_DBUS"
-
-multilib_src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 257728c805c1..c4e43dacd66d 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,11 +1,9 @@
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
 AUX qtdeclarative-5.9.5-texture-memleak.patch 2199 BLAKE2B 7b0f531e095fd80731983faf106811ef32d38ce83c2bb595683203d81d671d105720c6ee840740c4c30b0027c52825844bd1fe60a7ab52499feb2699ada92729 SHA512 20c83cd85120475fcec31c6394c149ab6d271f8f4856cd9da60346faebb67e3b119001fc3b0cbfd3f198f5237c4330e878d68d530f859192b6dd9560d7a949e5
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtdeclarative-everywhere-src-5.11.1.tar.xz 22203488 BLAKE2B 3304d5f1982380da6a82db9dee9782c7214fd307059055c9f42754b70cc760f9931357f5b9b4fc28bf5f6c799659d927f270ad154d43e91b28592465d7eac386 SHA512 d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053
 DIST qtdeclarative-opensource-src-5.9.4.tar.xz 21454140 BLAKE2B a7e792406c2eb42422aba1b779e2249f081840c8237a119cf4d9a001fa34d1f5e48e30216c08be431a89bca52dd56d4241d92cdfdb8b684b0912449bd0c9301e SHA512 e9e425665df42826c2525566e08b3588aa73b0efea295eed301ba5caeea7208b90c5a91a55cc16986ea9e0ceb9c6658bd59f56a3a276601ad5780f2c67f5ad5c
 DIST qtdeclarative-opensource-src-5.9.6.tar.xz 21417200 BLAKE2B 25d62058d85f845eb8a61ed949f7f3b2af972c0d3e97e4fe24b309fcc9570b5a00716bad012fca4cb8f65858b4aa7afb735181270be32e6a7bbe126d6a5931e4 SHA512 1fc7a542c60e8c13ba9b791d7b83a916fc1ffb1d3ab505405055a13d597a2c406f29bbd9309603af5bf56492874efeee33ab0128af1fa44866d66d689147ac39
-EBUILD qtdeclarative-4.8.7.ebuild 1493 BLAKE2B 1fc9ba56b9dd67fb840611e38e19a5bbc4b5f50d16cf7afbf9f384367ea03728f2d44aa1d14adf11ab44f8fba5532ce5f742803a5139f3ed25cf4f404e117d51 SHA512 b01c643b5d27f41e862260743be6701464ed145063ebb6642f5887b648b2f6e8c92c960d81e221a46c8aa7abc9461588953756390f080a7c6a02c53011338ca1
 EBUILD qtdeclarative-5.11.1.ebuild 1415 BLAKE2B e7d19fe7f65ae602510a2bdf1c3a76ceb0081caedf59f5a9f0bf9ed416c02ac4289c1bf079b84074ee377b6b8dbf8a18389c551710b55845692d4ec7978a08bc SHA512 b627a0c784670d6a4d660160b131b42ad7fb11874965535cd631836e0cc8bdba0ac46d9c790ec3d58e9bd6eb1af27c02d1ec7a2c7991bd8005cd75175befe603
 EBUILD qtdeclarative-5.9.4.ebuild 1323 BLAKE2B ca629dea8c113c90fc4e6da40be37bcc43d89fa240cd836eb162e70268f329c6050eabbacc00575ba22084639bcf9a577648c46f5dffe6be740806dd965f19a3 SHA512 a6ecf2a3c673529b97c08fe45596dc84b5378797c14c8afc8eb7ed48bf6013c8f70aee4948a6d7b7c16cfaf070d147f70473c7dd03f1fe4de9a2006977b1c175
 EBUILD qtdeclarative-5.9.6.ebuild 1386 BLAKE2B 978372fcd02c20695e14d74a6c44cf0d52c22810207327b3807ad236ce857634508039c855504a3fc75c29ec2d8baffb76f3e4c6a54aacea75a690fffee45fd6 SHA512 347b767c5e7bf85e15dcfc811db7128b364bf2a7352373b87f8297ed1e5efb3e00e624d2a96a131c5a9a9437830819d55578d6834b967437a0e8c2c265de8f4c
-MISC metadata.xml 1154 BLAKE2B 838bd6238e0b647adb40c4e0d73221104b2f26f160039a014c4576fbbbf51648ec1497e1833987ff298c4d42159c8ad2b2264b8f8a1a5c1d509e321e543709fc SHA512 fe0fdc462c9337726df24de8b8a13660da81a2cbd7cd3d122fadb3a6926e2cd6213d8eedc12185bf4dd1012ab1062ac59fa3cad3055b32e71012072aa31ef415
+MISC metadata.xml 811 BLAKE2B aca4ded12a2034fb5964d6c38806edeb1b2b984c182fe6ae5cf26f28db3ffa8cc942e8354971e46d7bd6f8eef600fe52ef3e0cdb5cb2aef7c7fe616fbc81d712 SHA512 0e278f92094bfc3d7a295cf559178ff093f5ff6776f03037cc9cb4e8574c9298c76f6210f84e611c8cf1c6c063cfd78f8d0c478f30798fc775d7bedcc409c711
diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml
index 9afadffbfb11..6333b5897c56 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -6,13 +6,8 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag>
-		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
-			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
-		<flag name="webkit">Build the WebView QML component</flag>
 		<flag name="widgets">Enable QtWidgets support</flag>
 		<flag name="xml">Build the XmlListModel import for QtQuick (requires QtXmlPatterns)</flag>
 	</use>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
deleted file mode 100644
index 267b79b445b8..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The Declarative module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+accessibility qt3support webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] )
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	src/declarative
-	src/imports
-	src/plugins/qmltooling
-	tools/qml
-	tools/qmlplugindump"
-
-QCONFIG_ADD="declarative"
-QCONFIG_DEFINE="QT_DECLARATIVE"
-
-pkg_setup() {
-	use webkit && QT4_TARGET_DIRECTORIES+="
-		src/3rdparty/webkit/Source/WebKit/qt/declarative"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		-declarative -no-gtkstyle
-		$(qt_use accessibility)
-		$(qt_use qt3support)
-		$(qt_use webkit)
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest
deleted file mode 100644
index 37c83857041b..000000000000
--- a/dev-qt/qtdemo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX qtdemo-4.6-plugandpaint.patch 609 BLAKE2B 0ac1483945e52ce7d2019a33133fedef7e18756b017bfe54960e338771d7190a8d6616ae645bece5c095c846862b27c6046c502744cb06143b82859cd53c8163 SHA512 e547e34d501bf29e0c5f17765f7355b330ab7533fef25ae97e55469d700ee929b36f885e5596b34e2406e63d7fb9fa200e509d4e517473597d3ceffccb7b94b2
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-EBUILD qtdemo-4.8.7.ebuild 2539 BLAKE2B 86fc59dd509a41109256c86fe586eebcaf9074dd0d6217d447001d4c876a27daef183c5f8b18057a286c91eb8bde4c4a3070fa9d17bb8b9ca86f77b81a5d10be SHA512 cd0c4c7a142189168a21a475d2333d4c95e5ef9e94777380a413d9dc289fbe0808d216307cca689653aaf95be4a4fdd3f5bc5dbdf4e1afc5fe08f7ef186bb2bb
-MISC metadata.xml 961 BLAKE2B e06d3c13099a8ede112b65295260a234f682b2c4426c16420a1fa0f44f36a82185b842cdc02228214bf4eb99de29bb8167282ac84c2067db288aa6b1dab9b3b5 SHA512 f84f3400e4b556cc7eef2c1f21c3b443fd4e7eebe2c7733cb2bdede1d4ce5bc025c9a7bc8087ee731daa02a96c5cd4e96deb9e108962b4c731338db80891210e
diff --git a/dev-qt/qtdemo/files/qtdemo-4.6-plugandpaint.patch b/dev-qt/qtdemo/files/qtdemo-4.6-plugandpaint.patch
deleted file mode 100644
index 262996aa1068..000000000000
--- a/dev-qt/qtdemo/files/qtdemo-4.6-plugandpaint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/examples/tools/plugandpaint/plugandpaint.pro b/examples/tools/plugandpaint/plugandpaint.pro
-index 9616eb8..e188bc1 100644
---- a/examples/tools/plugandpaint/plugandpaint.pro
-+++ b/examples/tools/plugandpaint/plugandpaint.pro
-@@ -10,7 +10,7 @@ SOURCES        = main.cpp \
- symbian {
-     LIBS           = -lpnp_basictools.lib
- } else {
--    LIBS           = -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools
-+    LIBS           += -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools
- }
- 
- if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml
deleted file mode 100644
index 288f9a8bd336..000000000000
--- a/dev-qt/qtdemo/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<use>
-		<flag name="dbus">Build QtDBus examples and demos</flag>
-		<flag name="declarative">Build QtDeclarative examples and demos</flag>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
-		<flag name="multimedia">Build QtMultimedia examples and demos</flag>
-		<flag name="opengl">Build QtOpenGL examples and demos</flag>
-		<flag name="phonon">Build Phonon examples and demos</flag>
-		<flag name="webkit">Build QtWebKit examples and demos</flag>
-		<flag name="xmlpatterns">Build QtXmlPatterns examples and demos</flag>
-	</use>
-	<upstream>
-		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>https://doc.qt.io/</doc>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
deleted file mode 100644
index e8c4d393d6e1..000000000000
--- a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="Demonstration module and examples for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ppc ppc64 x86"
-fi
-
-IUSE="dbus declarative multimedia opengl phonon webkit xmlpatterns"
-
-DEPEND="
-	~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qttest-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
-	multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	phonon? ( >=media-libs/phonon-4.8.3-r1[qt4,${MULTILIB_USEDEP}] )
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
-)
-
-QT4_TARGET_DIRECTORIES="
-	demos
-	examples"
-
-src_prepare() {
-	qt4-build-multilib_src_prepare
-
-	# Array mapping USE flags to subdirs
-	local flags_subdirs_map=(
-		'dbus'
-		'declarative:declarative'
-		'multimedia:spectrum'
-		'opengl:boxes|glhypnotizer'
-		'phonon:mediaplayer'
-		'webkit:browser'
-		'xmlpatterns'
-	)
-
-	# Disable unwanted examples/demos
-	for flag in "${flags_subdirs_map[@]}"; do
-		if ! use ${flag%:*}; then
-			einfo "Disabling ${flag%:*} examples"
-			sed -i -e "/SUBDIRS += ${flag%:*}/d" \
-				examples/examples.pro || die
-
-			if [[ ${flag} == *:* ]]; then
-				einfo "Disabling ${flag%:*} demos"
-				sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
-					demos/demos.pro || die
-			fi
-		fi
-	done
-
-	# Remove bogus dependency on qt3support (bug 510042)
-	sed -i -e 's/contains(QT_CONFIG, qt3support)://' \
-		examples/graphicsview/graphicsview.pro || die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(qt_use dbus)
-		$(qt_use declarative)
-		$(qt_use multimedia) -no-audio-backend
-		$(qt_use opengl)
-		-no-openvg
-		$(qt_use phonon) -no-phonon-backend
-		$(qt_use webkit)
-		$(qt_use xmlpatterns)
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 7b501186e9f9..f4f63c3a81f7 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,16 +1,10 @@
-AUX qtgui-4.7.3-cups.patch 3297 BLAKE2B 45c8668ffca24a7cfe9e02ec3fb3839f436470d55fb6f03a6a5890c7598bd3ec62c0bc62ecfd87ec530c210ef1c8e4d684c72109897ffe82456aa4225ce2b6ed SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee
-AUX qtgui-4.8.5-disable-gtk-theme-check.patch 1166 BLAKE2B 638fa282166a5ede48ff2b91532decab28969b392ae75c49860329e30018283f5206a367216027880e914e9a7ff4e16275fd364e8e99e52bacf460ecf6a637bb SHA512 c0f8b0c5bfb83552edc92af94669b15c85171aef72418dfa37a237f34b49e3999c939afed8b6c90391104c9ea305152ea85b0b0ad0e2400f5c64d6301a2c8d14
-AUX qtgui-4.8.5-qclipboard-delay.patch 1135 BLAKE2B 5972ab258ba5c60346f83a0c402edd39ea3c1fa777c59c6691e793d300956f1d966f37f6f35c187c95074872f8ccfb4b4cac8b255da462ddd3744cc67bc21108 SHA512 00c901fc9b9bd5b8ce45e8bb4dd4eda8832df7eda104ae1614d7cdac681d23f0daad543d0480f1d9366e2644833db680e0526660472a6cf1a907b803acf76517
 AUX qtgui-5.9.4-libinput-pixeldelta.patch 3597 BLAKE2B 88f54e4c832f132472aea296e8bcc4cf318456af48db3e260eed30b620acf98af0cfa2abd6d396a1396be678e133f5721cccbc79877d4f8934606aba6a0d6d39 SHA512 47aa0fb3971cd956d08fac4ace0b98b4034178d00c89db3fe31060d548acb8a075621dc2fb43ef0357dee79a927f82a7626e6cdf784b009028ae1435f68176d4
 AUX qtgui-5.9.4-opengl.patch 3586 BLAKE2B 56e5192b0455c8d6ccd307466fe9583c7ac8f3a6114bc3bfed62dad36aa7f72eb505452da4fd2af1ea3b2bb24241ac1716332064e5a97d0c97951ea92ddd55a6 SHA512 d77fbd4e44d32f70b9047f7ae4531684e7d142b659be03ead0bce0252635a6bd35eaa8cd5d0cbcca59a19ee740f809ca6ad950dd199805fa6a379e41fbb68582
 AUX qtgui-5.9.4-qsimpledrag.patch 6887 BLAKE2B 9da87acfe69c1cb8b1dd92b05a7b919d01227d0aa1316adfe97261bd59a7e0eb3b1e6d9b0896cc2f6a6a64eac3f31f72039a3acc2767998a668656acc8d8ffc2 SHA512 8229b87a40287c3c6e74d5aec9bfc346a1e0f7002687ba661573566ff5f700c99819850fc97f07d3a36d63ba83348f2ab315f835e44abce22242b4d1f29e7c7b
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-DIST qtgui-systemtrayicon-plugin-system.patch 51377 BLAKE2B 2b57d485c9ceb2b7e23cd6f8aa3be955e70d779ab0ca849148435e2a212a2db48948dc689c06eb8aea484513081df56d86584cb98ad4d64fb86ceb15eb802f38 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679
-EBUILD qtgui-4.8.7.ebuild 5502 BLAKE2B 13e6c5954107a56b929e32402307c352d417b6a41b71d1265fd35fec5534050637ed76707e33d040d26e6d66e863337802a9b3c4b5dc82ac11f78123b561bb8a SHA512 ebb51a68680d6c89ce16aa31378c59c9c66283cac71ecd970ba3998437303a936b601bef3292dc58c24dd63e0ca6a3e1a2945175901d3757a58f05f16edfc697
 EBUILD qtgui-5.11.1.ebuild 3575 BLAKE2B 1f2d3da7a365d1e07421c53bdcbc4d6d88c663ff006a159c4b919a9a169469c142c69bb9c9d6fe9493d283d4d27a8ab855332fa6f41e0de83c66497963b16c8c SHA512 50de3da979c4679dda40e83369c967db1faf0dfba8cd386d2286d13e01745cad0b0f201d487a1c3da26dad4421f54455d2ea815134eadbef3183579a37a6aa79
 EBUILD qtgui-5.9.4-r3.ebuild 3725 BLAKE2B d83d8e0c8407a8d4e9c0b7ab22f9c5bea55d4ebccba03b17ea70d22d00bff15ffe9bf8bedc1c8ce860d3f80ccbe38bfbef60ba656c0524d6a4dddac95c0f7488 SHA512 9d1e09c76bc4581c54a17b635de66a478a95dbc23072c27e593f4fad0b207b4825ccd2ccac83c873f68cc4ecbd97cfe10cec40c07f784e2420c0d245656e877b
 EBUILD qtgui-5.9.6.ebuild 3555 BLAKE2B 87d08c435eaa541cb24cc3826c7a7e66c5adad06a4272ab01fd09969ba207e87b6c771b45858714b3888bcccaf2630cd43ea2d0897bc4183f869a4b5277690b3 SHA512 5547121278fb441a33ef6be80a16c346beaba15bbfd38a5a52b199ff94d8fd225929bb0b476d0ec1e017d5a18cae82733cff43f93be631284f260b16b8c44767
-MISC metadata.xml 1862 BLAKE2B 062b123eab07ca09b1b6d63a9ce814a921b523c1861552a4f12903ccc8f627cf78e240d322c52b3a404ff154822a9cb42f894da5bc74a924d89dd51a42576115 SHA512 cba45629873eba71f152885640e51ad324b0dbb702c45811b4a1785a0af3baa7ce39923dfd0dbf7748d604e9a053d6580defdad75ad5ae228d37424d9b54e530
+MISC metadata.xml 1200 BLAKE2B 272e152cc1a9d596407c3d687fbb7b9f7b1b553cbf07e78e649031a427782f3377d3ee71d40e472b6f5978a8c1e9c2bfb9c0669edebcfcd1605d27973ba0ba1b SHA512 5ed40f7fdc6e289bd23bc5d4ce54794e58acf8c14863c45fe228d29c555e3afff84ee5b73f6f9e6be8b43e2ca28a96e4a73c22129ed2099262b5f682bf8b3aa6
diff --git a/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch b/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch
deleted file mode 100644
index e0305e11b89a..000000000000
--- a/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-28 04:34:16.000000000 +0100
-@@ -569,6 +569,32 @@
- void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
- {
-     options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
-+
-+    if (cups) {
-+        const ppd_option_t* duplex = cups->ppdOption("Duplex");
-+        if (duplex) {
-+            // copy default ppd duplex to qt dialog
-+            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+                options.duplexShort->setChecked(true);
-+            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+                options.duplexLong->setChecked(true);
-+            else
-+                options.noDuplex->setChecked(true);
-+        }
-+
-+        if (cups->currentPPD()) {
-+            // set default color
-+            if (cups->currentPPD()->color_device)
-+                options.color->setChecked(true);
-+            else
-+                options.grayscale->setChecked(true);
-+        }
-+
-+        // set collation
-+        const ppd_option_t *collate = cups->ppdOption("Collate");
-+        if (collate)
-+            options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
-+    }
- }
- #endif
- 
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp	2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp	2010-02-28 04:55:15.000000000 +0100
-@@ -627,6 +627,44 @@
-                && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
-         setOutputFormat(QPrinter::PdfFormat);
-     }
-+
-+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
-+    // fill in defaults from ppd file
-+    QCUPSSupport cups;
-+
-+    int printernum = -1;
-+    for (int i = 0; i < cups.availablePrintersCount(); i++) {
-+        if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
-+            printernum = i;
-+    }
-+    if (printernum >= 0) {
-+        cups.setCurrentPrinter(printernum);
-+
-+        const ppd_option_t* duplex = cups.ppdOption("Duplex");
-+        if (duplex) {
-+            // copy default ppd duplex to qt dialog
-+            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+                setDuplex(DuplexShortSide);
-+            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+                setDuplex(DuplexLongSide);
-+            else
-+                setDuplex(DuplexNone);
-+        }
-+
-+        if (cups.currentPPD()) {
-+            // set default color
-+            if (cups.currentPPD()->color_device)
-+                setColorMode(Color);
-+            else
-+                setColorMode(GrayScale);
-+        }
-+
-+        // set collation
-+        const ppd_option_t *collate = cups.ppdOption("Collate");
-+        if (collate)
-+            setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
-+    }
-+#endif
- }
- 
- /*!
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch b/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch
deleted file mode 100644
index 9a9f773537e4..000000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp
---- qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check	2013-06-09 16:28:22.938840346 -0500
-+++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp	2013-06-09 17:03:01.781125479 -0500
-@@ -503,18 +503,6 @@ void QGtkStylePrivate::initGtkWidgets()
-         return;
-     }
- 
--    static QString themeName;
--    if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
--        themeName = getThemeName();
--
--        if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
--            // Due to namespace conflicts with Qt3 and obvious recursion with Qt4,
--            // we cannot support the GTK_Qt Gtk engine
--            qWarning("QGtkStyle cannot be used together with the GTK_Qt engine.");
--            return;
--        }
--    }
--
-     if (QGtkStylePrivate::gtk_init) {
-         // Gtk will set the Qt error handler so we have to reset it afterwards
-         x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0);
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch b/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch
deleted file mode 100644
index d46f8c541872..000000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a83ddc5212736f89a0b94667c495494fe6861d63 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Mon, 16 Jun 2014 23:52:24 +1000
-Subject: Fix delay with QClipboard and useEventLoop.
-
-This manifests when using LibreOffice with KDE integration. When KFileDialog is
-open, the clipboard is repeatedly polled causing a visible delay since using
-QClipboard in "useEventLoop" mode adds 50ms delay to every single clipboard
-fetch.
-
-Change-Id: Id30cda7b983ae7c949fa270d04f772fa44fc21cd
-Task-number: QTBUG-38585
----
- src/gui/kernel/qclipboard_x11.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp
-index 14bf088..5f442b9 100644
---- a/src/gui/kernel/qclipboard_x11.cpp
-+++ b/src/gui/kernel/qclipboard_x11.cpp
-@@ -548,7 +548,8 @@ bool QX11Data::clipboardWaitForEvent(Window win, int type, XEvent *event, int ti
-                 return false;
- 
-             XSync(X11->display, false);
--            usleep(50000);
-+            if (!XPending(X11->display))
-+                usleep(5000);
- 
-             now.start();
- 
--- 
-2.0.0
-
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index ef12478e668a..bb8d780f9c2d 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -9,18 +9,9 @@
 		<flag name="egl">Enable EGL integration</flag>
 		<flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag>
 		<flag name="evdev">Enable support for input devices via evdev</flag>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
-		<flag name="glib">Enable integration with the <pkg>dev-libs/glib</pkg> event loop</flag>
-		<flag name="gtkstyle">Build a widgets style that mimics the active GTK+ theme</flag>
 		<flag name="ibus">Build the IBus input method plugin</flag>
 		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
-		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
-			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
-		<flag name="trace">Build the 'trace' graphicssystem engine which allows to record
-			all drawing operations into a trace buffer. The trace can be replayed
-			later with the qttracereplay tool.</flag>
 		<flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag>
 		<flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag>
 		<flag name="xcb">Build the XCB platform plugin and enable X11 integration</flag>
diff --git a/dev-qt/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild
deleted file mode 100644
index 79f95bf77ea1..000000000000
--- a/dev-qt/qtgui/qtgui-4.8.7.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
-
-REQUIRED_USE="
-	gtkstyle? ( glib )
-"
-
-# cairo[-qt4] is needed because of bug 454066
-RDEPEND="
-	app-eselect/eselect-qtgraphicssystem
-	~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.4.11-r1:2[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/jpeg:0[${MULTILIB_USEDEP}]
-	!aqua? (
-		>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.13-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.6.2-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.0-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-libs/libXinerama-1.1.2-r1[${MULTILIB_USEDEP}] )
-		xv? ( >=x11-libs/libXv-1.0.7-r1[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	gtkstyle? (
-		>=x11-libs/cairo-1.12[-qt4(-),${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.24.23-r1:2[aqua=,${MULTILIB_USEDEP}]
-	)
-	mng? ( >=media-libs/libmng-1.0.10-r2:=[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.3-r1[${MULTILIB_USEDEP}] )
-	nis? ( elibc_glibc? ( net-libs/libnsl:=[${MULTILIB_USEDEP}] ) )
-	tiff? ( >=media-libs/tiff-4.0.3-r2:0[${MULTILIB_USEDEP}] )
-	!<dev-qt/qthelp-4.8.5:4
-"
-DEPEND="${RDEPEND}
-	!aqua? ( x11-base/xorg-proto )
-"
-PDEPEND="
-	qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880
-	"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
-	"${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226
-	"${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968
-)
-
-QT4_TARGET_DIRECTORIES="
-	src/gui
-	src/scripttools
-	src/plugins/imageformats/gif
-	src/plugins/imageformats/ico
-	src/plugins/imageformats/jpeg
-	src/plugins/imageformats/tga
-	src/plugins/inputmethods"
-
-pkg_setup() {
-	use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets"
-	use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng"
-	use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff"
-	use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay"
-
-	[[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
-
-	QCONFIG_ADD="
-		mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
-		fontconfig system-freetype gif png system-png jpeg system-jpeg
-		$(usev accessibility)
-		$(usev cups)
-		$(use mng && echo system-mng)
-		$(usev nas)
-		$(usev nis)
-		$(use tiff && echo system-tiff)
-		$(usev xinerama)
-		$(use xv && echo xvideo)"
-	QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui"
-	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
-			$(use cups && echo QT_CUPS)
-			$(use egl && echo QT_EGL)
-			QT_FONTCONFIG QT_FREETYPE
-			$(use gtkstyle && echo QT_STYLE_GTK)
-			QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
-			$(use mng && echo QT_IMAGEFORMAT_MNG)
-			$(use nas && echo QT_NAS)
-			$(use nis && echo QT_NIS)
-			$(use tiff && echo QT_IMAGEFORMAT_TIFF)
-			QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES
-			$(use xinerama && echo QT_XINERAMA)
-			QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
-			$(use xv && echo QT_XVIDEO)"
-}
-
-src_prepare() {
-	qt4-build-multilib_src_prepare
-
-	# Add -xvideo to the list of accepted configure options
-	sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(qt_use accessibility)
-		$(qt_use cups)
-		$(qt_use glib)
-		$(qt_use mng libmng system)
-		$(qt_use nas nas-sound system)
-		$(qt_use nis)
-		$(qt_use tiff libtiff system)
-		$(qt_use egl)
-		$(qt_use qt3support)
-		$(qt_use gtkstyle)
-		$(qt_use xinerama)
-		$(qt_use xv xvideo)
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	dodir /usr/share/qt4/graphicssystems
-	echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
-	echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die
-
-	if has tools/qtconfig ${QT4_TARGET_DIRECTORIES}; then
-		newicon tools/qtconfig/images/appicon.png qtconfig.png
-		make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
-	fi
-}
-
-pkg_postinst() {
-	qt4-build-multilib_pkg_postinst
-
-	# raster is the default graphicssystem, set it on first install
-	eselect qtgraphicssystem set raster --use-old
-}
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index cb3a52f35109..8f8684fbe29a 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,13 +1,7 @@
-AUX qthelp-4.8.6-compat-install.patch 899 BLAKE2B c79463971979a10c05e792593b66bab186c091ed9e983c982c389ce517cda973d49a8f3d7685dc3242a3ddbab00284c1c503cd3e65aeb7e1dac9dbe7dee191a9 SHA512 dc960f735a92a8bfa7a10e2c898eeb1dbdbf273cf342af3b0924240a1f3bc15694e86679b0f6cbd28f24246bfad3a5d799a6f383503deafa5b4adeb368a69158
-AUX qthelp-4.8.6-compat-syncqt.patch 884 BLAKE2B 25cb103e5c013c262d8c99cf21218083dbee6edd56203ee61a4acf637930c72d63b6428eac45ae6cf5e74ddee9a45c5d34e635712e97e7cb33260e8cc0295c54 SHA512 ee18303ca95569a66b1680f10a65766d67caca33928eb5d4f7ae2a4ffa883caa32dcb4adf7f48536e5bf78dcc26d30521c1309e9dfb0226284322220895ec20a
-DIST qt-assistant-compat-headers-4.7.tar.gz 448 BLAKE2B ca3318ff64a4484faec0254d17f3831f75bc5d96ff6eef8dd57219076074c3b5cf23bdbc84266dc40c66231aba7342d9fb2cf9102c2bec05ce33d8854935a8e3 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb
-DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 BLAKE2B b84c207a7633229a1b06aee1560f969bc5088ef65d1c6366ac817017a5713c6c50915df95109fa1a8fadef4bf8c2de22d16dc95e36325a92f419051c1dcfe5b3 SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD qthelp-4.8.7.ebuild 3122 BLAKE2B 5c8e30e3826be0493b2304890022648b2073a2e30bcea15c620aef22763dd0f7bbb6805553f44b411482dbfdab8bd83ba7412a331a605c29bbbb845d0d88c46f SHA512 d06253208591e380d378db2e3496c42940581b781c1c4e82fdd3dba9d2bea6623161d4ada16b80bd6fcf503d78f0eb83972932e3ada501104539587857261d58
 EBUILD qthelp-5.11.1.ebuild 652 BLAKE2B 7f6f32e0e641cb4fc3cb370b28ce1eb2cfef9a1179bf3201c29167928d8e46665ffbbc2699d54f61b31cbc8e10de6b2bc15665897dea40abbf6f2006c418b483 SHA512 430038abf54f5b7d4394fe6a02f488a59fb8cc2a09fd2431ca9b41f4a77456f6e7d56fa9ba6c1ae53b03c79f3cc0cf5af545959bbd3da3917fa179ad4404e99a
 EBUILD qthelp-5.9.4.ebuild 648 BLAKE2B 0d520f2d3f9d4670aebc9fe0f1d33298f90802818363f0314fbe0a8500be839adf3433ecdc436bae0944190b24de11a114fbd117f83a412b753c2dad0d517962 SHA512 cd10ec0a0413197b7558a0b3749ba70f8100316faae82df3b92c2bcc2389cf8e934623d06e905c04269211cbd563020e320e007e02ce45a24ff3dd3f087cb88b
 EBUILD qthelp-5.9.6.ebuild 650 BLAKE2B 610605567af82f99ffb564e8e0ff7f0d014c16136825d4b21cc7b6193fe56e9485313dbaed1a7ff529eeced64545e97703066773fd83572608d32393a2db8920 SHA512 8952ece9c3d67e621a7b2181fd7e649531b2ba60155f2adff05ce3c514e44aa506b65caa33bdf6bf1d35f6c5f42fd8c7d7a8e61c16895b970454a09b6c07c374
-MISC metadata.xml 825 BLAKE2B de978b130ccf71032fb98469ae3562a483b4fd791a13bab4f0d34990ad5638325c90b2ae057e870cc9d4af156114b90498d13828ea51dd2cbe9d3f1c3709b9a7 SHA512 54d474dfe7325966022026beab59b144932f523ced472f0d5d49f72727f6129923af821211fff3d42bc8dd02701e80f313e9e8c0f34e2cf18db1888ad8907026
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch
deleted file mode 100644
index e157381c8f05..000000000000
--- a/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 89f99089abe0c1369a78a3bb8e2a576c513ec809 Mon Sep 17 00:00:00 2001
-From: Davide Pesavento <pesa@gentoo.org>
-Date: Wed, 6 May 2015 23:21:54 +0200
-Subject: [PATCH] Install assistant_adp binary.
-
----
- tools/assistant/compat/compat.pro | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro
-index 171106a..a14e3f8 100755
---- a/tools/assistant/compat/compat.pro
-+++ b/tools/assistant/compat/compat.pro
-@@ -14,6 +14,8 @@ QT += xml network
- 
- PROJECTNAME = Assistant
- 
-+DESTDIR = ../../../bin
-+
- FORMS += helpdialog.ui \
-         mainwindow.ui \
-         tabbedbrowser.ui \
-@@ -59,6 +61,9 @@ mac {
-     TARGET = Assistant_adp
- }
- 
-+target.path = $$[QT_INSTALL_BINS]
-+INSTALLS += target
-+
- TRANSLATIONS = translations/assistant_adp_de.ts \
-     translations/assistant_adp_ja.ts \
-     translations/assistant_adp_pl.ts \
--- 
-2.4.0
-
diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch
deleted file mode 100644
index 4ba6b6ff7417..000000000000
--- a/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 37725ccec4d26148dde377d78c71046e8b6a6de9 Mon Sep 17 00:00:00 2001
-From: Davide Pesavento <pesa@gentoo.org>
-Date: Wed, 6 May 2015 22:44:57 +0200
-Subject: [PATCH] Teach syncqt how to handle the QtAssistant compat headers.
-
-See https://bugs.gentoo.org/show_bug.cgi?id=529398#c47
----
- bin/syncqt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/bin/syncqt b/bin/syncqt
-index dd94d4d..cc5a7bf 100755
---- a/bin/syncqt
-+++ b/bin/syncqt
-@@ -81,6 +81,7 @@ my %modules = ( # path to module name map
-         "ActiveQt" => "$basedir/src/activeqt",
-         "QtTest" => "$basedir/src/testlib",
-         "QtHelp" => "$basedir/tools/assistant/lib",
-+        "QtAssistant" => "$basedir/tools/assistant/compat/lib",
-         "QtDesigner" => "$basedir/tools/designer/src/lib",
-         "QtUiTools" => "$basedir/tools/designer/src/uitools",
-         "QtDBus" => "$basedir/src/dbus",
--- 
-2.4.0
-
diff --git a/dev-qt/qthelp/metadata.xml b/dev-qt/qthelp/metadata.xml
index a1b560594940..32568f62fb8e 100644
--- a/dev-qt/qthelp/metadata.xml
+++ b/dev-qt/qthelp/metadata.xml
@@ -5,12 +5,6 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
-	<use>
-		<flag name="compat">Build the extra compatibility layer required by a few packages, see
-			http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
-	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
diff --git a/dev-qt/qthelp/qthelp-4.8.7.ebuild b/dev-qt/qthelp/qthelp-4.8.7.ebuild
deleted file mode 100644
index 0587f38e146e..000000000000
--- a/dev-qt/qthelp/qthelp-4.8.7.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The Help module for the Qt toolkit"
-SRC_URI+="
-	compat? (
-		http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
-		https://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
-	)"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
-fi
-
-IUSE="compat doc"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
-	compat? (
-		~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	tools/assistant/lib/fulltextsearch
-	tools/assistant/lib
-	tools/assistant/tools/qhelpgenerator
-	tools/assistant/tools/qcollectiongenerator
-	tools/assistant/tools/qhelpconverter
-	tools/qdoc3"
-
-pkg_setup() {
-	use compat && QT4_TARGET_DIRECTORIES+="
-		tools/assistant/compat
-		tools/assistant/compat/lib"
-}
-
-src_unpack() {
-	qt4-build-multilib_src_unpack
-
-	# compat version
-	# http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
-	if use compat; then
-		mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die
-		mv "${WORKDIR}"/QtAssistant "${S}"/include || die
-		find "${S}"/tools/assistant/compat -type f -execdir chmod a-x '{}' + || die
-	fi
-}
-
-src_prepare() {
-	use compat && PATCHES+=(
-		"${FILESDIR}/${PN}-4.8.6-compat-install.patch"
-		"${FILESDIR}/${PN}-4.8.6-compat-syncqt.patch"
-	)
-
-	qt4-build-multilib_src_prepare
-
-	# prevent rebuild of QtCore and QtXml (bug 348034)
-	sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns
-		-no-nas-sound -no-cups -no-nis -fontconfig
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_compile() {
-	qt4_multilib_src_compile
-
-	# release tarballs are shipped with prebuilt docs
-	if [[ ${QT4_BUILD_TYPE} == live ]] && multilib_is_native_abi; then
-		# qhelpgenerator needs libQtHelp.so.4
-		export LD_LIBRARY_PATH=${BUILD_DIR}/lib
-		export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework
-		emake docs
-	fi
-}
-
-multilib_src_install() {
-	qt4_multilib_src_install
-
-	if multilib_is_native_abi; then
-		emake INSTALL_ROOT="${D}" install_qchdocs
-		use doc && emake INSTALL_ROOT="${D}" install_htmldocs
-
-		# do not compress .qch files
-		docompress -x "${QT4_DOCDIR#${EPREFIX}}"/qch
-	fi
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	if use compat; then
-		insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
-		doins tools/assistant/compat/features/assistant.prf
-	fi
-}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index ab8b9b2459ba..9d26578e55f1 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,11 +1,7 @@
-AUX qtmultimedia-4.8.0-alsa.patch 2155 BLAKE2B 23b713531f7e4c63f568fd284d74586506acee583afe897bb40b53f2eb5e2a0178b353107e64f8d85d1fdd2c2f04a7eb0dbdcdfa648bfa6d2d4769c05275c36d SHA512 725dc78b861c82393ecd97ce293f9c165067ca940332fab22ecc252880e1c08aae301d54ddcdf38df9d32907c57bc70d772891a6dc9fdacf740de32b363f4aa4
-AUX qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch 6852 BLAKE2B fb9507a5ee7793c20e435896e553df808860f0ba1a1a9495325b8ecd06b06b0070f03bcec9313c509cad0cef8dc844ff48e00073d8c5b320b980ff8d9b694fef SHA512 ff513b5c68a02179e0a36803367b4dfe9f8c351fb76296570a2b382d2a1dd43fcb99033ab7844c52253c95124e2246cb81d68aa8e64e16c89d37bccaffcd9dea
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtmultimedia-everywhere-src-5.11.1.tar.xz 3711548 BLAKE2B 93d282725293c0750803e4cf00dfd4fdd2ceb23b5105eb339c60416cddcca2e39a51277ff60ad524b6225cfb6c2177fd52015bb7d10521a04973a4d24188fe0f SHA512 cfce510f5f5825ce12207070ce34bbc97e5433b5174bbdd562befcd383c74459436dfce23e5fd8ee5c5a4c28573b85374383d17ca3d0c61daa51b50c915b324c
 DIST qtmultimedia-opensource-src-5.9.4.tar.xz 3608792 BLAKE2B ac377b3cf33d727fa129fe623cc9ba9ea75555b2af7f70cf07524598d4044a94617b3627f7fd3a915596e51ac53040b9d72a5fcaa2faf316150a2c1ead220def SHA512 7a60434736f655900d00e70a68e5781f336446938f4f2b617e1d93205b7319bf01be987c001a9e6838ba5fd9e3afe3f20137597b6c27f6f77ee55486e283d425
 DIST qtmultimedia-opensource-src-5.9.6.tar.xz 3585964 BLAKE2B fdd18b1abcfbc8a1f81c9a99e75748dd68112ae4fd534e038d73d1f8fa33b76119824ade231e7b1c283ff109ee2473774d08c67bffa04383e7328437539aadbf SHA512 2d5f1341ef1f2d7e99ced28945f70b283630ce4ed9ac968c34ffc7d215c59a9b895681ee519aca64fe8a41ae574577ce834e486281db7e1f337245f9b6506207
-EBUILD qtmultimedia-4.8.7.ebuild 1298 BLAKE2B 2e78e5f2f0dfbf43aaabd1abcf06fb05a3612029bb9ed2f1007cda90ed32665cea64b2f56e7b64b879400a3a66ba4907fbacefa5bd431fce1a08b0db3c61c8cc SHA512 d7a6fb8aa9927fadfd23e59a695818b8e066ccba71877848669358fa640064a6dee16c38ba988e2501e3350939fddc13c6ec90791c1b7c670f1e654b6a5fe6d0
 EBUILD qtmultimedia-5.11.1.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61
 EBUILD qtmultimedia-5.9.4-r1.ebuild 1460 BLAKE2B e845058b50a99d2744c32adc8044b0144988bfe898770e9f5f7a316eee2e5ed17974a36ad1e9ddef786ae8f789b16221534d56eea9d84ca713b7960e8810a764 SHA512 f5f1131f8915e62c8978663187f3a02b4f19fcb8285b4557f809fa1bef9c4277d7b2fe8b4c6fe92b3f55333bea1e4244f94e5af52539968aa15b98b810d55c5a
 EBUILD qtmultimedia-5.9.6.ebuild 1448 BLAKE2B 07aca93b6cb0cd416e0ea4547f1224c711b524d2cb2dbd08707d9317d9cdca6ed399c98a14f5e40b7eecf58f68ef34f091939abbb601e4799182b540082e1f1c SHA512 6905b4dc12b188cd382ee3ba7e9b83fd2bf7e4e43fb85cd5ed61b777d4ba79edf4137d4c23c5cce68841def78c42afc918ca21eb20f584f42dadfe1edeb5cfbc
-MISC metadata.xml 937 BLAKE2B 804145c6bfe640955c5de227bdf2ba51570749541d5febec508b874fa823a2386da52648b2ba2bff959de2ef1371fa6384007591606410829d6fe4c12afd7ce4 SHA512 b5007c578748a64091105fd04aec3133587dcf0f8cf22b758520776e903699de80555fa2e69206edaf8415dad037018f8c169966fb48c1d402118a6e32509d31
+MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch b/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch
deleted file mode 100644
index 8bd40edb1e80..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- qt-everywhere-opensource-src-4.8.0.orig/configure	2012-03-13 00:45:02.502205702 +0100
-+++ qt-everywhere-opensource-src-4.8.0/configure	2012-03-13 00:47:40.386231881 +0100
-@@ -1049,7 +1049,7 @@
-         VAL=no
-         ;;
-     #Qt style yes options
--    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
-+    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu|-alsa)
-         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
-         VAL=yes
-         ;;
-@@ -2399,6 +2399,13 @@
-         else
-             UNKNOWN_OPT=yes
-         fi
-+        ;;
-+    alsa)
-+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
-+            CFG_ALSA="$VAL"
-+        else
-+            UNKNOWN_OPT=yes
-+        fi
-         ;;
-     *)
-         UNKNOWN_OPT=yes
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch b/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch
deleted file mode 100644
index 6a040b2d88a5..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 7737e5f851fdf33ea3e8e60cf7856f47565f09d3 Mon Sep 17 00:00:00 2001
-From: Davide Pesavento <pesa@gentoo.org>
-Date: Fri, 22 Jan 2016 23:17:16 +0100
-Subject: [PATCH] Relax ALSA version checks for alsa-lib >= 1.1.0
-
-Backport of qtmultimedia/3b322323d036ae2fc9f685bfc74d1ebcd5532159
----
- config.tests/unix/alsa/alsatest.cpp              |  2 +-
- src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp | 16 ++++++++--------
- src/multimedia/audio/qaudiodeviceinfo_alsa_p.h   |  2 +-
- src/multimedia/audio/qaudioinput_alsa_p.cpp      |  4 ++--
- src/multimedia/audio/qaudiooutput_alsa_p.cpp     |  4 ++--
- 5 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp
-index ac5f1e1..8d78f95 100644
---- a/config.tests/unix/alsa/alsatest.cpp
-+++ b/config.tests/unix/alsa/alsatest.cpp
-@@ -40,7 +40,7 @@
- ****************************************************************************/
- 
- #include <alsa/asoundlib.h>
--#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
-+#if (!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
- #error "Alsa version found too old, require >= 1.0.10"
- #endif
- 
-diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
-index 973cbab..a09dcf6 100644
---- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
-+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
-@@ -63,7 +63,7 @@ QAudioDeviceInfoInternal::QAudioDeviceInfoInternal(QByteArray dev, QAudio::Mode
-     device = QLatin1String(dev);
-     this->mode = mode;
- 
--#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-     checkSurround();
- #endif
- }
-@@ -159,13 +159,13 @@ bool QAudioDeviceInfoInternal::open()
-     QList<QByteArray> devices = availableDevices(mode);
- 
-     if(dev.compare(QLatin1String("default")) == 0) {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = QLatin1String(devices.first().constData());
- #else
-         dev = QLatin1String("hw:0,0");
- #endif
-     } else {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = device;
- #else
-         int idx = 0;
-@@ -212,13 +212,13 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const
-     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput);
- 
-     if(dev.compare(QLatin1String("default")) == 0) {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = QLatin1String(devices.first().constData());
- #else
-         dev = QLatin1String("hw:0,0");
- #endif
-     } else {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = device;
- #else
-         int idx = 0;
-@@ -396,7 +396,7 @@ void QAudioDeviceInfoInternal::updateLists()
-     }
-     channelz.append(1);
-     channelz.append(2);
--#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-     if (surround40) channelz.append(4);
-     if (surround51) channelz.append(6);
-     if (surround71) channelz.append(8);
-@@ -419,7 +419,7 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode)
-     QList<QByteArray> devices;
-     QByteArray filter;
- 
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-     // Create a list of all current audio devices that support mode
-     void **hints, **n;
-     char *name, *descr, *io;
-@@ -498,7 +498,7 @@ QByteArray QAudioDeviceInfoInternal::defaultOutputDevice()
-     return devices.first();
- }
- 
--#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
- void QAudioDeviceInfoInternal::checkSurround()
- {
-     QList<QByteArray> devices;
-diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
-index 96febf4..714bf60 100644
---- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
-+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
-@@ -98,7 +98,7 @@ private:
-     bool open();
-     void close();
- 
--#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-     void checkSurround();
-     bool surround40;
-     bool surround51;
-diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp
-index 339fd9f..202a5b2 100644
---- a/src/multimedia/audio/qaudioinput_alsa_p.cpp
-+++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp
-@@ -284,13 +284,13 @@ bool QAudioInputPrivate::open()
-     QString dev = QString(QLatin1String(m_device.constData()));
-     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioInput);
-     if(dev.compare(QLatin1String("default")) == 0) {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = QLatin1String(devices.first());
- #else
-         dev = QLatin1String("hw:0,0");
- #endif
-     } else {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = QLatin1String(m_device);
- #else
-         int idx = 0;
-diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
-index bf85de5..fe4b010 100644
---- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
-+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
-@@ -299,13 +299,13 @@ bool QAudioOutputPrivate::open()
-     QString dev = QString(QLatin1String(m_device.constData()));
-     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput);
-     if(dev.compare(QLatin1String("default")) == 0) {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = QLatin1String(devices.first());
- #else
-         dev = QLatin1String("hw:0,0");
- #endif
-     } else {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = QLatin1String(m_device);
- #else
-         int idx = 0;
--- 
-2.7.0
-
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index c6f5fc3b1269..833d7be66b31 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -6,8 +6,6 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="gstreamer">Enable audio support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag>
 		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild
deleted file mode 100644
index eb03bb3922ac..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The Multimedia module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86"
-fi
-
-IUSE="alsa"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.0-alsa.patch"
-	"${FILESDIR}/${PN}-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch" # bug 572426
-)
-
-QT4_TARGET_DIRECTORIES="src/multimedia"
-
-QCONFIG_ADD="multimedia"
-QCONFIG_DEFINE="QT_MULTIMEDIA"
-
-multilib_src_configure() {
-	local myconf=(
-		-multimedia -audio-backend
-		$(qt_use alsa)
-		-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
-		-no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index e939e6523186..7fc705d1e9f0 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,9 +1,7 @@
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtopengl-4.8.7.ebuild 1100 BLAKE2B 38f986aed1ac6fc40b6037cb17fece5ab7d759a2f79d0d28ba18e3ac09691673ce0dab0942301d06bcb11675c96b48cde6435c80a9e22f865884f5b5559e1558 SHA512 d099ac28dc473121906eae72560d5a100a8a085a110d82ebeb87ca8e9109dcd62c5cb4dae107b0adf15d2ee34b0a13de095de00096a3dc0bfc7f535d97bbaf01
 EBUILD qtopengl-5.11.1.ebuild 648 BLAKE2B 2ed179d870443194faebbfeb074111043d3a75da80c89a61f7b94c104b9a0fedd4fc5c1788b657ad76f6f76e4cbcf779b0983c3cc321965f2471d570e81a4be8 SHA512 459886ec36695f2d441a9b3b869366b2e84d97b99924c94af111fac822ef406c7b226c50de93afd844dc372e14073cba23ae976d068abffaebab5da0aae15e8a
 EBUILD qtopengl-5.9.4.ebuild 644 BLAKE2B 39c9006f5b9bf93fc18b0e78b18026d0bf15ded8281c3b5327fcd8030b3fcbfd05443d7e7e37a5b8eabf8ab7086cb98fe786fb5ca601621b51b6f6ca2a8c4ecc SHA512 e7e3b6b1a7c5e708b150387416ae0435f52833dc070a193ed232bb531a3cf6d69acc32f267dde7afe96dc0eeeca618f564ff7112b4b1ca96c189f055c46c189a
 EBUILD qtopengl-5.9.6.ebuild 646 BLAKE2B 78d42d9d7c225323fc3a598c9497e1bde3342d77665d4a7c63f369cce21339a0c3939b5d811490161f074ae032a3b25c706f0f93bc8cedde5c05cc5dfa6262f1 SHA512 84aec7b7db50938bd6099967a0a9b6dd657f6ca325cf275bea81cb06fad05bf29921eba26b17f3546198558344b4f1116da461be4ce88fd12c256ed8e41c70e1
-MISC metadata.xml 849 BLAKE2B 626ede10341fed23cd36a62710da3423c49fa4421d4f8dd883df3c1a0d157f4a4d343632763c542093566a8967050bb4a3cccac015f4aedba25471a4e03a591a SHA512 98644de5d50d3392db4099551755340012a29ef9ae129038eb64ff1aca49f2de34442d7fd8e4f6c457366148a7d9288843f7ea023d0759a71aadab3a419aad41
+MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml
index 3a2fbf1c8ab7..17b1d11ac715 100644
--- a/dev-qt/qtopengl/metadata.xml
+++ b/dev-qt/qtopengl/metadata.xml
@@ -6,11 +6,7 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
-		<flag name="egl">Use EGL instead of GLX to manage OpenGL contexts</flag>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
-		<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qtopengl/qtopengl-4.8.7.ebuild b/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
deleted file mode 100644
index fb17633c545f..000000000000
--- a/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The OpenGL module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="egl qt3support"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=,${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	src/opengl
-	src/plugins/graphicssystems/opengl"
-
-QCONFIG_ADD="opengl"
-QCONFIG_DEFINE="QT_OPENGL"
-
-multilib_src_configure() {
-	local myconf=(
-		-opengl
-		$(qt_use qt3support)
-		$(qt_use egl)
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	dodir /usr/share/qt4/graphicssystems
-	echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die
-}
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 4183ac5e099a..35755069f276 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,10 +1,7 @@
-AUX 4.8.6-javascriptcore-x32.patch 1826 BLAKE2B 2a695f9c563675e0d1a36c9edda8b01dd83db6b377a4e72dd3b6ced8d11d0c206aadf56c35423d11841407452ab3e8f4ff3509a803e757536ad76cb87eaea76a SHA512 9b93ebdb9c474ad4e4d09de9d99d97351022863ae3a58fb0b03d1cd103dd012d0a12643f6e00f60cf0a9a4ac24db98039e87d5dd9a1afcf8dc65696b4bcd4efb
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtscript-everywhere-src-5.11.1.tar.xz 2671428 BLAKE2B 8cc74db4f5b33e299964f81b00e634965f7471d191726521726a5f2556a8eccf344e7277071f817a9fa0c40856acdb955258e9491966b6f773701e809b73982d SHA512 609ac6675341fb2707ad3b91e955a430846253741931ada2343ab2d1ad27169a60548b1a2621369384043a4c5b983e392c3fafcffd50237563b9f4204123e411
 DIST qtscript-opensource-src-5.9.4.tar.xz 2612372 BLAKE2B 8213e2b70e23dfa6e42ffd0aaa1818a4794670de24fa5b30cdf4c7bd17f1a438d9d6a8bf9c03f2995a60b6e3ad6d57bf0273c6e1027ed3d0b77fc2987d285603 SHA512 e0c49e1286c4b1de6d197c42d8e4bcd82a5ea07e8c89f6f222fa62579b5d466336a5baa50372e5a9b514bd8be098e80f3793123cae09d7a923c4d1466b0e13c9
 DIST qtscript-opensource-src-5.9.6.tar.xz 2607812 BLAKE2B 3f11ae2270b1bdc6ac195a4a398754df16d4599211ba291fd0a5793cc7e586f0034f1f5d63a185541e35c744de1d3c8facf12bef2cbbf98abd94b3c27e40b6ba SHA512 2ddecda376b79edc8cfe9215a531a8f0b1892f3e6b39c298a679903c2600a1df43bb59baeed3392e92fefb476ec2ebdd2ffd351d14918fea00025d2cbd48da46
-EBUILD qtscript-4.8.7.ebuild 1072 BLAKE2B eb4d2995271b4c1b3b083df9b9b657b49a6aebc66bdceddf78269590db9ae47f99a72112f6d2c2de9cd737cabffa8679eaa6545af5c509a58b5c7a962d2a5adf SHA512 c3b6a2933cbf054228051ae4eddc50940915a269aa5130dccdb9bbfc895678632cbdb3935f061565eed532faa48aa661c194549b62fb1c83c11057512afad8e5
 EBUILD qtscript-5.11.1.ebuild 686 BLAKE2B 2b5a8207e0fbb0f7f5222688b6f8e3c391a3684481e5fb9b71bd543d3111b3cf8d62a56d44ca030c0f2b1019585f740de542dbb78323e1389dd617d0c684d943 SHA512 8fecd4ac008262217070af2efb26729fd21c75818f0555697d6e04a3f6e3c536bf3efc14008a64cbffd7ca4c9092bd3b1746141a1648310133306a298b9df97a
 EBUILD qtscript-5.9.4.ebuild 682 BLAKE2B fc04d73b06779e8abfec714ae6b59e59a72237b56fbcf48eb24a5cceaf9860e5fc88ad36b68d9cacb6dc470a795c7d783908a55b638b1e884faf4bd3a143df05 SHA512 91eb46966db41a9718404c74cc2f18b723b9630fbd9b2a3fbbc42bc2eaf0edca796a0fcb72e32731880a3c13631eb7b92241180161b94f88a7f5cda949f6a75d
 EBUILD qtscript-5.9.6.ebuild 684 BLAKE2B 740c6ecefc6fd61279e55c7886f704341e26be6acfbbe79e7090352a2427d3d0084226cb5f43882313742a63544e6e9f9cbd3caf72f026837ce8b9f515af3cea SHA512 3976777f709fd60b925104058cada2a7525bb00078840a720585f2bebbeab2b8fa97dffc112397ee9aeee4c56f965b69b7f1c0996490f4856f1be9f2ba61b1cc
-MISC metadata.xml 714 BLAKE2B ad5f2175907ab5167fa16d75c1c538e4e66fcfb96d4a2dd2d19d92ccc39fc3283dc7b67505636834ea772727e5e50aaefc8468b9ecdc448fff33e6806c93d805 SHA512 8324b4dc7a26ce06a5c8af58768e337f1e96a2077b65f5996a4af535a07ac3a13c05af2fb0c89796335ea106eb82d0857dc20cb9d4c8131907313557a0319b6e
+MISC metadata.xml 582 BLAKE2B 770c02c672a84e600bbbf91aa73e72947ff1e6944e0aec830ac24bc4b648197e78994bc949feb80381dff2af2e96c9792fe696059060c8c7ad3127a8992161d6 SHA512 d6ceb5cac55d142912f967e1336233aafbce4ebd981ca276f3f9f13214e1ec3576b04e89105e2b2b45cf9621a194ed09de581dc44092ee453dafb12304af8652
diff --git a/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch b/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch
deleted file mode 100644
index cde4cfb93f51..000000000000
--- a/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 4e7126ea1488f3e1df0b76cacf83cb73f9d4b54c Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@digia.com>
-Date: Tue, 4 Mar 2014 10:46:18 +0100
-Subject: Fix build on x32
-
-Recognize x32 and disable JIT in this configuration.
-
-Task-number: QTBUG-35463
-Change-Id: Ie5bf64f22f3e58a9b3f12190cf790ad6c39f415e
----
- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-index 0b95639..85ed8a7 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -202,6 +202,11 @@
- #if   defined(__x86_64__) \
-     || defined(_M_X64)
- #define WTF_CPU_X86_64 1
-+
-+#if defined(__ILP32__)
-+#define WTF_CPU_X32 1
-+#endif
-+
- #endif
- 
- /* 64-bit mode on AIX */
-@@ -906,7 +911,7 @@
- #endif
- 
- #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
-+#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
- #define WTF_USE_JSVALUE64 1
- #elif CPU(ARM) || CPU(PPC64)
- #define WTF_USE_JSVALUE32 1
-@@ -923,6 +928,11 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
- #define ENABLE_REPAINT_THROTTLING 0
- #endif
- 
-+/* Disable JIT on x32 */
-+#if CPU(X32)
-+#define ENABLE_JIT 0
-+#endif
-+
- #if !defined(ENABLE_JIT)
- 
- /* The JIT is tested & working on x86_64 Mac */
--- 
-cgit v0.11.0
-
diff --git a/dev-qt/qtscript/metadata.xml b/dev-qt/qtscript/metadata.xml
index a559e6341854..da283d207fe3 100644
--- a/dev-qt/qtscript/metadata.xml
+++ b/dev-qt/qtscript/metadata.xml
@@ -6,8 +6,6 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
 		<flag name="scripttools">Build the QtScriptTools module (requires QtWidgets)</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/qtscript/qtscript-4.8.7.ebuild b/dev-qt/qtscript/qtscript-4.8.7.ebuild
deleted file mode 100644
index ce3c8d0893c2..000000000000
--- a/dev-qt/qtscript/qtscript-4.8.7.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 qt4-build-multilib
-
-DESCRIPTION="The QtScript module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+jit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/script"
-
-QCONFIG_ADD="script"
-QCONFIG_DEFINE="QT_SCRIPT"
-
-PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" )
-
-multilib_src_configure() {
-	local myconf=(
-		$(qt_use jit javascript-jit)
-		-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
-		-no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif
-		-no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-		-no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
-		-no-gtkstyle
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index fa7c09677297..6084961dcc82 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,11 +1,9 @@
 AUX qtsql-5.9.4-mariadb-10.2.patch 1187 BLAKE2B 1ee0a4ad020a1d0e5bcaa19ac987eb5b472f9701adf876024003e377ca40060a52323bdfd3ec8213e6e8e199336bbfd92c7aab716be38b46fd105628eea447f6 SHA512 3ad71a5c3a31bb60484de09bb6503fd1c35f6e55aa2116f5ea468314a3c72cc43ddcfde6da01f479f91c381fbf2f2e64024ab88cf0e8f2e0a3edbda45bd44609
 AUX qtsql-5.9.5-mariadb-10.2.patch 1199 BLAKE2B cb5d5079aca9f9adb0343db8691418afc1e1b43c8a425f5c8f52ab24872047c9f9bdadfe48fee9e7c85b5cd1f886951aa3777f55ccada790113150c71a77ca42 SHA512 be4d8c3569ba3007a0b512184295f12043b79e09e948651fae3af5b4a6e7e0ebcf5c5f55c32c321c64a469eefeff16ee7169bbc03d7027ee04d62d384e04288d
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtsql-4.8.7-r1.ebuild 2261 BLAKE2B 24e39792f5fd56b5d61a7b61dee71f00cae4a45436e74137de29460d89c5c13235811142dfb8f5499eea483890c4c39ff2fd9d86f0ac9e52f05d08499b1ac8ce SHA512 a81056b36b8a081403824b1102883d7d35e181c05bc6b8e56e29c227ec832fe712a1dde8a4178a30bad5454798aa17eaf33890403c15b08b67cb221487b8e4ca
 EBUILD qtsql-5.11.1-r1.ebuild 1504 BLAKE2B 9370519007fd4316023f02b3c600b460d7f6700d5afd8a9021d44630b314c3e0ab80b17fc256f505a6569f76d71c66f7aef227f38e000432b4d54e3046aabbe8 SHA512 47784173975a4f6c0ab8d161c64ee7e511768f20b5179f6bb4e14196def668b89d7bd6edd969d97b68fc8e12b3df7229ebcae928c243c3584790a4accf374dbf
 EBUILD qtsql-5.9.4-r1.ebuild 1576 BLAKE2B e87c3461b70676298963c099fa518a622e05cf054f5dfebb707584ba6c629c37844b3d29c5dd846128f38295abdf26b016347a2b34ff9b1592dbcda74d89fdd6 SHA512 d33dca9366dc91e4410eed715aa3e31028dfc4be35f3cdc9dc266d3a83ba12c77e210362320a5e78ae9d9f8d3e77ea08cba9409b4a79e1317daa1aa7c7f8569a
 EBUILD qtsql-5.9.6-r1.ebuild 1620 BLAKE2B 90087b4ffcc3ae4e24679e4411cd0d2ba27c945f37904491b1cd394633afe4b06f7b85b002656f16523a7a72be55bd20db0e3e3614722b7b5a684f2b643e4ef1 SHA512 a60023e67e6a9e7f9287cd9874568eeac258e4c2709e075151df901f7f49b925e50ef9ffa55c1f3e7fdb6e376cda7dfa27f5526e0b1b7a840701cea45a2d6f39
-MISC metadata.xml 701 BLAKE2B b9f31dc4bdb158bda952ca941dc3a5f70004800c8874e310a2a9634223dde59e799df9b4f9d424d89870c191fe041ec29ecbab79c1f04be55c786170d921c10e SHA512 c807e5c85d7e4f23f15ef9f95f4bed3e303e25e355a096ee118e4846330948957dc44d16c97d3c687ee30a5895c511e9d1480a39ddf2360f8989d06daf0b91b8
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/metadata.xml b/dev-qt/qtsql/metadata.xml
index bea102dd5ae8..32568f62fb8e 100644
--- a/dev-qt/qtsql/metadata.xml
+++ b/dev-qt/qtsql/metadata.xml
@@ -5,11 +5,6 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
-	<use>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
-		<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
-	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
diff --git a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
deleted file mode 100644
index 089d7a76c79c..000000000000
--- a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib qt4-build-multilib
-
-DESCRIPTION="The SQL module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	freetds? ( dev-db/freetds )
-	mysql? ( virtual/libmysqlclient:=[${MULTILIB_USEDEP}] )
-	oci8? ( >=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
-	odbc? ( || (
-		>=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}]
-		>=dev-db/libiodbc-3.52.8-r2[${MULTILIB_USEDEP}]
-	) )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	src/sql
-	src/plugins/sqldrivers"
-
-multilib_src_configure() {
-	local myconf=(
-		$(qt_native_use freetds  sql-tds    plugin)
-		$(qt_use        mysql    sql-mysql  plugin) $(use mysql && echo -mysql_config "${EPREFIX}/usr/bin/${CHOST}-mysql_config")
-		$(qt_use        oci8     sql-oci    plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
-		$(qt_use        odbc     sql-odbc   plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
-		$(qt_native_use postgres sql-psql   plugin) $(use postgres && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
-		$(qt_use        sqlite   sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
-		-no-sql-db2
-		-no-sql-ibase
-		-no-sql-sqlite2
-		-no-sql-symsql
-		$(qt_use qt3support)
-		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-nis -no-opengl
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-		-no-glib
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 5460cfcbcac7..090b352cedb9 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,9 +1,7 @@
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtsvg-everywhere-src-5.11.1.tar.xz 1843216 BLAKE2B 8e5e94e706872f65189a51f0ea19a69d409de4d60c8cedd376e8e5efe74513370cc0add47d7d158ee386ce96455af27bef6ac3e29efdfc392d00dc7f5e3e7221 SHA512 2e9b126e72335b4b39296d033c6ea8761739148b812841797e1678135eaad944a5e4073010b5dbfb17708bd8fc8de0dd6b2b092330176b3b29c7637357353e39
 DIST qtsvg-opensource-src-5.9.4.tar.xz 1778072 BLAKE2B 077ca02c7a43cc5cc6170e0c24ee155e3d190033837494c58804934881361f738709f0aed9d876dada19c48b194624b90a759cf509c9e1fb9c566514a4f5c430 SHA512 242a471ba8b1b3fe45d53e0dbdd2bcba0ffe129f7658fa3608fb0f8ee72bf56244522861c12315eabc401f389031bea2027eb106eec67688f141ea8550b6b2b5
 DIST qtsvg-opensource-src-5.9.6.tar.xz 1778688 BLAKE2B 30084cdeaefef6c15f07fbdb9373b9cecb87fdd9676c2d89061a371439ec0c02ace2fe65b0061e518de6a1b75df9edf314adcdb6ffdc03c7be29424c92784d25 SHA512 6e86f050c07621d628f6e9440541be1fd80b3e05b034ba17bb5068afd4775d9ee08d7bf11d2ffdf03da2cb8ca66bfaf2f59b7e5e76acdb1a1e2ec25af25c65b4
-EBUILD qtsvg-4.8.7.ebuild 1147 BLAKE2B 2c640fadf3d57b7c745be9dd822be6db9a070dd077026197df9eabb9c398ee66a22a9bd9e9223c1ab99e9da6985a33cfdf47cd68c5350abb3614711d48f04226 SHA512 68e74c1c97a630ad57c2e6aeaa7d5a73b90c13eb29e9bf513a7b19b26b990b234e16d77c04231b59f8aa53110551c7b9844aae1f60f0f0bc8b94322911a6f583
 EBUILD qtsvg-5.11.1.ebuild 471 BLAKE2B 7d28048cbec0b1d0ebc7a155681f7636e1e7cbe08f7a9f6f8b00f8310696b8cbb6d786b217734d157987ddec8f124e402cdcd5fe134b89b11b36548bbbf96142 SHA512 2a140ea11d851126ce2242dccbb4475bcd662ef334df117a52c57bb7dfe26b29b2ffa54e281f6fc9c52b8ce1826c3ff02ebdeba3c419e470f11ab854c87bc66f
 EBUILD qtsvg-5.9.4-r2.ebuild 491 BLAKE2B 1f78d69d00c5ff09b09581769de621315a993c709ed19c09064fde88008c924d0ec59779946d3b3f6385787586a406e63cf91b1db33dc531fb02574f296565b4 SHA512 0eee956fca2fcbf1b2ec2c934e0c76a289941ca7112f37cc66f41807290a3e640299972e5239bc8682d87ebb639ce30db27d6b0c34184d5f4c21ad01d9eabcb1
 EBUILD qtsvg-5.9.6.ebuild 469 BLAKE2B d62fbc4257dd403c001b88dd476882a8c2872053df5bdd01d5871f52ab5a6cb7fd68ba0ec1f564142a8e2f0207a617f1b1341b43198f5dd051123d7cd384133d SHA512 fbd0a8da764815bb277293837aa0ccad363f0ecc0f287b879994a0f4f245588d51ebb9a7406c337736f8023887088dde609095983a46ad27b91508eb24d8e8db
-MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsvg/metadata.xml b/dev-qt/qtsvg/metadata.xml
index 22d751f51bd7..32568f62fb8e 100644
--- a/dev-qt/qtsvg/metadata.xml
+++ b/dev-qt/qtsvg/metadata.xml
@@ -5,10 +5,6 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
-	<use>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
-	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
diff --git a/dev-qt/qtsvg/qtsvg-4.8.7.ebuild b/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
deleted file mode 100644
index e93289484ea4..000000000000
--- a/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The SVG module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+accessibility"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	src/svg
-	src/plugins/imageformats/svg
-	src/plugins/iconengines/svgiconengine"
-
-QCONFIG_ADD="svg"
-QCONFIG_DEFINE="QT_SVG"
-
-multilib_src_configure() {
-	local myconf=(
-		-svg
-		$(qt_use accessibility)
-		-no-xkb  -no-xrender
-		-no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
-		-no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-		-no-fontconfig -no-glib -no-gtkstyle
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index fcb80275c91a..91dfd195ec03 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,9 +1,7 @@
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qttest-4.8.7.ebuild 933 BLAKE2B 234731d6bc636f8aafa311de9cfb8a89e3e6bdb5bab4b1fc2fd4b78bdead1eb3fa29df292e9bae5b73cad6b8c364984b6a16e76dff8b4e98621adf9e74333297 SHA512 7d2f377603287d0aff165aac7017622e0b8e4445103696911d6784c108cb4d9f1f04200c1baaf6aaaebb865c5038ce0d393240c91e6da06968c91171d93568e8
 EBUILD qttest-5.11.1.ebuild 549 BLAKE2B 42c5c9b7054d7838c2ec9db74c44b4e6421e3146398ad9568461ed8163a0ad49594c7d3827a6519d044139d3b03fc3d32132cb759a257755c22c850c0bf124f9 SHA512 df67411113389754057bf2157ed1a6ebdd5078ac9d2beeeee87e828ba9eb58c904ccb220aa1c12b9186d06b8d38263ec03d9babdc97d00891c11bd12d60fda88
 EBUILD qttest-5.9.4.ebuild 545 BLAKE2B 85bbb66b553452f36b6afbd85eeb571008e7b9e0b243307a1cca65068f8ae7e0f50d2d9c65b65d4b70af4966495e57a093382d05afa69b112b0974c1aa14a224 SHA512 50a40c8669a267cfaaed421d9e5d48b22ac6cfeb502bc63b49abba6062f022b52c8141868c388a1a3c1f9fcf819070f29796fd0d229090b9a3eac39b8a4dcbb6
 EBUILD qttest-5.9.6.ebuild 547 BLAKE2B 2078ba25107eec129eb20e7c0d7516a1eee0fcbbd51c26ed79bf0f0a0b110603c65284df96ba0c9737a92df072aa43d18da5ccd10d0f3616ea4e1a83f5bf876a SHA512 8802b34cce520c47d20c3b9ade67bcdc0dee0d70e39094a75ba6d30d9aca93f7c3e147a5fcf6b99468299b3088e003597022a7d307c61f1ebbd6d7cb19e4c7b6
-MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttest/metadata.xml b/dev-qt/qttest/metadata.xml
index 22d751f51bd7..32568f62fb8e 100644
--- a/dev-qt/qttest/metadata.xml
+++ b/dev-qt/qttest/metadata.xml
@@ -5,10 +5,6 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
-	<use>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
-	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
diff --git a/dev-qt/qttest/qttest-4.8.7.ebuild b/dev-qt/qttest/qttest-4.8.7.ebuild
deleted file mode 100644
index c9adac525eb4..000000000000
--- a/dev-qt/qttest/qttest-4.8.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/testlib"
-
-multilib_src_configure() {
-	local myconf=(
-		-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor
-		-no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-		-no-accessibility -no-fontconfig -no-glib -no-svg
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index dffcc2542727..2e63fdcbbe17 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,8 +1,6 @@
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttranslations-everywhere-src-5.11.1.tar.xz 1428808 BLAKE2B 55a8813a471ab14f885f95df6a2205c50424c8892d060f3dfb4123d281e55a1a8f0829ad3b8f1b713bac11a1160fc22a977269bcaae877b80c985c4b2c9232ff SHA512 b817b7be585413e352271204e88730c873e0701f65dbba9f5b331f0c3e0ddc1bd2446f038991bf9eabdd79ba440ea0172d0342b5b0d8b1593d9f55ad2a0ebcc0
 DIST qttranslations-opensource-src-5.9.4.tar.xz 1451972 BLAKE2B f859c764d63673866bc8be88d4e5f9e2956b3bd08a883268a0c9cbca45a7132578a87b98eadf592944864da2d70cbbff0b46a75665faaa72c4f6a723f203cdb6 SHA512 74375ee78e40e8de2349e575306c729d90d80de089f44d4ff57506085c748d5eb5d0699a769d4379f7dd23c48ab88b7e5a8227044ce07d6ae12b0d3ac19450f0
 DIST qttranslations-opensource-src-5.9.6.tar.xz 1376088 BLAKE2B f85611a787fbbc5820bf0b68773ab9be1edc2f659c7861c6d8bc8158c0ca495f882dd2201406315a1f5c3caf7b4dd87b2178362e4ee9d5523112c55f590a6fd8 SHA512 caafa6fb865c73c1c43ca5d78aab21925d5cf836b3e9d8c10ac699a96e7b583e85f12101a79a55102f8d404305764acadac599cf84b97d03582684f3b9bc4ec7
-EBUILD qttranslations-4.8.7.ebuild 773 BLAKE2B cd0ea1b0a67d8d9d8ee6fd5d5bf4c2bd37aa42ab5e7250ade8f4fe689bed011caccecf51dce162b2c445eef3b725ca183a37831e03d5e11d88687e5071c9d597 SHA512 1f833bde8f1dcdbd7838cee55c193738203bf74d0ef55865bfe511e3f5749675d216669af2476530e3b27e3b12ef481e092e7866e6fffafe9d8bfba75d3a52ab
 EBUILD qttranslations-5.11.1.ebuild 379 BLAKE2B 983cfd8e6e4342992f7d945371452484b3208909b390595036f98cac87d1199f82ff53f12c449eabdfad1dc4f4f88538b2a77490c20dbe1ea7f85b85eb28fc06 SHA512 66c2e18d13961fcaae9ca45a04772f13e18a08f1097ae543a4b2828ad9d8d91526259fb978d2476b67804068c8f3b48466ab2f1fd840debeabf43174111201b1
 EBUILD qttranslations-5.9.4.ebuild 375 BLAKE2B 1eb759e922cfdd8c16db5a2a275bd51b700369aaa0cc660cf80996506826f223dc1441c817bb5bc7ca2ab4d5eca57e71d2311821e257fd4371e254b3b30d6fba SHA512 6d72e2552b8fd5746029c4d76e43fa62162e520eed2a091d2ef605e9b6ffbede380dc9d6b6ac64774b309776346cbb6e71a889d1d647ef23d6700a28ae29e8b3
 EBUILD qttranslations-5.9.6.ebuild 377 BLAKE2B fe293bf9dcd464ae793d3fe67d092b9d5aa658e00c57170ccd77e9d2ffb7cac710f99d177a7ef90ecfc6b527bd4f6b409c3b3b7312353764e78d1ce67864f9de SHA512 025182f1237a4339cf9877771ff1d6478388565c7d8415878c8b5f14dae85dab2a789173603b44a66d40bfbc8d965bf438f37ba76129d15933168b23533cac8b
diff --git a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild b/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
deleted file mode 100644
index 11907196f693..000000000000
--- a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="Translation files for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND=""
-
-QT4_TARGET_DIRECTORIES="translations"
-
-multilib_src_configure() {
-	if multilib_is_native_abi; then
-		qt4_prepare_env
-		qt4_symlink_tools_to_build_dir
-		qt4_foreach_target_subdir qt4_qmake
-	fi
-}
-
-multilib_src_compile() {
-	multilib_is_native_abi && qt4_multilib_src_compile
-}
-
-multilib_src_test() {
-	:
-}
-
-multilib_src_install() {
-	multilib_is_native_abi && qt4_multilib_src_install
-}
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 7d6a1b742b92..3792212188af 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,8 +1,6 @@
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtxmlpatterns-everywhere-src-5.11.1.tar.xz 1378340 BLAKE2B 53675d44da768d322bd6ba8de30d4ad00f370c79aa871e1a80184df4cc9ce8d45c13f6fb3a808660a42a44c034b14929fa7dbac52878642057a49a4a778d20c9 SHA512 207fda037fce412412909799ba7737764ebfa5d8cd4b0185f158791adbecd9a0e0db15bb7e40aaa5e664809b600e77a7a3398a35d2f4e087f1ab15a31e706066
 DIST qtxmlpatterns-opensource-src-5.9.4.tar.xz 1361036 BLAKE2B 74fae07ff780bb44eaffc56822585c5dd2dc36c13237ae23666f8286488a837cafccf01c14d9efe4d151435235965b923bad1889ed604ebb2781237d8674db26 SHA512 c2789e7ca32f29f025b72704be49d9cfd3c02bfa61bf3df4145ea03b5df4fc60b2498bcf7e45090b36141aace91c645b0648b99c54e1b3fe6aec486e7fbe0dad
 DIST qtxmlpatterns-opensource-src-5.9.6.tar.xz 1344204 BLAKE2B 08478bdc81f49fb2e24a57a105f537000b945537b172392b56751614473bc63c8b2cc4d3c279a91b7ef0e68490d01655b6dac7f5771754baf73335fe3117a12a SHA512 c1b7983725cd208b207e366f3fcaedf073768cbe11d6c54c4569b8155e2c97e4af889792600d86769b7e6828409e0333ad7c66b8459d07c5c1a06268d28d6788
-EBUILD qtxmlpatterns-4.8.7.ebuild 679 BLAKE2B e26f0d2bb630e377f932c37e8e9399c40c722c2f4e7dcb68d42c3ee8c08bba1ef9263e6b704e33dc6ec402356e8829d004e007c20e91a49b93001c743f8182a5 SHA512 dde6d5ada8f3c9546bfed8a0b4f6c3f118794fa4fa382219a3f6b8ee75b8c5e8fc5913a2a0421a8904ba52dadbc707a3fd17c2ddbe4a1ec758b00d8fb0c2aecf
 EBUILD qtxmlpatterns-5.11.1.ebuild 427 BLAKE2B 9d56740f6f80e90e321b3af95d6dd3a2d4b9911714ff0d5ebc9dc5b164122f584c51a8e58a4c858ad58fa96a5d467b87af27c5fda6c8287e7f0bec35b011b7b4 SHA512 9d919140204f45dc74f792dbe00f49f057735a893bc691f4e21a32d3d0af9065014e543833a596f0e739264b589c0f7b1d4a32e4c1dcdcf5367344747ec57e53
 EBUILD qtxmlpatterns-5.9.4.ebuild 423 BLAKE2B 29a95538e2450fd50671dd1dd93e8605ad958de12901c20469aa4a8ab632a80d7f3cdc5beb08c63fe2ff57ce1e6ed8b8958edf401b6401faf57ab17542c90722 SHA512 eb6cf00eca1dbbbb50542e9c5ac7a872bb9aa74f93104b9abc892f44378cbcf4130474da14d69b613e1eaad6b72e12f11ed9e01a4c7f12ca24119795f8abf17a
 EBUILD qtxmlpatterns-5.9.6.ebuild 425 BLAKE2B 5fd1c372dfabfdac0167fc7eaf516b46cec871b3f0ce3327c0e40ac08afdcce4d53f8d869c59e65a113bd82ad1f77717f672aca0d7612259a6f95030e114d739 SHA512 a7e1d2dacf255f87595db2874a9e36e336c68aded55773b56acaca77526c9353760ed4b8ff79d0519d8377246e8080c94478877ec76fb1395a4e53871394ad47
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild
deleted file mode 100644
index c5ab5f0e709d..000000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-build-multilib
-
-DESCRIPTION="The XmlPatterns module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	src/xmlpatterns
-	tools/xmlpatterns
-	tools/xmlpatternsvalidator"
-
-QCONFIG_ADD="xmlpatterns"
-QCONFIG_DEFINE="QT_XMLPATTERNS"
-
-multilib_src_configure() {
-	local myconf=(
-		-xmlpatterns
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 8b874ae87bef..9ea494ebd630 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/amcl/Manifest b/dev-ros/amcl/Manifest
index 36b73bf65f87..3241f16a24d7 100644
--- a/dev-ros/amcl/Manifest
+++ b/dev-ros/amcl/Manifest
@@ -1,6 +1,6 @@
-DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-EBUILD amcl-1.16.0.ebuild 805 BLAKE2B b086b5912e6093bcb310e948c0ae7b2bc4423884a7b3f4f8db83b25e1ae0de13e37f9c27cc6c2aaa406f708e759cd005d97fa50c7a9513ef0b34b07a8594cef8 SHA512 c8c4b071779ca9e648d6ac4f8db59027368be1fe7dd38d1e93d1ee4784ef5ddce62cb7b2867710c5a85b51de148b423a3930e3b95633fef38a226f5c35bb9b55
-EBUILD amcl-1.16.1.ebuild 805 BLAKE2B b086b5912e6093bcb310e948c0ae7b2bc4423884a7b3f4f8db83b25e1ae0de13e37f9c27cc6c2aaa406f708e759cd005d97fa50c7a9513ef0b34b07a8594cef8 SHA512 c8c4b071779ca9e648d6ac4f8db59027368be1fe7dd38d1e93d1ee4784ef5ddce62cb7b2867710c5a85b51de148b423a3930e3b95633fef38a226f5c35bb9b55
-EBUILD amcl-9999.ebuild 805 BLAKE2B b086b5912e6093bcb310e948c0ae7b2bc4423884a7b3f4f8db83b25e1ae0de13e37f9c27cc6c2aaa406f708e759cd005d97fa50c7a9513ef0b34b07a8594cef8 SHA512 c8c4b071779ca9e648d6ac4f8db59027368be1fe7dd38d1e93d1ee4784ef5ddce62cb7b2867710c5a85b51de148b423a3930e3b95633fef38a226f5c35bb9b55
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
+EBUILD amcl-1.16.1.ebuild 946 BLAKE2B 39816421ee2595d0e31dce41aabb7df12577f3e3023eb76369cdd76fdf9c6b2ebd07a865da38f3af6dd5e21ee14fa01164c6950e8fd0f2e8e2acbd9b286541a6 SHA512 7c08f6cc045f3b575dfdd6808266c7d46cabc32f24b0d9f3a2652b142c4227d105393b3f7a0e49539f613136331cfc81f4755124fce1a7ceb802bb15f0bf8db6
+EBUILD amcl-1.16.2.ebuild 946 BLAKE2B 39816421ee2595d0e31dce41aabb7df12577f3e3023eb76369cdd76fdf9c6b2ebd07a865da38f3af6dd5e21ee14fa01164c6950e8fd0f2e8e2acbd9b286541a6 SHA512 7c08f6cc045f3b575dfdd6808266c7d46cabc32f24b0d9f3a2652b142c4227d105393b3f7a0e49539f613136331cfc81f4755124fce1a7ceb802bb15f0bf8db6
+EBUILD amcl-9999.ebuild 946 BLAKE2B 39816421ee2595d0e31dce41aabb7df12577f3e3023eb76369cdd76fdf9c6b2ebd07a865da38f3af6dd5e21ee14fa01164c6950e8fd0f2e8e2acbd9b286541a6 SHA512 7c08f6cc045f3b575dfdd6808266c7d46cabc32f24b0d9f3a2652b142c4227d105393b3f7a0e49539f613136331cfc81f4755124fce1a7ceb802bb15f0bf8db6
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/amcl/amcl-1.16.0.ebuild b/dev-ros/amcl/amcl-1.16.0.ebuild
deleted file mode 100644
index e02f95f8cedd..000000000000
--- a/dev-ros/amcl/amcl-1.16.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Probabilistic localization system for a robot moving in 2D"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosbag
-		dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/python_orocos_kdl[${PYTHON_USEDEP}] dev-ros/map_server[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/amcl/amcl-1.16.1.ebuild b/dev-ros/amcl/amcl-1.16.1.ebuild
index e02f95f8cedd..2c9900308d7a 100644
--- a/dev-ros/amcl/amcl-1.16.1.ebuild
+++ b/dev-ros/amcl/amcl-1.16.1.ebuild
@@ -16,13 +16,17 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/message_filters
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/rosbag
 		dev-libs/boost:=
 	dev-ros/roscpp
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
+	dev-ros/tf2
 	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_ros
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/python_orocos_kdl[${PYTHON_USEDEP}] dev-ros/map_server[${PYTHON_USEDEP}] )
diff --git a/dev-ros/amcl/amcl-1.16.2.ebuild b/dev-ros/amcl/amcl-1.16.2.ebuild
new file mode 100644
index 000000000000..2c9900308d7a
--- /dev/null
+++ b/dev-ros/amcl/amcl-1.16.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Probabilistic localization system for a robot moving in 2D"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/message_filters
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rosbag
+		dev-libs/boost:=
+	dev-ros/roscpp
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_ros
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/python_orocos_kdl[${PYTHON_USEDEP}] dev-ros/map_server[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/amcl/amcl-9999.ebuild b/dev-ros/amcl/amcl-9999.ebuild
index e02f95f8cedd..2c9900308d7a 100644
--- a/dev-ros/amcl/amcl-9999.ebuild
+++ b/dev-ros/amcl/amcl-9999.ebuild
@@ -16,13 +16,17 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/message_filters
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/rosbag
 		dev-libs/boost:=
 	dev-ros/roscpp
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
+	dev-ros/tf2
 	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_ros
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/python_orocos_kdl[${PYTHON_USEDEP}] dev-ros/map_server[${PYTHON_USEDEP}] )
diff --git a/dev-ros/base_local_planner/Manifest b/dev-ros/base_local_planner/Manifest
index b13d31a00513..5747de2f509d 100644
--- a/dev-ros/base_local_planner/Manifest
+++ b/dev-ros/base_local_planner/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
 EBUILD base_local_planner-1.16.1.ebuild 1088 BLAKE2B 07d1c699b36f6288a8c464d22428b45032b14e0139a3615f6b0ce2b0d772a33fc9894271c754f4c06a9f917e11b0b078a057f32c02e8e7d9872fdbfebc7ee65b SHA512 7c0a4f6750e3be9f4a480791a44d19fddc588061fb6f8dbeb0641b7b64e7a3f3204b0a21446a568f81391fd266004ec0aed55ac9e655252be87af0e4d20619b5
-EBUILD base_local_planner-9999.ebuild 1088 BLAKE2B 07d1c699b36f6288a8c464d22428b45032b14e0139a3615f6b0ce2b0d772a33fc9894271c754f4c06a9f917e11b0b078a057f32c02e8e7d9872fdbfebc7ee65b SHA512 7c0a4f6750e3be9f4a480791a44d19fddc588061fb6f8dbeb0641b7b64e7a3f3204b0a21446a568f81391fd266004ec0aed55ac9e655252be87af0e4d20619b5
+EBUILD base_local_planner-1.16.2.ebuild 1153 BLAKE2B 45ba326dfafd52147da17c0b34840c05fe438d1fa0d8bf990698e2c3986c691ae27d5299a42b43bb8e8ab3d5722bea2eedb7be20875aa6531f14c597df26f030 SHA512 eaf64d349960c06921abdd307da4c9689a1120b96c82176b7d78fd83d43d958658866e69aefe83b0d0a55ec31f57924a1fc77b817fe64985115e363514cf501f
+EBUILD base_local_planner-9999.ebuild 1153 BLAKE2B 45ba326dfafd52147da17c0b34840c05fe438d1fa0d8bf990698e2c3986c691ae27d5299a42b43bb8e8ab3d5722bea2eedb7be20875aa6531f14c597df26f030 SHA512 eaf64d349960c06921abdd307da4c9689a1120b96c82176b7d78fd83d43d958658866e69aefe83b0d0a55ec31f57924a1fc77b817fe64985115e363514cf501f
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/base_local_planner/base_local_planner-1.16.2.ebuild b/dev-ros/base_local_planner/base_local_planner-1.16.2.ebuild
new file mode 100644
index 000000000000..b9d3cfb7e498
--- /dev/null
+++ b/dev-ros/base_local_planner/base_local_planner-1.16.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/angles
+	>=dev-ros/costmap_2d-1.16
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-cpp/eigen:3
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/nav_core-1.16
+	dev-ros/pluginlib
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_ros
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/voxel_grid
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/base_local_planner/base_local_planner-9999.ebuild b/dev-ros/base_local_planner/base_local_planner-9999.ebuild
index 459e749a5fbb..b9d3cfb7e498 100644
--- a/dev-ros/base_local_planner/base_local_planner-9999.ebuild
+++ b/dev-ros/base_local_planner/base_local_planner-9999.ebuild
@@ -28,11 +28,13 @@ RDEPEND="
 	dev-ros/rosconsole
 	dev-ros/roscpp
 	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf2_ros
 	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/voxel_grid
 	dev-libs/boost:=[threads]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-ros/cmake_modules
diff --git a/dev-ros/carrot_planner/Manifest b/dev-ros/carrot_planner/Manifest
index dcb64f46d8c8..cc69f7885fb5 100644
--- a/dev-ros/carrot_planner/Manifest
+++ b/dev-ros/carrot_planner/Manifest
@@ -1,10 +1,6 @@
-DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
-DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
-DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-EBUILD carrot_planner-1.15.1-r1.ebuild 541 BLAKE2B 7020abbceb184d865ec76725b26d9cff22a1275b4b69657ad0283c56eb3e1bea75d04cb077457fe01f4b1406722c32e9d4a4ebe419d170ab9d494a9166256437 SHA512 e2a009858721c857e397112f235349807262897a34e91c7651972d1a7384e103704e80fa24a90b351eb2579373052ed9d29415b80cbf7042675409a5ef87c7d7
-EBUILD carrot_planner-1.15.2.ebuild 541 BLAKE2B 5d89690fc8f307ba8da75ad866ca06df0f401119de9322318bd32061969d54429dec6d971e5016b968d01a2506b94f253c3737fa3219ef1d7d43fdfb980b42ea SHA512 53b8e7a89844cc5dcb60863110b2dc097696ccd7a663c796d135b5912eb89c4c0747cc3afdf4358a6e464b5c7c1d4a1d7cda4fae2470cb9643a48512cc03d9a6
-EBUILD carrot_planner-1.16.0.ebuild 595 BLAKE2B c190b4df7617f2e600493e9841940b12b4841e17fea253cf59b20d86d2f701a80951f6b74b3074395967c7c22077f419efda210ee623427dc696dda11b45f833 SHA512 4457a05ddc7305f647c80a265b8ceb7e051452ade4e9f2ea316a53f389ed5e0685c186999de8d739f8a9a5c47c86fc5924bb46c4a2f16bb50286fe2954598f7b
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
 EBUILD carrot_planner-1.16.1.ebuild 595 BLAKE2B c190b4df7617f2e600493e9841940b12b4841e17fea253cf59b20d86d2f701a80951f6b74b3074395967c7c22077f419efda210ee623427dc696dda11b45f833 SHA512 4457a05ddc7305f647c80a265b8ceb7e051452ade4e9f2ea316a53f389ed5e0685c186999de8d739f8a9a5c47c86fc5924bb46c4a2f16bb50286fe2954598f7b
-EBUILD carrot_planner-9999.ebuild 595 BLAKE2B c190b4df7617f2e600493e9841940b12b4841e17fea253cf59b20d86d2f701a80951f6b74b3074395967c7c22077f419efda210ee623427dc696dda11b45f833 SHA512 4457a05ddc7305f647c80a265b8ceb7e051452ade4e9f2ea316a53f389ed5e0685c186999de8d739f8a9a5c47c86fc5924bb46c4a2f16bb50286fe2954598f7b
+EBUILD carrot_planner-1.16.2.ebuild 608 BLAKE2B 167e6751811107cf47a1f8eb596faa5ebf44dd65681d1db9bee8e9b4c10671dc6ed5fa4f75686578886217f4e201033fde2f1c280c6520d2b316933074ed6f6b SHA512 96e0afa83da45c339680c20b28a45b3829892d74d77244a794ecb644e51e20e5d513a5dfe94bf65660d0ce26ef5414b1103e51bdc284dafde2dffa90132fbb77
+EBUILD carrot_planner-9999.ebuild 608 BLAKE2B 167e6751811107cf47a1f8eb596faa5ebf44dd65681d1db9bee8e9b4c10671dc6ed5fa4f75686578886217f4e201033fde2f1c280c6520d2b316933074ed6f6b SHA512 96e0afa83da45c339680c20b28a45b3829892d74d77244a794ecb644e51e20e5d513a5dfe94bf65660d0ce26ef5414b1103e51bdc284dafde2dffa90132fbb77
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/carrot_planner/carrot_planner-1.15.1-r1.ebuild b/dev-ros/carrot_planner/carrot_planner-1.15.1-r1.ebuild
deleted file mode 100644
index e3dc1d771531..000000000000
--- a/dev-ros/carrot_planner/carrot_planner-1.15.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to find a legal place to put a carrot for the robot to follow"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_core
-	dev-ros/costmap_2d
-	dev-ros/base_local_planner
-	dev-ros/pluginlib
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/carrot_planner/carrot_planner-1.15.2.ebuild b/dev-ros/carrot_planner/carrot_planner-1.15.2.ebuild
deleted file mode 100644
index 3f5f3f231f33..000000000000
--- a/dev-ros/carrot_planner/carrot_planner-1.15.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to find a legal place to put a carrot for the robot to follow"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_core
-	dev-ros/costmap_2d
-	dev-ros/base_local_planner
-	dev-ros/pluginlib
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/carrot_planner/carrot_planner-1.16.0.ebuild b/dev-ros/carrot_planner/carrot_planner-1.16.0.ebuild
deleted file mode 100644
index 9b88284f1191..000000000000
--- a/dev-ros/carrot_planner/carrot_planner-1.16.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to find a legal place to put a carrot for the robot to follow"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/carrot_planner/carrot_planner-1.16.2.ebuild b/dev-ros/carrot_planner/carrot_planner-1.16.2.ebuild
new file mode 100644
index 000000000000..86e76aa7b195
--- /dev/null
+++ b/dev-ros/carrot_planner/carrot_planner-1.16.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Attempts to find a legal place to put a carrot for the robot to follow"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/base_local_planner
+	dev-ros/costmap_2d
+	dev-cpp/eigen:3
+	dev-ros/nav_core
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf2
+	dev-ros/tf2_ros
+
+	dev-libs/boost:=
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/carrot_planner/carrot_planner-9999.ebuild b/dev-ros/carrot_planner/carrot_planner-9999.ebuild
index 9b88284f1191..86e76aa7b195 100644
--- a/dev-ros/carrot_planner/carrot_planner-9999.ebuild
+++ b/dev-ros/carrot_planner/carrot_planner-9999.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-ros/nav_core
 	dev-ros/pluginlib
 	dev-ros/roscpp
+	dev-ros/tf2
 	dev-ros/tf2_ros
 
 	dev-libs/boost:=
diff --git a/dev-ros/clear_costmap_recovery/Manifest b/dev-ros/clear_costmap_recovery/Manifest
index 4b2d33ced296..0cb56f10403a 100644
--- a/dev-ros/clear_costmap_recovery/Manifest
+++ b/dev-ros/clear_costmap_recovery/Manifest
@@ -2,9 +2,11 @@ DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845b
 DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
 EBUILD clear_costmap_recovery-1.15.1-r1.ebuild 647 BLAKE2B c1d826027317640624ab0b1b65aa668eb90cdbedd36c5b6cf823b2ee0ebd0ba18869ba6ce0ea10b357412ca3a3e7c724212df063a52286ce88688771b6a1e258 SHA512 7561452bb3b29978c9984949b5c029b15cb5f22ff4356d212a765e921ae0b8780af4fa56fc32811f8f31c065254d68be2729e57575f968d1f0902d9d2617e23a
 EBUILD clear_costmap_recovery-1.15.2.ebuild 647 BLAKE2B 51836b3e628ad4602a74cd62e111b983ee0cfb1b65c906d8e3d695d13c594c7bc12933e2949f997448b11f97e9605c3faba834e039d8e55c7291fe7264621dff SHA512 7d484771d638a0be5c45d7f4409dc50d994dc7f3b91d8cd1c8ebc4afe176662650d4b982b36eb3b41bae41d173dbc054bcdcffd9d701548db1d326c99263755a
 EBUILD clear_costmap_recovery-1.16.0.ebuild 637 BLAKE2B 1fe350cb75dc86cdc175ff292d6473286ea723736e2d5e705ba83ce9eb897768cfc389afac7251914a85fa0103663f549fde97a74f7a3cebd13849a43e37d246 SHA512 65fba55d328b30785d55896bb30e78e22e12c9a81c94a08fd12ca5b502ae835becab6a0a789af809dde0d4ffe20a1f24280635b8805c09b47a39d2ada55e1000
 EBUILD clear_costmap_recovery-1.16.1.ebuild 637 BLAKE2B 1fe350cb75dc86cdc175ff292d6473286ea723736e2d5e705ba83ce9eb897768cfc389afac7251914a85fa0103663f549fde97a74f7a3cebd13849a43e37d246 SHA512 65fba55d328b30785d55896bb30e78e22e12c9a81c94a08fd12ca5b502ae835becab6a0a789af809dde0d4ffe20a1f24280635b8805c09b47a39d2ada55e1000
+EBUILD clear_costmap_recovery-1.16.2.ebuild 637 BLAKE2B 1fe350cb75dc86cdc175ff292d6473286ea723736e2d5e705ba83ce9eb897768cfc389afac7251914a85fa0103663f549fde97a74f7a3cebd13849a43e37d246 SHA512 65fba55d328b30785d55896bb30e78e22e12c9a81c94a08fd12ca5b502ae835becab6a0a789af809dde0d4ffe20a1f24280635b8805c09b47a39d2ada55e1000
 EBUILD clear_costmap_recovery-9999.ebuild 637 BLAKE2B 1fe350cb75dc86cdc175ff292d6473286ea723736e2d5e705ba83ce9eb897768cfc389afac7251914a85fa0103663f549fde97a74f7a3cebd13849a43e37d246 SHA512 65fba55d328b30785d55896bb30e78e22e12c9a81c94a08fd12ca5b502ae835becab6a0a789af809dde0d4ffe20a1f24280635b8805c09b47a39d2ada55e1000
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.2.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.2.ebuild
new file mode 100644
index 000000000000..c88df16826d6
--- /dev/null
+++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Recovery behavior that attempts to clear space by reverting the costmaps to the static map"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/costmap_2d-1.16
+	dev-cpp/eigen:3
+	dev-ros/nav_core
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf2_ros
+
+	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	test? ( dev-ros/rostest dev-cpp/gtest )
+"
diff --git a/dev-ros/costmap_2d/Manifest b/dev-ros/costmap_2d/Manifest
index fe66e675b1e4..ed555a37559e 100644
--- a/dev-ros/costmap_2d/Manifest
+++ b/dev-ros/costmap_2d/Manifest
@@ -1,10 +1,6 @@
-DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
-DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
-DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-EBUILD costmap_2d-1.15.1-r1.ebuild 1007 BLAKE2B 9b8b2fa26faf207a3d16dbf2562ea3b07377576a37da86d8c996a4a29d344ab111107f72411b7d5dce788e0410b5893f9154589fcfcd226600843a9a0cc99712 SHA512 e3098b94f091436dcb0e730da4046493152307822b25504a833a3fc4088f77f37cd46fec9e2d232f0b88579699ad0e0939bbf1f1c3ec7be358ebb0a59e403530
-EBUILD costmap_2d-1.15.2.ebuild 1007 BLAKE2B aae47e6fb1d3b1bd4bce8e2c8ca1a07a9676ba7119bd137a6e59417a5ce15a3b77351e98dbfee724278762330bf4906e2a279eb294d5a69cb97ded57a056291d SHA512 011232bd8d618e6efbefc4db9e55f19ae22da2d1a79a5a906df30e36d0b75a030b280bd1d5227fc90a6df6a8b31b6ef7c90856c335fddcbbb97517e8c1715358
-EBUILD costmap_2d-1.16.0.ebuild 1129 BLAKE2B 9fef526a72f8c74a2f5416f6023b737a98c0c00accfa854dd45997d0f7fe60631a5c637decd882a931d67d1f62f14e6928fbd67e1c4f745c5c5a2e2b1a58f768 SHA512 289558f8f6435ea8dcce6007015d987dfe0ee43f58eb787794d771dc28a039692e1ee323641e53638c81c6d96e02c30f10116fa568ad57da6f7b8c3031b33ddb
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
 EBUILD costmap_2d-1.16.1.ebuild 1129 BLAKE2B 9fef526a72f8c74a2f5416f6023b737a98c0c00accfa854dd45997d0f7fe60631a5c637decd882a931d67d1f62f14e6928fbd67e1c4f745c5c5a2e2b1a58f768 SHA512 289558f8f6435ea8dcce6007015d987dfe0ee43f58eb787794d771dc28a039692e1ee323641e53638c81c6d96e02c30f10116fa568ad57da6f7b8c3031b33ddb
-EBUILD costmap_2d-9999.ebuild 1129 BLAKE2B 9fef526a72f8c74a2f5416f6023b737a98c0c00accfa854dd45997d0f7fe60631a5c637decd882a931d67d1f62f14e6928fbd67e1c4f745c5c5a2e2b1a58f768 SHA512 289558f8f6435ea8dcce6007015d987dfe0ee43f58eb787794d771dc28a039692e1ee323641e53638c81c6d96e02c30f10116fa568ad57da6f7b8c3031b33ddb
+EBUILD costmap_2d-1.16.2.ebuild 1142 BLAKE2B f1c97efdafbf3bd401a2dbbe3b412f574ebf8eac3fe31881c4bb4be839ef565e768188395dbddd84c811689965fef423317a043226f6d2d356c74cab2fc04b7f SHA512 e384f914270afb78ff60d2963fa68e47f839970ea57131ec8a09318c530b8a7a544fbc34bfb230a045827128e1e5b91cc4324941249773b12abb9d81f40fab41
+EBUILD costmap_2d-9999.ebuild 1142 BLAKE2B f1c97efdafbf3bd401a2dbbe3b412f574ebf8eac3fe31881c4bb4be839ef565e768188395dbddd84c811689965fef423317a043226f6d2d356c74cab2fc04b7f SHA512 e384f914270afb78ff60d2963fa68e47f839970ea57131ec8a09318c530b8a7a544fbc34bfb230a045827128e1e5b91cc4324941249773b12abb9d81f40fab41
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/costmap_2d/costmap_2d-1.15.1-r1.ebuild b/dev-ros/costmap_2d/costmap_2d-1.15.1-r1.ebuild
deleted file mode 100644
index 82162901a3db..000000000000
--- a/dev-ros/costmap_2d/costmap_2d-1.15.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Creates a 2D costmap from sensor data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="ros_messages_cxx"
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/nav_msgs
-	dev-ros/pcl_conversions
-	dev-ros/pcl_ros
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf
-	dev-ros/voxel_grid
-	dev-cpp/eigen:3
-	sci-libs/pcl:=
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/costmap_2d/costmap_2d-1.15.2.ebuild b/dev-ros/costmap_2d/costmap_2d-1.15.2.ebuild
deleted file mode 100644
index afb1c245ae4e..000000000000
--- a/dev-ros/costmap_2d/costmap_2d-1.15.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Creates a 2D costmap from sensor data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="ros_messages_cxx"
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/nav_msgs
-	dev-ros/pcl_conversions
-	dev-ros/pcl_ros
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf
-	dev-ros/voxel_grid
-	dev-cpp/eigen:3
-	sci-libs/pcl:=
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/costmap_2d/costmap_2d-1.16.0.ebuild b/dev-ros/costmap_2d/costmap_2d-1.16.0.ebuild
deleted file mode 100644
index 8530f07a75db..000000000000
--- a/dev-ros/costmap_2d/costmap_2d-1.16.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Creates a 2D costmap from sensor data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="ros_messages_cxx"
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/voxel_grid
-
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_sensor_msgs
-
-	dev-cpp/eigen:3
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? (
-		dev-ros/map_server
-		dev-ros/rosbag
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit
-	)"
diff --git a/dev-ros/costmap_2d/costmap_2d-1.16.2.ebuild b/dev-ros/costmap_2d/costmap_2d-1.16.2.ebuild
new file mode 100644
index 000000000000..4a554602785b
--- /dev/null
+++ b/dev-ros/costmap_2d/costmap_2d-1.16.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Creates a 2D costmap from sensor data"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="ros_messages_cxx"
+
+RDEPEND="
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/laser_geometry
+	dev-ros/message_filters
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2
+	dev-ros/tf2_ros
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/voxel_grid
+
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_sensor_msgs
+
+	dev-cpp/eigen:3
+	dev-libs/boost:=[threads]
+	dev-libs/tinyxml2:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	test? (
+		dev-ros/map_server
+		dev-ros/rosbag
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-ros/rosunit
+	)"
diff --git a/dev-ros/costmap_2d/costmap_2d-9999.ebuild b/dev-ros/costmap_2d/costmap_2d-9999.ebuild
index 8530f07a75db..4a554602785b 100644
--- a/dev-ros/costmap_2d/costmap_2d-9999.ebuild
+++ b/dev-ros/costmap_2d/costmap_2d-9999.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	dev-ros/pluginlib
 	dev-ros/roscpp
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2
 	dev-ros/tf2_ros
 	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/voxel_grid
diff --git a/dev-ros/dwa_local_planner/Manifest b/dev-ros/dwa_local_planner/Manifest
index 9e2af81c3aea..e71106238376 100644
--- a/dev-ros/dwa_local_planner/Manifest
+++ b/dev-ros/dwa_local_planner/Manifest
@@ -1,10 +1,6 @@
-DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
-DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
-DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-EBUILD dwa_local_planner-1.15.1-r1.ebuild 720 BLAKE2B 336ea8187d60da9b4e50bbed3a7df2f898b82a4a0047ebf9ca146d2ededc71ba6c29f1539175927db241ee730bf5671f789ca3e332c19529fac742e4e70564f4 SHA512 e989c571520d4ce5b3d9fe9e1890ac3af91c013f9a660a8c127ae3b3de1f05b5332a85cc9ced1ad6b1bb1ed6f497a8e6c8f693b42e32d3373f3de5df4473cdcc
-EBUILD dwa_local_planner-1.15.2.ebuild 720 BLAKE2B 803c03ed98d8c86e06d23ba8038932325367bf4bde1c72508416d80ed489a49633fd53fae04e0b3d21f755dc670dee36187efc722e205d05959b9629b336b0e2 SHA512 2ac5793df00143b8a44832f14ca7eadbc989fa0c1c851abf1064030e873661013130b0d2b3a2408918693622d4d7d5ed78e78959b11e3e39b2ef3042d883b09a
-EBUILD dwa_local_planner-1.16.0.ebuild 746 BLAKE2B 8b654dc13b03bc20450717659ec46fdb5aa7feb9c29b7ec53d06a85c3f2823773eaf58f2e2e63f33459ce9ebaacae9d1a49b25e0651e1dff3db2b2d62b70043d SHA512 fcfdb8d8c5899488c71c424c8507db0d6d65e18347b2b0d2d00ff20f6b09fc16f72c87839328c77fa251d2a7e7cb0ea376df819a289021f88a2cbab445c69984
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
 EBUILD dwa_local_planner-1.16.1.ebuild 746 BLAKE2B 8b654dc13b03bc20450717659ec46fdb5aa7feb9c29b7ec53d06a85c3f2823773eaf58f2e2e63f33459ce9ebaacae9d1a49b25e0651e1dff3db2b2d62b70043d SHA512 fcfdb8d8c5899488c71c424c8507db0d6d65e18347b2b0d2d00ff20f6b09fc16f72c87839328c77fa251d2a7e7cb0ea376df819a289021f88a2cbab445c69984
-EBUILD dwa_local_planner-9999.ebuild 746 BLAKE2B 8b654dc13b03bc20450717659ec46fdb5aa7feb9c29b7ec53d06a85c3f2823773eaf58f2e2e63f33459ce9ebaacae9d1a49b25e0651e1dff3db2b2d62b70043d SHA512 fcfdb8d8c5899488c71c424c8507db0d6d65e18347b2b0d2d00ff20f6b09fc16f72c87839328c77fa251d2a7e7cb0ea376df819a289021f88a2cbab445c69984
+EBUILD dwa_local_planner-1.16.2.ebuild 827 BLAKE2B e82648179639420c67dfe780a59b37dbc4d4f7b14927f28c1a31a5e98ced5a3c057197f55b546a22fe6dcad8cec8e328318ea54660fa554f02f9092921b6cc65 SHA512 6b934ce33bf82f25e59bc498c603aee0f8afdae264b0ebac7b8b04346bd25a75abdd1afb6fa3fafed0a3a1015c7ea6deefe6d7ceacb9bd4beb3068c2f949b2d3
+EBUILD dwa_local_planner-9999.ebuild 827 BLAKE2B e82648179639420c67dfe780a59b37dbc4d4f7b14927f28c1a31a5e98ced5a3c057197f55b546a22fe6dcad8cec8e328318ea54660fa554f02f9092921b6cc65 SHA512 6b934ce33bf82f25e59bc498c603aee0f8afdae264b0ebac7b8b04346bd25a75abdd1afb6fa3fafed0a3a1015c7ea6deefe6d7ceacb9bd4beb3068c2f949b2d3
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-1.15.1-r1.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-1.15.1-r1.ebuild
deleted file mode 100644
index 34db0fe64df5..000000000000
--- a/dev-ros/dwa_local_planner/dwa_local_planner-1.15.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Dynamic Window Approach to local robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-	dev-ros/pcl_conversions
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-cpp/eigen:3
-	sci-libs/pcl
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-1.15.2.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-1.15.2.ebuild
deleted file mode 100644
index 17fe8f46f533..000000000000
--- a/dev-ros/dwa_local_planner/dwa_local_planner-1.15.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Dynamic Window Approach to local robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-	dev-ros/pcl_conversions
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-cpp/eigen:3
-	sci-libs/pcl
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-1.16.0.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-1.16.0.ebuild
deleted file mode 100644
index cb86c0b5ae58..000000000000
--- a/dev-ros/dwa_local_planner/dwa_local_planner-1.16.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Dynamic Window Approach to local robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-1.16.2.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-1.16.2.ebuild
new file mode 100644
index 000000000000..c2b31d506c31
--- /dev/null
+++ b/dev-ros/dwa_local_planner/dwa_local_planner-1.16.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Dynamic Window Approach to local robot navigation on a plane"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/angles
+	dev-ros/base_local_planner
+	dev-ros/costmap_2d
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-cpp/eigen:3
+	dev-ros/nav_core
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/pluginlib
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_ros
+
+	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-9999.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-9999.ebuild
index cb86c0b5ae58..c2b31d506c31 100644
--- a/dev-ros/dwa_local_planner/dwa_local_planner-9999.ebuild
+++ b/dev-ros/dwa_local_planner/dwa_local_planner-9999.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+	dev-ros/angles
 	dev-ros/base_local_planner
 	dev-ros/costmap_2d
 	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
@@ -22,10 +23,12 @@ RDEPEND="
 	dev-ros/nav_core
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/pluginlib
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
-	dev-ros/tf2_ros
 
+	dev-ros/tf2
 	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_ros
 
 	dev-libs/boost:=[threads]
 	dev-libs/console_bridge:=
diff --git a/dev-ros/fake_localization/Manifest b/dev-ros/fake_localization/Manifest
index 134ee241f858..99e16c336ab6 100644
--- a/dev-ros/fake_localization/Manifest
+++ b/dev-ros/fake_localization/Manifest
@@ -1,8 +1,10 @@
 DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
 EBUILD fake_localization-1.15.2.ebuild 720 BLAKE2B c908c0cd83c2103307dda8033ca003cc748f56a8a391f3285eac49be401d182d6eaed1f682379b861edca5b7be2c7f3d671bad838e9ac7c665f6ef7b658349cc SHA512 4bfe514a438cc5475255f4bb1a807d4a5325271b9c17536b17b3ee0f1cadd8d3090006ff6342fc049c908c97de470aeb44605f48986ea479902b071aab34a67c
 EBUILD fake_localization-1.16.0.ebuild 765 BLAKE2B 0e237ba1e5e9bdfe5e997ac17595c3d7606b937c91b2deffce7327dc8d5ac4d181e28a890ea8f6aa5dec540fe2880df4f5976ba09453df33f4ca2ec8d2b6c6a9 SHA512 aa8ec22b3120ff38e5f2d2f3a9429c1fe5d605c9fd6a9fca87f2bb3e024d66d63738d624e9ca72932521e89385a749c3bc0b6969894d950dc39e3202313027d4
 EBUILD fake_localization-1.16.1.ebuild 765 BLAKE2B 0e237ba1e5e9bdfe5e997ac17595c3d7606b937c91b2deffce7327dc8d5ac4d181e28a890ea8f6aa5dec540fe2880df4f5976ba09453df33f4ca2ec8d2b6c6a9 SHA512 aa8ec22b3120ff38e5f2d2f3a9429c1fe5d605c9fd6a9fca87f2bb3e024d66d63738d624e9ca72932521e89385a749c3bc0b6969894d950dc39e3202313027d4
+EBUILD fake_localization-1.16.2.ebuild 765 BLAKE2B 0e237ba1e5e9bdfe5e997ac17595c3d7606b937c91b2deffce7327dc8d5ac4d181e28a890ea8f6aa5dec540fe2880df4f5976ba09453df33f4ca2ec8d2b6c6a9 SHA512 aa8ec22b3120ff38e5f2d2f3a9429c1fe5d605c9fd6a9fca87f2bb3e024d66d63738d624e9ca72932521e89385a749c3bc0b6969894d950dc39e3202313027d4
 EBUILD fake_localization-9999.ebuild 765 BLAKE2B 0e237ba1e5e9bdfe5e997ac17595c3d7606b937c91b2deffce7327dc8d5ac4d181e28a890ea8f6aa5dec540fe2880df4f5976ba09453df33f4ca2ec8d2b6c6a9 SHA512 aa8ec22b3120ff38e5f2d2f3a9429c1fe5d605c9fd6a9fca87f2bb3e024d66d63738d624e9ca72932521e89385a749c3bc0b6969894d950dc39e3202313027d4
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/fake_localization/fake_localization-1.16.2.ebuild b/dev-ros/fake_localization/fake_localization-1.16.2.ebuild
new file mode 100644
index 000000000000..0c7895911491
--- /dev/null
+++ b/dev-ros/fake_localization/fake_localization-1.16.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="A ROS node that simply forwards odometry information"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/angles
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_ros
+	dev-ros/message_filters
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/global_planner/Manifest b/dev-ros/global_planner/Manifest
index 2d22cfc9fac8..563218b20f80 100644
--- a/dev-ros/global_planner/Manifest
+++ b/dev-ros/global_planner/Manifest
@@ -2,9 +2,11 @@ DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845b
 DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
 EBUILD global_planner-1.15.1-r1.ebuild 665 BLAKE2B 2f62de5934ed9a91e6a1e56e8028e2bb09e3166688530461b25cb9a3de23213bcd80b39c8c7ecaffd48b848f6cbaa79d429fabc344cb402e7ea1e1ab0df70ce6 SHA512 12c07e61b53c227e1ba6b4d8866a9e2addaac4bc156b7d4cb5520b07aeb0726f7a7b492cc222f9152d341de11a0f5fc2f9fef600b539ea4227afb2b37ab506a7
 EBUILD global_planner-1.15.2.ebuild 665 BLAKE2B 63ee38169ee7c4305119341480e3cb7e654fa060a1f7ef7e0d3260e3f116027cea6810d8e5c1ed90e7df16dc989af05a00a1fe4eb3a8ccbdd1ccb9525485b21a SHA512 695a3bc09081066c1535a42fca547b0367b3c0ebcdba1ba0a0a6e904353ad723d07a9762370103e9c16071b44f8ff5ed2ccefa1536d777097c78efa673516f7b
 EBUILD global_planner-1.16.0.ebuild 753 BLAKE2B c056f8414769bb08204b92aad7fbf2321d6d5c0e1ef72e9ece1c19a28d1ea2edd64e0804d91b8f819cf0e4e7d595b9fd370631d800e5532891d6ca15c1ca133f SHA512 9fc33db22f9273457a1f18af48a3ab70a861ef753460658c1003a51d361b337ab3860f9fe05f33c151776d25dff47faac9bc5c00bb83156d58ff5e8ca05ae8b8
 EBUILD global_planner-1.16.1.ebuild 753 BLAKE2B c056f8414769bb08204b92aad7fbf2321d6d5c0e1ef72e9ece1c19a28d1ea2edd64e0804d91b8f819cf0e4e7d595b9fd370631d800e5532891d6ca15c1ca133f SHA512 9fc33db22f9273457a1f18af48a3ab70a861ef753460658c1003a51d361b337ab3860f9fe05f33c151776d25dff47faac9bc5c00bb83156d58ff5e8ca05ae8b8
+EBUILD global_planner-1.16.2.ebuild 753 BLAKE2B c056f8414769bb08204b92aad7fbf2321d6d5c0e1ef72e9ece1c19a28d1ea2edd64e0804d91b8f819cf0e4e7d595b9fd370631d800e5532891d6ca15c1ca133f SHA512 9fc33db22f9273457a1f18af48a3ab70a861ef753460658c1003a51d361b337ab3860f9fe05f33c151776d25dff47faac9bc5c00bb83156d58ff5e8ca05ae8b8
 EBUILD global_planner-9999.ebuild 753 BLAKE2B c056f8414769bb08204b92aad7fbf2321d6d5c0e1ef72e9ece1c19a28d1ea2edd64e0804d91b8f819cf0e4e7d595b9fd370631d800e5532891d6ca15c1ca133f SHA512 9fc33db22f9273457a1f18af48a3ab70a861ef753460658c1003a51d361b337ab3860f9fe05f33c151776d25dff47faac9bc5c00bb83156d58ff5e8ca05ae8b8
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/global_planner/global_planner-1.16.2.ebuild b/dev-ros/global_planner/global_planner-1.16.2.ebuild
new file mode 100644
index 000000000000..53f5c3324f95
--- /dev/null
+++ b/dev-ros/global_planner/global_planner-1.16.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Path planner library and node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/costmap_2d-1.16
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_core
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/navfn
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf2_ros
+
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+
+	dev-ros/angles
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_transport/Manifest b/dev-ros/image_transport/Manifest
index 999dab762e10..0fe3655b1a55 100644
--- a/dev-ros/image_transport/Manifest
+++ b/dev-ros/image_transport/Manifest
@@ -1,4 +1,4 @@
 DIST image_common-1.11.13.tar.gz 54731 BLAKE2B 24c05d7da79ec4edc1713eb86efe9d570b8a9d55def1b0cdf7959275c4a0692af28d48d37d73361f3972c0f4ded5332ee02b535f1841473007eb8e61287b7826 SHA512 154a1acfc3ee1be83828f7b86de8a5e02d7613d724f734409c5b93b1505bcf911b95f20fe43435932f49e03e286ed7055e2b7abeb1c5292f540a2299dd424bfa
-EBUILD image_transport-1.11.13-r1.ebuild 611 BLAKE2B fb0737504823dcf0c3e949a866a3a0dcd64ff4dcdc9f7ba36323ef063fa7c88bf5ec75c35229f224c21d7b750a7b7e26aa819a735aa2c3f34d6673facf16d20a SHA512 4af5a92f384062293b1db44b3e76f80b5e4405b087717344dd95055b4db918de28c8afa97e961805f67d5d764a21daf70d42f3bb9e9908fd2b716022155ae91a
-EBUILD image_transport-9999.ebuild 611 BLAKE2B fb0737504823dcf0c3e949a866a3a0dcd64ff4dcdc9f7ba36323ef063fa7c88bf5ec75c35229f224c21d7b750a7b7e26aa819a735aa2c3f34d6673facf16d20a SHA512 4af5a92f384062293b1db44b3e76f80b5e4405b087717344dd95055b4db918de28c8afa97e961805f67d5d764a21daf70d42f3bb9e9908fd2b716022155ae91a
+EBUILD image_transport-1.11.13-r2.ebuild 635 BLAKE2B 68729bc28c9036f5e3268fc31589f751a8a70d660f8b29bbeb1c2febd18f3b9fb287fb29858c840887bb84b1c3585400c004dd4ababc08b8e276dc9c9dabbb61 SHA512 19ed960a0334557ee9c3cd7b9e79e29d7559ebcad99d3967fb3db9511f23ad24f8d903774f2493e62186d3c659cac0dd5f4356d43ab2283ce38c30785ab1ff45
+EBUILD image_transport-9999.ebuild 635 BLAKE2B 68729bc28c9036f5e3268fc31589f751a8a70d660f8b29bbeb1c2febd18f3b9fb287fb29858c840887bb84b1c3585400c004dd4ababc08b8e276dc9c9dabbb61 SHA512 19ed960a0334557ee9c3cd7b9e79e29d7559ebcad99d3967fb3db9511f23ad24f8d903774f2493e62186d3c659cac0dd5f4356d43ab2283ce38c30785ab1ff45
 MISC metadata.xml 341 BLAKE2B 73f546b8575b2b9855e3ed642d08ea3a9eb37be2e5b1b33b797ec4df9ad248d82681d857794fec592081101c0e285b8a9d2bfa1343ceed1ae336c2960c471eb5 SHA512 a7d57b99968b03ed5fbad1030f9dfde65d31c3b33fd3203c9bfd004f331e35b6f576f9dde7e3694360204d27c02fe95879743191cb8d96d491827708a61b1e69
diff --git a/dev-ros/image_transport/image_transport-1.11.13-r1.ebuild b/dev-ros/image_transport/image_transport-1.11.13-r1.ebuild
deleted file mode 100644
index d77bc019e972..000000000000
--- a/dev-ros/image_transport/image_transport-1.11.13-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transparent support for transporting images in low-bandwidth compressed formats"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/roslib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_transport/image_transport-1.11.13-r2.ebuild b/dev-ros/image_transport/image_transport-1.11.13-r2.ebuild
new file mode 100644
index 000000000000..2be6354ffbb1
--- /dev/null
+++ b/dev-ros/image_transport/image_transport-1.11.13-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/image_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transparent support for transporting images in low-bandwidth compressed formats"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/message_filters
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/roslib
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+	dev-ros/class_loader:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_transport/image_transport-9999.ebuild b/dev-ros/image_transport/image_transport-9999.ebuild
index d77bc019e972..2be6354ffbb1 100644
--- a/dev-ros/image_transport/image_transport-9999.ebuild
+++ b/dev-ros/image_transport/image_transport-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
@@ -23,5 +23,6 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
+	dev-ros/class_loader:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_transformer/Manifest b/dev-ros/imu_transformer/Manifest
index b370bb788353..9ffe7d880a67 100644
--- a/dev-ros/imu_transformer/Manifest
+++ b/dev-ros/imu_transformer/Manifest
@@ -1,4 +1,5 @@
+AUX pluginlib.patch 725 BLAKE2B 618e82a15e171459997bf508acad38d577e04fc77188f13dfba7dd3b109c845e96eaf6e7a236944097c822e03261981f571d5cb7ee6399e7df7737e42cbb7ed8 SHA512 5d03d7042fc4cc22a30dd9b39b6e024d0a157dc8370d0d39b19103f7c73d42d75db839f55faca1e2b8bf01caf8cfe3c02ca46a78f87bc9a66e44b2394e87ece8
 DIST imu_pipeline-0.2.2.tar.gz 8080 BLAKE2B cdeeb7b95cca23aa7c30902b3be3daa34af222ff660058c1e57cf02b75008d4840b82cb52dbf7fa9a2968b2e41244fe7f1833429bd04280fdf68fb7fff2d240d SHA512 95913f3edec9af4d981d6034beb8932bba2e8a4d05a72c70c1bf2bcd5b85a9afa490e2916b6e4178e35b6a1967208999bfb697f5925ce12cae7e57fad2721f3f
-EBUILD imu_transformer-0.2.2-r1.ebuild 710 BLAKE2B 66bdc536e40b5096f04518ffdcbae045689ba9138c178223589f4c87681c9c98479583433340eca588c5e1aafe7c9b74fa55794cca0a8ad3869108fefd52c7c5 SHA512 29f56b06b288ba78d230172b0baf19f549c80d7c8356a31f7e5c4903d0e6f73766ace85ff8cdf99f045119b0f5f79aa0a77fc8f8819d495d8dcdc747a6fa1112
+EBUILD imu_transformer-0.2.2-r1.ebuild 752 BLAKE2B f7cd1f813ebd7aff89edc3d4f4f2a5261ebf45bd4863b01ea2e1cddfb1c7ca7ed37824b8688942a3082daf412b3c87d13581c307f2ff8af0cb44173c53754450 SHA512 4dde22eeced427c0699cc8f8f9f94367c0492a2b25e0f5b8dd16dbcf032f7539a00f63c8ecd4e25cc8f5ee6134b0c1ae135e4171054bf02a5b39aecfae7e51e9
 EBUILD imu_transformer-9999.ebuild 710 BLAKE2B 66bdc536e40b5096f04518ffdcbae045689ba9138c178223589f4c87681c9c98479583433340eca588c5e1aafe7c9b74fa55794cca0a8ad3869108fefd52c7c5 SHA512 29f56b06b288ba78d230172b0baf19f549c80d7c8356a31f7e5c4903d0e6f73766ace85ff8cdf99f045119b0f5f79aa0a77fc8f8819d495d8dcdc747a6fa1112
 MISC metadata.xml 341 BLAKE2B 25a24a32562bee0499af4b1e1a59341a7087ae303f179dc1f83b7b67c16f6fb6d9c835eafeaf6cd006e5ff9bae9d6ccc661ea2319656532436e4b6b093231f20 SHA512 37ef287b9a99e47b966f647c2ec1690bc6339f2f82047a1cefecd138ffe388ac2900c744999385c86dd9819c2664ac89b36ab64dcded0d2358aa703b16115761
diff --git a/dev-ros/imu_transformer/files/pluginlib.patch b/dev-ros/imu_transformer/files/pluginlib.patch
new file mode 100644
index 000000000000..a7f519b1d26b
--- /dev/null
+++ b/dev-ros/imu_transformer/files/pluginlib.patch
@@ -0,0 +1,17 @@
+commit 2c98b4c99b90bf88eabcd1ce071c7194ae05bf2b
+Author: Mikael Arguedas <mikael@osrfoundation.org>
+Date:   Fri Oct 27 15:03:06 2017 -0700
+
+    update to use non deprecated pluginlib macro
+
+diff --git a/imu_transformer/src/imu_transformer_nodelet.cpp b/imu_transformer/src/imu_transformer_nodelet.cpp
+index 7c0a30f..9ad94ec 100644
+--- a/imu_transformer/src/imu_transformer_nodelet.cpp
++++ b/imu_transformer/src/imu_transformer_nodelet.cpp
+@@ -123,4 +123,4 @@ namespace imu_transformer
+ 
+ }
+ 
+-PLUGINLIB_DECLARE_CLASS(imu_transformer, ImuTransformerNodelet, imu_transformer::ImuTransformerNodelet, nodelet::Nodelet);
+\ No newline at end of file
++PLUGINLIB_EXPORT_CLASS(imu_transformer::ImuTransformerNodelet, nodelet::Nodelet)
diff --git a/dev-ros/imu_transformer/imu_transformer-0.2.2-r1.ebuild b/dev-ros/imu_transformer/imu_transformer-0.2.2-r1.ebuild
index b51a391ae5de..425e2e0e9797 100644
--- a/dev-ros/imu_transformer/imu_transformer-0.2.2-r1.ebuild
+++ b/dev-ros/imu_transformer/imu_transformer-0.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=5
@@ -28,3 +28,4 @@ RDEPEND="
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/pluginlib.patch" )
diff --git a/dev-ros/map_server/Manifest b/dev-ros/map_server/Manifest
index 674eaee0c3ab..bf9903281a71 100644
--- a/dev-ros/map_server/Manifest
+++ b/dev-ros/map_server/Manifest
@@ -1,8 +1,10 @@
 DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
 EBUILD map_server-1.15.2-r1.ebuild 570 BLAKE2B 105eb30a5c157083a2811379144364e93cacf7a8de44c132e0712a708edb646a4779464c76bc4f59f7844ea0875e5851950eba733c2b032c8635369b1e8c6575 SHA512 a846dba6800fa08ee1ddaed6543a0632404b02bb3d105a21c9f7a4bc159520e85b6d5578aa7c8945ed3e84cce125474045c2d415e9fc25afc77b3d6a3e63377b
 EBUILD map_server-1.16.0.ebuild 588 BLAKE2B 353a2b597b7b64dc29263cf751c4cb8d3e22fb84da7bd0119222b5799dc1e2d2746b6a9d3696e3c1cd2a9df3f0c762c399934cb2e845316daea754c9fe9cca28 SHA512 74ca672c4709755eb4e0e5245fd05192a3ce0f5f4386998976ef046cdb95016106a0686f0744a155ba3362e03d682a229b6a0601dec978599f0604afb70c0251
 EBUILD map_server-1.16.1.ebuild 588 BLAKE2B 353a2b597b7b64dc29263cf751c4cb8d3e22fb84da7bd0119222b5799dc1e2d2746b6a9d3696e3c1cd2a9df3f0c762c399934cb2e845316daea754c9fe9cca28 SHA512 74ca672c4709755eb4e0e5245fd05192a3ce0f5f4386998976ef046cdb95016106a0686f0744a155ba3362e03d682a229b6a0601dec978599f0604afb70c0251
+EBUILD map_server-1.16.2.ebuild 588 BLAKE2B 353a2b597b7b64dc29263cf751c4cb8d3e22fb84da7bd0119222b5799dc1e2d2746b6a9d3696e3c1cd2a9df3f0c762c399934cb2e845316daea754c9fe9cca28 SHA512 74ca672c4709755eb4e0e5245fd05192a3ce0f5f4386998976ef046cdb95016106a0686f0744a155ba3362e03d682a229b6a0601dec978599f0604afb70c0251
 EBUILD map_server-9999.ebuild 588 BLAKE2B 353a2b597b7b64dc29263cf751c4cb8d3e22fb84da7bd0119222b5799dc1e2d2746b6a9d3696e3c1cd2a9df3f0c762c399934cb2e845316daea754c9fe9cca28 SHA512 74ca672c4709755eb4e0e5245fd05192a3ce0f5f4386998976ef046cdb95016106a0686f0744a155ba3362e03d682a229b6a0601dec978599f0604afb70c0251
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/map_server/map_server-1.16.2.ebuild b/dev-ros/map_server/map_server-1.16.2.ebuild
new file mode 100644
index 000000000000..429845481287
--- /dev/null
+++ b/dev-ros/map_server/map_server-1.16.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Offers map data as a ROS service"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-physics/bullet:=
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	media-libs/sdl-image
+	dev-ros/tf2
+	>=dev-cpp/yaml-cpp-0.5:=
+
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit )
+	virtual/pkgconfig"
diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest
index f6a5db7fc65d..47d9178f2ee7 100644
--- a/dev-ros/message_filters/Manifest
+++ b/dev-ros/message_filters/Manifest
@@ -2,8 +2,10 @@ AUX tests.patch 4837 BLAKE2B 2793652865f2d1f8ce1499b37922e480d40ca3931f098156a6c
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD message_filters-1.13.5.ebuild 800 BLAKE2B e5bd733e2e07c031e60f3c7a306b043b8fd240e0ba0cbb895da7980d92faa82decbc1d08d056fc4bfa06fd542292dc2667248135a1b6f41330261d508cdafc41 SHA512 fad3d08a7de4c26b00488eb2e57d21faf2dc444faeae87d645bf02cc99eae49b09a4f8c10754c90cde26fb60f52102f8be3d10653196b2c2449c0fa727f18cc0
 EBUILD message_filters-1.13.6.ebuild 782 BLAKE2B 5fe1a17f76e448fb0e9e79d34e4562cd8646bb9460bf7924ed6675b79c4baf4291427f3828a27fdd4a59f706eeb3cb207e38d0f951b4500bee204b8b3cb44406 SHA512 62a1ffd1cdd967ccf4bbc9b78390499f050b72c17b9d0bcd906846f006c0e89a6c988e63b3cf4ccbfeef45e515d461aae3ab9046e26dc0bb9b3a0fddd16faa19
 EBUILD message_filters-1.14.2.ebuild 782 BLAKE2B 5fe1a17f76e448fb0e9e79d34e4562cd8646bb9460bf7924ed6675b79c4baf4291427f3828a27fdd4a59f706eeb3cb207e38d0f951b4500bee204b8b3cb44406 SHA512 62a1ffd1cdd967ccf4bbc9b78390499f050b72c17b9d0bcd906846f006c0e89a6c988e63b3cf4ccbfeef45e515d461aae3ab9046e26dc0bb9b3a0fddd16faa19
+EBUILD message_filters-1.14.3.ebuild 782 BLAKE2B 5fe1a17f76e448fb0e9e79d34e4562cd8646bb9460bf7924ed6675b79c4baf4291427f3828a27fdd4a59f706eeb3cb207e38d0f951b4500bee204b8b3cb44406 SHA512 62a1ffd1cdd967ccf4bbc9b78390499f050b72c17b9d0bcd906846f006c0e89a6c988e63b3cf4ccbfeef45e515d461aae3ab9046e26dc0bb9b3a0fddd16faa19
 EBUILD message_filters-9999.ebuild 782 BLAKE2B 5fe1a17f76e448fb0e9e79d34e4562cd8646bb9460bf7924ed6675b79c4baf4291427f3828a27fdd4a59f706eeb3cb207e38d0f951b4500bee204b8b3cb44406 SHA512 62a1ffd1cdd967ccf4bbc9b78390499f050b72c17b9d0bcd906846f006c0e89a6c988e63b3cf4ccbfeef45e515d461aae3ab9046e26dc0bb9b3a0fddd16faa19
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/message_filters/message_filters-1.14.3.ebuild b/dev-ros/message_filters/message_filters-1.14.3.ebuild
new file mode 100644
index 000000000000..ae26242e4665
--- /dev/null
+++ b/dev-ros/message_filters/message_filters-1.14.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit ros-catkin
+
+DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	dev-ros/genpy[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-ros/rosunit[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/move_base/Manifest b/dev-ros/move_base/Manifest
index 6bd76ffb5e2e..b0913153ad1f 100644
--- a/dev-ros/move_base/Manifest
+++ b/dev-ros/move_base/Manifest
@@ -2,9 +2,11 @@ DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845b
 DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
 EBUILD move_base-1.15.1-r2.ebuild 882 BLAKE2B c68f44cfe1582a8a66fee799f3a844daf4e507555510b565773c9741e489637bd5ed07b20538647b2599c4e842ffb2c28460e44baa2440c83549d80fefa16bc6 SHA512 80bd499cba6b095210a0d424ced28d65e5ebcece7d61b857db8eb0a78644f39099b22f2e82b9d14694963f58d51cca74509898c3038f8092f8fe958caed84b0b
 EBUILD move_base-1.15.2.ebuild 882 BLAKE2B c68f44cfe1582a8a66fee799f3a844daf4e507555510b565773c9741e489637bd5ed07b20538647b2599c4e842ffb2c28460e44baa2440c83549d80fefa16bc6 SHA512 80bd499cba6b095210a0d424ced28d65e5ebcece7d61b857db8eb0a78644f39099b22f2e82b9d14694963f58d51cca74509898c3038f8092f8fe958caed84b0b
 EBUILD move_base-1.16.0.ebuild 1094 BLAKE2B 8bd5d4eb6d707ad06280de0c5ea5a9c087465f2b00e807d570f3e995c62dedea0b519cfb829853520b2beff289e247cf3df0a24ebf1cf57584382999987a62dd SHA512 7ac41e7141f76fd634f3d39aaa5b3ea4eee2040b2de85bc5877bd0258495483da106482b43d7a7050985ee5906ec5925d1419f94d20beaba0f6f77de6025f4f9
 EBUILD move_base-1.16.1.ebuild 1094 BLAKE2B 8bd5d4eb6d707ad06280de0c5ea5a9c087465f2b00e807d570f3e995c62dedea0b519cfb829853520b2beff289e247cf3df0a24ebf1cf57584382999987a62dd SHA512 7ac41e7141f76fd634f3d39aaa5b3ea4eee2040b2de85bc5877bd0258495483da106482b43d7a7050985ee5906ec5925d1419f94d20beaba0f6f77de6025f4f9
+EBUILD move_base-1.16.2.ebuild 1094 BLAKE2B 8bd5d4eb6d707ad06280de0c5ea5a9c087465f2b00e807d570f3e995c62dedea0b519cfb829853520b2beff289e247cf3df0a24ebf1cf57584382999987a62dd SHA512 7ac41e7141f76fd634f3d39aaa5b3ea4eee2040b2de85bc5877bd0258495483da106482b43d7a7050985ee5906ec5925d1419f94d20beaba0f6f77de6025f4f9
 EBUILD move_base-9999.ebuild 1094 BLAKE2B 8bd5d4eb6d707ad06280de0c5ea5a9c087465f2b00e807d570f3e995c62dedea0b519cfb829853520b2beff289e247cf3df0a24ebf1cf57584382999987a62dd SHA512 7ac41e7141f76fd634f3d39aaa5b3ea4eee2040b2de85bc5877bd0258495483da106482b43d7a7050985ee5906ec5925d1419f94d20beaba0f6f77de6025f4f9
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/move_base/move_base-1.16.2.ebuild b/dev-ros/move_base/move_base-1.16.2.ebuild
new file mode 100644
index 000000000000..e3dca8f3bbf9
--- /dev/null
+++ b/dev-ros/move_base/move_base-1.16.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/actionlib
+	>=dev-ros/costmap_2d-1.15.1
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_core
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_ros
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+
+	dev-ros/base_local_planner
+	dev-ros/clear_costmap_recovery
+	dev-ros/navfn
+	dev-ros/rotate_recovery
+
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules"
diff --git a/dev-ros/move_slow_and_clear/Manifest b/dev-ros/move_slow_and_clear/Manifest
index dfc2f29bc789..9387d8a2f4dd 100644
--- a/dev-ros/move_slow_and_clear/Manifest
+++ b/dev-ros/move_slow_and_clear/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
 EBUILD move_slow_and_clear-1.16.1.ebuild 563 BLAKE2B 99b547fcd7fa8a3097df4f1dfd4fa17c685d426883d6333743802ce238579dbea95c78004682438b36a5e539a2ae89662c69a3f1ff6488198cff4b9f8ef86fc9 SHA512 9608e344774f9a2d598999f779884b91af623be4bc66ab2d88b925860c5a774356b2e77019f9fefeb4494201d777ae70cf2a5d8c92a638fe5f6c595ff6d88825
+EBUILD move_slow_and_clear-1.16.2.ebuild 563 BLAKE2B 99b547fcd7fa8a3097df4f1dfd4fa17c685d426883d6333743802ce238579dbea95c78004682438b36a5e539a2ae89662c69a3f1ff6488198cff4b9f8ef86fc9 SHA512 9608e344774f9a2d598999f779884b91af623be4bc66ab2d88b925860c5a774356b2e77019f9fefeb4494201d777ae70cf2a5d8c92a638fe5f6c595ff6d88825
 EBUILD move_slow_and_clear-9999.ebuild 563 BLAKE2B 99b547fcd7fa8a3097df4f1dfd4fa17c685d426883d6333743802ce238579dbea95c78004682438b36a5e539a2ae89662c69a3f1ff6488198cff4b9f8ef86fc9 SHA512 9608e344774f9a2d598999f779884b91af623be4bc66ab2d88b925860c5a774356b2e77019f9fefeb4494201d777ae70cf2a5d8c92a638fe5f6c595ff6d88825
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.2.ebuild b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.2.ebuild
new file mode 100644
index 000000000000..a70cd2ed0f3d
--- /dev/null
+++ b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Move slow and clear"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/costmap_2d-1.16
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_core
+	dev-ros/pluginlib
+	dev-ros/roscpp
+
+	dev-libs/boost:=[threads]
+	dev-cpp/eigen:3
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+
+"
diff --git a/dev-ros/nav_core/Manifest b/dev-ros/nav_core/Manifest
index e0a2d6fafdc5..189a8658621d 100644
--- a/dev-ros/nav_core/Manifest
+++ b/dev-ros/nav_core/Manifest
@@ -1,8 +1,10 @@
 DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
 EBUILD nav_core-1.15.2.ebuild 503 BLAKE2B 0d65bb8980f5b01daf85b3b64fe327110859c46da94def8f94b348919b4c23aae46e2705690c8a51548f9f10333271839929595eb2883cf0da1f878dad3813b6 SHA512 e408c2e3a83ab1f1551e387056e4203a14c810c29203528363fdad39a5e9bf30af06351d15075a15b1ce7683f086c31bc82e2bf5f27786f521047768a64736c7
 EBUILD nav_core-1.16.0.ebuild 508 BLAKE2B f7086a542e73a3ff3fad80751d9903f95382b10ddc07c80c8527bbc92deed182e097777f579bcfc5ab753b369fe66548a33eea971c0efbbf32802f58b4ccb98a SHA512 fa04713751839cd08b147de04b9607bcfd17843afd758770ebdd3da0b11c82f3b1acbbf2fe60cd3f50895d013ca9c2203be8f7c6e014375e4a532b427aa67860
 EBUILD nav_core-1.16.1.ebuild 508 BLAKE2B f7086a542e73a3ff3fad80751d9903f95382b10ddc07c80c8527bbc92deed182e097777f579bcfc5ab753b369fe66548a33eea971c0efbbf32802f58b4ccb98a SHA512 fa04713751839cd08b147de04b9607bcfd17843afd758770ebdd3da0b11c82f3b1acbbf2fe60cd3f50895d013ca9c2203be8f7c6e014375e4a532b427aa67860
+EBUILD nav_core-1.16.2.ebuild 508 BLAKE2B f7086a542e73a3ff3fad80751d9903f95382b10ddc07c80c8527bbc92deed182e097777f579bcfc5ab753b369fe66548a33eea971c0efbbf32802f58b4ccb98a SHA512 fa04713751839cd08b147de04b9607bcfd17843afd758770ebdd3da0b11c82f3b1acbbf2fe60cd3f50895d013ca9c2203be8f7c6e014375e4a532b427aa67860
 EBUILD nav_core-9999.ebuild 508 BLAKE2B f7086a542e73a3ff3fad80751d9903f95382b10ddc07c80c8527bbc92deed182e097777f579bcfc5ab753b369fe66548a33eea971c0efbbf32802f58b4ccb98a SHA512 fa04713751839cd08b147de04b9607bcfd17843afd758770ebdd3da0b11c82f3b1acbbf2fe60cd3f50895d013ca9c2203be8f7c6e014375e4a532b427aa67860
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/nav_core/nav_core-1.16.2.ebuild b/dev-ros/nav_core/nav_core-1.16.2.ebuild
new file mode 100644
index 000000000000..5001237ab345
--- /dev/null
+++ b/dev-ros/nav_core/nav_core-1.16.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Common interfaces for navigation specific robot actions"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/costmap_2d
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_ros
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/navfn/Manifest b/dev-ros/navfn/Manifest
index 19cd612a96d8..bdb2825030ee 100644
--- a/dev-ros/navfn/Manifest
+++ b/dev-ros/navfn/Manifest
@@ -1,7 +1,9 @@
 AUX pgm_h_location.patch 900 BLAKE2B 2816bc6803bce70d14f5fcf10161316961ffd265d94a36e90f7d98bd381a4966bd924e352cda2f859e07ea25547e62e0d6381afa1fa3b488364634b20730830c SHA512 4c3286e18d922d292858e8fc574cc440c344ae182133539efca93cb25e16dc78149efe521499024751a46f2b4d1b63516276f1e0510028114357520d4a560d81
 DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
 EBUILD navfn-1.16.0.ebuild 973 BLAKE2B 23e68780a702572cba4e3d806e1bbeecf82fef221152147bc32d2c466ad74f84ca7a2f21a9a7f5a1a2bd26ce3108f398e3b1f6f497828c760beaa3ce41f08448 SHA512 e6f2fde3bc78f3fac9c12d75e18deeb6c5f17772bfadbda92f4391ada8625cac330eee2eef699551784a40b47f9fc72842d95447b30d5c6dbb3f08da62e0d451
 EBUILD navfn-1.16.1.ebuild 973 BLAKE2B 23e68780a702572cba4e3d806e1bbeecf82fef221152147bc32d2c466ad74f84ca7a2f21a9a7f5a1a2bd26ce3108f398e3b1f6f497828c760beaa3ce41f08448 SHA512 e6f2fde3bc78f3fac9c12d75e18deeb6c5f17772bfadbda92f4391ada8625cac330eee2eef699551784a40b47f9fc72842d95447b30d5c6dbb3f08da62e0d451
+EBUILD navfn-1.16.2.ebuild 973 BLAKE2B 23e68780a702572cba4e3d806e1bbeecf82fef221152147bc32d2c466ad74f84ca7a2f21a9a7f5a1a2bd26ce3108f398e3b1f6f497828c760beaa3ce41f08448 SHA512 e6f2fde3bc78f3fac9c12d75e18deeb6c5f17772bfadbda92f4391ada8625cac330eee2eef699551784a40b47f9fc72842d95447b30d5c6dbb3f08da62e0d451
 EBUILD navfn-9999.ebuild 973 BLAKE2B 23e68780a702572cba4e3d806e1bbeecf82fef221152147bc32d2c466ad74f84ca7a2f21a9a7f5a1a2bd26ce3108f398e3b1f6f497828c760beaa3ce41f08448 SHA512 e6f2fde3bc78f3fac9c12d75e18deeb6c5f17772bfadbda92f4391ada8625cac330eee2eef699551784a40b47f9fc72842d95447b30d5c6dbb3f08da62e0d451
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/navfn/navfn-1.16.2.ebuild b/dev-ros/navfn/navfn-1.16.2.ebuild
new file mode 100644
index 000000000000..da9427d6977b
--- /dev/null
+++ b/dev-ros/navfn/navfn-1.16.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Fast interpolated navigation function that can be used to create plans for a mobile base"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/costmap_2d-1.16
+	dev-ros/nav_core
+	dev-ros/pluginlib
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_ros
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+
+	dev-cpp/eigen:3
+	x11-libs/fltk
+	media-libs/netpbm
+	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+	dev-ros/cmake_modules"
+
+PATCHES=( "${FILESDIR}/pgm_h_location.patch" )
diff --git a/dev-ros/python_qt_binding/Manifest b/dev-ros/python_qt_binding/Manifest
index 57694550284c..96c33ffde021 100644
--- a/dev-ros/python_qt_binding/Manifest
+++ b/dev-ros/python_qt_binding/Manifest
@@ -1,6 +1,8 @@
 DIST python_qt_binding-0.3.2.tar.gz 12047 BLAKE2B 330ab27cface576d37cfca709a9758b6499a181b8e2734c04ef0f55b84a3d45a4ae821fbf572337e71115b4db57839f900e406b9ce8b3cfc71daa2d4ff4b143c SHA512 777d7ba00652d34994648615125f6c426170a1723570de35b9e5a060d0f077b563a57c9b0cbe7bd85a7ed2f5f011797e9102918a27df4f0096831cce0bb80304
 DIST python_qt_binding-0.3.3.tar.gz 12114 BLAKE2B 12a2e785746ec3d9fe7b387a9e727bfacb5e37da90702c728c8e874c52cd3e4cfc000936d8f17cefbeeb98673de8c21f066eded743df3b5325b88e785f3dc100 SHA512 0dfd698b390a87e0619e93a291656c329ff37713411c5a805e720aeedf9fefd43fc780bbdba351cd1a73e30d67ce8e93a98b5ba6b5584a807d829611ac232263
+DIST python_qt_binding-0.3.4.tar.gz 12255 BLAKE2B bc72aa806098d460e5b884bde7664f295399555d96e10b66791e59a26d1e61dd22aabecf9b40b5d14f61c2c906c18ff3fe2cd03de6108d7d9c2c649d553ab09d SHA512 df5fc2c6a744e66d0c03089e15ce4cfb3890d8fd67d826a3832d22cf99de235e18720c59f737c3ddacefb02dac5571d64042dd862c10ea4c44835063037eb533
 EBUILD python_qt_binding-0.3.2.ebuild 464 BLAKE2B 4640d5f2755764535c55f415e3b013409f15a27db23a154bbe5c4d090e51f2be48a969081b5f688ba999b942dd20aca4f8868aa9857161165501df1371663e7a SHA512 ddccf3c99f45ec8d37e18ecd3fc84a2560bb06d03df32b57198c20589137f53ab39af42fcd75c2f5ea01d6a00f2a0718964190698ce54e28d5ffe40a3b18f7d9
 EBUILD python_qt_binding-0.3.3.ebuild 464 BLAKE2B 4640d5f2755764535c55f415e3b013409f15a27db23a154bbe5c4d090e51f2be48a969081b5f688ba999b942dd20aca4f8868aa9857161165501df1371663e7a SHA512 ddccf3c99f45ec8d37e18ecd3fc84a2560bb06d03df32b57198c20589137f53ab39af42fcd75c2f5ea01d6a00f2a0718964190698ce54e28d5ffe40a3b18f7d9
+EBUILD python_qt_binding-0.3.4.ebuild 464 BLAKE2B 4756cbd99fa7820b2a26f7b75f0b5ddbc1e3a4bf79dcb348b2c077ab1e3686cde05845dcaad44eb7b4416a80c2b771f4c918105cd6c6f85d1b340a25f5723913 SHA512 05ae3004a786e72aa2525bf8b5ac4dd61baa182a87cd2b725f72b5a95795a4338fa1b2ab7cf9ff0a24fca47c8fcd133f3bb901975780c898bdc8f7039542de0a
 EBUILD python_qt_binding-9999.ebuild 464 BLAKE2B 4640d5f2755764535c55f415e3b013409f15a27db23a154bbe5c4d090e51f2be48a969081b5f688ba999b942dd20aca4f8868aa9857161165501df1371663e7a SHA512 ddccf3c99f45ec8d37e18ecd3fc84a2560bb06d03df32b57198c20589137f53ab39af42fcd75c2f5ea01d6a00f2a0718964190698ce54e28d5ffe40a3b18f7d9
 MISC metadata.xml 349 BLAKE2B bc205c9c90eab1ea292d3e90f9f4a1d769c5202af60c57371152eaf80a50bdf6257cb2bb0ad6070a8443f0d19cc64e8493d5ec43e2701085f96c90ec6187a705 SHA512 f388f612a53c2de0a6cdece5a03d08e583f848592da6763b7995ff80e60756caca49da4318ded57ba09141facf717442141066142ed0691172f4e6b98a5ee266
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.3.4.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.3.4.ebuild
new file mode 100644
index 000000000000..c7463631a14c
--- /dev/null
+++ b/dev-ros/python_qt_binding/python_qt_binding-0.3.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit ros-catkin
+
+DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_dotgraph/Manifest b/dev-ros/qt_dotgraph/Manifest
index 8adf640762f1..ec839b5cf12c 100644
--- a/dev-ros/qt_dotgraph/Manifest
+++ b/dev-ros/qt_dotgraph/Manifest
@@ -2,21 +2,25 @@ DIST qt_gui_core-0.2.29.tar.gz 85881 BLAKE2B f88853320237b410fa9231c85ad44f930d0
 DIST qt_gui_core-0.2.30.tar.gz 86567 BLAKE2B a40e15ba1925db8afee2daffed2f2fbb3c242ecf84bc01d561b582ec561960e74e362d1ff0337e3100c3e050d63d3b9e5437ad0579f5580329f9af5e42cfd13d SHA512 4a9671c8814f16a371e77840d6df268e763ce5932d6e85842af34ee5322701ffa19d97d4d75b4fb6d4d272497281462296dc9cfc25d4efd96246a88a8ee08978
 DIST qt_gui_core-0.3.0.tar.gz 86904 BLAKE2B e136f6837c3e7cd55f51c49d7055243f4da5600adafef2d5ac59963222f0cfeda6bcc2aaaf18dcfc75fd6ed03771203503b1c44817c83f32c5cbb8d5a06d51e4 SHA512 6b14dafdc087f3fccfeacf2aedd438b069cd3592d6f834ba0d277107da936bbf0d3a40d0cd18468615fd9c508fb1fc5109ef83c4970031a7dca923b85270b385
 DIST qt_gui_core-0.3.1.tar.gz 87236 BLAKE2B ae7a8e094c8fc77a52c85511970a1c6782affdd833793a2c64eb35da33366e358cbdfab70fd2d599e20a3307b4d42389e95e88b07540e4a9d812b4109000bdcd SHA512 f209c257fe3f8bf10e285109e6d6a88e2c8f2d6bfdae82bf3177b94f0b0a74ac26585a1b688d37d6db828847f82b9a5d3c362847bedf41db8aa86a2bc9738c3c
+DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
 DIST qt_gui_core-0.3.2.tar.gz 87326 BLAKE2B f5d22f4d48ccb06f27c6ef8d388cf7360e8207d23120af1213c29bdebf56654174aa92e3b38b78cbf42a6c037ff50008a1ba60a26fb63c0144b34a8568b3285c SHA512 9a3e5c395a49efc0cbd747b35898e5931155b9e22f4789cc111cfb28866db4589b3b7fbd8b32cb8d64ade568dd5a9eb4ee4b24f7b7f60dcf5aabc4a380b5c180
 DIST qt_gui_core-0.3.3.tar.gz 87422 BLAKE2B a3477f68b9e8b019b58882e4e063443b4cee8adf210ca3bebf43fc3a34888e167ae10e862423ee7d0da6afc9d7d22cec677400d92586e6dc8a4932112d6528be SHA512 5f2906e412b35b6edc9ba8792272b3d733574deda955279327e392ee3b0f55bb01a08607a25632fda43112842743fdd1432874fbf090f6b1404604c329b7dc3a
 DIST qt_gui_core-0.3.4.tar.gz 87974 BLAKE2B 7550100c865167a5e617db6ddbf2c2fcdb9f59ca3d9a20da2ed0305783885ae8f652f10d4b2739e5527ef7a9b60b1c3e080e682fa74034eca1fed0dd813658bc SHA512 794b0ea8b92cdbb748282ef48dcb41f24f3b83dd8ad92e8dc895d45ed085b9838b2ca4a5dc43284971d33b7ac40c86ca578fe042d71e0c9d1903cdfb561507af
 DIST qt_gui_core-0.3.5.tar.gz 90480 BLAKE2B cdbe0a8b8ddeb430658138fbe5dceae2ed233dd906d4b8eadedf5a1640d9ec8bd50adcf396c84199796798d41c3bf7247c8e11ac7675e0aa283ba33ad68dbfba SHA512 1c307e220d8484013e83cf2e3e4b6d674db3d6273f08ffc1ab928f92c1a4009d3b3d8d011f88b40e73ad371be34c7d4a790a78a47361ddb1c44b1a44970bf955
 DIST qt_gui_core-0.3.6.tar.gz 90705 BLAKE2B 7002d22b8deb2d8cd95ddfffcfd60e8cf092a1ada86a5fb6c666b41689d235f000a9375bf2389a082e187b4aa69accf8da1b7ce1b29c980d736fb9860e10a5d5 SHA512 bdd824010552af098f2b9294aef18c73413a1f76fe1cf61daccf9d9f17d7d16f6a9a1ec11c157460c1b89d6c44f21fccbdcab813ca42c052a6bc46de52f86ab0
 DIST qt_gui_core-0.3.8.tar.gz 91248 BLAKE2B 9ed159b8d065e7b2a44dcf9ac496a699675e5ec41d5ed222413894f098e122b092c976c934dc37a99846e0fe80858fb377bf937b3eabc3f0c6df126de7944e88 SHA512 aec926adffc9f1ab84d7d5cccb207d87254496b37e9e2e4c430de191917823424751206647d61821a65dec0aad3241dab22c85f21980fbe1a4bf114bb2c29d70
+DIST qt_gui_core-0.3.9.tar.gz 91495 BLAKE2B c0f2f2b9231a42da68c0032bfb192a47060f4b0915952b77750985be00023f22678480605990a79016b8ed906cacbdb9cd7eafabbb917b06f891f6b7817a999c SHA512 3e7e45001f1749e3ca75c6b33e3e7a131a314a5ec66925b86f2617f6f749f4c2093d33420bbe0f148faa44fb1fb3071241e47180d3c56ed9d1f7a2befb006a95
 EBUILD qt_dotgraph-0.2.29.ebuild 545 BLAKE2B 6c79468a06604ee7ce7827ef7004cc0a70c90f387110a5664843e54ae9def5c75b4cfe97887e036b2511cbc4ae98ce88d3d076553bf29b21990f98007b471195 SHA512 27cfe95c5cae2fbf2add6c10ef15399b5808871438cf08cc21b1426089995833a2f516accef28041247e98e5127d463e792e66f728e69a07e455e18fe388414c
 EBUILD qt_dotgraph-0.2.30.ebuild 545 BLAKE2B 6c79468a06604ee7ce7827ef7004cc0a70c90f387110a5664843e54ae9def5c75b4cfe97887e036b2511cbc4ae98ce88d3d076553bf29b21990f98007b471195 SHA512 27cfe95c5cae2fbf2add6c10ef15399b5808871438cf08cc21b1426089995833a2f516accef28041247e98e5127d463e792e66f728e69a07e455e18fe388414c
 EBUILD qt_dotgraph-0.3.0.ebuild 553 BLAKE2B 4d45e928e4d9e8459a372e23848f84f183aa6ca978533c21e4ee2738dace60c70f9cc7a0f6c3f82bc3e0258d017591e4b313f40a0d31ba3233e62ce306a89b29 SHA512 0d0541f5feed4d30460d34ebf9197b38e90941d07901dc3f675f22b8d2ce2324e76f5676a8d26d464932a0ca92054f3daf7c3f0c6aabfc560f77c766451395c4
 EBUILD qt_dotgraph-0.3.1.ebuild 553 BLAKE2B 4d45e928e4d9e8459a372e23848f84f183aa6ca978533c21e4ee2738dace60c70f9cc7a0f6c3f82bc3e0258d017591e4b313f40a0d31ba3233e62ce306a89b29 SHA512 0d0541f5feed4d30460d34ebf9197b38e90941d07901dc3f675f22b8d2ce2324e76f5676a8d26d464932a0ca92054f3daf7c3f0c6aabfc560f77c766451395c4
+EBUILD qt_dotgraph-0.3.10.ebuild 553 BLAKE2B d05e4dc3e31ff1773fb74855149781ef396c36e59e1ff5322475ae7fe8bf4b8530473731a9ddfaaa9b69dab8958ef5c483e896cc61562c53180430cd0280e93e SHA512 74b31226705f4dabdfae9565713ecec395a37a18631a7cebb166d7acc04e299ee58eddebe29f09d54b743f82b8283adef3b4dfac0e10ccf5d37a5433916f33e7
 EBUILD qt_dotgraph-0.3.2.ebuild 553 BLAKE2B 4d45e928e4d9e8459a372e23848f84f183aa6ca978533c21e4ee2738dace60c70f9cc7a0f6c3f82bc3e0258d017591e4b313f40a0d31ba3233e62ce306a89b29 SHA512 0d0541f5feed4d30460d34ebf9197b38e90941d07901dc3f675f22b8d2ce2324e76f5676a8d26d464932a0ca92054f3daf7c3f0c6aabfc560f77c766451395c4
 EBUILD qt_dotgraph-0.3.3.ebuild 553 BLAKE2B 49b8d54ee7048bbeca3bc612e0cc55dbbcb6f1ffc69e0054f6dac39e5efc875f3af8729351afbe469904d5c0d3ad6e3523310d55fa9de0fef727d21d8d9fd7b4 SHA512 7cc3b353b875b38382df6164d8d94f233c023c3bf2c85871cba156332e508ed4f05b2f485812deeadcb574e0dcf99465bdc2078eb8c415c077d18ff9556163cc
 EBUILD qt_dotgraph-0.3.4.ebuild 553 BLAKE2B 6017571f1c49b534b1adb8b1104e11b905731de42e1eae93f815fb63e2ed4d1b993b2ef18a9d9f15cc4b7960d3605d4003f2bf10a6752497b758391c953d2e3d SHA512 011aba5249fb7641b2b876178723ff68410a0519d6494a059555ce4b1c2481ba4faed4ef49c14eae588f889532b5d3586ecdcb678082751db52c5ddfd208f591
 EBUILD qt_dotgraph-0.3.5.ebuild 553 BLAKE2B 6017571f1c49b534b1adb8b1104e11b905731de42e1eae93f815fb63e2ed4d1b993b2ef18a9d9f15cc4b7960d3605d4003f2bf10a6752497b758391c953d2e3d SHA512 011aba5249fb7641b2b876178723ff68410a0519d6494a059555ce4b1c2481ba4faed4ef49c14eae588f889532b5d3586ecdcb678082751db52c5ddfd208f591
 EBUILD qt_dotgraph-0.3.6.ebuild 553 BLAKE2B 6017571f1c49b534b1adb8b1104e11b905731de42e1eae93f815fb63e2ed4d1b993b2ef18a9d9f15cc4b7960d3605d4003f2bf10a6752497b758391c953d2e3d SHA512 011aba5249fb7641b2b876178723ff68410a0519d6494a059555ce4b1c2481ba4faed4ef49c14eae588f889532b5d3586ecdcb678082751db52c5ddfd208f591
 EBUILD qt_dotgraph-0.3.8.ebuild 553 BLAKE2B 6017571f1c49b534b1adb8b1104e11b905731de42e1eae93f815fb63e2ed4d1b993b2ef18a9d9f15cc4b7960d3605d4003f2bf10a6752497b758391c953d2e3d SHA512 011aba5249fb7641b2b876178723ff68410a0519d6494a059555ce4b1c2481ba4faed4ef49c14eae588f889532b5d3586ecdcb678082751db52c5ddfd208f591
+EBUILD qt_dotgraph-0.3.9.ebuild 553 BLAKE2B d05e4dc3e31ff1773fb74855149781ef396c36e59e1ff5322475ae7fe8bf4b8530473731a9ddfaaa9b69dab8958ef5c483e896cc61562c53180430cd0280e93e SHA512 74b31226705f4dabdfae9565713ecec395a37a18631a7cebb166d7acc04e299ee58eddebe29f09d54b743f82b8283adef3b4dfac0e10ccf5d37a5433916f33e7
 EBUILD qt_dotgraph-9999.ebuild 553 BLAKE2B 4d45e928e4d9e8459a372e23848f84f183aa6ca978533c21e4ee2738dace60c70f9cc7a0f6c3f82bc3e0258d017591e4b313f40a0d31ba3233e62ce306a89b29 SHA512 0d0541f5feed4d30460d34ebf9197b38e90941d07901dc3f675f22b8d2ce2324e76f5676a8d26d464932a0ca92054f3daf7c3f0c6aabfc560f77c766451395c4
 MISC metadata.xml 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.10.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.10.ebuild
new file mode 100644
index 000000000000..e833e27d3446
--- /dev/null
+++ b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Helpers to work with dot graphs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/pydot[${PYTHON_USEDEP}]
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.9.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.9.ebuild
new file mode 100644
index 000000000000..e833e27d3446
--- /dev/null
+++ b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Helpers to work with dot graphs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/pydot[${PYTHON_USEDEP}]
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/qt_gui/Manifest b/dev-ros/qt_gui/Manifest
index e01e33c84810..03dd02f9e143 100644
--- a/dev-ros/qt_gui/Manifest
+++ b/dev-ros/qt_gui/Manifest
@@ -1,10 +1,14 @@
+DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
 DIST qt_gui_core-0.3.4.tar.gz 87974 BLAKE2B 7550100c865167a5e617db6ddbf2c2fcdb9f59ca3d9a20da2ed0305783885ae8f652f10d4b2739e5527ef7a9b60b1c3e080e682fa74034eca1fed0dd813658bc SHA512 794b0ea8b92cdbb748282ef48dcb41f24f3b83dd8ad92e8dc895d45ed085b9838b2ca4a5dc43284971d33b7ac40c86ca578fe042d71e0c9d1903cdfb561507af
 DIST qt_gui_core-0.3.5.tar.gz 90480 BLAKE2B cdbe0a8b8ddeb430658138fbe5dceae2ed233dd906d4b8eadedf5a1640d9ec8bd50adcf396c84199796798d41c3bf7247c8e11ac7675e0aa283ba33ad68dbfba SHA512 1c307e220d8484013e83cf2e3e4b6d674db3d6273f08ffc1ab928f92c1a4009d3b3d8d011f88b40e73ad371be34c7d4a790a78a47361ddb1c44b1a44970bf955
 DIST qt_gui_core-0.3.6.tar.gz 90705 BLAKE2B 7002d22b8deb2d8cd95ddfffcfd60e8cf092a1ada86a5fb6c666b41689d235f000a9375bf2389a082e187b4aa69accf8da1b7ce1b29c980d736fb9860e10a5d5 SHA512 bdd824010552af098f2b9294aef18c73413a1f76fe1cf61daccf9d9f17d7d16f6a9a1ec11c157460c1b89d6c44f21fccbdcab813ca42c052a6bc46de52f86ab0
 DIST qt_gui_core-0.3.8.tar.gz 91248 BLAKE2B 9ed159b8d065e7b2a44dcf9ac496a699675e5ec41d5ed222413894f098e122b092c976c934dc37a99846e0fe80858fb377bf937b3eabc3f0c6df126de7944e88 SHA512 aec926adffc9f1ab84d7d5cccb207d87254496b37e9e2e4c430de191917823424751206647d61821a65dec0aad3241dab22c85f21980fbe1a4bf114bb2c29d70
+DIST qt_gui_core-0.3.9.tar.gz 91495 BLAKE2B c0f2f2b9231a42da68c0032bfb192a47060f4b0915952b77750985be00023f22678480605990a79016b8ed906cacbdb9cd7eafabbb917b06f891f6b7817a999c SHA512 3e7e45001f1749e3ca75c6b33e3e7a131a314a5ec66925b86f2617f6f749f4c2093d33420bbe0f148faa44fb1fb3071241e47180d3c56ed9d1f7a2befb006a95
+EBUILD qt_gui-0.3.10.ebuild 533 BLAKE2B 145e835a952757cdf3240f048e633df64b1ad454ab3b202b71132fa3425cafcee2ed778400754f0eef28fa1d29d367eeee6bcea7c2ba113f35d922c406a66a80 SHA512 43349fe25b35405318c09fe01ca92237b214216b414f10cead1ad23bb3869b7348ca2c9cae1703138058713ede5f53bfccc5051a90a8c4fa03fcbdceef59571c
 EBUILD qt_gui-0.3.4-r1.ebuild 533 BLAKE2B d64ab8aa44c2d4de3aa0859dd454810276568bfecbba4d61603f1dfb7340275a5e4782fdd73de80e44db5b8519903f8d1a9bfe1c8ba8f14a1309f9ba99ecfcd7 SHA512 438a587128f1b0a7d8aa13baa5dc4bb1f4e5139fc736acc32e76fdef427b8f19c320acb4dbe95781f083cfcd3e2e0a7fc768b81d94036da11225820455a77619
 EBUILD qt_gui-0.3.5.ebuild 533 BLAKE2B d64ab8aa44c2d4de3aa0859dd454810276568bfecbba4d61603f1dfb7340275a5e4782fdd73de80e44db5b8519903f8d1a9bfe1c8ba8f14a1309f9ba99ecfcd7 SHA512 438a587128f1b0a7d8aa13baa5dc4bb1f4e5139fc736acc32e76fdef427b8f19c320acb4dbe95781f083cfcd3e2e0a7fc768b81d94036da11225820455a77619
 EBUILD qt_gui-0.3.6.ebuild 533 BLAKE2B d64ab8aa44c2d4de3aa0859dd454810276568bfecbba4d61603f1dfb7340275a5e4782fdd73de80e44db5b8519903f8d1a9bfe1c8ba8f14a1309f9ba99ecfcd7 SHA512 438a587128f1b0a7d8aa13baa5dc4bb1f4e5139fc736acc32e76fdef427b8f19c320acb4dbe95781f083cfcd3e2e0a7fc768b81d94036da11225820455a77619
 EBUILD qt_gui-0.3.8.ebuild 533 BLAKE2B d64ab8aa44c2d4de3aa0859dd454810276568bfecbba4d61603f1dfb7340275a5e4782fdd73de80e44db5b8519903f8d1a9bfe1c8ba8f14a1309f9ba99ecfcd7 SHA512 438a587128f1b0a7d8aa13baa5dc4bb1f4e5139fc736acc32e76fdef427b8f19c320acb4dbe95781f083cfcd3e2e0a7fc768b81d94036da11225820455a77619
+EBUILD qt_gui-0.3.9.ebuild 533 BLAKE2B 145e835a952757cdf3240f048e633df64b1ad454ab3b202b71132fa3425cafcee2ed778400754f0eef28fa1d29d367eeee6bcea7c2ba113f35d922c406a66a80 SHA512 43349fe25b35405318c09fe01ca92237b214216b414f10cead1ad23bb3869b7348ca2c9cae1703138058713ede5f53bfccc5051a90a8c4fa03fcbdceef59571c
 EBUILD qt_gui-9999.ebuild 533 BLAKE2B d64ab8aa44c2d4de3aa0859dd454810276568bfecbba4d61603f1dfb7340275a5e4782fdd73de80e44db5b8519903f8d1a9bfe1c8ba8f14a1309f9ba99ecfcd7 SHA512 438a587128f1b0a7d8aa13baa5dc4bb1f4e5139fc736acc32e76fdef427b8f19c320acb4dbe95781f083cfcd3e2e0a7fc768b81d94036da11225820455a77619
 MISC metadata.xml 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_gui/qt_gui-0.3.10.ebuild b/dev-ros/qt_gui/qt_gui-0.3.10.ebuild
new file mode 100644
index 000000000000..ef3a31a6467e
--- /dev/null
+++ b/dev-ros/qt_gui/qt_gui-0.3.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS infrastructure for an integrated graphical user interface based on Qt"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui/qt_gui-0.3.9.ebuild b/dev-ros/qt_gui/qt_gui-0.3.9.ebuild
new file mode 100644
index 000000000000..ef3a31a6467e
--- /dev/null
+++ b/dev-ros/qt_gui/qt_gui-0.3.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS infrastructure for an integrated graphical user interface based on Qt"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/Manifest b/dev-ros/qt_gui_app/Manifest
index f2aa4d6a6c91..25598023e845 100644
--- a/dev-ros/qt_gui_app/Manifest
+++ b/dev-ros/qt_gui_app/Manifest
@@ -2,21 +2,25 @@ DIST qt_gui_core-0.2.29.tar.gz 85881 BLAKE2B f88853320237b410fa9231c85ad44f930d0
 DIST qt_gui_core-0.2.30.tar.gz 86567 BLAKE2B a40e15ba1925db8afee2daffed2f2fbb3c242ecf84bc01d561b582ec561960e74e362d1ff0337e3100c3e050d63d3b9e5437ad0579f5580329f9af5e42cfd13d SHA512 4a9671c8814f16a371e77840d6df268e763ce5932d6e85842af34ee5322701ffa19d97d4d75b4fb6d4d272497281462296dc9cfc25d4efd96246a88a8ee08978
 DIST qt_gui_core-0.3.0.tar.gz 86904 BLAKE2B e136f6837c3e7cd55f51c49d7055243f4da5600adafef2d5ac59963222f0cfeda6bcc2aaaf18dcfc75fd6ed03771203503b1c44817c83f32c5cbb8d5a06d51e4 SHA512 6b14dafdc087f3fccfeacf2aedd438b069cd3592d6f834ba0d277107da936bbf0d3a40d0cd18468615fd9c508fb1fc5109ef83c4970031a7dca923b85270b385
 DIST qt_gui_core-0.3.1.tar.gz 87236 BLAKE2B ae7a8e094c8fc77a52c85511970a1c6782affdd833793a2c64eb35da33366e358cbdfab70fd2d599e20a3307b4d42389e95e88b07540e4a9d812b4109000bdcd SHA512 f209c257fe3f8bf10e285109e6d6a88e2c8f2d6bfdae82bf3177b94f0b0a74ac26585a1b688d37d6db828847f82b9a5d3c362847bedf41db8aa86a2bc9738c3c
+DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
 DIST qt_gui_core-0.3.2.tar.gz 87326 BLAKE2B f5d22f4d48ccb06f27c6ef8d388cf7360e8207d23120af1213c29bdebf56654174aa92e3b38b78cbf42a6c037ff50008a1ba60a26fb63c0144b34a8568b3285c SHA512 9a3e5c395a49efc0cbd747b35898e5931155b9e22f4789cc111cfb28866db4589b3b7fbd8b32cb8d64ade568dd5a9eb4ee4b24f7b7f60dcf5aabc4a380b5c180
 DIST qt_gui_core-0.3.3.tar.gz 87422 BLAKE2B a3477f68b9e8b019b58882e4e063443b4cee8adf210ca3bebf43fc3a34888e167ae10e862423ee7d0da6afc9d7d22cec677400d92586e6dc8a4932112d6528be SHA512 5f2906e412b35b6edc9ba8792272b3d733574deda955279327e392ee3b0f55bb01a08607a25632fda43112842743fdd1432874fbf090f6b1404604c329b7dc3a
 DIST qt_gui_core-0.3.4.tar.gz 87974 BLAKE2B 7550100c865167a5e617db6ddbf2c2fcdb9f59ca3d9a20da2ed0305783885ae8f652f10d4b2739e5527ef7a9b60b1c3e080e682fa74034eca1fed0dd813658bc SHA512 794b0ea8b92cdbb748282ef48dcb41f24f3b83dd8ad92e8dc895d45ed085b9838b2ca4a5dc43284971d33b7ac40c86ca578fe042d71e0c9d1903cdfb561507af
 DIST qt_gui_core-0.3.5.tar.gz 90480 BLAKE2B cdbe0a8b8ddeb430658138fbe5dceae2ed233dd906d4b8eadedf5a1640d9ec8bd50adcf396c84199796798d41c3bf7247c8e11ac7675e0aa283ba33ad68dbfba SHA512 1c307e220d8484013e83cf2e3e4b6d674db3d6273f08ffc1ab928f92c1a4009d3b3d8d011f88b40e73ad371be34c7d4a790a78a47361ddb1c44b1a44970bf955
 DIST qt_gui_core-0.3.6.tar.gz 90705 BLAKE2B 7002d22b8deb2d8cd95ddfffcfd60e8cf092a1ada86a5fb6c666b41689d235f000a9375bf2389a082e187b4aa69accf8da1b7ce1b29c980d736fb9860e10a5d5 SHA512 bdd824010552af098f2b9294aef18c73413a1f76fe1cf61daccf9d9f17d7d16f6a9a1ec11c157460c1b89d6c44f21fccbdcab813ca42c052a6bc46de52f86ab0
 DIST qt_gui_core-0.3.8.tar.gz 91248 BLAKE2B 9ed159b8d065e7b2a44dcf9ac496a699675e5ec41d5ed222413894f098e122b092c976c934dc37a99846e0fe80858fb377bf937b3eabc3f0c6df126de7944e88 SHA512 aec926adffc9f1ab84d7d5cccb207d87254496b37e9e2e4c430de191917823424751206647d61821a65dec0aad3241dab22c85f21980fbe1a4bf114bb2c29d70
+DIST qt_gui_core-0.3.9.tar.gz 91495 BLAKE2B c0f2f2b9231a42da68c0032bfb192a47060f4b0915952b77750985be00023f22678480605990a79016b8ed906cacbdb9cd7eafabbb917b06f891f6b7817a999c SHA512 3e7e45001f1749e3ca75c6b33e3e7a131a314a5ec66925b86f2617f6f749f4c2093d33420bbe0f148faa44fb1fb3071241e47180d3c56ed9d1f7a2befb006a95
 EBUILD qt_gui_app-0.2.29.ebuild 464 BLAKE2B 5531374910a3174eebb0e2f5a7aacf45cc8cc8620274554c01366e080edc010c2b86c2217428a8455bddb0db1e16c632f17f7d8dbb91cc89d16be40f5e2172c0 SHA512 03673f5a04840269b565b004b13d159f6e5792c3b1954cfe1debb7eff6179fd318d87ec4f2f864720374789f147e4e4a9f39d0ab2d96835e24167c7a3a0e71ca
 EBUILD qt_gui_app-0.2.30.ebuild 464 BLAKE2B 5531374910a3174eebb0e2f5a7aacf45cc8cc8620274554c01366e080edc010c2b86c2217428a8455bddb0db1e16c632f17f7d8dbb91cc89d16be40f5e2172c0 SHA512 03673f5a04840269b565b004b13d159f6e5792c3b1954cfe1debb7eff6179fd318d87ec4f2f864720374789f147e4e4a9f39d0ab2d96835e24167c7a3a0e71ca
 EBUILD qt_gui_app-0.3.0.ebuild 472 BLAKE2B 4c7e357c70fe4a7d2dae3a5601090a20a548d52d71656b01ef406a0b31c903f33e8c7eb1d421e0a7d6ea2ecd9a3cb03b106482157f3261f0f9d514ac889661e7 SHA512 cec9a8da56df0f6e7a39a3f6f91381fce7be71dd4276daa9a1e2a9b52415b0adfa27ca590fe23f0e8c07bfd8192a727e67a011701c1e94a40cb0f3ef119beffa
 EBUILD qt_gui_app-0.3.1.ebuild 472 BLAKE2B 4c7e357c70fe4a7d2dae3a5601090a20a548d52d71656b01ef406a0b31c903f33e8c7eb1d421e0a7d6ea2ecd9a3cb03b106482157f3261f0f9d514ac889661e7 SHA512 cec9a8da56df0f6e7a39a3f6f91381fce7be71dd4276daa9a1e2a9b52415b0adfa27ca590fe23f0e8c07bfd8192a727e67a011701c1e94a40cb0f3ef119beffa
+EBUILD qt_gui_app-0.3.10.ebuild 472 BLAKE2B 10e1f7ed5ad94b8a36a1e8b07a417863968c97dc1429978bdf5559a2bfc23bb40ad077901366866806491bf376d3703f5003a6c29e85e6e7e6b8b1c3c9207206 SHA512 f147ce42b400b464cf7e6cab0be3fccf3eba04330cd270a16595ed31d75fbf77d8625e9f225d5ab24992e64a72a20deecfb2237fe6ee1082043180234990e90e
 EBUILD qt_gui_app-0.3.2.ebuild 472 BLAKE2B 4c7e357c70fe4a7d2dae3a5601090a20a548d52d71656b01ef406a0b31c903f33e8c7eb1d421e0a7d6ea2ecd9a3cb03b106482157f3261f0f9d514ac889661e7 SHA512 cec9a8da56df0f6e7a39a3f6f91381fce7be71dd4276daa9a1e2a9b52415b0adfa27ca590fe23f0e8c07bfd8192a727e67a011701c1e94a40cb0f3ef119beffa
 EBUILD qt_gui_app-0.3.3.ebuild 472 BLAKE2B 976f77da58f76de0c76f2304b6a58cbcd2a2ecf9d4ba87bc1f0c196da66ab990215e4f3a4cbfb8a89a0e332b2f73f2eaabba2c5c4a283c4d912002fe5cf30393 SHA512 dc52f8080944b02eaadcb1367fb257e1409ac4f491a168dab8d99c0b077da13503fcaa5035d4c4631ef4f0ad3d65d4a55d977e1fb3d3a29a3fe605458cec156d
 EBUILD qt_gui_app-0.3.4.ebuild 472 BLAKE2B ec44dea14908f5f7218404689b6bb666c2c4c20c226f6de108715f36dacbabed821e574b1ed80be5c293bd55c189506698ce262a05b124b8f71ea868e85939b5 SHA512 0019fd2c42a5cd017cb6d6b800fdc184cb8d87e851c261b3f87e3b11d1ad91bccf72d0b2d912951cec283eb77f8e1db666dd2f960431c83e7c827e81623b8d0a
 EBUILD qt_gui_app-0.3.5.ebuild 472 BLAKE2B ec44dea14908f5f7218404689b6bb666c2c4c20c226f6de108715f36dacbabed821e574b1ed80be5c293bd55c189506698ce262a05b124b8f71ea868e85939b5 SHA512 0019fd2c42a5cd017cb6d6b800fdc184cb8d87e851c261b3f87e3b11d1ad91bccf72d0b2d912951cec283eb77f8e1db666dd2f960431c83e7c827e81623b8d0a
 EBUILD qt_gui_app-0.3.6.ebuild 472 BLAKE2B ec44dea14908f5f7218404689b6bb666c2c4c20c226f6de108715f36dacbabed821e574b1ed80be5c293bd55c189506698ce262a05b124b8f71ea868e85939b5 SHA512 0019fd2c42a5cd017cb6d6b800fdc184cb8d87e851c261b3f87e3b11d1ad91bccf72d0b2d912951cec283eb77f8e1db666dd2f960431c83e7c827e81623b8d0a
 EBUILD qt_gui_app-0.3.8.ebuild 472 BLAKE2B ec44dea14908f5f7218404689b6bb666c2c4c20c226f6de108715f36dacbabed821e574b1ed80be5c293bd55c189506698ce262a05b124b8f71ea868e85939b5 SHA512 0019fd2c42a5cd017cb6d6b800fdc184cb8d87e851c261b3f87e3b11d1ad91bccf72d0b2d912951cec283eb77f8e1db666dd2f960431c83e7c827e81623b8d0a
+EBUILD qt_gui_app-0.3.9.ebuild 472 BLAKE2B 10e1f7ed5ad94b8a36a1e8b07a417863968c97dc1429978bdf5559a2bfc23bb40ad077901366866806491bf376d3703f5003a6c29e85e6e7e6b8b1c3c9207206 SHA512 f147ce42b400b464cf7e6cab0be3fccf3eba04330cd270a16595ed31d75fbf77d8625e9f225d5ab24992e64a72a20deecfb2237fe6ee1082043180234990e90e
 EBUILD qt_gui_app-9999.ebuild 472 BLAKE2B 4c7e357c70fe4a7d2dae3a5601090a20a548d52d71656b01ef406a0b31c903f33e8c7eb1d421e0a7d6ea2ecd9a3cb03b106482157f3261f0f9d514ac889661e7 SHA512 cec9a8da56df0f6e7a39a3f6f91381fce7be71dd4276daa9a1e2a9b52415b0adfa27ca590fe23f0e8c07bfd8192a727e67a011701c1e94a40cb0f3ef119beffa
 MISC metadata.xml 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.3.10.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.3.10.ebuild
new file mode 100644
index 000000000000..636659bf583e
--- /dev/null
+++ b/dev-ros/qt_gui_app/qt_gui_app-0.3.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.3.9.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.3.9.ebuild
new file mode 100644
index 000000000000..636659bf583e
--- /dev/null
+++ b/dev-ros/qt_gui_app/qt_gui_app-0.3.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_cpp/Manifest b/dev-ros/qt_gui_cpp/Manifest
index 6e2e24d914c7..fdf7904006bf 100644
--- a/dev-ros/qt_gui_cpp/Manifest
+++ b/dev-ros/qt_gui_cpp/Manifest
@@ -1,5 +1,9 @@
 AUX libdir.patch 1151 BLAKE2B f78ed19cff2df00514da0e60b6cfbda581443a0b7b1515a7c40d1a9518391611de3c5ff9eed6091ac2dbbdff168aba14239ac21754657541aa5b6e053e19aa7d SHA512 a6393e452f9a2a2517d35e2edb069f94acc8461dfda631c3183099a9b8bf6aa79bd5747ef1e1275637ad3fbbca67bab0aa9bcb21dce1f3eb67ed2600ceffe657
+DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
 DIST qt_gui_core-0.3.8.tar.gz 91248 BLAKE2B 9ed159b8d065e7b2a44dcf9ac496a699675e5ec41d5ed222413894f098e122b092c976c934dc37a99846e0fe80858fb377bf937b3eabc3f0c6df126de7944e88 SHA512 aec926adffc9f1ab84d7d5cccb207d87254496b37e9e2e4c430de191917823424751206647d61821a65dec0aad3241dab22c85f21980fbe1a4bf114bb2c29d70
+DIST qt_gui_core-0.3.9.tar.gz 91495 BLAKE2B c0f2f2b9231a42da68c0032bfb192a47060f4b0915952b77750985be00023f22678480605990a79016b8ed906cacbdb9cd7eafabbb917b06f891f6b7817a999c SHA512 3e7e45001f1749e3ca75c6b33e3e7a131a314a5ec66925b86f2617f6f749f4c2093d33420bbe0f148faa44fb1fb3071241e47180d3c56ed9d1f7a2befb006a95
+EBUILD qt_gui_cpp-0.3.10.ebuild 745 BLAKE2B b4c55f12bd7cb313436c2267d56d2e9af5ea75d4542053309708a47b4beb0e904f3caac9dfe5a79fcecd5fb990ce73d44405c1277b54789ab44afca1fe3e884c SHA512 7bf57c06abef1e07e5fa74fa5a98f3b8a45da55d5b2c689635d2493433d0d0d8c55b77ba66616c460031443f076113dd5f8809adf9b526719ea4874237ae0006
 EBUILD qt_gui_cpp-0.3.8-r1.ebuild 745 BLAKE2B 2f7e609d3f4336951307b9ba559969a437bf68f44a4695d333791fb9ccc7057a23c85048060812b232bc9c20ffd1a0c3c96bd341c53fb0bbda12230815c6be1d SHA512 776fa23e75d92cbf557fbcee6742f0fd18dbac87af5aa3640aded8e5775c59eac1294c22403bbf86a8ada2c205ca629e88f627ac82bffcd2f01c3e19f2c87060
+EBUILD qt_gui_cpp-0.3.9.ebuild 745 BLAKE2B b4c55f12bd7cb313436c2267d56d2e9af5ea75d4542053309708a47b4beb0e904f3caac9dfe5a79fcecd5fb990ce73d44405c1277b54789ab44afca1fe3e884c SHA512 7bf57c06abef1e07e5fa74fa5a98f3b8a45da55d5b2c689635d2493433d0d0d8c55b77ba66616c460031443f076113dd5f8809adf9b526719ea4874237ae0006
 EBUILD qt_gui_cpp-9999.ebuild 745 BLAKE2B 2f7e609d3f4336951307b9ba559969a437bf68f44a4695d333791fb9ccc7057a23c85048060812b232bc9c20ffd1a0c3c96bd341c53fb0bbda12230815c6be1d SHA512 776fa23e75d92cbf557fbcee6742f0fd18dbac87af5aa3640aded8e5775c59eac1294c22403bbf86a8ada2c205ca629e88f627ac82bffcd2f01c3e19f2c87060
 MISC metadata.xml 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.10.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.10.ebuild
new file mode 100644
index 000000000000..a52422eff7b2
--- /dev/null
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	>=dev-ros/pluginlib-1.9.23
+		dev-libs/tinyxml2:=
+	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
+	dev-libs/tinyxml
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}/libdir.patch"
+)
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.9.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.9.ebuild
new file mode 100644
index 000000000000..a52422eff7b2
--- /dev/null
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	>=dev-ros/pluginlib-1.9.23
+		dev-libs/tinyxml2:=
+	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
+	dev-libs/tinyxml
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}/libdir.patch"
+)
diff --git a/dev-ros/qt_gui_py_common/Manifest b/dev-ros/qt_gui_py_common/Manifest
index 0c722ab4c467..07b77fc43eb1 100644
--- a/dev-ros/qt_gui_py_common/Manifest
+++ b/dev-ros/qt_gui_py_common/Manifest
@@ -2,21 +2,25 @@ DIST qt_gui_core-0.2.29.tar.gz 85881 BLAKE2B f88853320237b410fa9231c85ad44f930d0
 DIST qt_gui_core-0.2.30.tar.gz 86567 BLAKE2B a40e15ba1925db8afee2daffed2f2fbb3c242ecf84bc01d561b582ec561960e74e362d1ff0337e3100c3e050d63d3b9e5437ad0579f5580329f9af5e42cfd13d SHA512 4a9671c8814f16a371e77840d6df268e763ce5932d6e85842af34ee5322701ffa19d97d4d75b4fb6d4d272497281462296dc9cfc25d4efd96246a88a8ee08978
 DIST qt_gui_core-0.3.0.tar.gz 86904 BLAKE2B e136f6837c3e7cd55f51c49d7055243f4da5600adafef2d5ac59963222f0cfeda6bcc2aaaf18dcfc75fd6ed03771203503b1c44817c83f32c5cbb8d5a06d51e4 SHA512 6b14dafdc087f3fccfeacf2aedd438b069cd3592d6f834ba0d277107da936bbf0d3a40d0cd18468615fd9c508fb1fc5109ef83c4970031a7dca923b85270b385
 DIST qt_gui_core-0.3.1.tar.gz 87236 BLAKE2B ae7a8e094c8fc77a52c85511970a1c6782affdd833793a2c64eb35da33366e358cbdfab70fd2d599e20a3307b4d42389e95e88b07540e4a9d812b4109000bdcd SHA512 f209c257fe3f8bf10e285109e6d6a88e2c8f2d6bfdae82bf3177b94f0b0a74ac26585a1b688d37d6db828847f82b9a5d3c362847bedf41db8aa86a2bc9738c3c
+DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
 DIST qt_gui_core-0.3.2.tar.gz 87326 BLAKE2B f5d22f4d48ccb06f27c6ef8d388cf7360e8207d23120af1213c29bdebf56654174aa92e3b38b78cbf42a6c037ff50008a1ba60a26fb63c0144b34a8568b3285c SHA512 9a3e5c395a49efc0cbd747b35898e5931155b9e22f4789cc111cfb28866db4589b3b7fbd8b32cb8d64ade568dd5a9eb4ee4b24f7b7f60dcf5aabc4a380b5c180
 DIST qt_gui_core-0.3.3.tar.gz 87422 BLAKE2B a3477f68b9e8b019b58882e4e063443b4cee8adf210ca3bebf43fc3a34888e167ae10e862423ee7d0da6afc9d7d22cec677400d92586e6dc8a4932112d6528be SHA512 5f2906e412b35b6edc9ba8792272b3d733574deda955279327e392ee3b0f55bb01a08607a25632fda43112842743fdd1432874fbf090f6b1404604c329b7dc3a
 DIST qt_gui_core-0.3.4.tar.gz 87974 BLAKE2B 7550100c865167a5e617db6ddbf2c2fcdb9f59ca3d9a20da2ed0305783885ae8f652f10d4b2739e5527ef7a9b60b1c3e080e682fa74034eca1fed0dd813658bc SHA512 794b0ea8b92cdbb748282ef48dcb41f24f3b83dd8ad92e8dc895d45ed085b9838b2ca4a5dc43284971d33b7ac40c86ca578fe042d71e0c9d1903cdfb561507af
 DIST qt_gui_core-0.3.5.tar.gz 90480 BLAKE2B cdbe0a8b8ddeb430658138fbe5dceae2ed233dd906d4b8eadedf5a1640d9ec8bd50adcf396c84199796798d41c3bf7247c8e11ac7675e0aa283ba33ad68dbfba SHA512 1c307e220d8484013e83cf2e3e4b6d674db3d6273f08ffc1ab928f92c1a4009d3b3d8d011f88b40e73ad371be34c7d4a790a78a47361ddb1c44b1a44970bf955
 DIST qt_gui_core-0.3.6.tar.gz 90705 BLAKE2B 7002d22b8deb2d8cd95ddfffcfd60e8cf092a1ada86a5fb6c666b41689d235f000a9375bf2389a082e187b4aa69accf8da1b7ce1b29c980d736fb9860e10a5d5 SHA512 bdd824010552af098f2b9294aef18c73413a1f76fe1cf61daccf9d9f17d7d16f6a9a1ec11c157460c1b89d6c44f21fccbdcab813ca42c052a6bc46de52f86ab0
 DIST qt_gui_core-0.3.8.tar.gz 91248 BLAKE2B 9ed159b8d065e7b2a44dcf9ac496a699675e5ec41d5ed222413894f098e122b092c976c934dc37a99846e0fe80858fb377bf937b3eabc3f0c6df126de7944e88 SHA512 aec926adffc9f1ab84d7d5cccb207d87254496b37e9e2e4c430de191917823424751206647d61821a65dec0aad3241dab22c85f21980fbe1a4bf114bb2c29d70
+DIST qt_gui_core-0.3.9.tar.gz 91495 BLAKE2B c0f2f2b9231a42da68c0032bfb192a47060f4b0915952b77750985be00023f22678480605990a79016b8ed906cacbdb9cd7eafabbb917b06f891f6b7817a999c SHA512 3e7e45001f1749e3ca75c6b33e3e7a131a314a5ec66925b86f2617f6f749f4c2093d33420bbe0f148faa44fb1fb3071241e47180d3c56ed9d1f7a2befb006a95
 EBUILD qt_gui_py_common-0.2.29.ebuild 487 BLAKE2B dd04f9e94dd975d7d0a7f8b91d26bc321504690ac81abf43f03dc82c994d8299243eb0a7f81121c2857af6152eed84f95d119a8dcedb80bffe0c2f84b9fc4ac0 SHA512 869826c0dddce1a231bf9ce36379ac578eb4f957b5ed5e769e81ddc88e45819b2be08e660c1ccf369131c672c1b2bea2ce9332a5abbf6a58a855d2657bf6a2a6
 EBUILD qt_gui_py_common-0.2.30.ebuild 487 BLAKE2B dd04f9e94dd975d7d0a7f8b91d26bc321504690ac81abf43f03dc82c994d8299243eb0a7f81121c2857af6152eed84f95d119a8dcedb80bffe0c2f84b9fc4ac0 SHA512 869826c0dddce1a231bf9ce36379ac578eb4f957b5ed5e769e81ddc88e45819b2be08e660c1ccf369131c672c1b2bea2ce9332a5abbf6a58a855d2657bf6a2a6
 EBUILD qt_gui_py_common-0.3.0.ebuild 495 BLAKE2B 0cae86616656725aeb1e599966a939d49ce21104b7d74f982d9d76c9f2cc1a1e01b46d119bae419e09edc8c6611b26797630d628cab5b848c878cc6a66e47a70 SHA512 25d41945066aeb36416eca403a173ff9cbf551d971a6f73d1c2ff90f1083ed1a7eb760f8d753278b0a6f64b3c9243209fdfbc137d950272fce6432e69f5d438e
 EBUILD qt_gui_py_common-0.3.1.ebuild 495 BLAKE2B 0cae86616656725aeb1e599966a939d49ce21104b7d74f982d9d76c9f2cc1a1e01b46d119bae419e09edc8c6611b26797630d628cab5b848c878cc6a66e47a70 SHA512 25d41945066aeb36416eca403a173ff9cbf551d971a6f73d1c2ff90f1083ed1a7eb760f8d753278b0a6f64b3c9243209fdfbc137d950272fce6432e69f5d438e
+EBUILD qt_gui_py_common-0.3.10.ebuild 495 BLAKE2B 6ff9af78697819a00ac135b63ce5659ae3c81d20ddc32e1e7de262c5e96502218c206549af5ac0d801f6438c16455a6bf831709ff3aa8e05a79e338175b38bfe SHA512 2a8c22e203afa1cdbfdfe587c089d52a32257d1ef2b8d2bc4dc90fa5f1d5222cb817cdaf573daa1afd3cc5ac81c46afa12ae50551cf4cbe74e87bbed6f0cd5eb
 EBUILD qt_gui_py_common-0.3.2.ebuild 495 BLAKE2B 0cae86616656725aeb1e599966a939d49ce21104b7d74f982d9d76c9f2cc1a1e01b46d119bae419e09edc8c6611b26797630d628cab5b848c878cc6a66e47a70 SHA512 25d41945066aeb36416eca403a173ff9cbf551d971a6f73d1c2ff90f1083ed1a7eb760f8d753278b0a6f64b3c9243209fdfbc137d950272fce6432e69f5d438e
 EBUILD qt_gui_py_common-0.3.3.ebuild 495 BLAKE2B c73ccdb054e9a6e657eefe7471a983f8c7b6907b90c61ccab41a07e04647b57b1c8724e974de394caa76460953023783fa68382a683472fad1c986d18880fe4b SHA512 8413e1bf77163b55a3caa9dcf760576db4de7953a2b44aeb20c0940b6ffff103da58fd6fa5f0c57383c566d419ce26076864095507ca4568ebbfe16ac0d942fe
 EBUILD qt_gui_py_common-0.3.4.ebuild 495 BLAKE2B fd6ee071255e4d0140dff2f4fb76996173cec0166e37ba0c2491ed1b2713b34e1b59844c6b78ad1a103512a4c164acad81504484341a0a767eebd4dff47825a3 SHA512 37c8d203ca8f7752983531a72bc8ce00711e8e907324e8fe1c239595de0094e865f979a1f6a9f65b19975dfa813665da27ce1c457af6819f8a9f91268ebcd022
 EBUILD qt_gui_py_common-0.3.5.ebuild 495 BLAKE2B fd6ee071255e4d0140dff2f4fb76996173cec0166e37ba0c2491ed1b2713b34e1b59844c6b78ad1a103512a4c164acad81504484341a0a767eebd4dff47825a3 SHA512 37c8d203ca8f7752983531a72bc8ce00711e8e907324e8fe1c239595de0094e865f979a1f6a9f65b19975dfa813665da27ce1c457af6819f8a9f91268ebcd022
 EBUILD qt_gui_py_common-0.3.6.ebuild 495 BLAKE2B fd6ee071255e4d0140dff2f4fb76996173cec0166e37ba0c2491ed1b2713b34e1b59844c6b78ad1a103512a4c164acad81504484341a0a767eebd4dff47825a3 SHA512 37c8d203ca8f7752983531a72bc8ce00711e8e907324e8fe1c239595de0094e865f979a1f6a9f65b19975dfa813665da27ce1c457af6819f8a9f91268ebcd022
 EBUILD qt_gui_py_common-0.3.8.ebuild 495 BLAKE2B fd6ee071255e4d0140dff2f4fb76996173cec0166e37ba0c2491ed1b2713b34e1b59844c6b78ad1a103512a4c164acad81504484341a0a767eebd4dff47825a3 SHA512 37c8d203ca8f7752983531a72bc8ce00711e8e907324e8fe1c239595de0094e865f979a1f6a9f65b19975dfa813665da27ce1c457af6819f8a9f91268ebcd022
+EBUILD qt_gui_py_common-0.3.9.ebuild 495 BLAKE2B 6ff9af78697819a00ac135b63ce5659ae3c81d20ddc32e1e7de262c5e96502218c206549af5ac0d801f6438c16455a6bf831709ff3aa8e05a79e338175b38bfe SHA512 2a8c22e203afa1cdbfdfe587c089d52a32257d1ef2b8d2bc4dc90fa5f1d5222cb817cdaf573daa1afd3cc5ac81c46afa12ae50551cf4cbe74e87bbed6f0cd5eb
 EBUILD qt_gui_py_common-9999.ebuild 495 BLAKE2B 0cae86616656725aeb1e599966a939d49ce21104b7d74f982d9d76c9f2cc1a1e01b46d119bae419e09edc8c6611b26797630d628cab5b848c878cc6a66e47a70 SHA512 25d41945066aeb36416eca403a173ff9cbf551d971a6f73d1c2ff90f1083ed1a7eb760f8d753278b0a6f64b3c9243209fdfbc137d950272fce6432e69f5d438e
 MISC metadata.xml 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.10.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.10.ebuild
new file mode 100644
index 000000000000..249bfcd6004e
--- /dev/null
+++ b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.10.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.9.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.9.ebuild
new file mode 100644
index 000000000000..249bfcd6004e
--- /dev/null
+++ b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest
index eec1f9ecf9db..f3ee71254ffd 100644
--- a/dev-ros/rosbag/Manifest
+++ b/dev-ros/rosbag/Manifest
@@ -1,8 +1,10 @@
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD rosbag-1.13.5-r1.ebuild 788 BLAKE2B aaff3aaa1cd2185386f03d77b1077af54dfe8db1679a0e188c30cdca8c405c471c13fffda3cc33427b9bf1a05b1dbfa774b49adcb2a03bbdcdea9bdc8c5f2f61 SHA512 eb722337ca6e9626ea86a2f0de133b3d649d71f2331463a81357f4f0cb6eae4c6f7e75648bacfa6a3184b1d9deccc1083948426f06d51ccfb3565b9b4686b636
 EBUILD rosbag-1.13.6.ebuild 788 BLAKE2B e79eae884ca24580a8a18e819a55720c74e7d6f5239600336f1664bee61b77467cf86e905a7f65c254b156b6a6e6d9211461a32ca2ca215cec5aac4da43c7d44 SHA512 4378dc8403f94b286cb4ca54a53f8006ef317b1ca343e6fa5e424ee4da972a7cc862d0f19a397afff98c004c012246133d32b60b8ebc727713dda6603ebe9fbc
 EBUILD rosbag-1.14.2.ebuild 795 BLAKE2B 8e258013d59eb159cb7c7d0bf45d1ccfed61b6b825a6ed722e8cc9a12cd2a97f48b3a3c6f84bd70b6ec5855a11086296f856c8c50b10d467ee8098fd774ee693 SHA512 061b231d306705ee102ce7fb09311a5c3d06fe1ed9f9ae1d42e6441f8548dcba47ef726ea81c8609ca22d4b72ae0baf27acb21104e1a2780e022caf71b9fe855
+EBUILD rosbag-1.14.3.ebuild 795 BLAKE2B 8e258013d59eb159cb7c7d0bf45d1ccfed61b6b825a6ed722e8cc9a12cd2a97f48b3a3c6f84bd70b6ec5855a11086296f856c8c50b10d467ee8098fd774ee693 SHA512 061b231d306705ee102ce7fb09311a5c3d06fe1ed9f9ae1d42e6441f8548dcba47ef726ea81c8609ca22d4b72ae0baf27acb21104e1a2780e022caf71b9fe855
 EBUILD rosbag-9999.ebuild 795 BLAKE2B 8e258013d59eb159cb7c7d0bf45d1ccfed61b6b825a6ed722e8cc9a12cd2a97f48b3a3c6f84bd70b6ec5855a11086296f856c8c50b10d467ee8098fd774ee693 SHA512 061b231d306705ee102ce7fb09311a5c3d06fe1ed9f9ae1d42e6441f8548dcba47ef726ea81c8609ca22d4b72ae0baf27acb21104e1a2780e022caf71b9fe855
 MISC metadata.xml 418 BLAKE2B 2d84b96bfb428654a9b926100a8bd083afb2addc6db8b2e6fb003fab4bb8c1615df40ee13c863a3ddfe98a1a1f9b72af8310a80a9f610a01fe14366afde2e38d SHA512 d7579d9a25bf9f83513e3d8058ec845ee9b59e5d999128532b63d992cee8ef94922aee88140f044829442077c6f9ae80d6b0b0f554cf677690fdc88a17c9f260
diff --git a/dev-ros/rosbag/rosbag-1.14.3.ebuild b/dev-ros/rosbag/rosbag-1.14.3.ebuild
new file mode 100644
index 000000000000..20157ef43255
--- /dev/null
+++ b/dev-ros/rosbag/rosbag-1.14.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE="lz4"
+
+RDEPEND="
+	>=dev-ros/rosbag_storage-1.14
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/topic_tools
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	app-arch/bzip2
+	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/genpy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosbag_storage/Manifest b/dev-ros/rosbag_storage/Manifest
index ad8dd735e598..7ba5db751a7a 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD rosbag_storage-1.14.2-r1.ebuild 597 BLAKE2B 396fa1a667259dc91de933d9537bf54db019b2e06c64ab5f4dfe5cc550813ccf5a629dec9ff53d3f409ce602d4b6ce2c7201f505eddc74aa5b9b1d40561f70c1 SHA512 35b01188976c4273bcd62675d4d88cd27947e57e53e0de036084a577c564ffb477bbc46f5966b9abcf7464c8a36bb86c4a91cc89cdb334a1e6abb777caf314f4
+EBUILD rosbag_storage-1.14.3.ebuild 597 BLAKE2B 396fa1a667259dc91de933d9537bf54db019b2e06c64ab5f4dfe5cc550813ccf5a629dec9ff53d3f409ce602d4b6ce2c7201f505eddc74aa5b9b1d40561f70c1 SHA512 35b01188976c4273bcd62675d4d88cd27947e57e53e0de036084a577c564ffb477bbc46f5966b9abcf7464c8a36bb86c4a91cc89cdb334a1e6abb777caf314f4
 EBUILD rosbag_storage-9999.ebuild 597 BLAKE2B 396fa1a667259dc91de933d9537bf54db019b2e06c64ab5f4dfe5cc550813ccf5a629dec9ff53d3f409ce602d4b6ce2c7201f505eddc74aa5b9b1d40561f70c1 SHA512 35b01188976c4273bcd62675d4d88cd27947e57e53e0de036084a577c564ffb477bbc46f5966b9abcf7464c8a36bb86c4a91cc89cdb334a1e6abb777caf314f4
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.14.3.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.14.3.ebuild
new file mode 100644
index 000000000000..048f341e9d2d
--- /dev/null
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.14.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back ROS message"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/console_bridge
+	app-crypt/gpgme
+	dev-ros/pluginlib
+	dev-ros/cpp_common
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/roslz4
+	dev-libs/boost:=
+	app-arch/bzip2
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest
index 04ccc890079a..d5d01b6c643e 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD roscpp-1.13.0.ebuild 660 BLAKE2B c672c938a5a26749a183413dd65ede6fe5d5ad878e02ae36447679995969ce9d60cc925bb0d4f9d43f36828ff245d34f68aceeb01d8f0b6a7b88d4c89987cd35 SHA512 8bddfb5b394c902c228d70808ef468c747dafba23701b50bfe6513725e6df36b426a1cd5a94655abdcdf52a3dff7f2d58478e47202b19af26c6044e7d3c72f1a
 EBUILD roscpp-1.13.1.ebuild 660 BLAKE2B c672c938a5a26749a183413dd65ede6fe5d5ad878e02ae36447679995969ce9d60cc925bb0d4f9d43f36828ff245d34f68aceeb01d8f0b6a7b88d4c89987cd35 SHA512 8bddfb5b394c902c228d70808ef468c747dafba23701b50bfe6513725e6df36b426a1cd5a94655abdcdf52a3dff7f2d58478e47202b19af26c6044e7d3c72f1a
 EBUILD roscpp-1.13.2.ebuild 660 BLAKE2B c672c938a5a26749a183413dd65ede6fe5d5ad878e02ae36447679995969ce9d60cc925bb0d4f9d43f36828ff245d34f68aceeb01d8f0b6a7b88d4c89987cd35 SHA512 8bddfb5b394c902c228d70808ef468c747dafba23701b50bfe6513725e6df36b426a1cd5a94655abdcdf52a3dff7f2d58478e47202b19af26c6044e7d3c72f1a
@@ -12,5 +13,6 @@ EBUILD roscpp-1.13.4.ebuild 660 BLAKE2B c672c938a5a26749a183413dd65ede6fe5d5ad87
 EBUILD roscpp-1.13.5.ebuild 660 BLAKE2B c672c938a5a26749a183413dd65ede6fe5d5ad878e02ae36447679995969ce9d60cc925bb0d4f9d43f36828ff245d34f68aceeb01d8f0b6a7b88d4c89987cd35 SHA512 8bddfb5b394c902c228d70808ef468c747dafba23701b50bfe6513725e6df36b426a1cd5a94655abdcdf52a3dff7f2d58478e47202b19af26c6044e7d3c72f1a
 EBUILD roscpp-1.13.6.ebuild 660 BLAKE2B e690e4fed779ce1564559bad4e32a8703d7497eda3d057d92181a199b90910203689bdb6fbaa6e4e415b8c8f81ebe65ea2f75f2d946a58b5e481d2b8647d5d31 SHA512 06fd3999eabbaeffc1e6f5563e1b28ba2838eaa4993780ea8b172376dda882ed953a729a638bfc7e920566320a722d0e6ec4bebec76e6b7b870618e3902ce92a
 EBUILD roscpp-1.14.2.ebuild 660 BLAKE2B e690e4fed779ce1564559bad4e32a8703d7497eda3d057d92181a199b90910203689bdb6fbaa6e4e415b8c8f81ebe65ea2f75f2d946a58b5e481d2b8647d5d31 SHA512 06fd3999eabbaeffc1e6f5563e1b28ba2838eaa4993780ea8b172376dda882ed953a729a638bfc7e920566320a722d0e6ec4bebec76e6b7b870618e3902ce92a
+EBUILD roscpp-1.14.3.ebuild 660 BLAKE2B e690e4fed779ce1564559bad4e32a8703d7497eda3d057d92181a199b90910203689bdb6fbaa6e4e415b8c8f81ebe65ea2f75f2d946a58b5e481d2b8647d5d31 SHA512 06fd3999eabbaeffc1e6f5563e1b28ba2838eaa4993780ea8b172376dda882ed953a729a638bfc7e920566320a722d0e6ec4bebec76e6b7b870618e3902ce92a
 EBUILD roscpp-9999.ebuild 660 BLAKE2B c672c938a5a26749a183413dd65ede6fe5d5ad878e02ae36447679995969ce9d60cc925bb0d4f9d43f36828ff245d34f68aceeb01d8f0b6a7b88d4c89987cd35 SHA512 8bddfb5b394c902c228d70808ef468c747dafba23701b50bfe6513725e6df36b426a1cd5a94655abdcdf52a3dff7f2d58478e47202b19af26c6044e7d3c72f1a
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roscpp/roscpp-1.14.3.ebuild b/dev-ros/roscpp/roscpp-1.14.3.ebuild
new file mode 100644
index 000000000000..6be640b77dc2
--- /dev/null
+++ b/dev-ros/roscpp/roscpp-1.14.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
index 3ed85d9dd570..2f7c6bcc2dc0 100644
--- a/dev-ros/rosgraph/Manifest
+++ b/dev-ros/rosgraph/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD rosgraph-1.13.0.ebuild 565 BLAKE2B c369316a472a383f8253f1cf220c53b1945f60514f7b06ca382bd4a5629995142dcefb3b10bc8f3eac41d94f0dc3c7631064de4091cf79a9dba266fad22f811a SHA512 70a937f19ab51f2c106458bc93a5771f32bebdf5c5bc7a56f7bf9a59bb11cfd8056a882300860429f751d8e9b8fdc9f131cc9477c5c629b35819d9ba983ba81e
 EBUILD rosgraph-1.13.1.ebuild 565 BLAKE2B c369316a472a383f8253f1cf220c53b1945f60514f7b06ca382bd4a5629995142dcefb3b10bc8f3eac41d94f0dc3c7631064de4091cf79a9dba266fad22f811a SHA512 70a937f19ab51f2c106458bc93a5771f32bebdf5c5bc7a56f7bf9a59bb11cfd8056a882300860429f751d8e9b8fdc9f131cc9477c5c629b35819d9ba983ba81e
 EBUILD rosgraph-1.13.2.ebuild 565 BLAKE2B c369316a472a383f8253f1cf220c53b1945f60514f7b06ca382bd4a5629995142dcefb3b10bc8f3eac41d94f0dc3c7631064de4091cf79a9dba266fad22f811a SHA512 70a937f19ab51f2c106458bc93a5771f32bebdf5c5bc7a56f7bf9a59bb11cfd8056a882300860429f751d8e9b8fdc9f131cc9477c5c629b35819d9ba983ba81e
@@ -12,5 +13,6 @@ EBUILD rosgraph-1.13.4.ebuild 565 BLAKE2B c369316a472a383f8253f1cf220c53b1945f60
 EBUILD rosgraph-1.13.5.ebuild 565 BLAKE2B c369316a472a383f8253f1cf220c53b1945f60514f7b06ca382bd4a5629995142dcefb3b10bc8f3eac41d94f0dc3c7631064de4091cf79a9dba266fad22f811a SHA512 70a937f19ab51f2c106458bc93a5771f32bebdf5c5bc7a56f7bf9a59bb11cfd8056a882300860429f751d8e9b8fdc9f131cc9477c5c629b35819d9ba983ba81e
 EBUILD rosgraph-1.13.6.ebuild 565 BLAKE2B f114b400b404be9513274f72198db5c78d44db0a9b492ceeba750fbdb9508dfe875846c7589e0405760494a3d1bb7e1fd2f18edbec07bf6c9bd91f0999972575 SHA512 671d90a8cdda97907381e55e2403ea109758b49aba964b13de5e4f3b7ec0e512e2fb3c59987a236cb7709c0708ac07df99cd2090cfc9608dd91243cb5aa9a88f
 EBUILD rosgraph-1.14.2.ebuild 565 BLAKE2B f114b400b404be9513274f72198db5c78d44db0a9b492ceeba750fbdb9508dfe875846c7589e0405760494a3d1bb7e1fd2f18edbec07bf6c9bd91f0999972575 SHA512 671d90a8cdda97907381e55e2403ea109758b49aba964b13de5e4f3b7ec0e512e2fb3c59987a236cb7709c0708ac07df99cd2090cfc9608dd91243cb5aa9a88f
+EBUILD rosgraph-1.14.3.ebuild 565 BLAKE2B f114b400b404be9513274f72198db5c78d44db0a9b492ceeba750fbdb9508dfe875846c7589e0405760494a3d1bb7e1fd2f18edbec07bf6c9bd91f0999972575 SHA512 671d90a8cdda97907381e55e2403ea109758b49aba964b13de5e4f3b7ec0e512e2fb3c59987a236cb7709c0708ac07df99cd2090cfc9608dd91243cb5aa9a88f
 EBUILD rosgraph-9999.ebuild 565 BLAKE2B c369316a472a383f8253f1cf220c53b1945f60514f7b06ca382bd4a5629995142dcefb3b10bc8f3eac41d94f0dc3c7631064de4091cf79a9dba266fad22f811a SHA512 70a937f19ab51f2c106458bc93a5771f32bebdf5c5bc7a56f7bf9a59bb11cfd8056a882300860429f751d8e9b8fdc9f131cc9477c5c629b35819d9ba983ba81e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosgraph/rosgraph-1.14.3.ebuild b/dev-ros/rosgraph/rosgraph-1.14.3.ebuild
new file mode 100644
index 000000000000..85373fac5957
--- /dev/null
+++ b/dev-ros/rosgraph/rosgraph-1.14.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Prints information about the ROS Computation Graph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index a38e8f8b305e..c0a4ac29c691 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -12,6 +12,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD roslaunch-1.13.0.ebuild 1439 BLAKE2B f6f002d1e89e4d476de600a9e1977c057715a6a26c79a37cf9d40d2b6b0ace1dce72e2a5977f4e690219ceca3f965100f0a1b57abaa02dceff6f3c6b565ee2ef SHA512 4e41004097cae99b8b2876daf760eb4a4238ad5558203e623c45cdc91f966597a0ad3599e52cd8c715bd02c9f17b7b347e7bc85f7de6ecf92697ea56508446fa
 EBUILD roslaunch-1.13.1.ebuild 1439 BLAKE2B f6f002d1e89e4d476de600a9e1977c057715a6a26c79a37cf9d40d2b6b0ace1dce72e2a5977f4e690219ceca3f965100f0a1b57abaa02dceff6f3c6b565ee2ef SHA512 4e41004097cae99b8b2876daf760eb4a4238ad5558203e623c45cdc91f966597a0ad3599e52cd8c715bd02c9f17b7b347e7bc85f7de6ecf92697ea56508446fa
 EBUILD roslaunch-1.13.2.ebuild 1439 BLAKE2B f6f002d1e89e4d476de600a9e1977c057715a6a26c79a37cf9d40d2b6b0ace1dce72e2a5977f4e690219ceca3f965100f0a1b57abaa02dceff6f3c6b565ee2ef SHA512 4e41004097cae99b8b2876daf760eb4a4238ad5558203e623c45cdc91f966597a0ad3599e52cd8c715bd02c9f17b7b347e7bc85f7de6ecf92697ea56508446fa
@@ -19,5 +20,6 @@ EBUILD roslaunch-1.13.4.ebuild 1439 BLAKE2B f6f002d1e89e4d476de600a9e1977c057715
 EBUILD roslaunch-1.13.5.ebuild 1439 BLAKE2B f6f002d1e89e4d476de600a9e1977c057715a6a26c79a37cf9d40d2b6b0ace1dce72e2a5977f4e690219ceca3f965100f0a1b57abaa02dceff6f3c6b565ee2ef SHA512 4e41004097cae99b8b2876daf760eb4a4238ad5558203e623c45cdc91f966597a0ad3599e52cd8c715bd02c9f17b7b347e7bc85f7de6ecf92697ea56508446fa
 EBUILD roslaunch-1.13.6.ebuild 1439 BLAKE2B b51daa806a06a27e7bd964664fcd5f645ea363c0d30c722646d3be4fc8e5d2714235f9aef77520b16a59fc7728bad21d09530d7bcd5de853fdd84e7a9548574a SHA512 9d1d5cb89bbf3a74f06da46bbcd37da29f16b9ec1d591d0f5a9a1abedb2b15438ed323ef3ca2176ea97a0b611fcaf8da9b99a06738f0d362d4225e74c0aff962
 EBUILD roslaunch-1.14.2.ebuild 1439 BLAKE2B b51daa806a06a27e7bd964664fcd5f645ea363c0d30c722646d3be4fc8e5d2714235f9aef77520b16a59fc7728bad21d09530d7bcd5de853fdd84e7a9548574a SHA512 9d1d5cb89bbf3a74f06da46bbcd37da29f16b9ec1d591d0f5a9a1abedb2b15438ed323ef3ca2176ea97a0b611fcaf8da9b99a06738f0d362d4225e74c0aff962
+EBUILD roslaunch-1.14.3.ebuild 1439 BLAKE2B b51daa806a06a27e7bd964664fcd5f645ea363c0d30c722646d3be4fc8e5d2714235f9aef77520b16a59fc7728bad21d09530d7bcd5de853fdd84e7a9548574a SHA512 9d1d5cb89bbf3a74f06da46bbcd37da29f16b9ec1d591d0f5a9a1abedb2b15438ed323ef3ca2176ea97a0b611fcaf8da9b99a06738f0d362d4225e74c0aff962
 EBUILD roslaunch-9999.ebuild 1439 BLAKE2B f6f002d1e89e4d476de600a9e1977c057715a6a26c79a37cf9d40d2b6b0ace1dce72e2a5977f4e690219ceca3f965100f0a1b57abaa02dceff6f3c6b565ee2ef SHA512 4e41004097cae99b8b2876daf760eb4a4238ad5558203e623c45cdc91f966597a0ad3599e52cd8c715bd02c9f17b7b347e7bc85f7de6ecf92697ea56508446fa
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslaunch/roslaunch-1.14.3.ebuild b/dev-ros/roslaunch/roslaunch-1.14.3.ebuild
new file mode 100644
index 000000000000..4a273f61dd48
--- /dev/null
+++ b/dev-ros/roslaunch/roslaunch-1.14.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin user
+
+DESCRIPTION="Tool for easily launching multiple ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/rosclean[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosparam[${PYTHON_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_USEDEP}]
+	dev-ros/rosout
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-util/rosdep[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/test_rosmaster
+	)"
+PATCHES=( "${FILESDIR}/timeout.patch" )
+
+src_test() {
+	rosdep update
+	ros-catkin_src_test
+}
+
+src_install() {
+	ros-catkin_src_install
+
+	dodir /etc/ros
+	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
+
+	newinitd "${FILESDIR}/roscore.initd" roscore
+	newconfd "${FILESDIR}/roscore.confd" roscore
+
+	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
+	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
+
+	doenvd "${FILESDIR}/40roslaunch"
+
+	# Needed by test_roslaunch
+	insinto /usr/share/${PN}
+	doins test/xml/noop.launch
+}
+
+pkg_preinst() {
+	enewgroup ros
+	enewuser ros -1 -1 /home/ros ros
+}
diff --git a/dev-ros/roslz4/Manifest b/dev-ros/roslz4/Manifest
index 47d870d438de..5235133cf715 100644
--- a/dev-ros/roslz4/Manifest
+++ b/dev-ros/roslz4/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD roslz4-1.13.0.ebuild 444 BLAKE2B ade6f8178790b8df54671967173694695b26d14071d816d556e496c444e1a9a1736bf7dc938a07ae9116e7038efdfbed29f6f615e85958e0d9ac49b0ae708286 SHA512 f14d7826160e308fcbc2e166888958a5c718e09993978f991ce8e804cf819506e1ddfa845ca8452f758d412e8854d8f74b98326f91dd6bf530d1caaff62d6ab2
 EBUILD roslz4-1.13.1.ebuild 444 BLAKE2B ade6f8178790b8df54671967173694695b26d14071d816d556e496c444e1a9a1736bf7dc938a07ae9116e7038efdfbed29f6f615e85958e0d9ac49b0ae708286 SHA512 f14d7826160e308fcbc2e166888958a5c718e09993978f991ce8e804cf819506e1ddfa845ca8452f758d412e8854d8f74b98326f91dd6bf530d1caaff62d6ab2
 EBUILD roslz4-1.13.2.ebuild 444 BLAKE2B ade6f8178790b8df54671967173694695b26d14071d816d556e496c444e1a9a1736bf7dc938a07ae9116e7038efdfbed29f6f615e85958e0d9ac49b0ae708286 SHA512 f14d7826160e308fcbc2e166888958a5c718e09993978f991ce8e804cf819506e1ddfa845ca8452f758d412e8854d8f74b98326f91dd6bf530d1caaff62d6ab2
@@ -12,5 +13,6 @@ EBUILD roslz4-1.13.4.ebuild 444 BLAKE2B ade6f8178790b8df54671967173694695b26d140
 EBUILD roslz4-1.13.5.ebuild 444 BLAKE2B ade6f8178790b8df54671967173694695b26d14071d816d556e496c444e1a9a1736bf7dc938a07ae9116e7038efdfbed29f6f615e85958e0d9ac49b0ae708286 SHA512 f14d7826160e308fcbc2e166888958a5c718e09993978f991ce8e804cf819506e1ddfa845ca8452f758d412e8854d8f74b98326f91dd6bf530d1caaff62d6ab2
 EBUILD roslz4-1.13.6.ebuild 444 BLAKE2B c3dc40fa9a3a839d22b0d8ce5be0db59540cda25f894ad3b76ad3e0ed17f3def497493371580ffcd12f567176e6983a980fe84a94ee365f40d5147e8c74bb1e7 SHA512 3905600fe691ee7132021d3e5797ba69458accb841cd4b6d2596bac85216c01db57cf1330ab9ba8dc2241366ea7915c5f4d745c56b120c6b1f1c5ee7f4f5d099
 EBUILD roslz4-1.14.2.ebuild 444 BLAKE2B c3dc40fa9a3a839d22b0d8ce5be0db59540cda25f894ad3b76ad3e0ed17f3def497493371580ffcd12f567176e6983a980fe84a94ee365f40d5147e8c74bb1e7 SHA512 3905600fe691ee7132021d3e5797ba69458accb841cd4b6d2596bac85216c01db57cf1330ab9ba8dc2241366ea7915c5f4d745c56b120c6b1f1c5ee7f4f5d099
+EBUILD roslz4-1.14.3.ebuild 444 BLAKE2B c3dc40fa9a3a839d22b0d8ce5be0db59540cda25f894ad3b76ad3e0ed17f3def497493371580ffcd12f567176e6983a980fe84a94ee365f40d5147e8c74bb1e7 SHA512 3905600fe691ee7132021d3e5797ba69458accb841cd4b6d2596bac85216c01db57cf1330ab9ba8dc2241366ea7915c5f4d745c56b120c6b1f1c5ee7f4f5d099
 EBUILD roslz4-9999.ebuild 444 BLAKE2B ade6f8178790b8df54671967173694695b26d14071d816d556e496c444e1a9a1736bf7dc938a07ae9116e7038efdfbed29f6f615e85958e0d9ac49b0ae708286 SHA512 f14d7826160e308fcbc2e166888958a5c718e09993978f991ce8e804cf819506e1ddfa845ca8452f758d412e8854d8f74b98326f91dd6bf530d1caaff62d6ab2
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslz4/roslz4-1.14.3.ebuild b/dev-ros/roslz4/roslz4-1.14.3.ebuild
new file mode 100644
index 000000000000..0e76c772bc3a
--- /dev/null
+++ b/dev-ros/roslz4/roslz4-1.14.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-arch/lz4"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/rosmaster/Manifest b/dev-ros/rosmaster/Manifest
index 2393ed1e6e08..d4e627d835a9 100644
--- a/dev-ros/rosmaster/Manifest
+++ b/dev-ros/rosmaster/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD rosmaster-1.13.0.ebuild 507 BLAKE2B d677748e4a749632124488bcb406472485451aec9069f8552b156fef595871a646de61f4caad5f5329843241d7dc5dadf725278835daeeea588a63c04db60f51 SHA512 8ce63e763e343457d51155784a816468172b969fb2ddb0d7547c37a5605ae4b555cbb5d17f75e435d390e4828e612cd30d7480ce70268bf3cfbfbea535fa9987
 EBUILD rosmaster-1.13.1.ebuild 507 BLAKE2B d677748e4a749632124488bcb406472485451aec9069f8552b156fef595871a646de61f4caad5f5329843241d7dc5dadf725278835daeeea588a63c04db60f51 SHA512 8ce63e763e343457d51155784a816468172b969fb2ddb0d7547c37a5605ae4b555cbb5d17f75e435d390e4828e612cd30d7480ce70268bf3cfbfbea535fa9987
 EBUILD rosmaster-1.13.2.ebuild 507 BLAKE2B d677748e4a749632124488bcb406472485451aec9069f8552b156fef595871a646de61f4caad5f5329843241d7dc5dadf725278835daeeea588a63c04db60f51 SHA512 8ce63e763e343457d51155784a816468172b969fb2ddb0d7547c37a5605ae4b555cbb5d17f75e435d390e4828e612cd30d7480ce70268bf3cfbfbea535fa9987
@@ -12,5 +13,6 @@ EBUILD rosmaster-1.13.4.ebuild 507 BLAKE2B d677748e4a749632124488bcb406472485451
 EBUILD rosmaster-1.13.5.ebuild 507 BLAKE2B d677748e4a749632124488bcb406472485451aec9069f8552b156fef595871a646de61f4caad5f5329843241d7dc5dadf725278835daeeea588a63c04db60f51 SHA512 8ce63e763e343457d51155784a816468172b969fb2ddb0d7547c37a5605ae4b555cbb5d17f75e435d390e4828e612cd30d7480ce70268bf3cfbfbea535fa9987
 EBUILD rosmaster-1.13.6.ebuild 507 BLAKE2B de748e4826e73ed170a738b4f8f0111c73c50425f71a446f9985f37ebe664487680db0700ad669f87e749495ad85119c7caa63622fd586af1e42eab319a59b98 SHA512 34977957fd2c2ae15eb7527899ea0eeab7421ee8ff58666ca2ea8aa16bcebf6027f827f71158acadf79b56bfbe5e312488de21bdbe115a163afb837fc3e2c23c
 EBUILD rosmaster-1.14.2.ebuild 507 BLAKE2B de748e4826e73ed170a738b4f8f0111c73c50425f71a446f9985f37ebe664487680db0700ad669f87e749495ad85119c7caa63622fd586af1e42eab319a59b98 SHA512 34977957fd2c2ae15eb7527899ea0eeab7421ee8ff58666ca2ea8aa16bcebf6027f827f71158acadf79b56bfbe5e312488de21bdbe115a163afb837fc3e2c23c
+EBUILD rosmaster-1.14.3.ebuild 507 BLAKE2B de748e4826e73ed170a738b4f8f0111c73c50425f71a446f9985f37ebe664487680db0700ad669f87e749495ad85119c7caa63622fd586af1e42eab319a59b98 SHA512 34977957fd2c2ae15eb7527899ea0eeab7421ee8ff58666ca2ea8aa16bcebf6027f827f71158acadf79b56bfbe5e312488de21bdbe115a163afb837fc3e2c23c
 EBUILD rosmaster-9999.ebuild 507 BLAKE2B d677748e4a749632124488bcb406472485451aec9069f8552b156fef595871a646de61f4caad5f5329843241d7dc5dadf725278835daeeea588a63c04db60f51 SHA512 8ce63e763e343457d51155784a816468172b969fb2ddb0d7547c37a5605ae4b555cbb5d17f75e435d390e4828e612cd30d7480ce70268bf3cfbfbea535fa9987
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmaster/rosmaster-1.14.3.ebuild b/dev-ros/rosmaster/rosmaster-1.14.3.ebuild
new file mode 100644
index 000000000000..fed9f60badee
--- /dev/null
+++ b/dev-ros/rosmaster/rosmaster-1.14.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS Master implementation"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest
index 37204bee1e45..bad0ab01ecc7 100644
--- a/dev-ros/rosmsg/Manifest
+++ b/dev-ros/rosmsg/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD rosmsg-1.13.0.ebuild 558 BLAKE2B 96a695d6c98833129338733b929369b52201115adf653e7e9a71685dd53c19c6f67b3fb73f255b9c156edf21bb5e523f53667a71c98b42710f9cad9a64b69ac8 SHA512 7a0f064fcbb1c218455bc573bd58e3b0f37f902047fbdb6023aa3bc49cc725fae1888d869945c450e203c634c47fc7c897d6759d25044ad43080ddd3cf865838
 EBUILD rosmsg-1.13.1.ebuild 558 BLAKE2B 96a695d6c98833129338733b929369b52201115adf653e7e9a71685dd53c19c6f67b3fb73f255b9c156edf21bb5e523f53667a71c98b42710f9cad9a64b69ac8 SHA512 7a0f064fcbb1c218455bc573bd58e3b0f37f902047fbdb6023aa3bc49cc725fae1888d869945c450e203c634c47fc7c897d6759d25044ad43080ddd3cf865838
 EBUILD rosmsg-1.13.2.ebuild 558 BLAKE2B 96a695d6c98833129338733b929369b52201115adf653e7e9a71685dd53c19c6f67b3fb73f255b9c156edf21bb5e523f53667a71c98b42710f9cad9a64b69ac8 SHA512 7a0f064fcbb1c218455bc573bd58e3b0f37f902047fbdb6023aa3bc49cc725fae1888d869945c450e203c634c47fc7c897d6759d25044ad43080ddd3cf865838
@@ -12,5 +13,6 @@ EBUILD rosmsg-1.13.4.ebuild 558 BLAKE2B 96a695d6c98833129338733b929369b52201115a
 EBUILD rosmsg-1.13.5.ebuild 558 BLAKE2B 96a695d6c98833129338733b929369b52201115adf653e7e9a71685dd53c19c6f67b3fb73f255b9c156edf21bb5e523f53667a71c98b42710f9cad9a64b69ac8 SHA512 7a0f064fcbb1c218455bc573bd58e3b0f37f902047fbdb6023aa3bc49cc725fae1888d869945c450e203c634c47fc7c897d6759d25044ad43080ddd3cf865838
 EBUILD rosmsg-1.13.6.ebuild 558 BLAKE2B 524d21bea49f0d39c3fc1048cecbcb41ac26fd95707477a95a935b9953bd22eed2374a572cf5383e2875cb9239d3d9dcab3bf893b90725516b7db1a20b54356d SHA512 4f0520cd384af41918728fb15a5c1e707a5cafa5ea43f420bc3daae8640ff42b1745def598cfd8615f5423f23898f08cd333bc27ecdd63a7a17cb2b5373a48ce
 EBUILD rosmsg-1.14.2.ebuild 558 BLAKE2B 524d21bea49f0d39c3fc1048cecbcb41ac26fd95707477a95a935b9953bd22eed2374a572cf5383e2875cb9239d3d9dcab3bf893b90725516b7db1a20b54356d SHA512 4f0520cd384af41918728fb15a5c1e707a5cafa5ea43f420bc3daae8640ff42b1745def598cfd8615f5423f23898f08cd333bc27ecdd63a7a17cb2b5373a48ce
+EBUILD rosmsg-1.14.3.ebuild 558 BLAKE2B 524d21bea49f0d39c3fc1048cecbcb41ac26fd95707477a95a935b9953bd22eed2374a572cf5383e2875cb9239d3d9dcab3bf893b90725516b7db1a20b54356d SHA512 4f0520cd384af41918728fb15a5c1e707a5cafa5ea43f420bc3daae8640ff42b1745def598cfd8615f5423f23898f08cd333bc27ecdd63a7a17cb2b5373a48ce
 EBUILD rosmsg-9999.ebuild 558 BLAKE2B 96a695d6c98833129338733b929369b52201115adf653e7e9a71685dd53c19c6f67b3fb73f255b9c156edf21bb5e523f53667a71c98b42710f9cad9a64b69ac8 SHA512 7a0f064fcbb1c218455bc573bd58e3b0f37f902047fbdb6023aa3bc49cc725fae1888d869945c450e203c634c47fc7c897d6759d25044ad43080ddd3cf865838
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmsg/rosmsg-1.14.3.ebuild b/dev-ros/rosmsg/rosmsg-1.14.3.ebuild
new file mode 100644
index 000000000000..7189f2bbf44a
--- /dev/null
+++ b/dev-ros/rosmsg/rosmsg-1.14.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tools for displaying information about message and services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosnode/Manifest b/dev-ros/rosnode/Manifest
index 67d1f9e05c8c..592ac214a73e 100644
--- a/dev-ros/rosnode/Manifest
+++ b/dev-ros/rosnode/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD rosnode-1.13.0.ebuild 563 BLAKE2B 366ea6732404b9746d50ac5a07976d563dfcd0385534c7f75bf1a427f262113b8188a0310ed0f6a0562d809574362319d6d611d6286736c3612a27626664a22b SHA512 b464b60f4f1bd7de42b78b37aafc9dd1f9853512400343adb842facef7e01d0274e2c3916d93ddc8e8e96a370f745762722aafc876191ed2e1078f94216cb5e3
 EBUILD rosnode-1.13.1.ebuild 563 BLAKE2B 366ea6732404b9746d50ac5a07976d563dfcd0385534c7f75bf1a427f262113b8188a0310ed0f6a0562d809574362319d6d611d6286736c3612a27626664a22b SHA512 b464b60f4f1bd7de42b78b37aafc9dd1f9853512400343adb842facef7e01d0274e2c3916d93ddc8e8e96a370f745762722aafc876191ed2e1078f94216cb5e3
 EBUILD rosnode-1.13.2.ebuild 563 BLAKE2B 366ea6732404b9746d50ac5a07976d563dfcd0385534c7f75bf1a427f262113b8188a0310ed0f6a0562d809574362319d6d611d6286736c3612a27626664a22b SHA512 b464b60f4f1bd7de42b78b37aafc9dd1f9853512400343adb842facef7e01d0274e2c3916d93ddc8e8e96a370f745762722aafc876191ed2e1078f94216cb5e3
@@ -12,5 +13,6 @@ EBUILD rosnode-1.13.4.ebuild 563 BLAKE2B 366ea6732404b9746d50ac5a07976d563dfcd03
 EBUILD rosnode-1.13.5.ebuild 563 BLAKE2B 366ea6732404b9746d50ac5a07976d563dfcd0385534c7f75bf1a427f262113b8188a0310ed0f6a0562d809574362319d6d611d6286736c3612a27626664a22b SHA512 b464b60f4f1bd7de42b78b37aafc9dd1f9853512400343adb842facef7e01d0274e2c3916d93ddc8e8e96a370f745762722aafc876191ed2e1078f94216cb5e3
 EBUILD rosnode-1.13.6.ebuild 563 BLAKE2B 522df7bcc03e916bf5cbb27ac830d9ad17ec2d3c56a73280c001521184921d8c9773c38eb013c198ff13532ff6617845e00df952544f1dd0d4c18dd5ac5b5a33 SHA512 523644d5838b3db6f1bb5a909248bc70ef7e8fd12ea165d758cc142935b0b60c37c003b70cd20ee325b2ed9d644248439d4866c4aee1b4604109e69ac560f90a
 EBUILD rosnode-1.14.2.ebuild 563 BLAKE2B 522df7bcc03e916bf5cbb27ac830d9ad17ec2d3c56a73280c001521184921d8c9773c38eb013c198ff13532ff6617845e00df952544f1dd0d4c18dd5ac5b5a33 SHA512 523644d5838b3db6f1bb5a909248bc70ef7e8fd12ea165d758cc142935b0b60c37c003b70cd20ee325b2ed9d644248439d4866c4aee1b4604109e69ac560f90a
+EBUILD rosnode-1.14.3.ebuild 563 BLAKE2B 522df7bcc03e916bf5cbb27ac830d9ad17ec2d3c56a73280c001521184921d8c9773c38eb013c198ff13532ff6617845e00df952544f1dd0d4c18dd5ac5b5a33 SHA512 523644d5838b3db6f1bb5a909248bc70ef7e8fd12ea165d758cc142935b0b60c37c003b70cd20ee325b2ed9d644248439d4866c4aee1b4604109e69ac560f90a
 EBUILD rosnode-9999.ebuild 563 BLAKE2B 366ea6732404b9746d50ac5a07976d563dfcd0385534c7f75bf1a427f262113b8188a0310ed0f6a0562d809574362319d6d611d6286736c3612a27626664a22b SHA512 b464b60f4f1bd7de42b78b37aafc9dd1f9853512400343adb842facef7e01d0274e2c3916d93ddc8e8e96a370f745762722aafc876191ed2e1078f94216cb5e3
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosnode/rosnode-1.14.3.ebuild b/dev-ros/rosnode/rosnode-1.14.3.ebuild
new file mode 100644
index 000000000000..e55999df9cae
--- /dev/null
+++ b/dev-ros/rosnode/rosnode-1.14.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosout/Manifest b/dev-ros/rosout/Manifest
index d2c3d8f0f4a4..de1359dbbf81 100644
--- a/dev-ros/rosout/Manifest
+++ b/dev-ros/rosout/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD rosout-1.13.0.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
 EBUILD rosout-1.13.1.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
 EBUILD rosout-1.13.2.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
@@ -12,5 +13,6 @@ EBUILD rosout-1.13.4.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04a
 EBUILD rosout-1.13.5.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
 EBUILD rosout-1.13.6.ebuild 447 BLAKE2B 81c9dd524245527cee90454c213d934a2a45b9da4ad4f99951b2ffa1e378ba29c1fd95cabb9e1b6ee06fe40bc92cc6a9b80b29a657364c6ad46ceb00d69b8117 SHA512 93c1d6a9774efc847bd8263218db6e932b9afcfb0f34f5836cb54fb0374777606917462fa198ba025a47268238ed95408a4e08233b602d3f21d4169b7a7cd56f
 EBUILD rosout-1.14.2.ebuild 447 BLAKE2B 81c9dd524245527cee90454c213d934a2a45b9da4ad4f99951b2ffa1e378ba29c1fd95cabb9e1b6ee06fe40bc92cc6a9b80b29a657364c6ad46ceb00d69b8117 SHA512 93c1d6a9774efc847bd8263218db6e932b9afcfb0f34f5836cb54fb0374777606917462fa198ba025a47268238ed95408a4e08233b602d3f21d4169b7a7cd56f
+EBUILD rosout-1.14.3.ebuild 447 BLAKE2B 81c9dd524245527cee90454c213d934a2a45b9da4ad4f99951b2ffa1e378ba29c1fd95cabb9e1b6ee06fe40bc92cc6a9b80b29a657364c6ad46ceb00d69b8117 SHA512 93c1d6a9774efc847bd8263218db6e932b9afcfb0f34f5836cb54fb0374777606917462fa198ba025a47268238ed95408a4e08233b602d3f21d4169b7a7cd56f
 EBUILD rosout-9999.ebuild 447 BLAKE2B adabe1d2c1ee22ac5c5a0a779b6aaf8727ef695af867b2c8b0c91d9d68f4fcefe12641d6952981925090335b78df5c35fc8f91d022e6e6abaaacea5539a59f6a SHA512 803a69ff8f9f0ee9dfd2c1d071307f185fead002952113c31c216583f3d77688bf86205e76d79326c72d2472e533d685304247178debda9607fa2d3547433a6b
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosout/rosout-1.14.3.ebuild b/dev-ros/rosout/rosout-1.14.3.ebuild
new file mode 100644
index 000000000000..73aa43ce3f38
--- /dev/null
+++ b/dev-ros/rosout/rosout-1.14.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/Manifest b/dev-ros/rosparam/Manifest
index 3564e881ed68..b3139144abd2 100644
--- a/dev-ros/rosparam/Manifest
+++ b/dev-ros/rosparam/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD rosparam-1.13.0.ebuild 513 BLAKE2B cb78bd19efd8a4ca007cc6cbf10d8d4b3669240d794a4ddf9ea6c93bf8fd820eb34cae3ce548ccdc05aa9142af2d1b0329b1cfc58a360a32e35f4f1ad4d10d9d SHA512 4aad95d1cf8eebdd10fc942b2df5b177e67c7e77bb9b18b9c38e5c14d8eee956c0bec18d1275169603bd6f5fe67b17277e5ba24f2280fa92c0c8126144060c81
 EBUILD rosparam-1.13.1.ebuild 513 BLAKE2B cb78bd19efd8a4ca007cc6cbf10d8d4b3669240d794a4ddf9ea6c93bf8fd820eb34cae3ce548ccdc05aa9142af2d1b0329b1cfc58a360a32e35f4f1ad4d10d9d SHA512 4aad95d1cf8eebdd10fc942b2df5b177e67c7e77bb9b18b9c38e5c14d8eee956c0bec18d1275169603bd6f5fe67b17277e5ba24f2280fa92c0c8126144060c81
 EBUILD rosparam-1.13.2.ebuild 513 BLAKE2B cb78bd19efd8a4ca007cc6cbf10d8d4b3669240d794a4ddf9ea6c93bf8fd820eb34cae3ce548ccdc05aa9142af2d1b0329b1cfc58a360a32e35f4f1ad4d10d9d SHA512 4aad95d1cf8eebdd10fc942b2df5b177e67c7e77bb9b18b9c38e5c14d8eee956c0bec18d1275169603bd6f5fe67b17277e5ba24f2280fa92c0c8126144060c81
@@ -12,5 +13,6 @@ EBUILD rosparam-1.13.4.ebuild 513 BLAKE2B cb78bd19efd8a4ca007cc6cbf10d8d4b366924
 EBUILD rosparam-1.13.5.ebuild 513 BLAKE2B cb78bd19efd8a4ca007cc6cbf10d8d4b3669240d794a4ddf9ea6c93bf8fd820eb34cae3ce548ccdc05aa9142af2d1b0329b1cfc58a360a32e35f4f1ad4d10d9d SHA512 4aad95d1cf8eebdd10fc942b2df5b177e67c7e77bb9b18b9c38e5c14d8eee956c0bec18d1275169603bd6f5fe67b17277e5ba24f2280fa92c0c8126144060c81
 EBUILD rosparam-1.13.6.ebuild 513 BLAKE2B 12c41654b69e870df6ad95d453463f68e6c809a0ee99f2428285bea055a30f8bbc1d5116966ffc06360f7fb52bc8154cb97279b14c82681dff84325a1a766436 SHA512 7fa0a85a0acb91465850dea55c864b9e7f61a7db0af2a510ce3e881f0ddf4deee162d5e9cf1ecfae4eae93b57b96d7e9e30341aa6d7c6e759a82d62bf94e01ce
 EBUILD rosparam-1.14.2.ebuild 513 BLAKE2B 12c41654b69e870df6ad95d453463f68e6c809a0ee99f2428285bea055a30f8bbc1d5116966ffc06360f7fb52bc8154cb97279b14c82681dff84325a1a766436 SHA512 7fa0a85a0acb91465850dea55c864b9e7f61a7db0af2a510ce3e881f0ddf4deee162d5e9cf1ecfae4eae93b57b96d7e9e30341aa6d7c6e759a82d62bf94e01ce
+EBUILD rosparam-1.14.3.ebuild 513 BLAKE2B 12c41654b69e870df6ad95d453463f68e6c809a0ee99f2428285bea055a30f8bbc1d5116966ffc06360f7fb52bc8154cb97279b14c82681dff84325a1a766436 SHA512 7fa0a85a0acb91465850dea55c864b9e7f61a7db0af2a510ce3e881f0ddf4deee162d5e9cf1ecfae4eae93b57b96d7e9e30341aa6d7c6e759a82d62bf94e01ce
 EBUILD rosparam-9999.ebuild 513 BLAKE2B cb78bd19efd8a4ca007cc6cbf10d8d4b3669240d794a4ddf9ea6c93bf8fd820eb34cae3ce548ccdc05aa9142af2d1b0329b1cfc58a360a32e35f4f1ad4d10d9d SHA512 4aad95d1cf8eebdd10fc942b2df5b177e67c7e77bb9b18b9c38e5c14d8eee956c0bec18d1275169603bd6f5fe67b17277e5ba24f2280fa92c0c8126144060c81
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosparam/rosparam-1.14.3.ebuild b/dev-ros/rosparam/rosparam-1.14.3.ebuild
new file mode 100644
index 000000000000..8f4a32442ac6
--- /dev/null
+++ b/dev-ros/rosparam/rosparam-1.14.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rospy/Manifest b/dev-ros/rospy/Manifest
index d8ada11f2828..861229ad34fd 100644
--- a/dev-ros/rospy/Manifest
+++ b/dev-ros/rospy/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD rospy-1.13.0.ebuild 734 BLAKE2B 96c03724a98663e3e06a90eb455899ca3f5061d8a006cd473ecce61e75404a0d09141065b14e1499de90fcc43a6681bed256a5dfccd200400dfad93cb0eb7810 SHA512 0daec5b0544638b2cf7437e18d719ddacf03e08c52e53fb70ac0384f389b5b2a4060209ff6d317c56d86c693bfa770cb6ddcf9c9881d1e43f9f9680df4ea106f
 EBUILD rospy-1.13.1.ebuild 734 BLAKE2B 96c03724a98663e3e06a90eb455899ca3f5061d8a006cd473ecce61e75404a0d09141065b14e1499de90fcc43a6681bed256a5dfccd200400dfad93cb0eb7810 SHA512 0daec5b0544638b2cf7437e18d719ddacf03e08c52e53fb70ac0384f389b5b2a4060209ff6d317c56d86c693bfa770cb6ddcf9c9881d1e43f9f9680df4ea106f
 EBUILD rospy-1.13.2.ebuild 734 BLAKE2B 96c03724a98663e3e06a90eb455899ca3f5061d8a006cd473ecce61e75404a0d09141065b14e1499de90fcc43a6681bed256a5dfccd200400dfad93cb0eb7810 SHA512 0daec5b0544638b2cf7437e18d719ddacf03e08c52e53fb70ac0384f389b5b2a4060209ff6d317c56d86c693bfa770cb6ddcf9c9881d1e43f9f9680df4ea106f
@@ -12,5 +13,6 @@ EBUILD rospy-1.13.4.ebuild 734 BLAKE2B 96c03724a98663e3e06a90eb455899ca3f5061d8a
 EBUILD rospy-1.13.5.ebuild 734 BLAKE2B 96c03724a98663e3e06a90eb455899ca3f5061d8a006cd473ecce61e75404a0d09141065b14e1499de90fcc43a6681bed256a5dfccd200400dfad93cb0eb7810 SHA512 0daec5b0544638b2cf7437e18d719ddacf03e08c52e53fb70ac0384f389b5b2a4060209ff6d317c56d86c693bfa770cb6ddcf9c9881d1e43f9f9680df4ea106f
 EBUILD rospy-1.13.6.ebuild 734 BLAKE2B 5d9b2c75d339a5d6d4b087039e8eee6fee7379106551fbb3bef655c014ecae22daab67cbf907468fd6942b32827f0ee7150603c2b8cfcc9795a22ac638e7eb3c SHA512 0e9f566e30c8401d751d94150f5830461ff46156a853b2c30cc9a7c5bdd7d7f67fae2c6a34480a5bc3711d48aee3093984b898520b3b4fc06316b455eae3e826
 EBUILD rospy-1.14.2.ebuild 734 BLAKE2B 5d9b2c75d339a5d6d4b087039e8eee6fee7379106551fbb3bef655c014ecae22daab67cbf907468fd6942b32827f0ee7150603c2b8cfcc9795a22ac638e7eb3c SHA512 0e9f566e30c8401d751d94150f5830461ff46156a853b2c30cc9a7c5bdd7d7f67fae2c6a34480a5bc3711d48aee3093984b898520b3b4fc06316b455eae3e826
+EBUILD rospy-1.14.3.ebuild 734 BLAKE2B 5d9b2c75d339a5d6d4b087039e8eee6fee7379106551fbb3bef655c014ecae22daab67cbf907468fd6942b32827f0ee7150603c2b8cfcc9795a22ac638e7eb3c SHA512 0e9f566e30c8401d751d94150f5830461ff46156a853b2c30cc9a7c5bdd7d7f67fae2c6a34480a5bc3711d48aee3093984b898520b3b4fc06316b455eae3e826
 EBUILD rospy-9999.ebuild 734 BLAKE2B 96c03724a98663e3e06a90eb455899ca3f5061d8a006cd473ecce61e75404a0d09141065b14e1499de90fcc43a6681bed256a5dfccd200400dfad93cb0eb7810 SHA512 0daec5b0544638b2cf7437e18d719ddacf03e08c52e53fb70ac0384f389b5b2a4060209ff6d317c56d86c693bfa770cb6ddcf9c9881d1e43f9f9680df4ea106f
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rospy/rospy-1.14.3.ebuild b/dev-ros/rospy/rospy-1.14.3.ebuild
new file mode 100644
index 000000000000..6491d58ff8b1
--- /dev/null
+++ b/dev-ros/rospy/rospy-1.14.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python client library for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roscpp[${PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	ros-catkin_src_install
+	# Other tests need these nodes
+	exeinto /usr/share/${PN}
+	doexe test_nodes/*
+}
diff --git a/dev-ros/rosservice/Manifest b/dev-ros/rosservice/Manifest
index 3ac6ed869edf..45d109702d2c 100644
--- a/dev-ros/rosservice/Manifest
+++ b/dev-ros/rosservice/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD rosservice-1.13.0.ebuild 539 BLAKE2B a31e81ef5f0f8073361ba4a7a05c4c6be67e727821a6fc2bea924e333f17451dee00ea5e53af8c24c1587fca0f5f59175546f5d68d4fa5ef89200cd45fdfb7c0 SHA512 7c1c2f7bf117425c550211b8a2574700234ccda37b229904d4c4596e2a82b747ba7f9316a9d214fa42b6ea789dc6f4e3b281784a4059a6d13a55db92447b1f0c
 EBUILD rosservice-1.13.1.ebuild 539 BLAKE2B a31e81ef5f0f8073361ba4a7a05c4c6be67e727821a6fc2bea924e333f17451dee00ea5e53af8c24c1587fca0f5f59175546f5d68d4fa5ef89200cd45fdfb7c0 SHA512 7c1c2f7bf117425c550211b8a2574700234ccda37b229904d4c4596e2a82b747ba7f9316a9d214fa42b6ea789dc6f4e3b281784a4059a6d13a55db92447b1f0c
 EBUILD rosservice-1.13.2.ebuild 539 BLAKE2B a31e81ef5f0f8073361ba4a7a05c4c6be67e727821a6fc2bea924e333f17451dee00ea5e53af8c24c1587fca0f5f59175546f5d68d4fa5ef89200cd45fdfb7c0 SHA512 7c1c2f7bf117425c550211b8a2574700234ccda37b229904d4c4596e2a82b747ba7f9316a9d214fa42b6ea789dc6f4e3b281784a4059a6d13a55db92447b1f0c
@@ -12,5 +13,6 @@ EBUILD rosservice-1.13.4.ebuild 539 BLAKE2B a31e81ef5f0f8073361ba4a7a05c4c6be67e
 EBUILD rosservice-1.13.5.ebuild 539 BLAKE2B a31e81ef5f0f8073361ba4a7a05c4c6be67e727821a6fc2bea924e333f17451dee00ea5e53af8c24c1587fca0f5f59175546f5d68d4fa5ef89200cd45fdfb7c0 SHA512 7c1c2f7bf117425c550211b8a2574700234ccda37b229904d4c4596e2a82b747ba7f9316a9d214fa42b6ea789dc6f4e3b281784a4059a6d13a55db92447b1f0c
 EBUILD rosservice-1.13.6.ebuild 539 BLAKE2B 7c02a04878a4508cc7bb8ce6251c8920af1c78db8894a65b9857881172ecece13b63acaa4c520829459dd9900f61485bede0c81d5912f3a58f9c40a8fef92053 SHA512 d83674d4eedd0611c56be1ae34b813a4c160d722aa8b8a2d45e0b8c427964ccd278ca9d138680ec9832265acc5a4ec59d367e65d1e86ab14c00720d42d3c7865
 EBUILD rosservice-1.14.2.ebuild 539 BLAKE2B 7c02a04878a4508cc7bb8ce6251c8920af1c78db8894a65b9857881172ecece13b63acaa4c520829459dd9900f61485bede0c81d5912f3a58f9c40a8fef92053 SHA512 d83674d4eedd0611c56be1ae34b813a4c160d722aa8b8a2d45e0b8c427964ccd278ca9d138680ec9832265acc5a4ec59d367e65d1e86ab14c00720d42d3c7865
+EBUILD rosservice-1.14.3.ebuild 539 BLAKE2B 7c02a04878a4508cc7bb8ce6251c8920af1c78db8894a65b9857881172ecece13b63acaa4c520829459dd9900f61485bede0c81d5912f3a58f9c40a8fef92053 SHA512 d83674d4eedd0611c56be1ae34b813a4c160d722aa8b8a2d45e0b8c427964ccd278ca9d138680ec9832265acc5a4ec59d367e65d1e86ab14c00720d42d3c7865
 EBUILD rosservice-9999.ebuild 539 BLAKE2B a31e81ef5f0f8073361ba4a7a05c4c6be67e727821a6fc2bea924e333f17451dee00ea5e53af8c24c1587fca0f5f59175546f5d68d4fa5ef89200cd45fdfb7c0 SHA512 7c1c2f7bf117425c550211b8a2574700234ccda37b229904d4c4596e2a82b747ba7f9316a9d214fa42b6ea789dc6f4e3b281784a4059a6d13a55db92447b1f0c
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosservice/rosservice-1.14.3.ebuild b/dev-ros/rosservice/rosservice-1.14.3.ebuild
new file mode 100644
index 000000000000..5fd9906789c0
--- /dev/null
+++ b/dev-ros/rosservice/rosservice-1.14.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for listing and querying ROS Services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosmsg[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rostest/Manifest b/dev-ros/rostest/Manifest
index 47c4ccbe05dd..7a98e721f7fc 100644
--- a/dev-ros/rostest/Manifest
+++ b/dev-ros/rostest/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD rostest-1.13.0.ebuild 726 BLAKE2B 1f45be27b42b2bfbcc782edb426e08c0d347967048bd65488d1ceee5954441397fdbc7d38671bc4f84d608dcb62d4c72f7ae1101cbc36dd61be211c81614ec6d SHA512 e2adcdb3f5837f146e02fabbefd2a3a56562810a8e8ef6d01c0fc2bc382b0a205fc59d3fea23a153d8673419d2225655a797dde3b8b4422d73742e523398644f
 EBUILD rostest-1.13.1.ebuild 726 BLAKE2B 1f45be27b42b2bfbcc782edb426e08c0d347967048bd65488d1ceee5954441397fdbc7d38671bc4f84d608dcb62d4c72f7ae1101cbc36dd61be211c81614ec6d SHA512 e2adcdb3f5837f146e02fabbefd2a3a56562810a8e8ef6d01c0fc2bc382b0a205fc59d3fea23a153d8673419d2225655a797dde3b8b4422d73742e523398644f
 EBUILD rostest-1.13.2.ebuild 726 BLAKE2B 1f45be27b42b2bfbcc782edb426e08c0d347967048bd65488d1ceee5954441397fdbc7d38671bc4f84d608dcb62d4c72f7ae1101cbc36dd61be211c81614ec6d SHA512 e2adcdb3f5837f146e02fabbefd2a3a56562810a8e8ef6d01c0fc2bc382b0a205fc59d3fea23a153d8673419d2225655a797dde3b8b4422d73742e523398644f
@@ -12,5 +13,6 @@ EBUILD rostest-1.13.4.ebuild 726 BLAKE2B 1f45be27b42b2bfbcc782edb426e08c0d347967
 EBUILD rostest-1.13.5.ebuild 726 BLAKE2B 1f45be27b42b2bfbcc782edb426e08c0d347967048bd65488d1ceee5954441397fdbc7d38671bc4f84d608dcb62d4c72f7ae1101cbc36dd61be211c81614ec6d SHA512 e2adcdb3f5837f146e02fabbefd2a3a56562810a8e8ef6d01c0fc2bc382b0a205fc59d3fea23a153d8673419d2225655a797dde3b8b4422d73742e523398644f
 EBUILD rostest-1.13.6.ebuild 726 BLAKE2B b7f810c064557daf24e458cd345cf525a72dadd94850e64fa47f1e3eefdbe0b806496c3a992e136ef3050a54c7470502928add640a14012e7f226bf0b9ac586b SHA512 1fbaa60365546572c1c955df97ee218981ca0a6a666d146ffcb6f0a0e56618108eda8524204968a73b98ced8ec947f35960472bbc14b000ac868fa183871cbad
 EBUILD rostest-1.14.2.ebuild 726 BLAKE2B b7f810c064557daf24e458cd345cf525a72dadd94850e64fa47f1e3eefdbe0b806496c3a992e136ef3050a54c7470502928add640a14012e7f226bf0b9ac586b SHA512 1fbaa60365546572c1c955df97ee218981ca0a6a666d146ffcb6f0a0e56618108eda8524204968a73b98ced8ec947f35960472bbc14b000ac868fa183871cbad
+EBUILD rostest-1.14.3.ebuild 726 BLAKE2B b7f810c064557daf24e458cd345cf525a72dadd94850e64fa47f1e3eefdbe0b806496c3a992e136ef3050a54c7470502928add640a14012e7f226bf0b9ac586b SHA512 1fbaa60365546572c1c955df97ee218981ca0a6a666d146ffcb6f0a0e56618108eda8524204968a73b98ced8ec947f35960472bbc14b000ac868fa183871cbad
 EBUILD rostest-9999.ebuild 726 BLAKE2B 1f45be27b42b2bfbcc782edb426e08c0d347967048bd65488d1ceee5954441397fdbc7d38671bc4f84d608dcb62d4c72f7ae1101cbc36dd61be211c81614ec6d SHA512 e2adcdb3f5837f146e02fabbefd2a3a56562810a8e8ef6d01c0fc2bc382b0a205fc59d3fea23a153d8673419d2225655a797dde3b8b4422d73742e523398644f
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rostest/rostest-1.14.3.ebuild b/dev-ros/rostest/rostest-1.14.3.ebuild
new file mode 100644
index 000000000000..10f35c044f10
--- /dev/null
+++ b/dev-ros/rostest/rostest-1.14.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roslaunch[${PYTHON_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	test? (
+		${RDEPEND}
+		dev-cpp/gtest
+	)"
diff --git a/dev-ros/rostopic/Manifest b/dev-ros/rostopic/Manifest
index d226cf7056d1..fef1ffe7f25e 100644
--- a/dev-ros/rostopic/Manifest
+++ b/dev-ros/rostopic/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD rostopic-1.13.0.ebuild 566 BLAKE2B a784e9bbea130808d8070a55ed07d8a6879a74d03e1b8046e5de7abb302bf25d27e4ea99d48de4adb3d922ef6163fd6352470ff8573db5b48a6373cf561a78a3 SHA512 3110b8d806f845a9f1a0899a84949087c90ed18a70c9aab33e81fc711542ab7b5e57e495421f8aeb9b1e538bdedee70c338e3b2e13f97667812fe9b5d6111c0b
 EBUILD rostopic-1.13.1.ebuild 566 BLAKE2B a784e9bbea130808d8070a55ed07d8a6879a74d03e1b8046e5de7abb302bf25d27e4ea99d48de4adb3d922ef6163fd6352470ff8573db5b48a6373cf561a78a3 SHA512 3110b8d806f845a9f1a0899a84949087c90ed18a70c9aab33e81fc711542ab7b5e57e495421f8aeb9b1e538bdedee70c338e3b2e13f97667812fe9b5d6111c0b
 EBUILD rostopic-1.13.2.ebuild 566 BLAKE2B a784e9bbea130808d8070a55ed07d8a6879a74d03e1b8046e5de7abb302bf25d27e4ea99d48de4adb3d922ef6163fd6352470ff8573db5b48a6373cf561a78a3 SHA512 3110b8d806f845a9f1a0899a84949087c90ed18a70c9aab33e81fc711542ab7b5e57e495421f8aeb9b1e538bdedee70c338e3b2e13f97667812fe9b5d6111c0b
@@ -12,5 +13,6 @@ EBUILD rostopic-1.13.4.ebuild 566 BLAKE2B a784e9bbea130808d8070a55ed07d8a6879a74
 EBUILD rostopic-1.13.5.ebuild 566 BLAKE2B a784e9bbea130808d8070a55ed07d8a6879a74d03e1b8046e5de7abb302bf25d27e4ea99d48de4adb3d922ef6163fd6352470ff8573db5b48a6373cf561a78a3 SHA512 3110b8d806f845a9f1a0899a84949087c90ed18a70c9aab33e81fc711542ab7b5e57e495421f8aeb9b1e538bdedee70c338e3b2e13f97667812fe9b5d6111c0b
 EBUILD rostopic-1.13.6.ebuild 566 BLAKE2B 758a5d3391f24f2d7f61b1581ca9ad0002e95f210692dfa05f680fc156abeac38f82f727364eb16b49e4d0f6282ef197cd28e54524ce411cce4483f65bdd6994 SHA512 d109003bc46cc131343fb8d85b735dcaa762db6fbfeaa3854b275103ec5280987443efcd68524fed0b3bf422506d1b5db83a93beafe46b52259ae6a785dc12c4
 EBUILD rostopic-1.14.2.ebuild 566 BLAKE2B 758a5d3391f24f2d7f61b1581ca9ad0002e95f210692dfa05f680fc156abeac38f82f727364eb16b49e4d0f6282ef197cd28e54524ce411cce4483f65bdd6994 SHA512 d109003bc46cc131343fb8d85b735dcaa762db6fbfeaa3854b275103ec5280987443efcd68524fed0b3bf422506d1b5db83a93beafe46b52259ae6a785dc12c4
+EBUILD rostopic-1.14.3.ebuild 566 BLAKE2B 758a5d3391f24f2d7f61b1581ca9ad0002e95f210692dfa05f680fc156abeac38f82f727364eb16b49e4d0f6282ef197cd28e54524ce411cce4483f65bdd6994 SHA512 d109003bc46cc131343fb8d85b735dcaa762db6fbfeaa3854b275103ec5280987443efcd68524fed0b3bf422506d1b5db83a93beafe46b52259ae6a785dc12c4
 EBUILD rostopic-9999.ebuild 566 BLAKE2B a784e9bbea130808d8070a55ed07d8a6879a74d03e1b8046e5de7abb302bf25d27e4ea99d48de4adb3d922ef6163fd6352470ff8573db5b48a6373cf561a78a3 SHA512 3110b8d806f845a9f1a0899a84949087c90ed18a70c9aab33e81fc711542ab7b5e57e495421f8aeb9b1e538bdedee70c338e3b2e13f97667812fe9b5d6111c0b
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rostopic/rostopic-1.14.3.ebuild b/dev-ros/rostopic/rostopic-1.14.3.ebuild
new file mode 100644
index 000000000000..222f83a30d20
--- /dev/null
+++ b/dev-ros/rostopic/rostopic-1.14.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/roswtf/Manifest b/dev-ros/roswtf/Manifest
index 20ff28cc3c99..9f94cb8b5ed5 100644
--- a/dev-ros/roswtf/Manifest
+++ b/dev-ros/roswtf/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD roswtf-1.13.0.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
 EBUILD roswtf-1.13.1.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
 EBUILD roswtf-1.13.2.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
@@ -12,5 +13,6 @@ EBUILD roswtf-1.13.4.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5
 EBUILD roswtf-1.13.5.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
 EBUILD roswtf-1.13.6.ebuild 662 BLAKE2B 7ca8fccb945abfa0b4c4c2048e1582063be1dd67276224522a9e568bb3947903a190a75b6f09306f1c273af70cec7a1d4b7979663244f746a14191d644034ae5 SHA512 086d738888864950509088d82d2d669397805523501addd75fb067220ee2b6cab9e515e469159fe5e0ed8a479780d6737c954d90d218401aacebbff868c8d43a
 EBUILD roswtf-1.14.2.ebuild 662 BLAKE2B 7ca8fccb945abfa0b4c4c2048e1582063be1dd67276224522a9e568bb3947903a190a75b6f09306f1c273af70cec7a1d4b7979663244f746a14191d644034ae5 SHA512 086d738888864950509088d82d2d669397805523501addd75fb067220ee2b6cab9e515e469159fe5e0ed8a479780d6737c954d90d218401aacebbff868c8d43a
+EBUILD roswtf-1.14.3.ebuild 662 BLAKE2B 7ca8fccb945abfa0b4c4c2048e1582063be1dd67276224522a9e568bb3947903a190a75b6f09306f1c273af70cec7a1d4b7979663244f746a14191d644034ae5 SHA512 086d738888864950509088d82d2d669397805523501addd75fb067220ee2b6cab9e515e469159fe5e0ed8a479780d6737c954d90d218401aacebbff868c8d43a
 EBUILD roswtf-9999.ebuild 662 BLAKE2B f6ccaffa46e840f520e1bd63befdbab04d52c240055e63e28be2793904cff438ad64082558ca361855afcd5b2ecca94a4ef610a2406bb8ba42b5c8ddfdc72f09 SHA512 b3afa27d6bc9e241f10f67a9ae876123db28a5960a4d069b95f790901565285814b16604c98777339ec805d1f7f0fdde98eabf47f394aabad3a6d69eaacd29b5
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roswtf/roswtf-1.14.3.ebuild b/dev-ros/roswtf/roswtf-1.14.3.ebuild
new file mode 100644
index 000000000000..396feee7b7a8
--- /dev/null
+++ b/dev-ros/roswtf/roswtf-1.14.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for diagnosing issues with a running ROS system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-util/rosdep[${PYTHON_USEDEP}]
+		dev-util/rosinstall[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/rotate_recovery/Manifest b/dev-ros/rotate_recovery/Manifest
index 2bfaa77b38bb..fae7998f5e95 100644
--- a/dev-ros/rotate_recovery/Manifest
+++ b/dev-ros/rotate_recovery/Manifest
@@ -1,10 +1,6 @@
-DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
-DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
-DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-EBUILD rotate_recovery-1.15.1-r1.ebuild 606 BLAKE2B 73f5ab04b5649cb806a00032935bda90516a782879bd554194a066bb9b97328affb91340b355528ac6c876688b90e14019b8618bfe70e5bb126abf777ba37644 SHA512 bb82c834a6b960be12782707a845485e18e56c29a92f68425e6b40d3d7d4ce212f4b5fadb70abe69aa4f36cfc19c5df651b7f89db3948219a2cf1d185ad42167
-EBUILD rotate_recovery-1.15.2.ebuild 606 BLAKE2B 2070356def81d0003474a0405ffd5466922e6aa5421af7b5d65ef451bf955e025f54cca1d8e1a10b18cc8c4bfc35d070a11172049fcfc211b3bb8be8148d165a SHA512 959150d508d21f213ac70df41e12ad9e1cf4a0e8f147610d12feeeee7b211405eaf17ed58afe932e8506fc271d53aebb83aa7c79a87b5db5f04fcad2e7fc8a5d
-EBUILD rotate_recovery-1.16.0.ebuild 619 BLAKE2B 5723dbe95ee96665120dbcb68cd68c695ac184ba7385f1c807d275c0a942c5dff6f4718c41273e9a443d393b799065dea6908e204b595954cddc43e0704a1595 SHA512 90d51fe0c9b43cbfa3c346d409ec5b7e1fd86e405fb0696c9be1d577a799d60264cb4db8ff9bed3f92b3ac8e9d299143cd56c651f4ae23452583f665c444a20c
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
 EBUILD rotate_recovery-1.16.1.ebuild 619 BLAKE2B 5723dbe95ee96665120dbcb68cd68c695ac184ba7385f1c807d275c0a942c5dff6f4718c41273e9a443d393b799065dea6908e204b595954cddc43e0704a1595 SHA512 90d51fe0c9b43cbfa3c346d409ec5b7e1fd86e405fb0696c9be1d577a799d60264cb4db8ff9bed3f92b3ac8e9d299143cd56c651f4ae23452583f665c444a20c
-EBUILD rotate_recovery-9999.ebuild 619 BLAKE2B 5723dbe95ee96665120dbcb68cd68c695ac184ba7385f1c807d275c0a942c5dff6f4718c41273e9a443d393b799065dea6908e204b595954cddc43e0704a1595 SHA512 90d51fe0c9b43cbfa3c346d409ec5b7e1fd86e405fb0696c9be1d577a799d60264cb4db8ff9bed3f92b3ac8e9d299143cd56c651f4ae23452583f665c444a20c
+EBUILD rotate_recovery-1.16.2.ebuild 760 BLAKE2B 2e5378e83e91a8c6cc30e86a00eb8e1990da41cc6bed2afa1504e881c4a610e585d0de77c79ded7272870676e63c646531ebac94579e52b1d7199792312807d7 SHA512 d3fea07c581de06f3c5febd5ed6f37ce3d266cb0bc277311f371d65f42082354ae053813fd0c73993466b693e70420c8bccf01550a40b46c5663a0de45ae0092
+EBUILD rotate_recovery-9999.ebuild 760 BLAKE2B 2e5378e83e91a8c6cc30e86a00eb8e1990da41cc6bed2afa1504e881c4a610e585d0de77c79ded7272870676e63c646531ebac94579e52b1d7199792312807d7 SHA512 d3fea07c581de06f3c5febd5ed6f37ce3d266cb0bc277311f371d65f42082354ae053813fd0c73993466b693e70420c8bccf01550a40b46c5663a0de45ae0092
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/rotate_recovery/rotate_recovery-1.15.1-r1.ebuild b/dev-ros/rotate_recovery/rotate_recovery-1.15.1-r1.ebuild
deleted file mode 100644
index a31e4f6d10c8..000000000000
--- a/dev-ros/rotate_recovery/rotate_recovery-1.15.1-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=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/costmap_2d
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/base_local_planner
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/rotate_recovery/rotate_recovery-1.15.2.ebuild b/dev-ros/rotate_recovery/rotate_recovery-1.15.2.ebuild
deleted file mode 100644
index f66e208f7dfe..000000000000
--- a/dev-ros/rotate_recovery/rotate_recovery-1.15.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/costmap_2d
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/base_local_planner
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/rotate_recovery/rotate_recovery-1.16.0.ebuild b/dev-ros/rotate_recovery/rotate_recovery-1.16.0.ebuild
deleted file mode 100644
index 149998080211..000000000000
--- a/dev-ros/rotate_recovery/rotate_recovery-1.16.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/costmap_2d
-	dev-cpp/eigen:3
-	>=dev-ros/nav_core-1.16
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-ros/base_local_planner
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/rotate_recovery/rotate_recovery-1.16.2.ebuild b/dev-ros/rotate_recovery/rotate_recovery-1.16.2.ebuild
new file mode 100644
index 000000000000..18ba50b0f71e
--- /dev/null
+++ b/dev-ros/rotate_recovery/rotate_recovery-1.16.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/angles
+	dev-ros/base_local_planner
+	dev-ros/costmap_2d
+	dev-cpp/eigen:3
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/nav_core-1.16
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_ros
+
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules"
diff --git a/dev-ros/rotate_recovery/rotate_recovery-9999.ebuild b/dev-ros/rotate_recovery/rotate_recovery-9999.ebuild
index 149998080211..18ba50b0f71e 100644
--- a/dev-ros/rotate_recovery/rotate_recovery-9999.ebuild
+++ b/dev-ros/rotate_recovery/rotate_recovery-9999.ebuild
@@ -14,14 +14,18 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+	dev-ros/angles
+	dev-ros/base_local_planner
 	dev-ros/costmap_2d
 	dev-cpp/eigen:3
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	>=dev-ros/nav_core-1.16
 	dev-ros/pluginlib
 	dev-ros/roscpp
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf2_ros
 
-	dev-ros/base_local_planner
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index d807748b03c2..474d29e14eb0 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,8 +1,4 @@
-DIST rviz-1.12.15.tar.gz 5088184 BLAKE2B 9096cd707ff265847fdb0ddc71b31ec50dcfb9af0cb658ccbe8530d75cf82abcfa7d5a76f220e1bf2393e28807b44fec3d8690463f19dfb6482bc7b51a07f2c2 SHA512 d12ca4b56a7a2a19f37ca69a4efc0f474ff1409cdd9e1f1d357d6c2b6033a21183e469c712b5583ddc41f579f697d55145516c79797e846d3345019e57615ad6
-DIST rviz-1.13.0.tar.gz 5090158 BLAKE2B 40f5135a0518be5c97b713e43d29bd16f115d3759d16a82853e85aa8a4f918e4c11d2e78781d8c2d0ee8337d3d60865e3e76434b6a7fdc4c96ebc39288290809 SHA512 5ab9d24ffeeb41db4c12ead22a38b5815c5660c884c23bf20769a59f18603938c4c804fc9de506f9d5137e438f7241d06f0968ab80be70b7e9e281f9693e1ad8
 DIST rviz-1.13.1.tar.gz 5094089 BLAKE2B 7f4c106bf51b2465177107f5eb19602323045423b3ee5149f70b177170af9eea1cea0d4069f859c3c9bf3a2bdbe7feb91b802c758a66f6b990bd890b124d2a52 SHA512 cace4d41341647a8e4d5ab3be64ca71a4b41134a15a4df8556f35824c550c5fb7024f7338d0ffac1ea9c7f574c10757b773a8df37625d6e616eafdcd7f0aab09
-EBUILD rviz-1.12.15-r1.ebuild 1694 BLAKE2B 80e391c4dd623f9ba988a00b90146c20f2b4fb363b29efa712d1a2e382f647765849a5eef73e74831d61202a27e4e20a316f3d640205c149dfb938ac044ddca1 SHA512 8113c7539a6a2674d99ef82b181e8907a449023d983a8d007a42dc81785007a5e9a4fb2d6e08f4c9ead16fc306327a4a06f9f995ba1a71608804995073f766c2
-EBUILD rviz-1.13.0.ebuild 1694 BLAKE2B 80e391c4dd623f9ba988a00b90146c20f2b4fb363b29efa712d1a2e382f647765849a5eef73e74831d61202a27e4e20a316f3d640205c149dfb938ac044ddca1 SHA512 8113c7539a6a2674d99ef82b181e8907a449023d983a8d007a42dc81785007a5e9a4fb2d6e08f4c9ead16fc306327a4a06f9f995ba1a71608804995073f766c2
-EBUILD rviz-1.13.1.ebuild 1694 BLAKE2B 80e391c4dd623f9ba988a00b90146c20f2b4fb363b29efa712d1a2e382f647765849a5eef73e74831d61202a27e4e20a316f3d640205c149dfb938ac044ddca1 SHA512 8113c7539a6a2674d99ef82b181e8907a449023d983a8d007a42dc81785007a5e9a4fb2d6e08f4c9ead16fc306327a4a06f9f995ba1a71608804995073f766c2
-EBUILD rviz-9999.ebuild 1673 BLAKE2B d1a261869bfc377df3f3a81a8fa5883cc2fdccfb9e1a25c2fde1241dc87bd0bbca1f865ff336acffe03c04abf31b55cebe44b502ec9f40b9526af4ecb553ae1f SHA512 a66f24ff2386853906a87a71895edf27d401c24251b3cf1b09146d4db8016102e3214591d8346d1c7a2be985a6e717e786003dae5c9c45d650aaa97e3df31aa9
+EBUILD rviz-1.13.1-r1.ebuild 1681 BLAKE2B ce51638542b6abbebb13d647552646d5e8cd797845a386a347733acc02ab585d451e0fcfff19a7d798e99f79e37238751167d2331b83bc89ec03e76e56ca9a39 SHA512 19569262319e122cc37f572429315302b31da5b5f7de520cd9b60c8841fbdc617aaae0ff25d1e0b6dd9b007e0d49e735cd5ddded586efb4750d6a87c3e211f34
+EBUILD rviz-9999.ebuild 1681 BLAKE2B ce51638542b6abbebb13d647552646d5e8cd797845a386a347733acc02ab585d451e0fcfff19a7d798e99f79e37238751167d2331b83bc89ec03e76e56ca9a39 SHA512 19569262319e122cc37f572429315302b31da5b5f7de520cd9b60c8841fbdc617aaae0ff25d1e0b6dd9b007e0d49e735cd5ddded586efb4750d6a87c3e211f34
 MISC metadata.xml 336 BLAKE2B 8cba61f66f05c578aa056805cff5c5f9b79f4cc9a36001a5c332b048958039e049e8003b4c6a6cbe44a10973b5094daf880f25f9a124a2967069687762a492d0 SHA512 5621623b90d64245ec73b1ff7cace103dd809ac9da8b4614cd8b5931854ed159e8b5de867f1a6e83949376b99e41c181def0569f90f128c4c85e97cd42659120
diff --git a/dev-ros/rviz/rviz-1.12.15-r1.ebuild b/dev-ros/rviz/rviz-1.12.15-r1.ebuild
deleted file mode 100644
index e91a1a39c000..000000000000
--- a/dev-ros/rviz/rviz-1.12.15-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/rviz"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="3D visualization tool for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/assimp
-	dev-games/ogre
-	virtual/opengl
-	dev-qt/qtwidgets:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-cpp/eigen:3
-	dev-cpp/yaml-cpp:=
-	dev-libs/urdfdom:=
-	dev-libs/tinyxml:=
-
-	dev-ros/angles
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/interactive_markers
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-ros/resource_retriever
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/urdf
-	dev-ros/media_export
-
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	virtual/pkgconfig
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_configure() {
-	local mycatkincmakeargs=( "-DUseQt5=ON" )
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/rviz/rviz-1.13.0.ebuild b/dev-ros/rviz/rviz-1.13.0.ebuild
deleted file mode 100644
index e91a1a39c000..000000000000
--- a/dev-ros/rviz/rviz-1.13.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/rviz"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="3D visualization tool for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/assimp
-	dev-games/ogre
-	virtual/opengl
-	dev-qt/qtwidgets:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-cpp/eigen:3
-	dev-cpp/yaml-cpp:=
-	dev-libs/urdfdom:=
-	dev-libs/tinyxml:=
-
-	dev-ros/angles
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/interactive_markers
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-ros/resource_retriever
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/urdf
-	dev-ros/media_export
-
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	virtual/pkgconfig
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_configure() {
-	local mycatkincmakeargs=( "-DUseQt5=ON" )
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/rviz/rviz-1.13.1-r1.ebuild b/dev-ros/rviz/rviz-1.13.1-r1.ebuild
new file mode 100644
index 000000000000..46cc11490699
--- /dev/null
+++ b/dev-ros/rviz/rviz-1.13.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/rviz"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="3D visualization tool for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	media-libs/assimp
+	<dev-games/ogre-1.10:=
+	virtual/opengl
+	dev-qt/qtwidgets:5
+	dev-qt/qtcore:5
+	dev-qt/qtopengl:5
+	dev-cpp/eigen:3
+	dev-cpp/yaml-cpp:=
+	dev-libs/urdfdom:=
+	dev-libs/tinyxml2:=
+
+	dev-ros/angles
+	dev-ros/image_geometry
+	dev-ros/image_transport
+	dev-ros/interactive_markers
+	dev-ros/laser_geometry
+	dev-ros/message_filters
+	dev-ros/pluginlib
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+	dev-ros/resource_retriever
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rosconsole
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf
+	dev-ros/urdf
+	dev-ros/media_export
+
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	virtual/pkgconfig
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+	)"
+
+src_configure() {
+	local mycatkincmakeargs=( "-DUseQt5=ON" )
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/rviz/rviz-1.13.1.ebuild b/dev-ros/rviz/rviz-1.13.1.ebuild
deleted file mode 100644
index e91a1a39c000..000000000000
--- a/dev-ros/rviz/rviz-1.13.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/rviz"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="3D visualization tool for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/assimp
-	dev-games/ogre
-	virtual/opengl
-	dev-qt/qtwidgets:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-cpp/eigen:3
-	dev-cpp/yaml-cpp:=
-	dev-libs/urdfdom:=
-	dev-libs/tinyxml:=
-
-	dev-ros/angles
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/interactive_markers
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-ros/resource_retriever
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/urdf
-	dev-ros/media_export
-
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	virtual/pkgconfig
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_configure() {
-	local mycatkincmakeargs=( "-DUseQt5=ON" )
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index ffbd4e5c47bd..46cc11490699 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -17,7 +17,7 @@ IUSE=""
 RDEPEND="
 	dev-libs/boost:=[threads]
 	media-libs/assimp
-	dev-games/ogre
+	<dev-games/ogre-1.10:=
 	virtual/opengl
 	dev-qt/qtwidgets:5
 	dev-qt/qtcore:5
diff --git a/dev-ros/test_rosbag/Manifest b/dev-ros/test_rosbag/Manifest
index 1f0f74216a40..20d14f515573 100644
--- a/dev-ros/test_rosbag/Manifest
+++ b/dev-ros/test_rosbag/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD test_rosbag-1.13.0.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
 EBUILD test_rosbag-1.13.1.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
 EBUILD test_rosbag-1.13.2.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
@@ -12,5 +13,6 @@ EBUILD test_rosbag-1.13.4.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c
 EBUILD test_rosbag-1.13.5.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
 EBUILD test_rosbag-1.13.6.ebuild 840 BLAKE2B 9f1886a266e904b42f948de75eb4befb12b589248050ae75bcda3ff682d8248ded8e601e6113af84f30e42ab5b024b1a90b96af0f18d46f4dcf822a03561766c SHA512 c3a56c11dc788d45ed76b1e151312c3db2832c391581a18a6ed7e67a72702fdb8454255b7c4be2c85a0a67bb8ad37fd0155ffcec56d61e746b5347e7f05e809f
 EBUILD test_rosbag-1.14.2.ebuild 840 BLAKE2B 9f1886a266e904b42f948de75eb4befb12b589248050ae75bcda3ff682d8248ded8e601e6113af84f30e42ab5b024b1a90b96af0f18d46f4dcf822a03561766c SHA512 c3a56c11dc788d45ed76b1e151312c3db2832c391581a18a6ed7e67a72702fdb8454255b7c4be2c85a0a67bb8ad37fd0155ffcec56d61e746b5347e7f05e809f
+EBUILD test_rosbag-1.14.3.ebuild 840 BLAKE2B 9f1886a266e904b42f948de75eb4befb12b589248050ae75bcda3ff682d8248ded8e601e6113af84f30e42ab5b024b1a90b96af0f18d46f4dcf822a03561766c SHA512 c3a56c11dc788d45ed76b1e151312c3db2832c391581a18a6ed7e67a72702fdb8454255b7c4be2c85a0a67bb8ad37fd0155ffcec56d61e746b5347e7f05e809f
 EBUILD test_rosbag-9999.ebuild 840 BLAKE2B 4ea77fe53b2287de2f68558340968b0833871953aea2008574e1f85395ce8c35d7169c612fff9f66579119aa1f80f42d5a10806b3321fd0edd9fff7795b4f5f8 SHA512 f094d1f6268deb2b18ca04e0d1098eccb889e9e40337f947392a36c603b2ffd111cb0968187e2ceb8aa77f7dec772c00f0d5d1660ff3e1b85476c5939a33e6ba
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosbag/test_rosbag-1.14.3.ebuild b/dev-ros/test_rosbag/test_rosbag-1.14.3.ebuild
new file mode 100644
index 000000000000..e1c884997333
--- /dev/null
+++ b/dev-ros/test_rosbag/test_rosbag-1.14.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+PYTHON_COMPAT=( python2_7 )
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/message_generation
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-ros/topic_tools[${PYTHON_USEDEP}]
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/boost[threads]
+		app-arch/bzip2
+		dev-ros/rosout
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+	)
+"
diff --git a/dev-ros/test_rosbag_storage/Manifest b/dev-ros/test_rosbag_storage/Manifest
index 7cd37235a255..a4a005b6cf58 100644
--- a/dev-ros/test_rosbag_storage/Manifest
+++ b/dev-ros/test_rosbag_storage/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD test_rosbag_storage-1.13.0.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
 EBUILD test_rosbag_storage-1.13.1.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
 EBUILD test_rosbag_storage-1.13.2.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
@@ -12,5 +13,6 @@ EBUILD test_rosbag_storage-1.13.4.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04f
 EBUILD test_rosbag_storage-1.13.5.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
 EBUILD test_rosbag_storage-1.13.6.ebuild 452 BLAKE2B 2769e5d28c34b7102298c3d0f98d660baa870c59a7299be038029e6ce3636489b3d02a16d954dd9779fb635917ad134408ef5205cc62c8ea6dd43b9e98f408a3 SHA512 deff131d08cdead605916e1af61fd5aabdbe2f70479075272a9ec78202686638377d72c27fbbe2561d18452b950682ae7a2e0042bb4d6766c58715ce047e9830
 EBUILD test_rosbag_storage-1.14.2.ebuild 452 BLAKE2B 2769e5d28c34b7102298c3d0f98d660baa870c59a7299be038029e6ce3636489b3d02a16d954dd9779fb635917ad134408ef5205cc62c8ea6dd43b9e98f408a3 SHA512 deff131d08cdead605916e1af61fd5aabdbe2f70479075272a9ec78202686638377d72c27fbbe2561d18452b950682ae7a2e0042bb4d6766c58715ce047e9830
+EBUILD test_rosbag_storage-1.14.3.ebuild 452 BLAKE2B 2769e5d28c34b7102298c3d0f98d660baa870c59a7299be038029e6ce3636489b3d02a16d954dd9779fb635917ad134408ef5205cc62c8ea6dd43b9e98f408a3 SHA512 deff131d08cdead605916e1af61fd5aabdbe2f70479075272a9ec78202686638377d72c27fbbe2561d18452b950682ae7a2e0042bb4d6766c58715ce047e9830
 EBUILD test_rosbag_storage-9999.ebuild 452 BLAKE2B 77d6739d14ac2a65205f3fb708f2876a5ac77cb1d5dd398d77418ad90295a431c0184711d6bba55780c8249690fd870170b2bf492134c88879ab8b71ce6ef643 SHA512 5da1d0e29a39475966df57aa6f820e053b3cd4873d9ce88803956c52fd3a3a14773b618c57a5621831cc5b505380658c4881a23fe16a656f0f3ba1215b9a07e8
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.14.3.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.14.3.ebuild
new file mode 100644
index 000000000000..31f2c38f62c9
--- /dev/null
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.14.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag_storage"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rosbag_storage
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_roscpp/Manifest b/dev-ros/test_roscpp/Manifest
index 242157bb4cef..d1a6de3b68e8 100644
--- a/dev-ros/test_roscpp/Manifest
+++ b/dev-ros/test_roscpp/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD test_roscpp-1.13.0.ebuild 686 BLAKE2B 296e8e053461f066595a98c326f46f3bc66efe748748a996df81c64ce40b3dcc69f4ae94f33e4b2d4c68d3eb7ee9e56d6f685f150e9d1d16fe8f680b9d71f6b0 SHA512 5326ed5fe18e0c6b65d667a5ee932ad44ecdeca05a32a480f8cc9eda62accd0fd9a03d17790a75d383f8b59a2824914b7b8a8a1166686335cbede424de0067d8
 EBUILD test_roscpp-1.13.1.ebuild 686 BLAKE2B 296e8e053461f066595a98c326f46f3bc66efe748748a996df81c64ce40b3dcc69f4ae94f33e4b2d4c68d3eb7ee9e56d6f685f150e9d1d16fe8f680b9d71f6b0 SHA512 5326ed5fe18e0c6b65d667a5ee932ad44ecdeca05a32a480f8cc9eda62accd0fd9a03d17790a75d383f8b59a2824914b7b8a8a1166686335cbede424de0067d8
 EBUILD test_roscpp-1.13.2.ebuild 686 BLAKE2B 296e8e053461f066595a98c326f46f3bc66efe748748a996df81c64ce40b3dcc69f4ae94f33e4b2d4c68d3eb7ee9e56d6f685f150e9d1d16fe8f680b9d71f6b0 SHA512 5326ed5fe18e0c6b65d667a5ee932ad44ecdeca05a32a480f8cc9eda62accd0fd9a03d17790a75d383f8b59a2824914b7b8a8a1166686335cbede424de0067d8
@@ -12,5 +13,6 @@ EBUILD test_roscpp-1.13.4.ebuild 686 BLAKE2B 296e8e053461f066595a98c326f46f3bc66
 EBUILD test_roscpp-1.13.5.ebuild 686 BLAKE2B 296e8e053461f066595a98c326f46f3bc66efe748748a996df81c64ce40b3dcc69f4ae94f33e4b2d4c68d3eb7ee9e56d6f685f150e9d1d16fe8f680b9d71f6b0 SHA512 5326ed5fe18e0c6b65d667a5ee932ad44ecdeca05a32a480f8cc9eda62accd0fd9a03d17790a75d383f8b59a2824914b7b8a8a1166686335cbede424de0067d8
 EBUILD test_roscpp-1.13.6.ebuild 686 BLAKE2B 51f728f587419c338a10bc87ec34ae493f31936785c460c5f339c4842df4d170090cca5ffb859424a8a3061c6ebd7eb271bb1e0584e2bd3f504f778b9804efc0 SHA512 248c4b2c8b6afe224576f4581c13d85b79abafd63bdd7832bfad6074d6abf2fdee67ff66a1cfad78dcde23a93696633b4b7a96f9e87b0d352ad507753613f964
 EBUILD test_roscpp-1.14.2.ebuild 686 BLAKE2B 51f728f587419c338a10bc87ec34ae493f31936785c460c5f339c4842df4d170090cca5ffb859424a8a3061c6ebd7eb271bb1e0584e2bd3f504f778b9804efc0 SHA512 248c4b2c8b6afe224576f4581c13d85b79abafd63bdd7832bfad6074d6abf2fdee67ff66a1cfad78dcde23a93696633b4b7a96f9e87b0d352ad507753613f964
+EBUILD test_roscpp-1.14.3.ebuild 686 BLAKE2B 51f728f587419c338a10bc87ec34ae493f31936785c460c5f339c4842df4d170090cca5ffb859424a8a3061c6ebd7eb271bb1e0584e2bd3f504f778b9804efc0 SHA512 248c4b2c8b6afe224576f4581c13d85b79abafd63bdd7832bfad6074d6abf2fdee67ff66a1cfad78dcde23a93696633b4b7a96f9e87b0d352ad507753613f964
 EBUILD test_roscpp-9999.ebuild 686 BLAKE2B 913ebd162894a4839ac240006a07f9007384d8066f71fcbef889b020b1283e5d528edc297e9f81497a984e152b6d0f1d91149bbaf0cdb437b2a6074ea51b9326 SHA512 88523b4bd636f6c066a7132bb0509c92cdfbfdbf24db72adef2c4461358c31c40f5c4f7db655aecbc41766429b50f73f1c7e247b7a956fefe2184e9079cd8df8
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roscpp/test_roscpp-1.14.3.ebuild b/dev-ros/test_roscpp/test_roscpp-1.14.3.ebuild
new file mode 100644
index 000000000000..74f15fb4247b
--- /dev/null
+++ b/dev-ros/test_roscpp/test_roscpp-1.14.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roscpp"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=[threads]
+	test? (
+		dev-cpp/gtest
+	)
+"
+REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_rosgraph/Manifest b/dev-ros/test_rosgraph/Manifest
index 103031400a3c..e708469342f2 100644
--- a/dev-ros/test_rosgraph/Manifest
+++ b/dev-ros/test_rosgraph/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD test_rosgraph-1.13.0.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
 EBUILD test_rosgraph-1.13.1.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
 EBUILD test_rosgraph-1.13.2.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
@@ -12,5 +13,6 @@ EBUILD test_rosgraph-1.13.4.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99
 EBUILD test_rosgraph-1.13.5.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
 EBUILD test_rosgraph-1.13.6.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
 EBUILD test_rosgraph-1.14.2.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
+EBUILD test_rosgraph-1.14.3.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
 EBUILD test_rosgraph-9999.ebuild 438 BLAKE2B 7f9b25d24b5cab1d71ca26dc80adc38743677d4794e97dc06d8f9c8f40e0cbe42824928f279078bd7c8ea0fac89d17a331f22ced085397a58232be41de424422 SHA512 6a7779f57141d8c72a97e36d73411f5241b3839ff8d1a3d102314fee9192ff6ff637ae86918723a4fa1b8e5dc2523c6a8907ec655f3ec6f5e3abb25533f3a780
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.14.3.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.14.3.ebuild
new file mode 100644
index 000000000000..e901f1348a64
--- /dev/null
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.14.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosgraph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/test_roslaunch/Manifest b/dev-ros/test_roslaunch/Manifest
index ba1ad56f220f..33946be60e2b 100644
--- a/dev-ros/test_roslaunch/Manifest
+++ b/dev-ros/test_roslaunch/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD test_roslaunch-1.13.0.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
 EBUILD test_roslaunch-1.13.1.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
 EBUILD test_roslaunch-1.13.2.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
@@ -12,5 +13,6 @@ EBUILD test_roslaunch-1.13.4.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96
 EBUILD test_roslaunch-1.13.5.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
 EBUILD test_roslaunch-1.13.6.ebuild 483 BLAKE2B 5823a43960ad28a1efb407a8e13bc4482329d2f9d893d2110a286d0dbfa76ea9c42ee3aa483780c2c586df817b19c8b08084ff603384e52d542c6a9d3f409117 SHA512 ff69459d80e8cebe100b59e89c29e09242762d67c3cfe5c115bb0a764f1a65f7c7a2cef29c5d0e7fedf0157b89a40e6173955878f1d2e2cd2bdd3bd97dfbf1ba
 EBUILD test_roslaunch-1.14.2.ebuild 483 BLAKE2B 5823a43960ad28a1efb407a8e13bc4482329d2f9d893d2110a286d0dbfa76ea9c42ee3aa483780c2c586df817b19c8b08084ff603384e52d542c6a9d3f409117 SHA512 ff69459d80e8cebe100b59e89c29e09242762d67c3cfe5c115bb0a764f1a65f7c7a2cef29c5d0e7fedf0157b89a40e6173955878f1d2e2cd2bdd3bd97dfbf1ba
+EBUILD test_roslaunch-1.14.3.ebuild 483 BLAKE2B 5823a43960ad28a1efb407a8e13bc4482329d2f9d893d2110a286d0dbfa76ea9c42ee3aa483780c2c586df817b19c8b08084ff603384e52d542c6a9d3f409117 SHA512 ff69459d80e8cebe100b59e89c29e09242762d67c3cfe5c115bb0a764f1a65f7c7a2cef29c5d0e7fedf0157b89a40e6173955878f1d2e2cd2bdd3bd97dfbf1ba
 EBUILD test_roslaunch-9999.ebuild 483 BLAKE2B 30e75a9862ea977d4aaf8f4429e35ec20ecc5999219c3d783b27f96de7ccaa18af6bbcf664611eda1b56933e3247b0e37dff999bb8532d8cc4f9586ba60afb72 SHA512 4d6f106652d163dcade1a720e50fe7ef7d3f219f9196128fc044b19fc98c8a4d183c5933d9aa8a152959f331f0b17fd1f8ff67c34f8c875b532d25af5a39e180
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.14.3.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.14.3.ebuild
new file mode 100644
index 000000000000..04a9794a2d44
--- /dev/null
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.14.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslaunch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	test? (
+		dev-ros/roslaunch[${PYTHON_USEDEP}]
+		dev-python/rospkg[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/test_roslib_comm/Manifest b/dev-ros/test_roslib_comm/Manifest
index b391400b3f3d..7057537ba5a7 100644
--- a/dev-ros/test_roslib_comm/Manifest
+++ b/dev-ros/test_roslib_comm/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD test_roslib_comm-1.13.0.ebuild 556 BLAKE2B e0007a98d958cdee5405bc5209ced4b7288dc6a72a819a7ab1ee4c0e483408d1b9cbd457ac8d5ae09561a90c66a3bba45f75b8be050b46dd68b64be85c986e66 SHA512 5389f774e680c06cb109b50cc415538a7fe72d77197e96d924890776203cd70c92e4f30b0cc7c84cc77016477866f5e6f577b06643810dc5ffc8f060c6b99ee0
 EBUILD test_roslib_comm-1.13.1.ebuild 556 BLAKE2B e0007a98d958cdee5405bc5209ced4b7288dc6a72a819a7ab1ee4c0e483408d1b9cbd457ac8d5ae09561a90c66a3bba45f75b8be050b46dd68b64be85c986e66 SHA512 5389f774e680c06cb109b50cc415538a7fe72d77197e96d924890776203cd70c92e4f30b0cc7c84cc77016477866f5e6f577b06643810dc5ffc8f060c6b99ee0
 EBUILD test_roslib_comm-1.13.2.ebuild 556 BLAKE2B e0007a98d958cdee5405bc5209ced4b7288dc6a72a819a7ab1ee4c0e483408d1b9cbd457ac8d5ae09561a90c66a3bba45f75b8be050b46dd68b64be85c986e66 SHA512 5389f774e680c06cb109b50cc415538a7fe72d77197e96d924890776203cd70c92e4f30b0cc7c84cc77016477866f5e6f577b06643810dc5ffc8f060c6b99ee0
@@ -12,5 +13,6 @@ EBUILD test_roslib_comm-1.13.4.ebuild 556 BLAKE2B e0007a98d958cdee5405bc5209ced4
 EBUILD test_roslib_comm-1.13.5.ebuild 556 BLAKE2B e0007a98d958cdee5405bc5209ced4b7288dc6a72a819a7ab1ee4c0e483408d1b9cbd457ac8d5ae09561a90c66a3bba45f75b8be050b46dd68b64be85c986e66 SHA512 5389f774e680c06cb109b50cc415538a7fe72d77197e96d924890776203cd70c92e4f30b0cc7c84cc77016477866f5e6f577b06643810dc5ffc8f060c6b99ee0
 EBUILD test_roslib_comm-1.13.6.ebuild 556 BLAKE2B ba0100b4680795f137e8d40d567c1b8de599bf1fefeaec049426ac6156c9548f9d194b7c06c24872361fe11342574028b0aa48037c1d98cebf3822593c640148 SHA512 20767eb40a897f75beff6cab033ee24a70a1971c41d83fab04a9160e6e2f1fe536b319017736ac40fc8930320bcf8efdc77913bea0cc8bf367ea590399730c2a
 EBUILD test_roslib_comm-1.14.2.ebuild 556 BLAKE2B ba0100b4680795f137e8d40d567c1b8de599bf1fefeaec049426ac6156c9548f9d194b7c06c24872361fe11342574028b0aa48037c1d98cebf3822593c640148 SHA512 20767eb40a897f75beff6cab033ee24a70a1971c41d83fab04a9160e6e2f1fe536b319017736ac40fc8930320bcf8efdc77913bea0cc8bf367ea590399730c2a
+EBUILD test_roslib_comm-1.14.3.ebuild 556 BLAKE2B ba0100b4680795f137e8d40d567c1b8de599bf1fefeaec049426ac6156c9548f9d194b7c06c24872361fe11342574028b0aa48037c1d98cebf3822593c640148 SHA512 20767eb40a897f75beff6cab033ee24a70a1971c41d83fab04a9160e6e2f1fe536b319017736ac40fc8930320bcf8efdc77913bea0cc8bf367ea590399730c2a
 EBUILD test_roslib_comm-9999.ebuild 556 BLAKE2B 500e11a34be014312a1e6432df777843bafb425e09d976cf3c7e4aa86eb8a8c1f085f76d48841aad243b97f1fdf87b79fbdd84b2294089bb6520701923c92939 SHA512 34db49c0d2de9f563da46e1ec3b87a0b4adfe9b99e6b6bbfce2b2b176320ce6f27d9f05c8c47346d07088b23d9f7771a56b7f346bbefc340c8ff5d116523def8
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3.ebuild
new file mode 100644
index 000000000000..25cb9086d149
--- /dev/null
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslib"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (	dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
+"
diff --git a/dev-ros/test_rosmaster/Manifest b/dev-ros/test_rosmaster/Manifest
index 9db87ad7602e..4c7fdda4e82a 100644
--- a/dev-ros/test_rosmaster/Manifest
+++ b/dev-ros/test_rosmaster/Manifest
@@ -6,6 +6,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD test_rosmaster-1.12.7.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
 EBUILD test_rosmaster-1.13.0.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
 EBUILD test_rosmaster-1.13.1.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
@@ -14,5 +15,6 @@ EBUILD test_rosmaster-1.13.4.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3
 EBUILD test_rosmaster-1.13.5.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
 EBUILD test_rosmaster-1.13.6.ebuild 698 BLAKE2B 58ce81be4098e9839761dd1979ce2f5c44f0fc6d7bced98d12ecb6cacaee7d36d7a507ff32e3e4aabdc35ac822eeec17d9b24f694f834b3856ca4e3405f37826 SHA512 f8169b68855c6dcdef425686423d9d4d78bc354cd4f85fbcfebf2e3394c16095c74f0ef21a06f56d45a649adf8f451f7b18e2fcaf37210f94db7750948af47d0
 EBUILD test_rosmaster-1.14.2.ebuild 698 BLAKE2B 58ce81be4098e9839761dd1979ce2f5c44f0fc6d7bced98d12ecb6cacaee7d36d7a507ff32e3e4aabdc35ac822eeec17d9b24f694f834b3856ca4e3405f37826 SHA512 f8169b68855c6dcdef425686423d9d4d78bc354cd4f85fbcfebf2e3394c16095c74f0ef21a06f56d45a649adf8f451f7b18e2fcaf37210f94db7750948af47d0
+EBUILD test_rosmaster-1.14.3.ebuild 698 BLAKE2B 58ce81be4098e9839761dd1979ce2f5c44f0fc6d7bced98d12ecb6cacaee7d36d7a507ff32e3e4aabdc35ac822eeec17d9b24f694f834b3856ca4e3405f37826 SHA512 f8169b68855c6dcdef425686423d9d4d78bc354cd4f85fbcfebf2e3394c16095c74f0ef21a06f56d45a649adf8f451f7b18e2fcaf37210f94db7750948af47d0
 EBUILD test_rosmaster-9999.ebuild 698 BLAKE2B d5b4d4a9029b5fb5d967a146d22f056f48bab5c55d71db031322feadd8dbd11cccd46dfb8bba77bf70328e24b329e3bdb7df824c9706f30c5dd7e40f1d5c9eb0 SHA512 99dc926c24a752cedb957d9322d1f9a76ca3eb1855ef485ba81fe12fcca2641ecebc960279dbc04739a14cdb77e807cc012233419d6d7c7466b4778c2f5d9498
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.14.3.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.14.3.ebuild
new file mode 100644
index 000000000000..f9547e8381b1
--- /dev/null
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.14.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosmaster"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
+"
+
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
+
+src_install() {
+	ros-catkin_src_install
+	dodir /usr/share/${PN}
+	cp -a test "${ED}//usr/share/${PN}/" || die
+}
diff --git a/dev-ros/test_rosparam/Manifest b/dev-ros/test_rosparam/Manifest
index 841282f12fa1..6e8c9d663cf3 100644
--- a/dev-ros/test_rosparam/Manifest
+++ b/dev-ros/test_rosparam/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD test_rosparam-1.13.0.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
 EBUILD test_rosparam-1.13.1.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
 EBUILD test_rosparam-1.13.2.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
@@ -12,5 +13,6 @@ EBUILD test_rosparam-1.13.4.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b
 EBUILD test_rosparam-1.13.5.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
 EBUILD test_rosparam-1.13.6.ebuild 503 BLAKE2B d782d1f52885c86ac50106fb19b07f9a2517a29dfa321f82e15b9ef0d0517586ce1fa0b7248aaadfa0d7e56d6c4a31ca852ad7c637e7bc2586b1f3537c879adf SHA512 b42629a3510b66d53f9e326d95aef7eb8545aecfd3e4277fb8e082982d9568334d082bb38a5e6901e2d68e9fb45b7b8a58a89df438ff345611113c316ee9c0ae
 EBUILD test_rosparam-1.14.2.ebuild 503 BLAKE2B d782d1f52885c86ac50106fb19b07f9a2517a29dfa321f82e15b9ef0d0517586ce1fa0b7248aaadfa0d7e56d6c4a31ca852ad7c637e7bc2586b1f3537c879adf SHA512 b42629a3510b66d53f9e326d95aef7eb8545aecfd3e4277fb8e082982d9568334d082bb38a5e6901e2d68e9fb45b7b8a58a89df438ff345611113c316ee9c0ae
+EBUILD test_rosparam-1.14.3.ebuild 503 BLAKE2B d782d1f52885c86ac50106fb19b07f9a2517a29dfa321f82e15b9ef0d0517586ce1fa0b7248aaadfa0d7e56d6c4a31ca852ad7c637e7bc2586b1f3537c879adf SHA512 b42629a3510b66d53f9e326d95aef7eb8545aecfd3e4277fb8e082982d9568334d082bb38a5e6901e2d68e9fb45b7b8a58a89df438ff345611113c316ee9c0ae
 EBUILD test_rosparam-9999.ebuild 503 BLAKE2B e065bfcfa421c3de64ad8840a544eb4f427c3b2753b38b64960b51e4a9f432d7d3a6e8f2f4ef5303e47c0005e533deea5f34cd63369febb1f05ea3ac0bfb460f SHA512 a36d13dae004b782d566d5c7edf5ebe551c6e6a4d5213904824b1ccacfb61b24c437d01765fe96d584ffcc497fee7a3a630c3bbd45d0849fd0b460289ba8a654
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild b/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild
new file mode 100644
index 000000000000..1c24d77d5702
--- /dev/null
+++ b/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosparam"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/rosparam[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/test_rospy/Manifest b/dev-ros/test_rospy/Manifest
index 7ef33e8d2770..a7ab34d2dc1a 100644
--- a/dev-ros/test_rospy/Manifest
+++ b/dev-ros/test_rospy/Manifest
@@ -6,6 +6,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD test_rospy-1.12.7.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
 EBUILD test_rospy-1.13.0.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
 EBUILD test_rospy-1.13.1.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
@@ -14,5 +15,6 @@ EBUILD test_rospy-1.13.4.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9
 EBUILD test_rospy-1.13.5.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
 EBUILD test_rospy-1.13.6.ebuild 843 BLAKE2B 13c5ffa92a54986807fc5eff84d10624f2cc4ec05809a20049c8996ea4cc327836009bd680fbe0776aacb0a46f399beb15fcd9efa51bcb6d525b85207484999e SHA512 56e91015952815944f4357e9589296af3985c721150616c73e718ec9e5068a01c1e46df91ef5cacc080111954a6242884e6d373c2beaa63a277947d666c2c1bf
 EBUILD test_rospy-1.14.2.ebuild 843 BLAKE2B 13c5ffa92a54986807fc5eff84d10624f2cc4ec05809a20049c8996ea4cc327836009bd680fbe0776aacb0a46f399beb15fcd9efa51bcb6d525b85207484999e SHA512 56e91015952815944f4357e9589296af3985c721150616c73e718ec9e5068a01c1e46df91ef5cacc080111954a6242884e6d373c2beaa63a277947d666c2c1bf
+EBUILD test_rospy-1.14.3.ebuild 843 BLAKE2B 13c5ffa92a54986807fc5eff84d10624f2cc4ec05809a20049c8996ea4cc327836009bd680fbe0776aacb0a46f399beb15fcd9efa51bcb6d525b85207484999e SHA512 56e91015952815944f4357e9589296af3985c721150616c73e718ec9e5068a01c1e46df91ef5cacc080111954a6242884e6d373c2beaa63a277947d666c2c1bf
 EBUILD test_rospy-9999.ebuild 843 BLAKE2B 95bee07029a08cc289842cab2529c1854f1af6ea706853c51725ae88e6e50cad233090f48dfb4c203747a3e4d1fb7849caaf7daa3865730bc6bcb02e295cb77f SHA512 0351a18324e0c5c13cb36af850383a9c904ac8d5bd8f005dfafa6fa1e84a7a9377aaa8fd760036cc7057ee2d4f210f924fed6e65147da9a6c7676f31c75d54a0
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rospy/test_rospy-1.14.3.ebuild b/dev-ros/test_rospy/test_rospy-1.14.3.ebuild
new file mode 100644
index 000000000000..c681d244b919
--- /dev/null
+++ b/dev-ros/test_rospy/test_rospy-1.14.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-ros/rosbuild
+		dev-ros/rosgraph[${PYTHON_USEDEP}]
+		dev-ros/rospy[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/test_rosservice/Manifest b/dev-ros/test_rosservice/Manifest
index ef854d1eb411..a9d556ff5668 100644
--- a/dev-ros/test_rosservice/Manifest
+++ b/dev-ros/test_rosservice/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD test_rosservice-1.13.0.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d
 EBUILD test_rosservice-1.13.1.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d
 EBUILD test_rosservice-1.13.2.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d
@@ -12,5 +13,6 @@ EBUILD test_rosservice-1.13.4.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e4
 EBUILD test_rosservice-1.13.5.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d
 EBUILD test_rosservice-1.13.6.ebuild 679 BLAKE2B 79475728406b39495d95ea0f5c7b7ee57ee8392f3194bbf98eae6bd491e3d4830c25f1df75ac050724c9c5dd8f3aacad90621775f743390c10ed4366a68b4423 SHA512 d5557ba461241fbf6b04c3238be7df0042a46ced72a014df1a53fcb9dfd4a8cc916f59bfe4717f24449512650b194db976c27e5f618c904fca85238e6d51ca33
 EBUILD test_rosservice-1.14.2.ebuild 679 BLAKE2B 79475728406b39495d95ea0f5c7b7ee57ee8392f3194bbf98eae6bd491e3d4830c25f1df75ac050724c9c5dd8f3aacad90621775f743390c10ed4366a68b4423 SHA512 d5557ba461241fbf6b04c3238be7df0042a46ced72a014df1a53fcb9dfd4a8cc916f59bfe4717f24449512650b194db976c27e5f618c904fca85238e6d51ca33
+EBUILD test_rosservice-1.14.3.ebuild 679 BLAKE2B 79475728406b39495d95ea0f5c7b7ee57ee8392f3194bbf98eae6bd491e3d4830c25f1df75ac050724c9c5dd8f3aacad90621775f743390c10ed4366a68b4423 SHA512 d5557ba461241fbf6b04c3238be7df0042a46ced72a014df1a53fcb9dfd4a8cc916f59bfe4717f24449512650b194db976c27e5f618c904fca85238e6d51ca33
 EBUILD test_rosservice-9999.ebuild 679 BLAKE2B d8c7decce6abc14a7e9c0d9b36a40a001c282333d0e50e8caf7c8598b646adb458bce1aadd01a2a97639dac10d2ec7a232f8145c6fb6a904eb83311bbb47afae SHA512 36c5673453deb431ee1e5816af18510e7bfd9d324089e6bf05af963ef4d769ddc2d8d1d04796f849b75a8d0aeb0dc9663fa9747c07ad20c68934e258e0d273cc
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild b/dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild
new file mode 100644
index 000000000000..e129fbdc99eb
--- /dev/null
+++ b/dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	test? (
+		dev-ros/test_rosmaster[${PYTHON_USEDEP}]
+		dev-ros/rospy[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
index 99b79e398a4c..d2d32a93f321 100644
--- a/dev-ros/topic_tools/Manifest
+++ b/dev-ros/topic_tools/Manifest
@@ -5,6 +5,7 @@ DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d3
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD topic_tools-1.13.0.ebuild 695 BLAKE2B e7db753be80e10a45afaea27eda9e8d8ef671612792a2ab92f5ae6910c2907f6f7f9ab4a4e66d4d73af09ac522a394e78ed97bb825879bfb6878612250060db6 SHA512 9d720cd48cf826527f5cb8ee0d7ec0c46b52612c6880ab0d61474412185a34461fdbad8ec3879fa48168ca9d411df151aa08779627606f1bf17e3ddb7e38f17e
 EBUILD topic_tools-1.13.1.ebuild 695 BLAKE2B e7db753be80e10a45afaea27eda9e8d8ef671612792a2ab92f5ae6910c2907f6f7f9ab4a4e66d4d73af09ac522a394e78ed97bb825879bfb6878612250060db6 SHA512 9d720cd48cf826527f5cb8ee0d7ec0c46b52612c6880ab0d61474412185a34461fdbad8ec3879fa48168ca9d411df151aa08779627606f1bf17e3ddb7e38f17e
 EBUILD topic_tools-1.13.2.ebuild 695 BLAKE2B e7db753be80e10a45afaea27eda9e8d8ef671612792a2ab92f5ae6910c2907f6f7f9ab4a4e66d4d73af09ac522a394e78ed97bb825879bfb6878612250060db6 SHA512 9d720cd48cf826527f5cb8ee0d7ec0c46b52612c6880ab0d61474412185a34461fdbad8ec3879fa48168ca9d411df151aa08779627606f1bf17e3ddb7e38f17e
@@ -12,5 +13,6 @@ EBUILD topic_tools-1.13.4.ebuild 695 BLAKE2B e7db753be80e10a45afaea27eda9e8d8ef6
 EBUILD topic_tools-1.13.5.ebuild 695 BLAKE2B e7db753be80e10a45afaea27eda9e8d8ef671612792a2ab92f5ae6910c2907f6f7f9ab4a4e66d4d73af09ac522a394e78ed97bb825879bfb6878612250060db6 SHA512 9d720cd48cf826527f5cb8ee0d7ec0c46b52612c6880ab0d61474412185a34461fdbad8ec3879fa48168ca9d411df151aa08779627606f1bf17e3ddb7e38f17e
 EBUILD topic_tools-1.13.6.ebuild 695 BLAKE2B efb0405deee55dc5f573debd35e7f6e03f6bd0e1e89c022d64e108d6f790f1c7ce6271b027557ed0dc2d36b48d4958320d1d4f9cbeb5d51b6c038e9aec2c4271 SHA512 5efbd84f924cded65cce7323e67a1246b0564c7e903913a437cbdcd3632683338083f1e01d8689f0e2b0af6444eb0cca8f6274487917b6c0fd2a7b238e046fba
 EBUILD topic_tools-1.14.2.ebuild 695 BLAKE2B efb0405deee55dc5f573debd35e7f6e03f6bd0e1e89c022d64e108d6f790f1c7ce6271b027557ed0dc2d36b48d4958320d1d4f9cbeb5d51b6c038e9aec2c4271 SHA512 5efbd84f924cded65cce7323e67a1246b0564c7e903913a437cbdcd3632683338083f1e01d8689f0e2b0af6444eb0cca8f6274487917b6c0fd2a7b238e046fba
+EBUILD topic_tools-1.14.3.ebuild 695 BLAKE2B efb0405deee55dc5f573debd35e7f6e03f6bd0e1e89c022d64e108d6f790f1c7ce6271b027557ed0dc2d36b48d4958320d1d4f9cbeb5d51b6c038e9aec2c4271 SHA512 5efbd84f924cded65cce7323e67a1246b0564c7e903913a437cbdcd3632683338083f1e01d8689f0e2b0af6444eb0cca8f6274487917b6c0fd2a7b238e046fba
 EBUILD topic_tools-9999.ebuild 695 BLAKE2B 63c6c776011923217856c1392fb0d292d0bb44bebd000c7fa6530371a237aefda1a18c07bd78d9352d0f4dc7608a1c9dd335710cc6860485678dd2da4fa621df SHA512 918f548657eeab6f571e371dde921b0cdc374890b3f4a80b9eb51ece52e3404ce750a9447d1139e15a60409054f8f3e6d829f75ad538e6c80ffa8617eaca646a
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/topic_tools/topic_tools-1.14.3.ebuild b/dev-ros/topic_tools/topic_tools-1.14.3.ebuild
new file mode 100644
index 000000000000..227b9521dac4
--- /dev/null
+++ b/dev-ros/topic_tools/topic_tools-1.14.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-ros/rosunit[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/voxel_grid/Manifest b/dev-ros/voxel_grid/Manifest
index a4f00cf5d9a7..c30b8d0c346b 100644
--- a/dev-ros/voxel_grid/Manifest
+++ b/dev-ros/voxel_grid/Manifest
@@ -1,8 +1,10 @@
 DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
 EBUILD voxel_grid-1.15.2.ebuild 395 BLAKE2B 83874df4d5d10255cc78efa4b0df9f0ee182acf21a166b7ec1897fd271b14c5f8971eee84358a1bd5a0720e582476f28b3794d21be37417bf028697d5406e34f SHA512 9fff1d5091009da26d447f633bb30e7dce527481ec506500546ea55579d17d37bd1e597a39e658829694fdccbeb0500e2f08b2c9af34ad2bd2e9ee4f0758e05e
 EBUILD voxel_grid-1.16.0.ebuild 395 BLAKE2B 83874df4d5d10255cc78efa4b0df9f0ee182acf21a166b7ec1897fd271b14c5f8971eee84358a1bd5a0720e582476f28b3794d21be37417bf028697d5406e34f SHA512 9fff1d5091009da26d447f633bb30e7dce527481ec506500546ea55579d17d37bd1e597a39e658829694fdccbeb0500e2f08b2c9af34ad2bd2e9ee4f0758e05e
 EBUILD voxel_grid-1.16.1.ebuild 395 BLAKE2B 83874df4d5d10255cc78efa4b0df9f0ee182acf21a166b7ec1897fd271b14c5f8971eee84358a1bd5a0720e582476f28b3794d21be37417bf028697d5406e34f SHA512 9fff1d5091009da26d447f633bb30e7dce527481ec506500546ea55579d17d37bd1e597a39e658829694fdccbeb0500e2f08b2c9af34ad2bd2e9ee4f0758e05e
+EBUILD voxel_grid-1.16.2.ebuild 395 BLAKE2B 83874df4d5d10255cc78efa4b0df9f0ee182acf21a166b7ec1897fd271b14c5f8971eee84358a1bd5a0720e582476f28b3794d21be37417bf028697d5406e34f SHA512 9fff1d5091009da26d447f633bb30e7dce527481ec506500546ea55579d17d37bd1e597a39e658829694fdccbeb0500e2f08b2c9af34ad2bd2e9ee4f0758e05e
 EBUILD voxel_grid-9999.ebuild 395 BLAKE2B aaa80f5692268540023d6b98161e92fd5f9376e2835f40699601cc08873412c38586c3a7d70d717680ef70976f22f1542a9fdc2c3660c66183c21e18a9905b36 SHA512 d79c9dbd9f28164ccd0945f2dd8a53e317369a372d254dadefe8e4b72867474b5b9a708fe78950ca469b69e90497c68dcb54d575df9acfa93412cad351dce8cf
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/voxel_grid/voxel_grid-1.16.2.ebuild b/dev-ros/voxel_grid/voxel_grid-1.16.2.ebuild
new file mode 100644
index 000000000000..8ced333d52ee
--- /dev/null
+++ b/dev-ros/voxel_grid/voxel_grid-1.16.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Implementation of an efficient 3D voxel grid"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/roscpp"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/xmlrpcpp/Manifest b/dev-ros/xmlrpcpp/Manifest
index cdc4d39379e2..e4b6527db86d 100644
--- a/dev-ros/xmlrpcpp/Manifest
+++ b/dev-ros/xmlrpcpp/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD xmlrpcpp-1.14.2.ebuild 372 BLAKE2B 8caf0ab6a8639e6dacde87df3fd5e236e43c27d0f419775f6689613d772b08d1019e23b62dd6580a09d22097c418b359462a507684163b7878b2e4d058c417ef SHA512 6509ebcf6deee98bbdaf1b82a95a137801c8dffe9e8fffed70533b78ee19941544432d770089130707747d93fd955fb035440354bf30938081afe9a97c53002c
+EBUILD xmlrpcpp-1.14.3.ebuild 372 BLAKE2B 8caf0ab6a8639e6dacde87df3fd5e236e43c27d0f419775f6689613d772b08d1019e23b62dd6580a09d22097c418b359462a507684163b7878b2e4d058c417ef SHA512 6509ebcf6deee98bbdaf1b82a95a137801c8dffe9e8fffed70533b78ee19941544432d770089130707747d93fd955fb035440354bf30938081afe9a97c53002c
 EBUILD xmlrpcpp-9999.ebuild 372 BLAKE2B a665b463f43367c765319e4a86d0027fabecb2ec7672f3fce55a3b593f875171eeef769bfbc70d3cfb701c035895ee1819b2b922b2e29c083085e43e491b2d2c SHA512 cd4b48ddd4741f7112ecc47ee4e6907ce1d7e67ab4d580b876f95229b325ce2fbbb466d764155cda81d99c9f22f05f2d0524a5ccf7c930a5cb57f0e8bf0b0791
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.14.3.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.14.3.ebuild
new file mode 100644
index 000000000000..e20aad21511f
--- /dev/null
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.14.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of the XML-RPC protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/cpp_common"
+DEPEND="${RDEPEND}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 072363e50565..82001e4215b0 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 17b206b98871..e1c7bb43b472 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -3,9 +3,11 @@ DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
+DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 EBUILD actioncable-5.0.7.ebuild 941 BLAKE2B 76bbd65b75a57abeb351ab20ae1f1ee0a5481a4a4e9efcb98c279d8ef85914f5596fb22bf2835ce55522de0e96db4849be7c3c58da1d77d48cca7af9160aa909 SHA512 2e5d199f6e444f35796a84027e701601abe5d9d4c70ed712b01e59303a6d7f679b0f9dd3e9e64bcf2fff18ef5fae980edf458288cf5fffc9ede53a4d387b5be3
 EBUILD actioncable-5.1.4.ebuild 993 BLAKE2B 3d32ab30014b97a719eb25a34e443f1d41f49eabf3f87c6f21772ae72423f3913d2b6d3283e8eca416aa2e8482019882bdaebb002360e0c36073d15b864366e3 SHA512 5941e8ac6f9311e5168f30a2bcb37f84e73b2ab601cb7a37f2646a194033c1c994ba6eed1c2c4db5be37bee389c04c03a96077aff263efa4b801809f98f00325
 EBUILD actioncable-5.1.5.ebuild 1000 BLAKE2B c5ff9fb4aa09f74fba83da260b9e136a096200b6d517904ccad399fc26d29a816f6201be72ce2037efbd0e3a24b56aed181fc4e969b18b1e683ce72155e315d2 SHA512 524f765727e7f879da16178df6bbda7cbbbbfdc49b4a042f08a861a4563b5c6936e3e9ea22636dff3d9539c647de77545ce452dc8ddf5f0c3c3dcf1454b8f537
 EBUILD actioncable-5.1.6.ebuild 1000 BLAKE2B c5ff9fb4aa09f74fba83da260b9e136a096200b6d517904ccad399fc26d29a816f6201be72ce2037efbd0e3a24b56aed181fc4e969b18b1e683ce72155e315d2 SHA512 524f765727e7f879da16178df6bbda7cbbbbfdc49b4a042f08a861a4563b5c6936e3e9ea22636dff3d9539c647de77545ce452dc8ddf5f0c3c3dcf1454b8f537
 EBUILD actioncable-5.2.0.ebuild 968 BLAKE2B 2c9d685d823e7ca51dace7de0ec7d17881bf19f32e9c1018df840ad179f7dcc34960695adb0ced45cb6784f56642e34350832238f6471b5b78d550321db98374 SHA512 57abbe3ab5d7671fd9dbdcbef2410730367c411c7368d8ed692aea9a0d169cd49ec71c63428342ee72f742530fbcd9bd7ba21694e26ba493d300ea0b225dbbb4
+EBUILD actioncable-5.2.1.ebuild 946 BLAKE2B 03b936b23cd04a065d34b1fbcc56e7387ad15631a64c1ea576ac536dd93e03c04d43ff48bf84ae63d12109b708060b8bd48b50231af0e20c59a963ec16fb85ea SHA512 9347cd15cfb98e06b65ac6b42e633ffabc25f045298c01f7f7c84538d57d67cbfaa8c82c162be7ce8ec67e8429c4feca9edb9ec27ba1a19efef5f238091e2b32
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actioncable/actioncable-5.2.1.ebuild b/dev-ruby/actioncable/actioncable-5.2.1.ebuild
new file mode 100644
index 000000000000..5cf2265a9f36
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-5.2.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Integrated WebSockets for Rails"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	dev-ruby/nio4r:2
+	>=dev-ruby/websocket-driver-0.6.1:0
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 44d05b0f9f73..f9696b100a64 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
+DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 EBUILD actionmailer-4.2.10.ebuild 1623 BLAKE2B 4d0c3f0bda494ed811e449e1495e80dbd219655656af9f5660ad0ea52a17658e4db5a07054af00ad3c3948db9cf352e3cb3d0f84f1c3930d437eb5367c605f9c SHA512 ac0680ca62d49c5b7a3b5f3c99ded7bf6cee1388909d6533dff042790d3f117eaf5b2692a823b7e46ded85783f5c7bccfba0606b09563632a9844ea38b1ecc09
 EBUILD actionmailer-5.0.7.ebuild 1341 BLAKE2B 2a17605f8210edb2253fe3914d267f32c1bd2ad0cc0f744b835b20e61a19eb4ed65328bdf28e4e835efa558155fb97d26fc6269dd172e4515aa15cb3c6c804bb SHA512 1ec9190bb29c931be32dec90015c68af783b4d9f26bde51e7df2195ec605e7a61b8374c423ea83533b15a51721f5d62f804095542fd294e49a6cb4d2e7dea4a6
 EBUILD actionmailer-5.1.4.ebuild 1321 BLAKE2B a1225fd8d4433c84dbd412ca2a9d763791ea9bb13c1b7064490743156238fc7291494419837cd0843d82ca7e67dbd4ac660185258ec78922abc4eb7c57d88f7d SHA512 11568b63575505388731bc9db9240b24b3b260fa5e2883fc72b00aca5729e12543b9bb93ba7c7331eba7ff5053ffae0f1b9ca1de21b353a9ec66b1baa9f2a909
 EBUILD actionmailer-5.1.5.ebuild 1321 BLAKE2B a1225fd8d4433c84dbd412ca2a9d763791ea9bb13c1b7064490743156238fc7291494419837cd0843d82ca7e67dbd4ac660185258ec78922abc4eb7c57d88f7d SHA512 11568b63575505388731bc9db9240b24b3b260fa5e2883fc72b00aca5729e12543b9bb93ba7c7331eba7ff5053ffae0f1b9ca1de21b353a9ec66b1baa9f2a909
 EBUILD actionmailer-5.1.6.ebuild 1379 BLAKE2B ac0d01d99ff1344b7d7276faa30e1321b684599df861b4fdcddfe8890002f891badd7a8b8226501fd37aa93a4af314fe798f2f0e30e4386319cf2e5be027560b SHA512 a2642967c13c1a8fd31a312d041a2087367bba2d3b9a31877a61b9262d4e61314112181d3c29aedd748fc360a046249fbd7933930e40e6a4faec3c7253c72692
 EBUILD actionmailer-5.2.0.ebuild 1316 BLAKE2B fac377956e157d869078e2142ccdd7afdb0977ed06046109b71c4f745cbf96977ee0f4961dccd2a970c1b72e696524f25b2fb9c10e9517e30ec3d5003c254ce8 SHA512 7c0fd6e1568849cb44d6a127d03a14c34631f766f282074d7a6dfae6ebc6b7497d99966285dfe78b518135dd7e517c77c94f4ef41bf68270513ed2f984779483
+EBUILD actionmailer-5.2.1.ebuild 1294 BLAKE2B da187cc2d8ddd70344465d7965af6a8aea68a5cbb45b5b37939fee3d612d83ec5a3a9fd713fcf35552b1f48c8d83e1ec75a8a2fe05392b9d8d7f711e4d35ce16 SHA512 fa48259d40fd8cdd7a656c6d8aeb3de6b4aa1cedb4a8e2133aa367f2815ed004ea38e53698dd38b8a5748148fea39562bde25e681df594fabc7d506e00cf8c7e
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailer/actionmailer-5.2.1.ebuild b/dev-ruby/actionmailer/actionmailer-5.2.1.ebuild
new file mode 100644
index 000000000000..10e4af7927cf
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-5.2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
+}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 93ccbe4f6fdf..83ea863f9cd2 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
+DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 EBUILD actionpack-4.2.10.ebuild 1813 BLAKE2B ea7e07d54d35fd6754cf574aa2f98ded244d8df6f8e86e4e639295b6651353c71461a6cdddde94062d820fca03746e49573e9ea4e134d0e37d254f99345db838 SHA512 41f1e17fd3f40e72d6c5ed659dae4281a7a94b5b2528f2931f0203f4ab778ad2eea16e4110aaa7c5e320073608667b5fc41c31d12d37c39eedd5f4b0c771bec8
 EBUILD actionpack-5.0.7.ebuild 2095 BLAKE2B 90e1cc87ff932dcb868e0c75479adce4137e9d6472ad1520e00d324242cbff1a2462ff8579fb5a435525ea94586f8458899b382ad4ed0bcce2452ec68ff4145a SHA512 b1be51877b60e2b359d6bdfe7e37cf84af47dff1024f96fee9e8bb71f09e403a9d7eefba007de52d535c8726739160f6416b72dc740853438fdcc07e891b4948
 EBUILD actionpack-5.1.4.ebuild 1670 BLAKE2B b2b115ec16dbee477649e0068b6407f5097fda63bc746e6451a5eb8d8a0cc3ac6e58a5d3ab761789b3acda4708e1bc0e822b8ba9334f26e29cabd0d3c53c40f9 SHA512 d757de769ecae219fc268fbcb98b046117a3d880116ac7a309278e778fff575d3d34f53d8bba98c306a678c94e6d7518fbae2aa00046701ea48921055891abe2
 EBUILD actionpack-5.1.5.ebuild 1671 BLAKE2B 4f9741a6208682c3c3dc86b92e23cf1578950f64f7991e9ac69faa3d3ca375691a40c717e475bf3d4d92c77c164dc33ce15b8b904487fc4520cdb5e34ada2217 SHA512 7bc54a749625c4ed9b8e8d2cc54f9a9f0ac0338c647138a9e8187578e5583dec1e023c7d5fa1b4d1009ebe9d1fdf6d21c679cdb3d359fbc23650f7fe2d013f1d
 EBUILD actionpack-5.1.6.ebuild 1727 BLAKE2B 95e81c77b8c3b36cada69a289d0530d26d81044e58352cfc73b42c4faa106de94a3737fa36e0ad5c9669a31d2922080980b36b24456134dda88558020998cbc7 SHA512 24ce6a5ab88ed34c62bf0a52d4651d2684601e33edc1b7dd6571eb1039c69161fb55353ea51e1576a6819db29b62d1c52482a83896ee4a8a5a8a85976d67e7e3
 EBUILD actionpack-5.2.0.ebuild 1598 BLAKE2B f1b2b9f4823bc2122b1a4ed973406a05feecad21e58cc2c543dbe28be6f5442e6863d0f6bc3dcc2c2c19f1d988d4a3d20e2a92f90b59ff0aa889c50b9a9c8ce7 SHA512 fa8a005d7899fcf3f7bfba6d7930a843e3131edaf04b7b84d615e176709f5da7dd242cf33a73b1220df8007e77697db1b6e71f3e9c5ff8f743e84f8f966971be
+EBUILD actionpack-5.2.1.ebuild 1576 BLAKE2B 11795f76ec687399c6d8ab083c6e85664b77243aa4f9aa64bff2bc0d61ed2a0a11a6dae784c0a1b2d048286462ba63af90db4dd342114e82ac20994d639856ad SHA512 7ece59952a4021a8a3f934b66cd23f8955f104c7ce8446b271c171b0abdf25e87596543370b8c6c79cf63b673f7e050f2123766c550b997cbc804d1cd1257604
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-5.2.1.ebuild b/dev-ruby/actionpack/actionpack-5.2.1.ebuild
new file mode 100644
index 000000000000..24de861eddde
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-5.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionview-${PV}
+	dev-ruby/rack:2.0
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/rails-html-sanitizer-1.0.2:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		dev-ruby/bundler
+		>=dev-ruby/capybara-2.13:2
+		~dev-ruby/activemodel-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+		www-servers/puma
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 7ce7acf9a427..4ac54c48e50d 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
+DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 EBUILD actionview-4.2.10.ebuild 1540 BLAKE2B 0be7bac1a0113b5d07b8f5cf7632c1387177ef615a151b47519353ec6f498d8f7bf930fe841b03b1ef48e96cb3fcc6e2db6f4ea8b8869f2849a8551687d935ff SHA512 6a9cb78813408092737682398c6f909c7be13654f09c555c88293885c5a8f6e9f9e9d60968df27d2054ca18ff9de3009fd8eb884a4eea8cd36cb2fb06168015a
 EBUILD actionview-5.0.7.ebuild 1839 BLAKE2B 766842730ddb8927b3be2fb39382ec1689e558a8df29ad66e5ca9757d5cd822fe5ffa40ab558cd7f2d608c346359966deb61bd9bf10d78f22690d3d2a0320f79 SHA512 5db463c1aeb7c227b2fc260b6f9a053281809541614db067edcaeb192cb5b361aa9297d36f1862770efad3f4b9bffbb10fa6796814d5f1a9800a9b47cf6b95a2
 EBUILD actionview-5.1.4.ebuild 1756 BLAKE2B c154d68ac1efe85f9fe58d4605915ac457d23201447284c070e4e376c8161d81c7f7cde71b8090b88c19efe14d619cce54985ad42374da9ae2f6301a0737c4dc SHA512 7d21a6d903260203b96f7ea725bb2d9a72a25ae90a4ff84d7a5d302f349a4f85c6735bdad874fafa39f7988ce15100cbca634ea73bb7ec80845ea90b7ce7a084
 EBUILD actionview-5.1.5.ebuild 1757 BLAKE2B 186d24cfa202cb32fc97791e9d957c69f09e9af8293fd6ce09dbb70dea96835a337b7eea36f4a5757aaf2900dfa8e6844007f907f1d12dfc144aa404ed20b67a SHA512 45daa6fe7a74262b1aedabcf5280786f3282ddf5d29dc646092c82b6754b05014e1a81f768bde5661f5fbef248ff5c964267e150b85055d78ce3249afa3e3285
 EBUILD actionview-5.1.6.ebuild 1887 BLAKE2B 75354ee4950ae9bb6c67b5b878c85c7436b9a5cc462f10eb06178c8a3c5eb8c4ba0c462b06daa71990caaabc486431bee2a05bf54d44d79219b84c89d1664ab0 SHA512 42caafaa2a8b9959383419715d0f1287f22f17a357d1358b2a4b0fe0de6605dffdec6985e3579049f112e6cf8322971590f32d12a66f1a6b0bb99ecca3c9c180
 EBUILD actionview-5.2.0.ebuild 1752 BLAKE2B f5df1ae26919c1671d24396e870ffa22615a082e843794e17be6da618aadac44af1615d4c41e28b13633ce634eabc18e6b67c92a5d94345e51b678f55f4ef0c0 SHA512 b95cfb9bb71c5ed58286b2b4dd0dd19be223c954cf2e689f48117f5c4fd0c1da0e0b4b17b2792542acc0bf883f6564758cde5377d7041cb90e584fd2f274dd52
+EBUILD actionview-5.2.1.ebuild 1730 BLAKE2B 651f96f67c2a8e18c3f9a20b36accf2635ed25954d23e9fd1261d5e1256e2aba09459415618e6f785d6aa01b443963ab7b8aa5255e39bb86effbde5deebaefce SHA512 7b1d0e2f3ab9d3b54d098f98a9c2257910027f2c1010d904f993175a1ad14b1013796e9a6b0ffacc61081bbf99ac049dc29f23c991a304354327fde9382a8d63
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-5.2.1.ebuild b/dev-ruby/actionview/actionview-5.2.1.ebuild
new file mode 100644
index 000000000000..dbb1a5989ab6
--- /dev/null
+++ b/dev-ruby/actionview/actionview-5.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubi-1.4:0
+	>=dev-ruby/rails-html-sanitizer-1.0.3:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid tests failing due to missing logger setup in activerecord,
+	# most likely related to test environment setup.
+	rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
+}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 5568e03d1438..18acc2daad54 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
+DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 EBUILD activejob-4.2.10.ebuild 1080 BLAKE2B 4c8c1019fe13365a0c3ffa221319c5816ab25cf1d5b8802e6b5236768dcfc6394ce6eeef42a20c24b8619cd6b7c3d26844eb6535063dc59c81c0f91fa3e1161f SHA512 fce94a7ddfa303fdb02233985944c11ddbfea867f5d9de2c893be34f43941b74073f2c66ec0d3b3e1c9f84ee7fe4ca286d1fd6bac24bbbb30040a8853dbd79ea
 EBUILD activejob-5.0.7.ebuild 1129 BLAKE2B d5cc088a44ce42427940b892e0f8a560ef2b587ee12ee5f3d07cef82369025d921bf2d1e0a2ac091e95c2f251bf0f7788d61a13c5b51b0db2052c3afc7d7dea2 SHA512 9c19395298377b1653cdfc2cfafdbcccf396b77787a8bb0dffe12564aa26c1ccf7f3bc447edc21f1eecb128ccef550143edbc1f4f482c966ebaa8384e58d2d52
 EBUILD activejob-5.1.4.ebuild 1102 BLAKE2B cea04c003777a5c731ae3bcd33ae2e2feba2d4d8b723236413788ea313519ea109f6825fadf9e3c46e47a1dafb999dc62a7bbf16c3ab7aab54a3870dd38f9d1c SHA512 96b0ccd5572ca46e69264e7ef96dff7dd538f566d38b823c14e57e08427bb3dab5902d94251ab0ec3dbc314d0591e0bf1afcc8169ba715931a4b4eb660af23de
 EBUILD activejob-5.1.5.ebuild 1102 BLAKE2B cea04c003777a5c731ae3bcd33ae2e2feba2d4d8b723236413788ea313519ea109f6825fadf9e3c46e47a1dafb999dc62a7bbf16c3ab7aab54a3870dd38f9d1c SHA512 96b0ccd5572ca46e69264e7ef96dff7dd538f566d38b823c14e57e08427bb3dab5902d94251ab0ec3dbc314d0591e0bf1afcc8169ba715931a4b4eb660af23de
 EBUILD activejob-5.1.6.ebuild 1102 BLAKE2B cea04c003777a5c731ae3bcd33ae2e2feba2d4d8b723236413788ea313519ea109f6825fadf9e3c46e47a1dafb999dc62a7bbf16c3ab7aab54a3870dd38f9d1c SHA512 96b0ccd5572ca46e69264e7ef96dff7dd538f566d38b823c14e57e08427bb3dab5902d94251ab0ec3dbc314d0591e0bf1afcc8169ba715931a4b4eb660af23de
 EBUILD activejob-5.2.0.ebuild 1113 BLAKE2B c53eebc5d1de92a1db17b442c17d73d7c918993c132c54551a6f6fff07313ba897f7098cf08f09c1f14a1be6595b7da484421eadabeac046e6f32ba25d2670aa SHA512 a5f77cf5db3997cadead0cf8390f3b58876b809273851476618cb11b92c952efeed50d83f066f835cd5d1500336f3d904f78fdbe45cc269d30cc88a9fbf7ec2d
+EBUILD activejob-5.2.1.ebuild 1091 BLAKE2B dc7eadc3e17401f37f38fb79fb6b63a426fe05655f9c5310359d774ebf0867cb54bb59e903d84de8d530ae26487142cd4e569da9de72e656ad64ee01f95769ac SHA512 c6bf91c4ee3af2308bd28b568e87549c85842e508eed1853453fc4b77defa83f28a6c2e0c3ceff822fd8ce20a09c443d96cc270df22e88731de379598c139feb
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activejob/activejob-5.2.1.ebuild b/dev-ruby/activejob/activejob-5.2.1.ebuild
new file mode 100644
index 000000000000..8f053ca9e8ab
--- /dev/null
+++ b/dev-ruby/activejob/activejob-5.2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Job framework with pluggable queues"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+
+	# Remove all currently unpackaged queues.
+	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+		-e 's/delayed_job//' Rakefile || die
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 751a2fee8ba8..c099b3bbda75 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
+DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 EBUILD activemodel-4.2.10.ebuild 1499 BLAKE2B 7cc5ec14bca05ddbe528396c7f721f28015d711dcefdaa2e45addb1887473cc4b9ca2f34859ef22f8b40c8dcb697588531e6dbdcb719d9a9a8c5d19ee9640ed7 SHA512 8b01a0317dd860a4196a70d44630924a02caecc09c8fbaa787a66f4f794975e2722cf886d107d42e4060e4d71cff133512cebc3d1e211ec035a5740578b297b8
 EBUILD activemodel-5.0.7.ebuild 1049 BLAKE2B c9c18543ca2671932e46098cd7baf12b29059ad74e3785a0c174296c93a693e9e09b5955c71e7d7b1f3f67dd92f2025df337dfad31eee953fd738324fad547ce SHA512 3c6c3121f4eeb2f5770366924883dc312d0413ddba3de490d4eb44822d7cd6d2e5f815ab93b38992ba48de2e9ce6e4a681c9e98ef7cf33031a07c5bbfc510d50
 EBUILD activemodel-5.1.4.ebuild 1072 BLAKE2B dee7ef7b1c90455a737cde502105ec1a9b5b4b6362dc115d4f5fa2f4057bd19bf2ba2c79ccd1ce81cf5fe74a3399efd9e511a3e60034bc20f8d04321a7392080 SHA512 d39122a4323f0ad9ac1ddbebfd5c7c579c216682e7676f5f3025ab11a44d8a9366671c2c7f860bef1ed721a630a36a37fb0649897c6b7e9935eb61707151490b
 EBUILD activemodel-5.1.5.ebuild 1073 BLAKE2B 2f5781d6165bdd88e801cd598dbcfb123f99bbfbc68428fe3aac48b5dba83d4a4e7820c2ce588ae2452dca2db0d4e40fb02b41a133bb00ad5b84989759acca06 SHA512 afb9244e7d717cf10c681ca2a3b62fae982d58b91f0dcf60be9854b580e7ad787bff501c52adf7cb27e72969bef2fc2574aa61c468f727f1b2641ac13790036a
 EBUILD activemodel-5.1.6.ebuild 1128 BLAKE2B 2fc63660f837f86752d5f00f61232e76ab31e62a8848ae49bdfa02895fad2f72371b4874993389299adbd8f5c68dcb722e6692a5e003b9beab58ab74dfd3a035 SHA512 2b180c4ba579b11fb455495f97eef341d5b7757207b153ac8459f5a44a1f3ffb8e2cc3b3e42e014c8ab4c979a6717f4a8642f5bb528c05a5e50596b3d616097b
 EBUILD activemodel-5.2.0.ebuild 1059 BLAKE2B 70b0fc0b667b918a04486d26eacd0b46a6797b9ab50396752ab35d7de908a348638d66e5519f711f12676aeb61cbfb1534fa95c2557ddd8012ec57c68ca09f17 SHA512 8e17729197e212eaf4efd6f56e1ae1d350be6560f36677d8f417db63fbc4a47421c0cd36186e2f18f469cddfe2a5c10e5cdcf8a7380d967e3a38f7550d82837a
+EBUILD activemodel-5.2.1.ebuild 1037 BLAKE2B 71253c6186c85519090f52b6f6c611214989cc13c8f1e16353ac128e3f720e766e3e2d4a65b5ae23744b4477f889dad5f099f6eff4d21bb671bef592095cb36b SHA512 5a80de8c2cab98aa2894da7df81a058b30af2ec7efc556bbe87bc49a7c29643b0db20de61147b0261db1822ae2f0f3454d36ccd491edd0cda1f1489f85ddd6dc
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-5.2.1.ebuild b/dev-ruby/activemodel/activemodel-5.2.1.ebuild
new file mode 100644
index 000000000000..9e0c5da63868
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-5.2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		dev-ruby/test-unit:2
+		dev-ruby/mocha
+		>=dev-ruby/bcrypt-ruby-3.1.7
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 9fd5b02f3da0..90e2af63e3e1 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
+DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 EBUILD activerecord-4.2.10.ebuild 2433 BLAKE2B 606c1cd593165b80487fa6e9b20dc437d785dc283910003db2802d274175170cb906412239afedf4955db3535b689eb8f1812a81011d6d7f9309c10e6de19ff7 SHA512 bf9b3edea74d5c2a2e62772afe4558752b392152e60af194e5772b23aa889c9ad58bf0c676ed103235127ef5d7b2362e9ebb66ed2381c004c16f17d9392387ea
 EBUILD activerecord-5.0.7.ebuild 2732 BLAKE2B 52ff7f3e27a3c9bfbdb82884c6a70408e3cac330ad79c0e26e9ab5cfd360cd3f2d55f5ed637f3e60880c260a6c73fb06896e1b647d9a0b3d470fa64d8a1b9d13 SHA512 29fbf0ba49971b440999f9e8ab2bf74574ce166933990d2bd2e83e6c6da98d56cee2460391ef8b14b5a534cc041f304dc0493de60500b624eb8430250bade393
 EBUILD activerecord-5.1.4.ebuild 2652 BLAKE2B 399413789bf9faf2fbe4116ca0d821841f5b758c990aeb5d041a0e5c6c265dd025e55337f6538aa65edb388ed6bf8e98a98b0e60f3bf839be71089ddb20457b0 SHA512 9c0d204f106e22b8a8cd8abd2e5407ef8ef64b3ef854613c53a63187137e587f16dbd3e784c099d71baac62b3a8b8e06f86e93c29d30926c18931183d8f55ce7
 EBUILD activerecord-5.1.5.ebuild 2652 BLAKE2B 399413789bf9faf2fbe4116ca0d821841f5b758c990aeb5d041a0e5c6c265dd025e55337f6538aa65edb388ed6bf8e98a98b0e60f3bf839be71089ddb20457b0 SHA512 9c0d204f106e22b8a8cd8abd2e5407ef8ef64b3ef854613c53a63187137e587f16dbd3e784c099d71baac62b3a8b8e06f86e93c29d30926c18931183d8f55ce7
 EBUILD activerecord-5.1.6.ebuild 2652 BLAKE2B 399413789bf9faf2fbe4116ca0d821841f5b758c990aeb5d041a0e5c6c265dd025e55337f6538aa65edb388ed6bf8e98a98b0e60f3bf839be71089ddb20457b0 SHA512 9c0d204f106e22b8a8cd8abd2e5407ef8ef64b3ef854613c53a63187137e587f16dbd3e784c099d71baac62b3a8b8e06f86e93c29d30926c18931183d8f55ce7
 EBUILD activerecord-5.2.0.ebuild 2649 BLAKE2B 71e66f664e4117625dff7aa5e3153948d3ed4bd8423a375ebf721794750640cd84185007c9434074b0009edaad23cd1953e05fec094ce6fc4de9e201f7cd7465 SHA512 fdc2b4070a4e3904850d04126e1c4e3394488a774b395d05b90d7188434d6e26564e5c6b683d8b0909671675cfe5bba00b19f2029996b0addfb11e38dcb715c2
+EBUILD activerecord-5.2.1.ebuild 2627 BLAKE2B 6de57ed8d43808d5239efcb4bc8c92a99d7f8d5704cfb1c3a8154406cb581e0595d8495fb5fac6ee3beaad3ed68104e64231054b53c5ec2759bf38b6a37f3575 SHA512 a1948195338a0cb4d3bf13fb5c48166b5fbe902a359c1dac7b0efc0a5e3d1b971cf4eae92579155207ccfa3151dc2203b54491b0e81f04c647bdbb41a2387bb3
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activerecord/activerecord-5.2.1.ebuild b/dev-ruby/activerecord/activerecord-5.2.1.ebuild
new file mode 100644
index 000000000000..2f581e941789
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-5.2.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	dev-ruby/arel:9.0
+	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
+	mysql? ( || ( dev-ruby/mysql2:0.4 >=dev-ruby/mysql2-0.3.18:0.3 ) )
+	postgres? ( >=dev-ruby/pg-0.18.0:* )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/actionmailer-${PV}
+		>=dev-ruby/sqlite3-1.3.6
+		dev-ruby/mocha
+		dev-ruby/minitest:5
+	)"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	rm ../Gemfile.lock || die
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid single test using mysql dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+
+	# Avoid failing test that makes bad assumptions on database state.
+	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
+		test/cases/associations/has_many_associations_test.rb
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 256a0e19b904..9ab1dfa8af90 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,3 +1,5 @@
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
-EBUILD activestorage-5.2.0.ebuild 1833 BLAKE2B 76ec3cb2d7d8e292a5426392394372f1c1a3bed95a9e4f26bb2f59fbe8437266060dd6e2d5f03fd01a56d5471f4fa3e3141ea41a1a6a2de2a2af81e817ec0e07 SHA512 0ea24496f9c0c3895cb18b6887f046ad9afe554d73949d414918cac507c65fefaaff031c7bcbfbbbdf47383df118f121b51e39c7b250b3dfe765d3395eca822a
+DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
+EBUILD activestorage-5.2.0.ebuild 1840 BLAKE2B 95a4e7830b313dd7903c803dda9d85186b53c3ed8c9cddb6ae6a3dfd6066f0271fd85f567cb33ae1dd78b713529d432039a6580fbc0c1e01a76a2137ecd8c65d SHA512 cbefb090bd5ab10aee09ba5156a955c9038458a098fe32a717a6b4cb7edaa62eb19133c908e3b38c2ee2455a3f7f021d80a91071a54f68ce81bf71014495bf00
+EBUILD activestorage-5.2.1.ebuild 1818 BLAKE2B 31f6ea8367af2acdd8391fe9c3b356ec737e9799a6b373534baf58bd6729e0538009dc8bf9cb52ccd477fc0eb0105c976972c5a6097780dad872de54ac8ff2eb SHA512 7128d5708748e2cec4912fae33b6daf2509e3eab7ca260b0402c809ed4d61b767dde4fe2301e1895289c234fb7637f247a4cc201ecf78bf63a048497ce7d06da
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activestorage/activestorage-5.2.0.ebuild b/dev-ruby/activestorage/activestorage-5.2.0.ebuild
index 0fc602e58822..2276e3a7be0b 100644
--- a/dev-ruby/activestorage/activestorage-5.2.0.ebuild
+++ b/dev-ruby/activestorage/activestorage-5.2.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activestorage/activestorage-5.2.1.ebuild b/dev-ruby/activestorage/activestorage-5.2.1.ebuild
new file mode 100644
index 000000000000..6968309d3f3a
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-5.2.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Attach cloud and local files in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( app-text/mupdf ) "
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activerecord-${PV}:*
+	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		dev-ruby/test-unit:2
+		dev-ruby/mini_magick
+		dev-ruby/mocha
+		dev-ruby/rake
+		dev-ruby/sqlite3
+	)"
+
+all_ruby_prepare() {
+	   # Remove items from the common Gemfile that we don't need for this
+		# test run. This also requires handling some gemspecs.
+		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\)/ s:^:#:" \
+			-e '/dalli/ s/2.7.7/2.7.9/' \
+			-e '/:job/,/end/ s:^:#:' \
+			-e '/:test/,/^end/ s:^:#:' \
+			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+		rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index ee1ab4b6514d..dad6570e2f12 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
+DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 EBUILD activesupport-4.2.10.ebuild 2168 BLAKE2B 4bfe8e4d4d585733bbe6a0ab9618e5e79a04799eb699a11479b3036a123c030d1d2a99176ad5a463b6b218262f7df575506122fb36ccae504c890504374f97de SHA512 873c00a1090978e422509043f4f067c2478179db2c0bfb96d2afd9053754a89f015c4340785ed1efca3ff5e83992aeab6e72dface39c256e5b449238afe152a1
 EBUILD activesupport-5.0.7.ebuild 2646 BLAKE2B 8a5b75824494c5f25b43e9196b38ce5ce4a1e7dd6398345b70e028198afc73c92ef8b83effc12abbbcfe30325f44df4e7ca89f52cf986b55439b9fb35d807d9b SHA512 6b7242961eb6b2a4e5070925193d8c03ff7ad95275922ae52b86d5017262059e918c462381d5655479868203f0fe634b3231376a24e6db64fb5b219aab818500
 EBUILD activesupport-5.1.4.ebuild 2191 BLAKE2B 1686675733d595c5ffb005b7b343bd0ae1adf1da2564baf31cb13b48f8edb867d9cc1ece62d7b0e39f7490b48f9a91c923eed1ee0cf8ed157509a4d4574c526d SHA512 d2fa57234919fecd20717dc7a84c271ddfc7ef74437cbc63f3bcc6b83c08c38c5f0bac72833ea0dd34c5121654dcdf429535143f1e7677ea9b6c3ced03a38eaa
 EBUILD activesupport-5.1.5.ebuild 2192 BLAKE2B 6609109cdce8db84365b4acc378641e477ed98ccbd082e0e71da261917c9c719019fc303fb4607311be842f00db5e68c819054ddfb38bcd50156552c9bb56089 SHA512 8372de87880a7be9104082c95ecc059ce7ae27f8963560858a0cd8305513f2dd592f297375fa2a38527fdeefe9decd70c1dab6bfeac6d5436383c3f50b139733
 EBUILD activesupport-5.1.6.ebuild 2320 BLAKE2B a56309fd9c8fade096989b148ef03d0ce42c902aefc24972e40a333fd2cfdc55fe7ce7c45b057b4abc7643c34dbc872ea14a622a437e5f27bd51d3fdeae7815c SHA512 bbf22dc539464f64d2628e9fd0e14f8d83fad292e9f8ce2e3234c4ae719e2139dfa04bb22d6c0d732c978a0632af1e5cea2075cf7115ec8ca720ef30a5a4e912
 EBUILD activesupport-5.2.0.ebuild 2535 BLAKE2B 68f3dbf317ff7f7dcc4a744c1d3c7c502a41bfe31dd8a5957884c6f22349eaca05b02f8b66d6536cfcb1950dbbc31d751bdb86ceda585c7a75270896d8675c55 SHA512 379fd25deea457cd5f69fb65015ca7cd7972cbe732c8262acdf6d4a01515c221289186f0ef991f03c4aedc687d76ae5dad34b1133bd0ef9caa987192e54a67cf
+EBUILD activesupport-5.2.1.ebuild 2514 BLAKE2B 40e111d3df90e50d58269ecec76d9a3004334f88abc51b36544a29fc152680fa800148e35e2466b5345b21766b2cae75470d41efda466e0296156346288e73cd SHA512 a9960a469660a42dafdf22797ed52cba4b7b58c7ac2ef5a159ac20ade279023119141ae1e038b0ecf0f6c9e5b276cf25a541d04ec22a1f12062fb7d32ef69ca1
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-5.2.1.ebuild b/dev-ruby/activesupport/activesupport-5.2.1.ebuild
new file mode 100644
index 000000000000..867bd28f7946
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-5.2.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	|| ( dev-ruby/i18n:1 dev-ruby/i18n:0.9 dev-ruby/i18n:0.8 dev-ruby/i18n:0.7 )
+	>=dev-ruby/tzinfo-1.1:1
+	>=dev-ruby/minitest-5.1:5"
+
+# memcache-client, nokogiri, and builder are not strictly
+# needed, but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/nokogiri-1.4.5
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.0.5:3
+	dev-ruby/rack
+	dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/ammeter/Manifest b/dev-ruby/ammeter/Manifest
index 0621acb69a47..be7f99ecf182 100644
--- a/dev-ruby/ammeter/Manifest
+++ b/dev-ruby/ammeter/Manifest
@@ -1,3 +1,3 @@
 DIST ammeter-1.1.4.gem 19968 BLAKE2B dbc773e4db83d820e5ef1c6ae3af2e65f87ff1a10a09759c66a4dad87cd175e5e8af857435b6df6cb93167869d31fb1f43dcf220e063db03d048aa8926c7daaf SHA512 57d24c67be85fe34ded8feda045771974be7cdd828780a82ff0b2f6b52d0b35b48c2eb7e59dae70700fba676242918ef6463448090d7729d49db0f05f04b0131
-EBUILD ammeter-1.1.4-r1.ebuild 1599 BLAKE2B 2e0b618ab5c7f549dd5d13e116b947349e57b0c6076a2af2a44035b567a796c826854b4268d074325ff71db357a207ab344a14cf23aa9da1b60b17f361ef1538 SHA512 7d85cccbb8d0649954122aa4b99c9b60502e93a3215a53373bed9319cff3c8bac2727db4ed5636ddf8448be9f19df72a96e89effb65f7fcf34d0b1528dca5b75
+EBUILD ammeter-1.1.4-r1.ebuild 1599 BLAKE2B ef91d4791caa169f24804f7a85c2c65b1b9cc33358da3c86dc2b9c70e09ab39fd3ac6d16cc01b7dbbdebbc4b9956dbbea4a578aaa34e379c142dd8dcce4506c2 SHA512 344fb49ad9cc4c0e22d3ee947df37188135a0b1434d074fb827a5c835303cbc0a0c8873dedde53b297e4f844b80a9f0c94248b44d4cd7085f44990821cd6348f
 MISC metadata.xml 348 BLAKE2B 1eae86b63a0e04b8b5e8d8d9438b102b029a919af6fdb0cf2319b11a3c50ee282a255dedd7bad0bc3098ea8d1c0c05e17a5d98b382fa454feebbd304b18d3f57 SHA512 f81eb53098c1d67a4d5cfe32c9b3aace294cb90788775c639e189cf3932ef8101466d9a1541ceada391ebdacfedf926d9549f4591b42efd6c391e5fe6b0e72f1
diff --git a/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild b/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild
index c27bb706e506..f6a76334fcc7 100644
--- a/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild
+++ b/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/annoy/Manifest b/dev-ruby/annoy/Manifest
index 8d4b401a63f8..3c481ac40123 100644
--- a/dev-ruby/annoy/Manifest
+++ b/dev-ruby/annoy/Manifest
@@ -1,3 +1,3 @@
 DIST annoy-0.5.6.gem 9728 BLAKE2B e8d4c8cef99be2a380c96fa596547b108a2ed7d8b9e8f996bf8bad163d8030c73c627a17afd564cbf446660bccad1a0287c6a05db9e6d68db8b55e20a5a6bbd1 SHA512 6cade9d766fa315042ba04922bba315157872a25bc2c7e5ea428c1f2343045d0a5d400dc8eade20f650f2cc6a64492020ef608d355963c09c5e6e8d454d3cc8f
-EBUILD annoy-0.5.6-r1.ebuild 547 BLAKE2B a4830af335049254e585354215bb4e50c5a27536f56be258901dc43926f685e54485049fa94e8e46e8bd7ff56331209e54e78ef9790cc064a462774b157d6a2e SHA512 8baeba2d9af42e6277b238c22fd22606f6a4bc9ccda2598c90f2c12296dd3514b60003fc97e349e4579d5f9140f1570650cee724960857e08d10f8423b2c3518
+EBUILD annoy-0.5.6-r1.ebuild 540 BLAKE2B 00c8a17e2ba964fa0a664d3842c4d1d055771fde6dd45a04cc7bd9b3542d0150fecffbc766a7eda9f7438d125f8c1869786d1b6b8433f632feae4bb5cf3e8de0 SHA512 52fc7b4e63865411ad74b10b1879b6d03f306a562506c963df50356375381408eb2b54326b295967e5c7a30de76671e855bcd59e54cc507dea6c6b214e161033
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/annoy/annoy-0.5.6-r1.ebuild b/dev-ruby/annoy/annoy-0.5.6-r1.ebuild
index 94b202b0bd7b..9cf7d4267a68 100644
--- a/dev-ruby/annoy/annoy-0.5.6-r1.ebuild
+++ b/dev-ruby/annoy/annoy-0.5.6-r1.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
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
index 5fb98edcd171..bb5ba66e5168 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -3,5 +3,5 @@ DIST arel-helpers-2.6.1.gem 12288 BLAKE2B 75958abc0f3c1ff61482cb576f650d230757d6
 DIST arel-helpers-2.7.0.gem 12288 BLAKE2B 623225b35205ff32bada46b1f2cc857f384938726fcec6137cc33cbb16903ec51731835bb1fa1a7b603d35d0f623eb59af7d0e5b163e28d0d6f7802f30e6a6b7 SHA512 48305acd4d40f60ced74c32c334ab6ca2b7f648cd2185f829f36f5c942ff53b1e0aa709ea08fcd2200c2b56dcd9c76fe0328408e6e84934f27fb0bbf6075873c
 EBUILD arel-helpers-2.5.0.ebuild 667 BLAKE2B 2691aafcda53349d43c236dd5aea54f979065c2ce1ec3dd2dcbeb215dea744522e122a6bb98965cde00a06643919dcfa457e1f63e56ff34c60c1264d6b393d94 SHA512 0c2833e6de441cdb905c73c0e02ebe30f19f3aedd97a8910bc3ca36bd0ed4b64f11e66f6157f199685f8b8bd29f0d2c5735942b557222d6fed2f0ae21f332dc4
 EBUILD arel-helpers-2.6.1.ebuild 664 BLAKE2B 62f54c6943fbf6692b9b87c55776a6d50c1da249e5c7c1cdba77f4f06afb7742ae37fe6e7a91bb4a15647516b3b8d9fde3ab40883458a1b6dd64a4a6df7b6934 SHA512 a38e1fcda818b8cee7cb6aa79b65eeefe23dfd5297332f065b9856e760b9a8f5c7498ebc67915faf7a2642126a216f899b45b878823d79df2fa5e76bfe8e9a9f
-EBUILD arel-helpers-2.7.0.ebuild 693 BLAKE2B 1c92e3921a7f96abe30fb5cb335f31f58ba6437d148b3123bb81fbffff65cc5805ed51cb9c2fee21e5729cfd0afe90c5176cf320d9af0a31955076020073d3c6 SHA512 7431750404f303b53794e6193112e3040c931867199d5f72164eea7bc26676c8cc48250b7e76e87076a801d345427fbf360a45a05b87a71011ef25b95cbc8c45
+EBUILD arel-helpers-2.7.0.ebuild 693 BLAKE2B f16838448db982d8aaa733009882c706f1a491027abb0370cd8460a81fa91d94966e221021cd46e00f55261c96bfb9594132b1ea3129259eb4e2ca37a43ba43d SHA512 02a72633b22c43e6948c4d3045d0156362f7af8d112922ebbbe5b49abba70be5d7be150cb02bc05809e6ed7f44c4db1025adafb1eee3aa6904ad5fc1be6de3d2
 MISC metadata.xml 344 BLAKE2B 3c7611e49af6a5fdfabda583dc91fbe8fc4b7943e774a938e100d91633b3a5c38cefab5973207c25d62a5b8b9e8e7c720b5614c083c8568e532e819bb747855f SHA512 2b4f9f6a7cd7aea5f161da441195d3138810930778d441f0c0d3620fc3de6632088d0d49135e7638553e83db723356184db1abaaf1622999adeec59883087c96
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.7.0.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.7.0.ebuild
index 589f4b6b5d5c..96b2a7e9f4f3 100644
--- a/dev-ruby/arel-helpers/arel-helpers-2.7.0.ebuild
+++ b/dev-ruby/arel-helpers/arel-helpers-2.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-ruby/astrolabe/Manifest b/dev-ruby/astrolabe/Manifest
index ef9399884ee0..160341123dc3 100644
--- a/dev-ruby/astrolabe/Manifest
+++ b/dev-ruby/astrolabe/Manifest
@@ -1,3 +1,3 @@
 DIST astrolabe-1.3.1.gem 16384 BLAKE2B 4853c4c9c8fb926c8f58f6c940f22e44e20db7b3b7c853a0ea120657074cb0bfb42b3a22832042fcb27546e2ab3e32c526c93ccd3ea4d43f17c8e0c09fd2fbf8 SHA512 db29d26559e4adb82e4a25a3b7d3df94fcb9847dbd65abdb25abd0181b60af2e0fe0021bb8193c5f94d58e074da06de3d1f7170cb341ac675e3c3ab39ba95bef
-EBUILD astrolabe-1.3.1.ebuild 756 BLAKE2B 1cc69baa0375c0417063720d0a4972d54117aaa1658dd84f78e4e7757718373747a854034ab4518972828199ba4c1c040626b937fb1a1a703340e78244b4e8a3 SHA512 a13e2bd9bf93c44ff673c816e1dcfd082ac46ab3107d67366fb09ebb06e7bc0f0ddfad7fcbee07951de9045b4768537a465b2d27f909ef64b422df1549ea436c
+EBUILD astrolabe-1.3.1.ebuild 749 BLAKE2B fdcb7f596177df4402c977b3943a8bf611e9a1391eb9b0237c0361b1e3b61caa8bb3789f54d1e909f6908e8c219bd6f2e86a59f762d317f42b9d2dc42c9ac7b2 SHA512 a70babfdebce63ee56d613d4a563d7f178ca7271f320ea5a88f5041ea221e1fb091f332b304a4365c43414586e32bb6f49deadb9e9443a7b3aca6149ffb1838e
 MISC metadata.xml 348 BLAKE2B 7d999da9a49726292bc0c44f26b0ba86f093340a4ffc1d211f0a0f8510c9de6ff4d2dcf90e1307683073c87aa45d77aab6b050a7fb2241be9458a6f649924f97 SHA512 ca7e080c9465cf8f8c1607ffbb9a39a8bc17a00e3f0d60ff35d3d3d21bc33c00a4d6d7e647ac8c309df75d6406e48acf6b02858127d3be247d54f0da63f537b4
diff --git a/dev-ruby/astrolabe/astrolabe-1.3.1.ebuild b/dev-ruby/astrolabe/astrolabe-1.3.1.ebuild
index 61abe54ff9fb..9c6737e8d2a3 100644
--- a/dev-ruby/astrolabe/astrolabe-1.3.1.ebuild
+++ b/dev-ruby/astrolabe/astrolabe-1.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 2dd0f323cd00..0ad273b6e033 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -3,9 +3,11 @@ DIST autoprefixer-rails-8.6.0.gem 203264 BLAKE2B 23ca172f6c862cb43fa3609ffe1fe02
 DIST autoprefixer-rails-8.6.3.gem 208384 BLAKE2B a373a18b43fefafd5e29b9da78b7ec2b276738729b748244d34684429b5081c34516512794234526af7f952218973f20ef6245772436c4cfc4fd511dedd80e92 SHA512 db7bd3737d5356adcd91edfd35623459ba67541ffb615eeb85155de9ec7b2c7bdf69518b9258dbf97a1a8a82a22a27da5eda2e445cbdf305a726f31dbf296f0d
 DIST autoprefixer-rails-8.6.4.gem 208896 BLAKE2B 4a4edba06d55a3de33d625d3827777ad98d7a36b040ec3c2a02274ca50d1e18c68217a81dbf18c61f80310b1f225680971a746e0ac9018eadd4314da1d648da7 SHA512 e71cd9889932e881154737287dca21000b929b8dec56e51fd8a9b97705f0ce83969515aa36e40b78ab4629f404caf78125cd066c7fea19fd63339c2c9b873576
 DIST autoprefixer-rails-8.6.5.gem 208896 BLAKE2B 50e8b8ef3fec9a0bb8d68afa8950989dbf84b58b79b8822e83bf22873c5172c2c514643c31dca88cfec49bd585563eb9b201c621d3ab6707ed0d49c6cd4c8fc8 SHA512 fddabc4d745ad1b4282622a52ab4e36c377eccec85c4e80b3e8d633ffcc2d1613f4fee9e9f2356c85d251e44b0010418029bb278894987119689435ac885e982
-EBUILD autoprefixer-rails-7.2.6.ebuild 827 BLAKE2B 1b95e2a789aea1c2d3612f14d90bdee9cf8cdc6545b7b9305bc08e614c2b598966b4ae1ebac1afda7502acd50ecfd6df2634082028b29931dd9201927260ecec SHA512 57dc81b8560f040012f9de1bd8a74bf09c3316a0bb5503cde2ae21498228cee548ce7bf81f798aa1965c992d9d09b4044797852a269c31668b93c05c4837cf35
+DIST autoprefixer-rails-9.1.0.gem 204800 BLAKE2B 1aa4befa996db5f5e49637327d464816709cf30f816e1107a4916db272a9c7052a96f8cc3ab2b7259d01a0d9eeffab9fc7fd5a3fd7f6b372b6a18bb7fa1126a1 SHA512 aefa976523c6f71a918620803178b11700c8a5d40c32d2e714b085c090b710cf30a9bf9d45b1b6b16f0cf06c1abe219c99f81a7e5e18291e23ba36da50dbc430
+EBUILD autoprefixer-rails-7.2.6.ebuild 827 BLAKE2B fd6aef469bd1e07f5100e88ebe523da96383c721dfc2bee9b7babb7d11f3d710bbb6debf4cf9cd57702f81150c8b7c7ef9a0f3de4efc1e6325240fd1bf2e4bf0 SHA512 f17f3e58a7cf0a8d960d683d3cdc6ddae7065ce7d28d3284b45b169210a068a9ec0dafcee100fcbda098aab73c809f455908df069ba72e5536b95aa1ddac7ace
 EBUILD autoprefixer-rails-8.6.0.ebuild 820 BLAKE2B a6ff9ac662691abdade26a4c5af9762924cbc3007aadf3e5fd1a0a4091f33a06a288f1c69cc8c43597f5736b46dcf36a65372d942c1ce64e1cce73a1ee0986d5 SHA512 028872e339c0fc598fc83906e14b562c86f3b8d487bcf7cbca5483525706c3e53a3d91ff04d693a53cfd01c2245a15814671fab91c6bd8fbfc5acba23569ff0e
 EBUILD autoprefixer-rails-8.6.3.ebuild 820 BLAKE2B a6ff9ac662691abdade26a4c5af9762924cbc3007aadf3e5fd1a0a4091f33a06a288f1c69cc8c43597f5736b46dcf36a65372d942c1ce64e1cce73a1ee0986d5 SHA512 028872e339c0fc598fc83906e14b562c86f3b8d487bcf7cbca5483525706c3e53a3d91ff04d693a53cfd01c2245a15814671fab91c6bd8fbfc5acba23569ff0e
 EBUILD autoprefixer-rails-8.6.4.ebuild 820 BLAKE2B a6ff9ac662691abdade26a4c5af9762924cbc3007aadf3e5fd1a0a4091f33a06a288f1c69cc8c43597f5736b46dcf36a65372d942c1ce64e1cce73a1ee0986d5 SHA512 028872e339c0fc598fc83906e14b562c86f3b8d487bcf7cbca5483525706c3e53a3d91ff04d693a53cfd01c2245a15814671fab91c6bd8fbfc5acba23569ff0e
-EBUILD autoprefixer-rails-8.6.5.ebuild 820 BLAKE2B a6ff9ac662691abdade26a4c5af9762924cbc3007aadf3e5fd1a0a4091f33a06a288f1c69cc8c43597f5736b46dcf36a65372d942c1ce64e1cce73a1ee0986d5 SHA512 028872e339c0fc598fc83906e14b562c86f3b8d487bcf7cbca5483525706c3e53a3d91ff04d693a53cfd01c2245a15814671fab91c6bd8fbfc5acba23569ff0e
+EBUILD autoprefixer-rails-8.6.5.ebuild 827 BLAKE2B 4bce491c80db4a8eb1d77467167c3c290c0af5311f4395424f5f0c4e2b30e1474fed1746c3dc5127413d48b9e7031f8e782f7b5d1a1987550747c3900d8954cd SHA512 8bd8a32ceb04e688ec4d149a67b98905b2ec975684f3fb2fe3dddcc4ff0d8a04e7556b41a3a804a6b1dd2d4c46d4b5ab45c6ed45f300c7171bf2335f73d42768
+EBUILD autoprefixer-rails-9.1.0.ebuild 848 BLAKE2B 875ab493b7f7673729a6743fe86163786024b30fc3703fbba59f9bc1a7767afaecfe7768d33bda44deaac312547523f0c2a43b5b7e732130fb78201fdd662a71 SHA512 dc78cdf0a7de95cebcd20d3493fbd43a11aa4ae00f2ca51bd374837d8f030465c2048d5d7078680a0260084775613e167aebf808d5fce0bb4adebc4240cfc98c
 MISC metadata.xml 347 BLAKE2B 71b067345809944df1e70cdcaa44e44ae416d0c4ff80975aa796b8217170825e6be32a15d2549f464d9a65e8aa9ff1b2e9496989e66bce29d3dad672742495ec SHA512 b0985f41e9463a6c5bdbda0d5a84cc76cb6090614fa07395705b3207e0cd4fadbe9b1bb18fb7382f3c8bd00663db1232fd7107f6757bd20cfca0a0df99928426
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.2.6.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.2.6.ebuild
index c4f4758fd095..f6c5705e54bd 100644
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.2.6.ebuild
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.5.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.5.ebuild
index f623a7c290e0..aed804b3d309 100644
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.5.ebuild
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.1.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.1.0.ebuild
new file mode 100644
index 000000000000..ea1c27226645
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs:*"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rails
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
+	rm spec/rails_spec.rb spec/compass_spec.rb || die
+}
diff --git a/dev-ruby/axiom-types/Manifest b/dev-ruby/axiom-types/Manifest
index 22adc011d0a0..4c1d8eeb2ba4 100644
--- a/dev-ruby/axiom-types/Manifest
+++ b/dev-ruby/axiom-types/Manifest
@@ -1,3 +1,3 @@
 DIST axiom-types-0.1.1.gem 23552 BLAKE2B 26a9c7f242d331951a85d8a5819eb00bdf599c7f891eac2a7478d0f28d11a6f90c6c81a9beb4c6cedbe540684fb99382148568d28bf5cb55aecc85987c8913e2 SHA512 1d1eb7680cc7370e81506acf8a3a5ca2e40e8c375cc6e91176fca2b5ba388b87792b0e0872e6847b7f8ab27f3fc52f4cd4792875c97f579ffa4578e3c414d2e5
-EBUILD axiom-types-0.1.1.ebuild 734 BLAKE2B ac591243f3ba1f4c39169ea55d4163174a4cbe74fa6eaa45ccb6426c4cb02f05dbfa6fb319a32e94d722e1ac86d7f6d87715fe2d53d7646949a50d8f0fd1935b SHA512 1d40357e9db9912b784a37d9dc40a21ddde60d645238c877281b17e1a913eba347b99588511047c8f9433887cfb65eb5cdc9bdba443a33f0dbb88910c3755d46
+EBUILD axiom-types-0.1.1.ebuild 734 BLAKE2B 715dcb51f514cd5fa1eab615f2c9ecb5fecac6762b8db9c91b906ab7ee17a6664efa589f64c39cc3b3abd7ae4536d1dfbe62dfd966cca73e4c9eed5f0dbebfc1 SHA512 3a27b1d2bfbbb1beba036118a2a9dd2f6522dda033d63e5df44f648c859f8ffe09132d15c00a511c6322922e6e5543109d5ac386352e5b8754cd6ed3f98ee6fa
 MISC metadata.xml 398 BLAKE2B 53ab62259975f7b7aa7413bfce595b9c05459d9fc2052fce262b5921003bd3a2915627b57fd325c4422d2bc5b7125c80b609f0a8ca1af6a565a705a88311dcca SHA512 99d1d06e2af5c9ee6ecdadeceac40ea7ec7f3774ed5de1b817bb2d96db7ae1d2b147755a32f3b16c721afe0c28470d8e7d19e31af841d919d44b0ed6969f31ca
diff --git a/dev-ruby/axiom-types/axiom-types-0.1.1.ebuild b/dev-ruby/axiom-types/axiom-types-0.1.1.ebuild
index ee5ffa99775b..e809adc5795c 100644
--- a/dev-ruby/axiom-types/axiom-types-0.1.1.ebuild
+++ b/dev-ruby/axiom-types/axiom-types-0.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/bogus/Manifest b/dev-ruby/bogus/Manifest
index 2650e7c8d83b..79b9b1c0ec9d 100644
--- a/dev-ruby/bogus/Manifest
+++ b/dev-ruby/bogus/Manifest
@@ -1,3 +1,3 @@
 DIST bogus-0.1.6.gem 56320 BLAKE2B 1c314e3ca9aa270162e4deba87912901c3291f9765de2dfb8f50f43dde47bd8794ca64c2e1ea55a752afb3d1997161e08adee27638d952c035212e47896ab493 SHA512 c65a8b8c6f19c6ef07c4330035e05abc47a63176ec1899e0d9cf611d5a195e0e2fe53b25110e0d2fe5e61c3d3325b79b71c7b42870cb4bfedb25d459f6f90e25
-EBUILD bogus-0.1.6.ebuild 713 BLAKE2B d7f8eb5677160be614f3b5ba0acfe1a04c3533646936712b7780e6c4fa3fcb7feb4d6d5775c48261a8a110a219397cd98b1aa6871faaa40239f51907734ebc5c SHA512 a744ae99bbc8504cced6b1b4f192794076e439074da9df63c36bef3794533e0bf1efead1e8ad35f9a52b0596c20ffb818813fd23014452af5e550f04f160a0f8
+EBUILD bogus-0.1.6.ebuild 706 BLAKE2B 92124c929d7d15896022fe1f6742bcc5c49013eda60dbf93276cdf8381357dbb10df1ef487553b31f9aeace88aa9c09a71c315b8d7e991bdfcdcdc76237c7233 SHA512 434f8493af1114d042585129e311d8c2d1dfc832b817a09061d28894811afb5e9942520a6cced5277b32f712fc3b45661e4f137588b3897c164293193c6ed94b
 MISC metadata.xml 337 BLAKE2B 84f65af92e1578249c21b03d7babc2967a0c77921604f707f313c6462169d528659174bfefcef14339331aa0116c03b57bc677fde196d8a5a319c3b6c3772da1 SHA512 034772fe8e7d00b80053f22f5d5cccf85d5f4a100279a47d280bdef5af6558a1fb83aa7f5ee27b855a61e6dbfc7988ff3bb95cb4a17391f00f87a9cf6932b5dc
diff --git a/dev-ruby/bogus/bogus-0.1.6.ebuild b/dev-ruby/bogus/bogus-0.1.6.ebuild
index 91b7a6b75e09..2ccdc47cba2e 100644
--- a/dev-ruby/bogus/bogus-0.1.6.ebuild
+++ b/dev-ruby/bogus/bogus-0.1.6.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=6
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest
index cc286b17c064..e3ac5c56bee5 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -1,11 +1,7 @@
 DIST bunny-2.10.0.gem 202240 BLAKE2B 7651c904b851930d044c240d83942aa1afd20c5a1e4c97e50dd1c3e40991de916c0435bf28769c6bd4a49202c2d58bb9b7be92a19413f0188472bc1e1ff7ef5b SHA512 af8f5d8b78efffa32824007c3aa472a2492b563767e7d00616feb86b5d350a4bcda0258ecbace02a3e81b5f552476d3b71ef742117c13e6d14a6b352cc4dcd89
 DIST bunny-2.11.0.gem 202240 BLAKE2B 29cfa68c4aeb04e3b826f02afb083dc479f851ae24c285963f56aa81e64b532577d20f10649fdc339d4b3ede6fc2619a03f35a3cc8a8bb75e3d57a1a6ebcbeb4 SHA512 540636337b5af36cee691e61677fc381be26d57b1e5dd175fa0dcb7f1fe8f531412ad1b1c5812d5ca9af1b2f83b09f37c2cfb1456643fb7872d4e6cf9de6b011
-DIST bunny-2.8.1.gem 200704 BLAKE2B 6692bf5e16975193ef2c56992b542258f2dea5f013f0e744f8a7c1537fd3f1496ac1e566d314c65e198aafb096bd20378afd773a2074d1c14526153302ec6459 SHA512 024aa4d8e13dfb6cda0cdb2f3f12d3d2c7bb62b8bb28e7c580214db34aea4a6c88d07ff2fb01f0bf2b679bf2208c6e71b358bf67d55a52b3c8a38ffd61e2e8e9
-DIST bunny-2.9.1.gem 201216 BLAKE2B 008c308484fccd42761f237a57d244a0843b3eaffa04d826a04fae73712aa8b1fce407359905040164a10ff7ca06141951206f5975b3f23a394e2e44ed2949e8 SHA512 56a44c4ca6269c3a120a8e77cb370e008b81d2e072c7637d812b501f7e8793573a7f1fcbccd62a95b677348e8996b156477e9519ed8f6c73104996fe805a4600
 DIST bunny-2.9.2.gem 201216 BLAKE2B c885364558c7833f77f3154765468f1c4d2f3f75c34a14f9c3dc64aacb1f8f048ff1f688914de5831f0f924975facd259e2f55667d58e468aae410f3db9da61c SHA512 24e329fe2cb84a0789ac53d5cd406a999f0b415439dfbce75dc36646e53c5a138d20980489fc1dcc6741026082fc268f9adb00370478d99accf0f42a4e05ad12
 EBUILD bunny-2.10.0.ebuild 642 BLAKE2B 104dda9e0df4fc062f98d57a84eed602fe658247100b0bcfa4b9641d99dc44797e78268e696f6c82c2a170db8ac63802837c0dd99da8ed1641dfe2668de4df24 SHA512 dcc5261152dba7a7e110556a1d3c01b0c7937f81295e152b8290f2a026cc241684e92daf751d44b9692475f9516f58bbd113b0015f63f0773a2439f6e8eff282
 EBUILD bunny-2.11.0.ebuild 642 BLAKE2B 104dda9e0df4fc062f98d57a84eed602fe658247100b0bcfa4b9641d99dc44797e78268e696f6c82c2a170db8ac63802837c0dd99da8ed1641dfe2668de4df24 SHA512 dcc5261152dba7a7e110556a1d3c01b0c7937f81295e152b8290f2a026cc241684e92daf751d44b9692475f9516f58bbd113b0015f63f0773a2439f6e8eff282
-EBUILD bunny-2.8.1.ebuild 642 BLAKE2B 4d46348f3446064dbaabb4a60ba7b11a2fe4599bb10cea3f0f8559852e48502b2aee98646f9f05bfc21a4db02912868edcd87df3dee0ba08fc4217b5a089805c SHA512 955f9ec3b25dde15d2a162ade7fd922ad4ecd4876ba4afa6d6854035af95cf69ceada5eefa68c942f0f00d51392ec66fd4cef6b48a2c33cc646aa07b1c9e0d42
-EBUILD bunny-2.9.1.ebuild 642 BLAKE2B 3c8a5d70f6fe4b60386022c74bb3ee70b2044adf29be2db2659d66dc3c7d4fc67da8199cc3349e006300a165bd91f41244bc76b2cd21730dee970b0037b5f7a9 SHA512 11a8e08b2e9d01f600e0cba9d1eb9ffacaf3980231dac006523fa8306a1186690d0ce98a828d33ffc57103b51488d164e25e899a7ac0878bf0c94a93bb370b58
-EBUILD bunny-2.9.2.ebuild 642 BLAKE2B 3c8a5d70f6fe4b60386022c74bb3ee70b2044adf29be2db2659d66dc3c7d4fc67da8199cc3349e006300a165bd91f41244bc76b2cd21730dee970b0037b5f7a9 SHA512 11a8e08b2e9d01f600e0cba9d1eb9ffacaf3980231dac006523fa8306a1186690d0ce98a828d33ffc57103b51488d164e25e899a7ac0878bf0c94a93bb370b58
+EBUILD bunny-2.9.2.ebuild 642 BLAKE2B 104dda9e0df4fc062f98d57a84eed602fe658247100b0bcfa4b9641d99dc44797e78268e696f6c82c2a170db8ac63802837c0dd99da8ed1641dfe2668de4df24 SHA512 dcc5261152dba7a7e110556a1d3c01b0c7937f81295e152b8290f2a026cc241684e92daf751d44b9692475f9516f58bbd113b0015f63f0773a2439f6e8eff282
 MISC metadata.xml 339 BLAKE2B 4a125163d9a518d1b7da4bacf6af27231a0015ac40cec6278b0d144dc43734bf5b4957d0ecce757f4029634768da9460c44e6be884b8f1649cec204f5ec79e7f SHA512 2d782782ba704b3ea7db62f8b7fbdb71e09bbe7429de43461be76c6319d4e81d502a75008b12a580a9ad8a0d34ceba6bbc749ec061a7fb288043e7d9e2c2670f
diff --git a/dev-ruby/bunny/bunny-2.8.1.ebuild b/dev-ruby/bunny/bunny-2.8.1.ebuild
deleted file mode 100644
index fab30742e0a7..000000000000
--- a/dev-ruby/bunny/bunny-2.8.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-# Tests require a live AMQP server.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Another synchronous Ruby AMQP client"
-HOMEPAGE="https://github.com/celldee/bunny"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/amq-protocol-2.2.0:2"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples || die
-}
diff --git a/dev-ruby/bunny/bunny-2.9.1.ebuild b/dev-ruby/bunny/bunny-2.9.1.ebuild
deleted file mode 100644
index 18136f36d42f..000000000000
--- a/dev-ruby/bunny/bunny-2.9.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-# Tests require a live AMQP server.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Another synchronous Ruby AMQP client"
-HOMEPAGE="https://github.com/celldee/bunny"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/amq-protocol-2.3.0:2"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples || die
-}
diff --git a/dev-ruby/bunny/bunny-2.9.2.ebuild b/dev-ruby/bunny/bunny-2.9.2.ebuild
index 18136f36d42f..973c02b1ffe4 100644
--- a/dev-ruby/bunny/bunny-2.9.2.ebuild
+++ b/dev-ruby/bunny/bunny-2.9.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 3bd95a7b595c..68a2bf05fcaf 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -4,10 +4,12 @@ DIST capybara-3.1.1.gem 282112 BLAKE2B 82740933a34bc80ff4901fdf538b9d48d3ae8b5d9
 DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
 DIST capybara-3.4.1.gem 292352 BLAKE2B baf07378ec9c932ca4fac4b9ce465b76704c5b17cea73db01d584dbf7076b2c6defe0170a0575691f6af5dcda2d8f97bd16a3901d36c8a9db63c72491fbfc962 SHA512 abd969af564a9b8a827493674d51e2cabbb57c47795ede260498f99600da0da9bf00c97e64ccd07cfdb1b630135714191f232f166e08856a4cb9fdff6c47fe1a
 DIST capybara-3.4.2.gem 292864 BLAKE2B f04bef4540df60eaaeab2cdf59577962493da34adae1abcb4fc23101244a522fa2bc80ad86ba906368a98e68d6918877a073be1e0068b4eb2ba44e0d060b40cd SHA512 e9415ce626a1391d9a0af944d9afaa536d98b6d44bb19d288e3b71399effa2fa8ffeef72a0fb2d786a3267f6809943f499f50f88f95c24552888db24888867e5
+DIST capybara-3.5.1.gem 294400 BLAKE2B 413281f52305c47cad34b6200e534798f05cf8a4257ca0f396dcb5c7f4d689d1c34463a99644ce8861cb12fe921918c6ddc503ffa3c4f00b04b6570ce1096dfb SHA512 c42c4492865f70fad30f9c554dfd4a5e435102d58c3934392d9e692638ace50dd7f3301628e45eee0ceb0e94f91b051341bdc9eb9a3f498aec7a477a866bc76c
 EBUILD capybara-2.16.1.ebuild 1509 BLAKE2B 8ff52d1240388337ea4eefc688caeddcb53f0c589ffc50d2cddfec130e6702b5ae3bee7ae8ca0dfd8c672867ecfb0347aa37e6961f3dbf185145600e493e0276 SHA512 2b9160aa85c4ac67c1756b385e3bd98951b83e114ea390d0c0243ddae60dfc0a56ad1126a841768c1956641be68c76b935f633509791aa1c07ddc1172cc66987
 EBUILD capybara-2.18.0.ebuild 1525 BLAKE2B 17327933169f1c330a0f0580b8dfd00be4ae39e0fa94d62e172d6621a8a91189925acfca3730685ed80573e6eb456f731d8072fb1adb2653b6b646714a89bc5b SHA512 a6347a7b9014e3ca1bdeee9eed2a9e22d866dd831041e700086b00c4245d254ea3107c82b019f7550faa273777430898c571c837ac4202cdb2cfdf15068edd47
 EBUILD capybara-3.1.1.ebuild 1512 BLAKE2B d8c1dc1208dd7c7aedeb2f48ccaeb190dac1451e60feba70bd2cce2b3e7425f1179716e02792ecaf27b9301c560821d8bc322d2c56a5a92c3032f94303c5e268 SHA512 9f96398cd632b4b2aa5386d84c19bffc3c22cd416178e516a755412c9ecb75287dc089d88925354a6f6d1bae5d5109b4c0831b3b6edf3615deed6253aeb595bb
 EBUILD capybara-3.2.1.ebuild 1518 BLAKE2B af598a905b37db7eb77511372ace937bff702c2aa116afcdf4bb2d32bd99489e95a61ca442c8cf5c8174fe7f0021fb7aadb6fda65b2dd7ab41a1d8829bd3099f SHA512 9bcf03fa1561b95257a319825c5ae165914fac5ad4993e028f51d9b3d70bebc7e51203f30cf70d2a9b66a61a4b30dfe85d79037a5f19c3e61997f0e3f41f5372
 EBUILD capybara-3.4.1.ebuild 1502 BLAKE2B 8aa63d3d3d39207e1884b05ba051ebabc8a5d65b472bbb57db356a7482efb91e3adb20ed7f7f06db3f609d50b456a0f1bad8b36d53880682742039b04826d9aa SHA512 9b5a5c6d9e8362eaf76aae52065706ea8192e59ead7acefe282023295f46c0d89d8548f955286bd3e240c8d20e39e1e0123c81d1054c91a37bade11f74d7f4c1
 EBUILD capybara-3.4.2.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
+EBUILD capybara-3.5.1.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.5.1.ebuild b/dev-ruby/capybara/capybara-3.5.1.ebuild
new file mode 100644
index 000000000000..da6c2de9e770
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.5.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( www-client/firefox )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	>=dev-ruby/launchy-2.4.0
+	>=dev-ruby/selenium-webdriver-3.5:3
+	dev-ruby/sinatra:2
+	www-servers/puma
+)"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/rack-1.6.0:*
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/xpath-3.1:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
+}
diff --git a/dev-ruby/coercible/Manifest b/dev-ruby/coercible/Manifest
index fa9ea02b1aa6..7811aeaf5831 100644
--- a/dev-ruby/coercible/Manifest
+++ b/dev-ruby/coercible/Manifest
@@ -1,3 +1,3 @@
 DIST coercible-1.0.0.gem 24064 BLAKE2B 5f9708211600621869e78742dc5421672f27162c1e09e703bb2954d67b2ad281ddf59f9ecb28722f4423cbd0c7fc8bc14bda0f1f064135cbefc24ddb94ab1648 SHA512 5de43166625cca102cd048ae5cd4113ef834b273fb798490a99eeaab423174f1fa40410546de4e0224234efb996a4aa1f2c37b093298f50356f925b8a6163767
-EBUILD coercible-1.0.0.ebuild 583 BLAKE2B 85282b8caa4ca5b6288f0234a7cdae1b0d0fed5a7c4ff7d3bcb257c924a672500b2a0ee8ce58e2dfb73b146f2aafccb07fc31ff8846b79c13193d64e480faad1 SHA512 b5d7a2c33f81e72ab15d96850169654b0d8109bb2987558c20fad15cff2b7dbbc72a29f2991437c9b5cedc2bfd7dfa9dee5be4392b26219fd3393a617360934e
+EBUILD coercible-1.0.0.ebuild 576 BLAKE2B f65914eb7a720bb08447b7436e8cc88b927389188c35668aaed1a233f8f21128c10c5459f05b9cf54a78c7321e145cd31f1fe75d49bb7394556cee709f1e52fb SHA512 c7cbab9149c8e77cfd180968efd9580e4b26832c39b1ed58b6f9988f5b452f193d296406bec689ad6c87b3e835f40719ae18982fbb6818c7e5736f37f4e169da
 MISC metadata.xml 395 BLAKE2B 61cef84ade40ac40da9066fefb8efaf827d74c2593b6867885a5f9128fc2b2bd8d58d951ba32119464bcedc7e80522eab29eddb7336a17a08e82ffe769ae1fbb SHA512 07eb2459fb9aebd3501e79cdc16dd53c2c992ef8fb63f1e14bc4e88f627fc9d450182df968c6875216b35edea65e5ada72ea16f64f567d58548c8b670c130b7a
diff --git a/dev-ruby/coercible/coercible-1.0.0.ebuild b/dev-ruby/coercible/coercible-1.0.0.ebuild
index c343fc51b8c4..aba4fc8fcacc 100644
--- a/dev-ruby/coercible/coercible-1.0.0.ebuild
+++ b/dev-ruby/coercible/coercible-1.0.0.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
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="README.md Changelog.md"
 
diff --git a/dev-ruby/combustion/Manifest b/dev-ruby/combustion/Manifest
index e3f85ef66f27..4e0de3d60641 100644
--- a/dev-ruby/combustion/Manifest
+++ b/dev-ruby/combustion/Manifest
@@ -3,5 +3,5 @@ DIST combustion-0.9.0.gem 17920 BLAKE2B ac5a1c41b5993614a0101427f0a8d7491736a98b
 DIST combustion-0.9.1.gem 18432 BLAKE2B db569f0e97c756b5ebbe9fe33186d793ea8be97c9a629db0f263576a15bad1deaa353e43afff0ec72807be7fc9fc87075696ce5fbd20abaa0dc064a9d448d4a1 SHA512 9a64b0cd440ea10f1318b24f7643303d9cd7d7ac6d8d2d16a5b7b6e656a6cbbc98684636520a12950ab038bc819ee817763e802996914cc7ee6ba0fb12ae9248
 EBUILD combustion-0.8.0.ebuild 503 BLAKE2B fd2f8df943e511330b6948903260d7ac5b0ebc7cb90d739e1f6fc3efd2c4cfa18b224b9f6580e420d009e8941027bd42a9c80863b9becd958a138aebdff1451d SHA512 39e410894963f8c9fafbc0ff472de26de768e7cad4ef011b6c669ef3eee233640b65aad938d246584d1aed42f059a6d79357f5f25a12dbe77f15e07b837000f6
 EBUILD combustion-0.9.0.ebuild 503 BLAKE2B fd2f8df943e511330b6948903260d7ac5b0ebc7cb90d739e1f6fc3efd2c4cfa18b224b9f6580e420d009e8941027bd42a9c80863b9becd958a138aebdff1451d SHA512 39e410894963f8c9fafbc0ff472de26de768e7cad4ef011b6c669ef3eee233640b65aad938d246584d1aed42f059a6d79357f5f25a12dbe77f15e07b837000f6
-EBUILD combustion-0.9.1.ebuild 509 BLAKE2B 0a105ad549619412e2eb4279d3ab5db7019684687cc7b6af477832ca2ad7ab16faed04bcc3283c8735957edc52382fa41719d123a70884ffec9f81c0c78436ee SHA512 0a255391ad936bdf9000ec61880166aeca389656e64dbc2c4b3976e98abc7c62ea3f06c1493e6685cf3e3c11f3e948b0176745c1a9a01a75d036a26a8b7137c4
+EBUILD combustion-0.9.1.ebuild 509 BLAKE2B aeb8b81737358ad571e882f55087c924a03317235ee6c751fb3199e9e6ba6b250078f6a7e1eb28a006304209d6009d534b2a545bab582cd65d13ce43fa2fb8cc SHA512 bf2acaf0a03184b4f69bfc3947f1a2117cc4a7eb4040182a2f255139e6dff2d390c99ef4015b5538c4422d36ddc1c864443811e557240aa107ab111236a0ce30
 MISC metadata.xml 340 BLAKE2B 92307b9df9e0e099c9e38095e3fe14be95374db3313eff5357c57ea1c86cae77276f0a7fe828189402f69e1c29feefa17975d03c94694c59257be999c103a488 SHA512 85ab18259671a4c6f57a305fe992c5a0b078f6bc9f10d88662123def6b378340f5b2f62350a007dd1f62bb66766f1e7b6f3c2546042ff9e52f53332f66ff11bd
diff --git a/dev-ruby/combustion/combustion-0.9.1.ebuild b/dev-ruby/combustion/combustion-0.9.1.ebuild
index 31470caeb484..be44f5684da4 100644
--- a/dev-ruby/combustion/combustion-0.9.1.ebuild
+++ b/dev-ruby/combustion/combustion-0.9.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index 79cf18d2c417..3196830e456a 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -2,8 +2,10 @@ DIST fakefs-0.11.3.tar.gz 44888 BLAKE2B 498dbcbe12389f27b6c6776425910f91ccc45ff8
 DIST fakefs-0.14.2.tar.gz 44978 BLAKE2B 6cf17d70c1c65ff5dd17c00d2a2f61860aa2d499365906e8a056d182a2402af08c33b1d4608ed2ea2749a49966eb3142195b5d29b014e41a176e793bd8223e97 SHA512 bfe33f0849a8e72bae6c3b4cdd05485c6ea807f2048decfcda84055fa601c85fcb6ebe0db9de81d9ec77c5040e58335be7109779bd765da73a405541903049e1
 DIST fakefs-0.15.0.tar.gz 46331 BLAKE2B 5994921c2696a48ea0541a2a49fc9e372a52ef585a7a48ad4c15303d8f817dbb95411d0efcfb93334ffaac876e349a41cb7330d073f019bb09d60e22f6bf5f1a SHA512 49602cb3dce3b0bd2950e77aed515bcb71dd453bf658c8f15f218abec7fe595aa62969495d46974d983bd52a19d6d19bd2986ad8a6e9b45e370c37259c9f32fb
 DIST fakefs-0.17.0.tar.gz 48156 BLAKE2B 0d05def00b527fb0d510ea73d6c39ac9025f5d2e79b04055ef4e7c9250152f9c7a339f2566765da5a406c3c0c561252a70d44da13fdf3b042e58e60275e7465f SHA512 3e63a439a2d9e3898c50453e062808110128d5bcae148d90751e72a2a1ba528e00e4cf1511b4cef3c3fb37b8dcfca038289bef35eaeccc1f766aeb2984530203
+DIST fakefs-0.18.0.tar.gz 49625 BLAKE2B 2b6a93c307df8e8ca50b8f669daf6d662f5798f456ef69c3841249dd7874fb026b1b78ab47db2b3648396b93915e569c529c5339ed73bcacf7f563210a8c1458 SHA512 3a693a0e6338dad0e91fc5176c390d2f1153d093ead1750d084434392d79a8d9ca22c94ba90adadf5ab3931f5b760c32144668f7791f959d442452116165936f
 EBUILD fakefs-0.11.3.ebuild 1098 BLAKE2B d31a81a83d641186b7780447a291fab0812191766b5a6600ded1e365d3ffe1807df11ab4bb557d60782532a67cf13b05c5b892fcc8fadbe536eaf3cb9c3a6047 SHA512 52832e5b6530397c423f3ebfa64c7fb9b60e52acc9e5d84aec735a784130ecc75a604ded3cba48979c4e511624e90bbff8d9e3dea9df9dbde84a0bbb8c40f53b
 EBUILD fakefs-0.14.2.ebuild 1104 BLAKE2B 5c672ea370bd900215722582fcde3fe53a9318a2a59e6ee555ff887d89ae8bb8f46b99e7ee0d2d960b3171f6113c57d8ceecc2adef89d32a65f75af8880a8de7 SHA512 486e8c96c9ba5099b280990c5d0860e7513fbf40dd1dae361eb760443bb82220a432096077da3eba7baac9d98b5d8f5db8252956a25119d3b47df9b2b0c97f08
 EBUILD fakefs-0.15.0.ebuild 1104 BLAKE2B 5c672ea370bd900215722582fcde3fe53a9318a2a59e6ee555ff887d89ae8bb8f46b99e7ee0d2d960b3171f6113c57d8ceecc2adef89d32a65f75af8880a8de7 SHA512 486e8c96c9ba5099b280990c5d0860e7513fbf40dd1dae361eb760443bb82220a432096077da3eba7baac9d98b5d8f5db8252956a25119d3b47df9b2b0c97f08
 EBUILD fakefs-0.17.0.ebuild 1104 BLAKE2B 5c672ea370bd900215722582fcde3fe53a9318a2a59e6ee555ff887d89ae8bb8f46b99e7ee0d2d960b3171f6113c57d8ceecc2adef89d32a65f75af8880a8de7 SHA512 486e8c96c9ba5099b280990c5d0860e7513fbf40dd1dae361eb760443bb82220a432096077da3eba7baac9d98b5d8f5db8252956a25119d3b47df9b2b0c97f08
+EBUILD fakefs-0.18.0.ebuild 1104 BLAKE2B 5c672ea370bd900215722582fcde3fe53a9318a2a59e6ee555ff887d89ae8bb8f46b99e7ee0d2d960b3171f6113c57d8ceecc2adef89d32a65f75af8880a8de7 SHA512 486e8c96c9ba5099b280990c5d0860e7513fbf40dd1dae361eb760443bb82220a432096077da3eba7baac9d98b5d8f5db8252956a25119d3b47df9b2b0c97f08
 MISC metadata.xml 340 BLAKE2B a31a62212f53154af4d3dce332d30eab8433785cdcb07531f743a5d48f3e7d9dc55580651cdcc765d4dcea5d27e78902624d475f8ae052efc6d9c2eea8b57d0e SHA512 1369c8941ac7aad5dd54222a870a5d173194c4f241093864b25abc1ca97e9f55d8fe928157c11ed63d2281352bbdbf6779cbc00abaac206fd024385ed5eb8478
diff --git a/dev-ruby/fakefs/fakefs-0.18.0.ebuild b/dev-ruby/fakefs/fakefs-0.18.0.ebuild
new file mode 100644
index 000000000000..0190df166417
--- /dev/null
+++ b/dev-ruby/fakefs/fakefs-0.18.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="A fake filesystem. Use it in your tests"
+HOMEPAGE="https://github.com/defunkt/fakefs"
+SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-3.1:3
+		>=dev-ruby/minitest-5.5
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler
+	rm Gemfile || die
+
+	# Avoid unneeded minitest-rg dependency.
+	sed -i -e '1igem "minitest", "~>5.5"' \
+		-e '/bundler/ s:^:#:' \
+		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index 8841506713da..9b980beef33e 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,3 +1,3 @@
 DIST faraday_middleware-0.12.2.tar.gz 25041 BLAKE2B 0ce9750f9ce8394d1d926345c50c6b565bc2f5bbc3991d8543424dacb243f2176a066cdb4c7dd4fa66f7f90beb477aa66513538d7a6c2f84de56075c304d3caa SHA512 a93c6ad6a97da1c84e539ff5976f464e6126ea444b269be2f3bb3dab71ef6f46fd12cc0b4de7aa34842d4dcc274cca584ef879a8c1b80ca4557af4d4dafcd755
-EBUILD faraday_middleware-0.12.2.ebuild 1669 BLAKE2B af68d72464cb45f92211f17de914e92f9582f83c7b6718b2b96b6b0033f71c933c417b887a66f4168ce74e651480f18fe65d91af46329ecbc2e9eb01e8ac2dbd SHA512 381911e5d37bccf5c2766b3fdc59cb9ac34be1b4de1dce01a0e55b042722063708da48647746389a010e3aa57305f730ee4b562831890827ddf11f1768ac952f
+EBUILD faraday_middleware-0.12.2.ebuild 1669 BLAKE2B 3a1b12cb4507ce8f10f94577e5f57b43dd91ad0fbf6101c726de4a301bcc64bccc3ccdd06f3646af3d28e1e4a2d64859570c6c5f1336bce205629a3adfb8603d SHA512 b8959df49ff171cd2435b34a404f07cd33696be8664ee7b5638aa294690ea0dbcf0f0b4be5414c7d9a2e3bf478e7a116a5a0ff2f65b9798a01d7c861298223cc
 MISC metadata.xml 823 BLAKE2B 3329517a3334e1d682430843b838b09e5deab6f87a485ce05245beccfdfb32c66ccc23cec648074f060162ff107a276007a343950b246140dfc9b1675d63f8ee SHA512 68204a852a7a6eb422d389fdbd15abf5aa2424707329b42d48c0c9aec407a30b9ed0567ae87deffdf1cdccc582c31f9b1fb83bf45569915ff72e351940ffe92f
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.12.2.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.12.2.ebuild
index 86278ad3138b..ba2e99f5d3bd 100644
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.12.2.ebuild
+++ b/dev-ruby/faraday_middleware/faraday_middleware-0.12.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 68189439def5..f3fa7110e19d 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -4,16 +4,16 @@ DIST i18n-0.7.0.tar.gz 57647 BLAKE2B 50ea36ec616b90a261151cce47c98250e85b25ae75f
 DIST i18n-0.8.6.tar.gz 59657 BLAKE2B f0ddbee202daa4ac75f00113aa8bcac44797e782072a9626125497c9eca0545dccb2228c2d634bf0b9daab0339196c9d0cdd2df07285bd3792c9300353a60e53 SHA512 fe55729b5d9d2af7112d030c020257a98e7504aa554f691a759f5abe48058949442296ec154060d4a3243cefe0d6d420417f3aa8c857e3616de9bc996decc8cb
 DIST i18n-0.9.1.tar.gz 60359 BLAKE2B 98201124b557dd7e77ea56c491a99274f90853eabbdfd8217cd3a27888ddaf976f76c14fc2236609283546117b0c9837e272fc44aae0ff498ab7c557d6f036f3 SHA512 9726dea0b5aff12e6ddf499ddd5dea0853d345241b1ff19d6f97106a3f5f592b3336d2afddcd0717d15ed04c8098a8f9ea2870f1388353e073f78add2f0a77a5
 DIST i18n-0.9.5.tar.gz 61494 BLAKE2B 2a7bb401d5e75022ba6c40c6ee08809bc8728fe9aa22f308c4d532e6c042df57970b7fbfa574494072d8e5d0e125a01498c1964780d2ad9588b0a57da299a520 SHA512 356ce1290b207ce1b3dbed4d0ae542d027e74c43f453359ebf401755a5a55fd1fd815a2f046a634246e41f54c5360174dac1076be9cb7bf82f893f0dafdbd4bb
-DIST i18n-1.0.0.tar.gz 61451 BLAKE2B d054c69725b3eadf68a885b0d153a808e853ed9bd7e7edc032f2373ca45f56a6c61ff56005d4efe2a0fa531205bdbfd6f4631b014476c70b4c9da63a036e3730 SHA512 c00fc7a28886e7a3fad5432b0d06975ef42864fa8083d8f31bb111b93e27af07554c9dbe3288d5af648ef6a2d99e8ccadd27bf2e5a94ac09d6e50ec4c1a35e69
 DIST i18n-1.0.1.tar.gz 61536 BLAKE2B d439410004511f90e010beb7ab90029367e9ddb876c2215e101fa9a3385c0420a774586ec626136957dedd66c8c7b3b9ddcc6570e3a7075bbd5a90e3508ddea3 SHA512 1d0e05e04318e31d35d19c1af3b6d3aaef3d45df9b2868b65fef9aa3628c9502c6f8fca4beb52aa8c7c914c46ff159da489bc2ccac69013808459e709358b4ca
+DIST i18n-1.1.0.tar.gz 61628 BLAKE2B bed8a93362659919194de09f5963fcd0129cfdacb7ebe9e08d8a5f8efc46748c02ad39197daa7ac68d8202ea8c81dcbe65d94a3ea1b675e74f93595dbb474235 SHA512 528e3c32d68aefe1ac4b0470249af2aec9a16b76f57f703182b6540d8e18625bf7e50aeda7782b6c64853f1be5561fe49fcb4d641d388371f8066b92d5a27161
 EBUILD i18n-0.6.11-r1.ebuild 1325 BLAKE2B 6f0fdfe1af9f5c11e36f6f4d5090854f9b61752059053b143f58f63dde4eb160d79b36c71900b83cde941ae69bb2d777af999fedbe1d48b39846c11681aca5ce SHA512 0497dbca374d5afd9e7064335457fca6fdc8daf2d20bc550bc04603748f3818e9d44799ac510004afc304ecfc1774053d8928d9352da62e5d4197081791010fc
 EBUILD i18n-0.7.0-r2.ebuild 1514 BLAKE2B a027548d166ca6bd176d3cf2c7728fb0b6a22445ac22cf9e6e628a1d77f65d6c5f7262149cfdf6f22b83aa2c7a0fdfbc30d948466adc5885a2eeb58c1cce7360 SHA512 fe0eaaeda79550bd120e08fc6adf0a17d6e437e2682578dbd7dad08145e4188b37ea7f0a590d27a3548fc6b2e2989210957e39b94fe2f570234f5d7c06bfeff8
 EBUILD i18n-0.7.0-r3.ebuild 1625 BLAKE2B 047cb266a12b698343260e0ff2d2448a95005493672a1e2bad7423c8c69b08c02b596d633864db0fe301c8afb1e82031feee602765bf1c97ee7472e60c72c0f1 SHA512 6427eac2d7f85ebd7d1060d565899a976da63229cf3567b01fdf0357e22b5cc185c6e200b0d2fe219589b031c5377706136dbec7d64c1ba8f5559014f687c91a
 EBUILD i18n-0.8.6.ebuild 1350 BLAKE2B ccc38b18a766f850c3dbc7bc092b805ac15d9b7505e8443d5e39269d4f6e800d75dc09921ecd8123644b43f377573431e87aa58f5ba3624a177efddbefd6a2ba SHA512 6466ad5af282db56c980b065378ce87ad3a6495079d2f0436cdfaf1e77bfb3fc8ed120bc0eefec55d27dbeced6ac1ccb687b53fd02aebe107cb131e8a9f1ae37
 EBUILD i18n-0.9.1.ebuild 1393 BLAKE2B bfd42402e4c243c86285c6ee40019454595a17b38a338b1f7bf5794e23aa275c3b6ce7a5109f878490b6ac9690852a58977644f9b2f14b81f368df3d381495d5 SHA512 ed277f52680d78f7f790c2008bdd1a65c7c326c2d3ca265348c492f89275c1e90880605af61c641aef02e12cb50d971bd8bf3694bedd395929405115675a559b
-EBUILD i18n-0.9.5-r1.ebuild 1466 BLAKE2B 4fa4e7bd038ec1edb85e3c8fa5d97c29e263727fb0f2a89c68858bf8e8e1d0903a883f29e1eddf26f2444cba486a9fe761d96740bf64a52ea47e0c23760be844 SHA512 03e9185d1ba538e167f11805935f4e17ff0f381a81ccfa289d19fd37bcd38d8892db89ebe99699031d957b275ebe7a02fd6e89bc21f9a08f2ab2c2fb3ef43bf5
+EBUILD i18n-0.9.5-r1.ebuild 1465 BLAKE2B 4a0c8c91473c3ff64da3d1adabac1c6d7d07bdf1e5b4fd9ae4a38b0e69e06f6c0518ac1af41159e511d7391269665187623f08d80ded2fe541774c3c2fee2eb1 SHA512 5ec9410d7f944caae29a0ffd24da13f277a6a08a6dc2d2d8fbdb390dfd3b612bfad94fb62edae952b57348ddfff2ad2f1167aa6e6e1197f530509bfd13d975b8
 EBUILD i18n-0.9.5.ebuild 1475 BLAKE2B 177aa41b3e8af750c7eaa59f3c1f8bbf0b8cbcff0b2797ba68ad11d0153339faea0e6fc70f6883d4ad084a3d68f3d07814701b303aa0b56126d9819b3621d9ad SHA512 ea69750d22d11bd6acf125dce3677bf5550d1ec5b421e449f8dcbdc3c16a883e54abf09ecd62f952fdc695744318fe7214ed502094b7d9ff3ce102a8ff31687e
-EBUILD i18n-1.0.0.ebuild 1473 BLAKE2B db2fdf21648ff851b12ce06b91a49dc23bbc1b9c2030a0cab4eefc14dcfbdf81e94c13b8155cb0b4e1e924753f5834e2786d68550961aa74d64d9602880cb2bd SHA512 663274fcf31d82f478ddcd5e4eadf84f3cb9b59b891ad42d851d493b673e06a919a638db2abe16688688fab986c921e3f75deddd74a7a01677ae793933c894c4
 EBUILD i18n-1.0.1-r1.ebuild 1500 BLAKE2B ae1e7006df7e28a816aea7265deb8df0789832a216ef0ae9250ecad4820b77ec6d9a3685973365661373c4dd62d37a0e6a8c2e74b3c92918e97441ff60dfc0ea SHA512 3940e1b90a6f389655942b982857371bfa63d32fd8aeef999b7b83dd90e76ad65b1aee86924d678522957dfa17ebf820f71633e883171b6e2beb74c044cb2d35
 EBUILD i18n-1.0.1.ebuild 1473 BLAKE2B db2fdf21648ff851b12ce06b91a49dc23bbc1b9c2030a0cab4eefc14dcfbdf81e94c13b8155cb0b4e1e924753f5834e2786d68550961aa74d64d9602880cb2bd SHA512 663274fcf31d82f478ddcd5e4eadf84f3cb9b59b891ad42d851d493b673e06a919a638db2abe16688688fab986c921e3f75deddd74a7a01677ae793933c894c4
+EBUILD i18n-1.1.0.ebuild 1442 BLAKE2B 0ceec4a90238824aa7fa6cf47d15d3a01ea754ab80a82e054f93a068ac285f62dacdaf4b30617620a1d6db671f5fef328204707494cede8903dd7db04942d5b9 SHA512 6e0175b2ad2e2d693f79c176d336fbba21b8d11fcbd4bea6f1ad9e6fe8730d2d527352bfcbe52960a9371719eab018c2bf1fed665614795827408b03cec41be9
 MISC metadata.xml 340 BLAKE2B fd50e1569f22c70ba423cfd181cdfbad5348aed4ffc751ff04d38db0e3c64ec0e3d7501fd134401337337549509f7501a23e36b8a9bdd99a18a374885f8c8596 SHA512 09bf74eefe2371ac635fe302efe1b928e37cf0e1da0979f629085f357bc3e93ea87407781ad172139166f21cb979dbbc7e1bec013f8fe0a760cbbe94ab23ac64
diff --git a/dev-ruby/i18n/i18n-0.9.5-r1.ebuild b/dev-ruby/i18n/i18n-0.9.5-r1.ebuild
index 360a808b58d6..92ea56215747 100644
--- a/dev-ruby/i18n/i18n-0.9.5-r1.ebuild
+++ b/dev-ruby/i18n/i18n-0.9.5-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
diff --git a/dev-ruby/i18n/i18n-1.0.0.ebuild b/dev-ruby/i18n/i18n-1.0.0.ebuild
deleted file mode 100644
index b3c68adf43a6..000000000000
--- a/dev-ruby/i18n/i18n-1.0.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-4.2
-	dev-ruby/bundler
-	>=dev-ruby/mocha-0.13
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby22|*ruby23|*ruby24)
-			versions="4.2 5.0 5.1"
-			;;
-		*)
-			versions="4.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.1.0.ebuild b/dev-ruby/i18n/i18n-1.1.0.ebuild
new file mode 100644
index 000000000000..c97771c806f9
--- /dev/null
+++ b/dev-ruby/i18n/i18n-1.1.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="test"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/activesupport-4.2
+	dev-ruby/bundler
+	>=dev-ruby/mocha-0.13
+	dev-ruby/test_declarative )"
+
+all_ruby_prepare() {
+	rm -f gemfiles/*.lock || die
+
+	# Remove optional unpackaged oj gem
+	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby25)
+			versions="5.1"
+			;;
+		*ruby23|*ruby24)
+			versions="4.2 5.0 5.1"
+			;;
+	esac
+
+	for version in ${versions} ; do
+		if has_version "dev-ruby/activesupport:${version}" ; then
+			einfo "Running tests with activesupport ${version}"
+			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+		fi
+	done
+}
diff --git a/dev-ruby/ice_nine/Manifest b/dev-ruby/ice_nine/Manifest
index 60dedb16c0e6..cbc8ea190d0f 100644
--- a/dev-ruby/ice_nine/Manifest
+++ b/dev-ruby/ice_nine/Manifest
@@ -1,3 +1,3 @@
 DIST ice_nine-0.11.2.gem 17920 BLAKE2B d70aee3ba5d82719936e355bacd0c157fae262abb494c8d584e8530928218fb3c8a736e15903cdef2acd421fa5d08eafda11a0544651389e8b4b791299f1afca SHA512 e75237d901235dadeea159279b324982c6288d7c200ef3363eaa09340a480d5d94b8977915341218e6e2e6e439d40364f8569d757cdf47175bdc69ddb8d959ac
-EBUILD ice_nine-0.11.2.ebuild 485 BLAKE2B a3615f7fe668bafce9a829b33b59d43a986b77f414ce231ad30a1228c1d2a3421cb9c3a8c3f9aa32391f8ff864eaf69d5051869b3d072a4bc26215d0683ea2e7 SHA512 4bd4625d475455412ccbd168ae7d12135e31e1d88ad0715e9e2163375d0fe8d2830c035efa6cbc7a4e5706d86b3c0eb77cf743289a489c38125447b80358cb19
+EBUILD ice_nine-0.11.2.ebuild 478 BLAKE2B 0909171888ba4ba0422c85b7d86bfe557e99f002f5c382f897ff1363d09dde06e2f4a2541db4729866434a7ed0a9c2073b6a85eab192f40773630da4692fef22 SHA512 69ddbfd812b0cd5951618a96537216be8c364a2995ef42eb0c5c9e00b212ce4836dc7ac66b5481ed2c92cb69e4d9d19caf7be640f71b91c1322f8164254ab5ea
 MISC metadata.xml 392 BLAKE2B 005ee6bde41af66645b9076e37091d69e098bec443d81892dff2c0f20f1e175dd8e6b770107f0ce789b6bfa48e90e51ec616f365d8975396ac3046e61f752d30 SHA512 d9b5cfcda960d3ce6c69a28fae35a92e23270c683c578d62ff24664cd9b0de6880b514acb39746097b0f9c8d92c3ebd2861f232d05454c0fab3323eacaa885e9
diff --git a/dev-ruby/ice_nine/ice_nine-0.11.2.ebuild b/dev-ruby/ice_nine/ice_nine-0.11.2.ebuild
index f9bc9a374f6c..8accfc601a78 100644
--- a/dev-ruby/ice_nine/ice_nine-0.11.2.ebuild
+++ b/dev-ruby/ice_nine/ice_nine-0.11.2.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
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="README.md TODO CONTRIBUTING.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/marcel/Manifest b/dev-ruby/marcel/Manifest
index ab4a2b782ad2..e4ae59e8176a 100644
--- a/dev-ruby/marcel/Manifest
+++ b/dev-ruby/marcel/Manifest
@@ -1,4 +1,4 @@
 DIST marcel-0.3.2.gem 7839232 BLAKE2B 001e03b109617f7804e1e8f77d65eaec81544040a13e1d18ef197fed1caa5a26dfc69e1796632a3ec29c3778eef9458a6f701bbefb2f30c89d77fb22622cdb0f SHA512 0e27c5c36f219e30ad41aa87a94e559ecc0185319ab33fbff2cc54656c5ec378c9f8ebd8d8d28a644c9b64cd7106aa2b235b893c5871ddda9db3596d8b8847bb
-EBUILD marcel-0.3.2-r1.ebuild 559 BLAKE2B b7ac9c43d9a016aa50bad0ed23080fd7f3a93184c876b5df57efcf9e0c98c120b6f4ef064d5ae02d7556e92be237a8800f709c2856cfcf99949ff8d9c309d153 SHA512 c9fe6906c7a15e9274773da79e1b7e7c432d9ee53ee451dd6770ce169292e1babae00048147fd1d5119fc98afdaf80b7229ad74a254d5fca589f984762070452
+EBUILD marcel-0.3.2-r1.ebuild 566 BLAKE2B 63aaafb9f2fdb29710922c3e1154566bc2ddc88726aff217d7e5aafeaafa280bc5b00617e9647e863d1c2ea2d432da084aca8452268657534c63f51e459eb1b6 SHA512 5461968cb3bea1a500d24d257b7a5948099b0b5b71822360f0ceb0219a64ab348998ea5c5da4f6d49634bcb0b65bae1801aa58185ce0a013f2c2d8edd516feae
 EBUILD marcel-0.3.2.ebuild 512 BLAKE2B 34dc9c450e27ef0badd3e17f5db91704c437b6b271ce95f17939d91ca86cf19039a4152f8054b0821e46979a9a2f47641dc143ba38437a9308c990bbec86a484 SHA512 7fce3f35854662a10407208b95b4094df6bdf38b5a7bf904b5a558459853f9587b142aa316a09e91699da21738c9591cb3267b736745a9517e874075da6af513
 MISC metadata.xml 341 BLAKE2B f284cd2a1df740c004e9af77a1aaea9254ddb1672b567faff9c65be99171a69abeedbc229a05db711d2f91f5f8bca0f7e2e6c5442a81b1776ba299db47ebc281 SHA512 1c71acef93507dc8305c65be9fd3e90978f6a2a14781b019f06762aa6159539596404afc32c0d9c718b361ecf90cb4e93b0b0186e7b110d895a14216d25b3360
diff --git a/dev-ruby/marcel/marcel-0.3.2-r1.ebuild b/dev-ruby/marcel/marcel-0.3.2-r1.ebuild
index e2f4c7b496d7..b6e40ae0998a 100644
--- a/dev-ruby/marcel/marcel-0.3.2-r1.ebuild
+++ b/dev-ruby/marcel/marcel-0.3.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/basecamp/marcel"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/mimemagic-0.3.2:0"
diff --git a/dev-ruby/mimemagic/Manifest b/dev-ruby/mimemagic/Manifest
index a7afb51aaca2..c68e43d8c62e 100644
--- a/dev-ruby/mimemagic/Manifest
+++ b/dev-ruby/mimemagic/Manifest
@@ -1,3 +1,3 @@
 DIST mimemagic-0.3.2.gem 366080 BLAKE2B a99db4fee3a41da872a95dcd31126a497ab47cf990d3c390ca1552f632d1dba5abf86378f2500b285f1cf9f78a56040ee6ee501f641de788e11fd693a655d839 SHA512 0d919ecf7f787c1b72ea337945089070db3647976192adeb510985542962a9efc9a2dc62c51024a9a32afbebf804c21745cc06d6d4738f570f1d2eee0b1ae181
-EBUILD mimemagic-0.3.2.ebuild 517 BLAKE2B e7316ef21b2738fe500b71f764d95cd3e6492de934a6ec19e081787e5db52309664912a3f9ef3fff038e1a15fb6527baf4970deefb01be4ff8d8464b5dee672e SHA512 e50027c5ad92e3f847ba31f93fbf237aaecce850c7e0bd7226bd6a9eccb7a4f04ca035a0dc52d383f8dd5c317678c6e942e288e160cafa02933cbe12b5b375b1
+EBUILD mimemagic-0.3.2.ebuild 524 BLAKE2B a25c1ab0695c538c5230a99a1d3020bb3ed9dd434d7ac01ba0bc722d0378ad362ff8ae7f185939970886d3e31060fdd29be59a3cd876eb19dfb7b494ba09e124 SHA512 724c0fc871c29ab56751db9969cfa68790e5b40f0f26ed5b9e714d99b1805a39871a554e4c9f15c7354c79a8910bfdde22c7c959b59b14f1a6ff66ff59b1eeb8
 MISC metadata.xml 341 BLAKE2B 6d21edf9da7e6ae6913d3101cb96b5e82376e080baed3c07b9d4a9259eb0c097522b35807a89e4b9b32fbc6a6288dba17be7912bef5654dbdf32c9b34da567db SHA512 601856326d3da975f418b59996f89c68b33d089d662b684b9db13ea79481f34706fd4726a531f7f2fee55f25e2c7b3d1ecc69cedab1ff627109c80effa7bc406
diff --git a/dev-ruby/mimemagic/mimemagic-0.3.2.ebuild b/dev-ruby/mimemagic/mimemagic-0.3.2.ebuild
index afd105191c1e..cae92781843a 100644
--- a/dev-ruby/mimemagic/mimemagic-0.3.2.ebuild
+++ b/dev-ruby/mimemagic/mimemagic-0.3.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/minad/mimemagic"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bacon )"
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index e340a8d39cd0..19e0d5e4652b 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,3 +1,3 @@
 DIST mini_magick-4.8.0.tar.gz 1184374 BLAKE2B 9949cb8b668d5b31c8a9b19ac1b68147e4865cebb2d51b75c01dad11bf98a64609acb90a08f08867f173424bfa720f83e475ab08853c11fff29e86e7af5bcba2 SHA512 7c582c967480f51114c42eec2f8c260713755fa3e6078eaf5a296b0cb4502f2edd1dd65d5ef46409226943913b81e8818fc3066a09879e9da7dcb0f9f732f6d4
-EBUILD mini_magick-4.8.0.ebuild 2282 BLAKE2B a7548d677811fa8dc5a1b6faaa0b95cd02a34478e869d8ef264f081fb765df94328edfd194c0f04354be89f32c12ee3864f94ec7eff3a4a9a5c7d46c2268f49b SHA512 84a8812bc87832b316f93e27fbf6fd702ec54cb06eaf66a3c66e0f560aaaa8efad8f4e752b4537f4186a71265aaf9b360f1ee43138db9e0f9a53a5fbad771ce0
+EBUILD mini_magick-4.8.0.ebuild 2289 BLAKE2B f57f049bf7d9ae968cd7d2200dcc7cb22ee67af9a777ee66c1135bd2e1529ec695edec4b18ff7c11dafdc18be95ea58beb0008ec7bb36b1c56f59a6a92532e9e SHA512 9cd11f65288c59b3ffacb48d1955f1ac094c3591030dc3d139b697f011762062f5c3470f424e3284a2f7183d34d8218b0f23e3d0299ce5c04b60e84836365873
 MISC metadata.xml 347 BLAKE2B 679c10bbe1e22a6374f3a45b14364514d2cb3c23e0b965e9418d1c8f10b1b036bbf019539d95fbf19630d6f315a930142575da49d237c782f7a11b100fa7fd2a SHA512 9b98a4a0ec7b4c2945df5300ad26d8ffe1394294d0c6e142dc7e55e2cd270327df70fed857ff7d6f12f6b0212d6c25b8043be7800fdcca20bd58d14ac75fe6d5
diff --git a/dev-ruby/mini_magick/mini_magick-4.8.0.ebuild b/dev-ruby/mini_magick/mini_magick-4.8.0.ebuild
index 422758027fef..d6c5777d3499 100644
--- a/dev-ruby/mini_magick/mini_magick-4.8.0.ebuild
+++ b/dev-ruby/mini_magick/mini_magick-4.8.0.ebuild
@@ -22,7 +22,7 @@ RUBY_S="minimagick-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 # It's only used at runtime in this case because this extension only
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index 4d35ba21075a..fe810f7b8236 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -1,3 +1,3 @@
 DIST oauth-0.5.4.tar.gz 59141 BLAKE2B 1e588d411795b7c5b4ae5b7b3c9928b69aaa005bef858137759757e9f06d6de144408e4dba33d7fbf82a3f2586238a71b85b89c681f5d633453dfe0da954a2fb SHA512 f114f80255944934a276d0f9556ed37e4a0a72b221269cf7792f2c3a5a1504c5ec726fd5b7437b1102c648a6cf451a1c83de4689f53d30ea8c6a1d62662de535
-EBUILD oauth-0.5.4.ebuild 953 BLAKE2B 158e6f759ab55eac9a1150e62fa991451d6f021c43d9588f4e8df882434143f5e415bf39a8c2f1743fefef181718569ccc6d012c7e5fa265d3ab707a7dc68925 SHA512 a6550c10e2f9d95541f330da186ad6ca2f99d979f3e43ef6c7328711963b97d1482f80064d84790774e90fdea6306c0dfd39e8f6719bf7ea72b5e9dabcb6958b
+EBUILD oauth-0.5.4.ebuild 953 BLAKE2B aeb6f408573885422f8b6146701a863cb091af80473310fb1d7bcaa43880446d266a7191564978820f7c53ed37b7530ae358bab19a67395823adfae07693296c SHA512 151246d5f5f1c3934ee9724b38bd98fa33cc4848abb258e8c465d3ec8191ed7bc501975c4ac5f1b77c6781194069338b032bb7df11c40124d6b523f344852387
 MISC metadata.xml 335 BLAKE2B 57f59b76960a57baa7a46f505fa812b1f3417ea7f026272eb513139014e245cf7f34c286a677b6b91e7bd293c28da283dca118e32f76338758bf4a2247c01a32 SHA512 a740b8de21545f432e6e1d4b72a588bd1332bca643f017d8cffa84ae76f6a3d4514e3734f24f80954b7691034411b46463581291ae405a1026b90d93d991cb96
diff --git a/dev-ruby/oauth/oauth-0.5.4.ebuild b/dev-ruby/oauth/oauth-0.5.4.ebuild
index 1b883606f567..fd90e9faa800 100644
--- a/dev-ruby/oauth/oauth-0.5.4.ebuild
+++ b/dev-ruby/oauth/oauth-0.5.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
@@ -25,12 +25,12 @@ ruby_add_bdepend "test? (
 	dev-ruby/mocha:1.0
 	dev-ruby/webmock
 	dev-ruby/rack
-	dev-ruby/actionpack:5.1
+	dev-ruby/actionpack:5.2
 )"
 
 all_ruby_prepare() {
 	# Require a compatible version of mocha
-	sed -i -e '1igem "mocha", "~> 1.0"; gem "actionpack", "~>5.1.0"' \
+	sed -i -e '1igem "mocha", "~> 1.0"; gem "actionpack", "~>5.2.0"' \
 		-e '2i gem "test-unit"; require "test/unit"' \
 		-e '/\(byebug\|minitest_helpers\|simplecov\)/I s:^:#:' test/test_helper.rb || die
 }
diff --git a/dev-ruby/posix-spawn/Manifest b/dev-ruby/posix-spawn/Manifest
index 37eab052f026..e32d862e4478 100644
--- a/dev-ruby/posix-spawn/Manifest
+++ b/dev-ruby/posix-spawn/Manifest
@@ -1,5 +1,5 @@
 AUX posix-spawn-0.3.13-x86.patch 713 BLAKE2B 0c10ac73b938fe985d6c3f3f084c4f96d19293610254029267cd5b16111acbb5792de7cc5dd5195f79d5f957206140bcc7a7c47b171bd565f9eee5350352bcb6 SHA512 33f5ee510fdeb7b8b150aa61e9d3044a1571470e1187d4dd0483e700c09bfb4bfba9a52c2cde723ed568ac3d2d1cb27855a4ef09826b902946138055d4b04774
 DIST posix-spawn-0.3.13.gem 28160 BLAKE2B 68b1c241310c7b35bf8bea055e63a60320ae3fc877f9bc9f4e2dc0d30c1484eb5081be8c7d60309ed04900c410d52624dae6e37a0f134993f334526f2d9de98d SHA512 a9cd878571440cc0aaee541cbb97b6f4dcb03e48a8ef8588693f4c68990eb530e3b1685d615546763c9bba5d3109134442285023938eb2f116e9749f0da12bb9
-EBUILD posix-spawn-0.3.13-r1.ebuild 741 BLAKE2B b6d682b000542b2a1deb40e9d3d9397839bda09a4e44bcfa12ab8843f6335a605c240d8d7c22ca87b5cedf35ab63500fc834c022b1ae7e8405404c4754d91700 SHA512 b5dc9e969fc3f397abd3af513362d21c6b6a8bd3f7ca82f7c6f35292cc40cd9c4be7d30761f5509aa63b102e2c85b155d0ff5c89aab0b3b9e75b773e20dccc7d
+EBUILD posix-spawn-0.3.13-r1.ebuild 748 BLAKE2B 6fcf2461aaadafdb6bce57d5bc114e69beecf4c9c113673b920da5afb54bd8328c1b0fc6b2978d34c61ede6f7c72d3664818d99903f9ceaba17c92b045812e45 SHA512 93b48f94349cdb3938ad9b64a59dc85badd13d81c0f8c6298dd713ec4c56c573af158342561338e3deac4fcd96aa75314486dbd441caf852d5bf8cc2b8fd271b
 EBUILD posix-spawn-0.3.13.ebuild 681 BLAKE2B e8c61d27ff00d42aca97ce70ff3e30a23fb073596bd02b4b3831ed84ec9003e80f3704908eeb563d551cc6575e92c348d40b801b710d49fbebde3ff36efc5f5d SHA512 489ecafe543fef55d3b819468e92e0b9dbd931461551ce686339187487d9ca325c1eb5ee584755b96f27f340b7c9f5f04ae018444b5254502eddfa2b577de906
 MISC metadata.xml 346 BLAKE2B cb818c5b61108ddb5acfcf890d8ba737a8cc949fe607d02a5cc7dd1d264ecc7d73a096d8d40b65872fddb0791d63aefbdd774906da4b65122cd1087e040c4cd3 SHA512 208a7646bd550d2ecd50aecda3f1891b46cc586f74479eb6a72be27c985bf2ef1f411b609e54e73f418c1653a205e1ecedcfe3f2c2ebdb719e56c60f7b1b48a7
diff --git a/dev-ruby/posix-spawn/posix-spawn-0.3.13-r1.ebuild b/dev-ruby/posix-spawn/posix-spawn-0.3.13-r1.ebuild
index eaea11a07923..171406823c83 100644
--- a/dev-ruby/posix-spawn/posix-spawn-0.3.13-r1.ebuild
+++ b/dev-ruby/posix-spawn/posix-spawn-0.3.13-r1.ebuild
@@ -13,7 +13,7 @@ inherit ruby-fakegem
 DESCRIPTION="Library that implements a subset of the Ruby 1.9 Process::spawn"
 HOMEPAGE="https://github.com/rtomayko/posix-spawn/"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 LICENSE="MIT LGPL-2.1"
 SLOT="0"
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index cdfb61c9c9a8..df2cf8c7735c 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.4.gem 6656 BLAKE2B 1a6d15a13eca0fdc3b78d359b0d1edc29c29ac4186f15f
 DIST rails-5.1.5.gem 6656 BLAKE2B a6d86d40c215ba343f4bfeb5bb11db15a3f3b0d5828df3a8179f678b8df313a49952bed21842bdfe71965d80da88ce08fb665a3a843ff5ab4115e49ca71f5a8e SHA512 33aa51d13261b2cc040a603f3a94a2a56d02e7e9f2591d46b43c72a00923b7869ec61ae288cb19a6d90789ff322c4a536f715ddf6d79eddf6ae8bc72f1b3332f
 DIST rails-5.1.6.gem 6656 BLAKE2B 9e5af755854f7096446f5f02cc93ea0f32d9699440cc925c397fa8a62337d01b3d8e04f74d40d1a409e789b55e3046e3ed565d87f5cfe8f8d8225335c7ed0734 SHA512 df201bdbdb720c4ec3045cab908d5e97c53e3a31e29d84224e7bf918f6f2cd108a47792ac39e091b9a0cdd9749f15adc8c5c703659610f5da11d9bd9a63c13b9
 DIST rails-5.2.0.gem 6656 BLAKE2B f436d571ba9bb3866ad0568d3514b46fecdc26019b2237b111089df9473ec9706e52aaa00a1d8787523847cd5bd2e6fc3f470257f347fb5f37ce293d570859e8 SHA512 323b82b0b6a8451d37097925299624814f54a1f7896563bb23d34df37a1d41bf1ee50164211569fd9859ed55a6323af13310f9ad267d130fd3341acd71275558
+DIST rails-5.2.1.gem 6656 BLAKE2B 0ed8e5d0ccfd0d41d2574f0acf02ce67f068108780f4bff27ac1ac2c5f103ee3fbf566db92b85b3b590549837ec31c3f22ce1d11ecd24e64fe6fea692ad088d7 SHA512 1c90b91bfcd064f06e93a00e22e8a73f371390640ef4c59e5552ea802e68b2f1f04cc735aa618c7c7839d160df0e7175f60f1bd97c9ead4ad56393a7121db990
 EBUILD rails-4.2.10.ebuild 1117 BLAKE2B 4e31a087075b1e4ce236a372a4dda915467c1aa020a0de9d56ed01eae3a7011838f476da849faff693be03c13036a42802881d145e8cab62af87e0cf51d8ac6f SHA512 a7fcdd075d0cf39399307c017bbc4c04529ac30a2229c725e762a692a911e533574338444a885835aabc0c07dc69ff82f79f38c0a428475ccfa5965b26332967
 EBUILD rails-5.0.7.ebuild 1071 BLAKE2B b70df468058ba620fd44049ee714350e04450a15688ae8e5171bb5222b2e90346ba6b54cdf4cf89348844d923bc79e4158d9a0b40e3d1feb2bf965ece8a3d79c SHA512 cbdb54c6799b1b25dc3d927c332a6137f7106c5f982442cc407e119d96bc63d892cc884c0ac139ccee904c0d45ee92db0898f95a2d612a54a1005f295b2e55ae
 EBUILD rails-5.1.4.ebuild 1071 BLAKE2B d135e4b6112ae71d2e9517d383751896b5571f747f2fef2c0c331a6ebdcdcea4bc6b0ac72cd0b4686acbb98e3933775775d6de64f012f7eb71f634b877c387ea SHA512 ee99ff8624133f1a83998e3af0e0473d790a8ad3a453eaed448e74741a4262f01e7ed6ee536360781649d800201f3f345adbea36e8758420a0c3fe7e1d34938c
 EBUILD rails-5.1.5.ebuild 1078 BLAKE2B 92b2e355b162f771cee82a983df74cd8063e27a29af0b6b637dfdd12ff64dc40804e5afc50a06849cfe05c69cd4c00dda20c75474308ba68eb4fc76c1504f07a SHA512 bae7bba25b9174d0641a9e34ebe65e91e4203a6942556287d094ef95b4a0b68625b1f9c7b064e3270d7a969cdfb722c7726f3950df586f894f09d208e4d0fd7d
 EBUILD rails-5.1.6.ebuild 1078 BLAKE2B 92b2e355b162f771cee82a983df74cd8063e27a29af0b6b637dfdd12ff64dc40804e5afc50a06849cfe05c69cd4c00dda20c75474308ba68eb4fc76c1504f07a SHA512 bae7bba25b9174d0641a9e34ebe65e91e4203a6942556287d094ef95b4a0b68625b1f9c7b064e3270d7a969cdfb722c7726f3950df586f894f09d208e4d0fd7d
-EBUILD rails-5.2.0.ebuild 1084 BLAKE2B ac4f62502dcbfbdcbaf0e1be64c8b8787a0eea60c980f991b89b2b449480ef8c39256947c98d7ed33201b1ca2272d133ec472a06673829de2d3b5f91adbbec5e SHA512 fb0f136293185bb2fc753c3616fb9c8ef64eb1bd07dca4b635cbd4ad84183a27230c02cb6c9764fd1a7478f02e1e73af0cd718b3df94eb82a2bd2ab5b440a605
+EBUILD rails-5.2.0.ebuild 1091 BLAKE2B 5eaa9813c65d4adb4531a6e7fa939c5d9480273fd0dae095091b1fb099fa0d5d6dca140cc05e688d0222ed8afec3aaf91702d354d587b3f9d17d936aad09dcc1 SHA512 be8551dac238d06670c6423ac04abde0148911095576062cf7464329a7af3d881cdf5c39afca00918a255b8136ab9a30cadc107e69e544608c8b6b905fc2dce6
+EBUILD rails-5.2.1.ebuild 1069 BLAKE2B 374f347debd93fe329da39e4e648b782a8e2228211275dc2a6cb4d89e79e8922c2100d9bb355bbe6a65d70b0ea0005796cb91a75fa33e8350cb7537bce64caff SHA512 aa2cbcbb0c7ef0b0629ad308c40d769e56c8fc9dfcfb3ba9d40860f4ab38c370f65ea2321a6ff7fd9df78b4fd7027869bfa3687bad67f5faf64a67f0f274ed72
 MISC metadata.xml 491 BLAKE2B 83b3fd3239655be2b30f22235bac80ff14e4c7480a50a32921ce1be24e898b62b68738d635f037ee2a5c5e645b616aa5a2f9e3f1f7df09ca59378ff30f35b6ab SHA512 329f17a58eab42893f554965a142409c32b26e1b195ee315a833ccc96f3081e8920d2c97bba0230a03c882c027a0184f340b8c7760d4e1b3765041f56781769f
diff --git a/dev-ruby/rails/rails-5.2.0.ebuild b/dev-ruby/rails/rails-5.2.0.ebuild
index b566ef75ac86..51d72efca6a9 100644
--- a/dev-ruby/rails/rails-5.2.0.ebuild
+++ b/dev-ruby/rails/rails-5.2.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.rubyonrails.org"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE="+asset-pipeline"
 
diff --git a/dev-ruby/rails/rails-5.2.1.ebuild b/dev-ruby/rails/rails-5.2.1.ebuild
new file mode 100644
index 000000000000..9d52ad18ad92
--- /dev/null
+++ b/dev-ruby/rails/rails-5.2.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="http://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE="+asset-pipeline"
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.3 =dev-ruby/bundler-1*
+	>=dev-ruby/sprockets-rails-2.0.0:*
+	asset-pipeline? (
+		dev-ruby/jquery-rails:*
+		>=dev-ruby/sass-rails-5.0:5.0
+		>=dev-ruby/uglifier-1.3.0:*
+		>=dev-ruby/coffee-rails-4.1.0:*
+	)"
+
+# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index b36fa0756469..d64bba1e84e0 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
+DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 EBUILD railties-4.2.10.ebuild 1717 BLAKE2B 3ff657f26f860f75d7c34be0410e06cf68f3a1ee79f6c3317af9cd75ac2f68d2ee43ace1c9ced96f7c8cd6c4339317dca56ae0808fb39c5600bb9c5802244287 SHA512 aecb917e4204cc2d7dd8948bcbebfcb9f4f01022d5c691f0aa4878e74b3ee3a7ee0044f54e0878db398a6af873e793b4c648d3d7a269b9f144288bb52bbeaf1d
 EBUILD railties-5.0.7.ebuild 1847 BLAKE2B cde912bbfe97eb8897785c6e7d1767b3ee6132bf2160c292f1c7e1dc9b273a09f67f5e807bc0801a685094ac11eb915b6a024550a3dc33746b5848089585eca6 SHA512 920393642215f96bf98b0d2ba3a18a5d323dd1cb109e9780f39e8de43d287b793d160c519f9d9cbc23cf031ace33fe283632d57941d8a30921fc0201bae54d2f
 EBUILD railties-5.1.4.ebuild 1670 BLAKE2B 7d953780b258c60f033f5bd5c6e6b453687aca3de51805a745f08c032d2386a6b06af4cac2d2169aff145cf64ed2ef35057b0e466684cf878f1ae2b20b90ec81 SHA512 add35da11cf530b55e60d7382b0129ef43c75794b586e0c9b42a7e19a34969ab233672727b4d3397bcb67f44c969a409833ce6408e71f4626ceb2ef91148080f
 EBUILD railties-5.1.5.ebuild 1671 BLAKE2B 89d54e60f7fc09216c7c31cb44221a5e126e75ace5c6e2eec2a094328355044c09e764c6ed395b3058e4473fec24b89c101b555ed3af0d28024850d6ff35acae SHA512 10b0a2da5a63d928e84653dd50561ea9a7421f2cd8f0ab2f192c5d423441954ab9c17cd5d11d39f41a195ff2f7751b156f3e21c3eed3ec93ee745e06d064326e
 EBUILD railties-5.1.6.ebuild 1670 BLAKE2B 7d953780b258c60f033f5bd5c6e6b453687aca3de51805a745f08c032d2386a6b06af4cac2d2169aff145cf64ed2ef35057b0e466684cf878f1ae2b20b90ec81 SHA512 add35da11cf530b55e60d7382b0129ef43c75794b586e0c9b42a7e19a34969ab233672727b4d3397bcb67f44c969a409833ce6408e71f4626ceb2ef91148080f
 EBUILD railties-5.2.0.ebuild 1671 BLAKE2B cd775122965ad69f2f595b01d2d97b129ffeec30a5b2e91d50b750e11f52136f2df82453e6b0fca737a5bb0f2177061b4f13a7458ac84219066568bd2cc811cf SHA512 9e843354fa41e19161b989a102e3e2b7f4f2d50c90536edaadaf9276cd8f69a021566d381ff527c17174e945ff9940be54b4d82524be16fe4e79a4825c54bb52
+EBUILD railties-5.2.1.ebuild 1649 BLAKE2B b4ebd23ce4e3713f02cd978fefc5364314f6ce22661c5354ee9856f5b36d59b3c06f10c91c5b218ea47e88148e3b7cced47c98a01bda5a8a3bd617917684e5d8 SHA512 d41dcac2f06e22b113aead34d030631a5690fadc2bd5894419341e491f9b4be9dcf3f365a4540c68114e66bc8fe75462286b33b473ad9df9de500e287066ea95
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-5.2.1.ebuild b/dev-ruby/railties/railties-5.2.1.ebuild
new file mode 100644
index 000000000000..193c7e2a5414
--- /dev/null
+++ b/dev-ruby/railties/railties-5.2.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.23"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	>=dev-ruby/thor-0.18.1
+	>=dev-ruby/rake-0.8.7
+	dev-ruby/method_source
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha:0.14
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 511afc511bf3..a1af2dde541f 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,3 +1,3 @@
 DIST rmagick-2.16.0.gem 1545728 BLAKE2B 2f5396b5d5c6a60fabf7f67d104e68443c038a8e9431fbc8252a3ca915b4fb353d6a0740f00fbaac91cf3bbaff84c0dfb45d4adca6a81622fc1d2e395ed04cac SHA512 e37fdd9c1e45d7ef7000602f495c3951ee2abcae83a87f68702a51a2183edb6fd8e576ca1a5ac8b64e05ae0287141137b505bf27fddc579e753f9310cb4d653c
-EBUILD rmagick-2.16.0.ebuild 2034 BLAKE2B 0ce3eff9602b4bb713d817e8c362e5c1850d9e56777f9412cf9a6f83392d168da85c9b57578fdc080ad194e3932dfce113ad456fb0e2189c878b86e227e8d885 SHA512 2cc267bbf285aa7259672fb38345b816de7565232a9826955e85b52ca0f0cbb9e1a95799f94de785eef73386e22d2831c63abed9cf84da70c24b59383824f050
+EBUILD rmagick-2.16.0.ebuild 2028 BLAKE2B 0d3b6ae50cf5a39bc0900203669ca58e716f0b974fa9b95414b2719d6ce451b0bc671f81d98ce58666d1cf856e6e23e1fe20e7a89d0d33bbbb24785b4f49c2b7 SHA512 3c857463d81ea5582c158e7e79c70406547103ceafed6c3dd661e4c5f555008f2e7999a34464ba8ae1b6824012173afeac63d4222384a5ead2a461ec726fff08
 MISC metadata.xml 341 BLAKE2B 537583fa385971de2e8ae510c7d32f11bf7644b3aac908b482833d26a2d92060255c2f15afd229c6c50207e969cbd5857705850440949788a6fac7329f26c757 SHA512 84bb956a38056526fd173c3f4aa972ea121712c15111a35e19e1f27b0cc797ebda4550ada88a46de7e66e058a66bb92d2e715d646068779843133a66d7523683
diff --git a/dev-ruby/rmagick/rmagick-2.16.0.ebuild b/dev-ruby/rmagick/rmagick-2.16.0.ebuild
index 1f4f12eba14e..9276a4b95f07 100644
--- a/dev-ruby/rmagick/rmagick-2.16.0.ebuild
+++ b/dev-ruby/rmagick/rmagick-2.16.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -41,7 +41,7 @@ all_ruby_prepare() {
 	sed -i -e '/test_\(gray\|compress_colormap\)/,/^  end/ s:^:#:' test/Image2.rb || die
 	sed -i -e '/test_iterations/,/^    end/ s:^:#:' test/ImageList1.rb || die
 	sed -i -e '/test_\(optimize_layers\|montage\)/,/^  end/ s:^:#:' test/ImageList2.rb || die
-	sed -i -e '/test_\(background_color\|border_color\|image_type\)/,/^  end/ s:^:#:' test/Image_attributes.rb || die
+	sed -i -e '/test_\(background_color\|border_color\|colors\|image_type\)/,/^  end/ s:^:#:' test/Image_attributes.rb || die
 }
 
 each_ruby_configure() {
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 3e2f8ab924ef..4be912f1a3fd 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -2,8 +2,10 @@ DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab6
 DIST rspec-core-3.5.4-git.tgz 369170 BLAKE2B c95fa7740bcc1b586b4e26be1db4cb52bb470cb23c9ef74dc644d0ea7c4ca769ab62e587ecff2a16cd6f656e9f3bbdc81b199765f9397dddbe28a8cdce6a1945 SHA512 c672381e9233b6f8c6e92ed70d084ff7a558edd6ca7d5a09a28fff1554975b952b6fab94483324b5bd6a62ff7aac576e7a216dbb3972749ef0210fe1cd05411d
 DIST rspec-core-3.6.0-git.tgz 375590 BLAKE2B e8b4987ea3d5cc3a403eaec98243e4c4be6c9eace798bc97599020543401ecd036c6121a6736995fb716aabd1a2016393506bee1e3076c61b0c49173d991d990 SHA512 cecd3885652e18ba1ffed45e40d12c932ba0d880e96b2f1d264709f55dbda8d6b0c78c3bf4bb940d246b84261d1b80038618735f65302ff62646165b2e932be1
 DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db0d0246ee619e8edef30bd9f7aeeb80bd0488e4fc73b0a00d119074c35055f6b9d0cbbe6160ae78d0727ce9848a710 SHA512 1561d044281c1b8b97cc89033ad991548fa74abbc5f20d3951d3f3de754c581a027f9ccb2bd0107c05e744d3b2804555cf4cf207e72adf365b28fc7ce052dab8
+DIST rspec-core-3.8.0-git.tgz 386022 BLAKE2B e827f006fe9f05f93b741d021bbb108ae3e98cd23f3388c1fdf2a87d8be349c04e91c810cbb7c47cc99ce99a00f62e13eb01a927b8b89d54dfa437ed46b1d24f SHA512 6d3f431a1f9485009f5029bea967f36cb789be8cf33722b36c40df44e12a2284674c6c8af333bfe8ba8825e032576569fd42c92f798988faad732ac3a720c5e6
 EBUILD rspec-core-2.99.2-r2.ebuild 3518 BLAKE2B 017a60ccb0ac017b08c4d97903a5bd59921fd0c0bc3b4322059d856bfee6eba2c026242bfda1e2083b043c190ad9160c6122ad62350b07aa0a486afbbb3089b6 SHA512 7b22027fa5ae71e80f071c4fc7cf3fa0e291ec42e06e0c07bcd0e94ab2782aa2dd79d4cba709751077b7c19cb0c5bc7a346c2c424cf9ffbbb62ed486776b6888
 EBUILD rspec-core-3.5.4.ebuild 3096 BLAKE2B 0dd38520f3c03ff53f1d4de2ad6add6df77e8f55719eea1e7282fe4411e254afe0b51b06a2b7a7263b7a77c5caa7ec0cfd773444c6edf9846d06c98ba68a959b SHA512 2b5c663071b496f4925624d74ab18a870bb1ac64089164f8fae9216a00999465073de08741db7aec0fed85a2beb3e94808abb423dfcd9e44ff094f402317aacc
 EBUILD rspec-core-3.6.0.ebuild 3408 BLAKE2B a8dc00749465067e68999303bb1f936065096bcacb9488f3523c740c08e837ad0be3acf9a827ae068519de5dc3e505b10d167d18e08a49c9a398c7a71d03605e SHA512 7453b7e3f93b2a5b2c5a94fa70312892be87b803305bbf5414c7e259c7899a519cdf1b47de7ea7bbcaff8270ff0eabd0634e826b4cb20505f5cb18ac59a7c76b
 EBUILD rspec-core-3.7.1.ebuild 3414 BLAKE2B 2fea004e794166c2c7cbca481c0d25c1865018fea73edb99ad3ea4c775e46b12d9d33794e14c651ff3ef96a69265c25f6dc6d281819627b591351f453cf378e0 SHA512 5f1a8d0f5e517c2ccc3e0269e34519e614afdad64d3a2491f9335dd4989c317f95b32f503d8fd0e298308e352845592154e9ae8fd0f4fe9f5c0177fad6b2dc63
+EBUILD rspec-core-3.8.0.ebuild 2965 BLAKE2B cb76ba83dce43eda2f511949f085697c832142a34c611d6ec845d7da73801aba37136d392fceacbb3241a69e63f1148631eb2bd584db2d611eb38e52fe5c4004 SHA512 175a24dd2d96a60a39d185aa855b6a1c771d1cf996e5b3898878e86e65fefcb81b399b24f9339c27815268e083bd5f9ce47e1828178818d0fa7e33134a3be837
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.8.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.8.0.ebuild
new file mode 100644
index 000000000000..c3b7ec4a3d57
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.8.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="highlight"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	!!<dev-ruby/rspec-core-2.14.8-r4
+	highlight? ( >=dev-ruby/coderay-1.1.1 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.1.1
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/rspec-expectations-3.8.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/support/aruba_support.rb || die
+	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
+	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+
+	# Avoid a spec that depens on dev-ruby/rspec to lessen circular
+	# dependencies, bug 662328
+	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index c567a094cca4..f218e06640fb 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -3,8 +3,12 @@ DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc
 DIST rspec-expectations-3.5.0-git.tgz 187600 BLAKE2B 607dabc38e077ed82e18cdc690900f7fef86e6bb30a8004534992804717f8430a132b8f7d882226557e8c83832a1a8f43a32e9791b19869919c9b0aa8cfead8f SHA512 e6077549a028de0e34cdd50d93552ca3ee0f30bb550e9df20d391f287beb57070dcb3a5104627e7adb55689e7b102c91b7d3a3b944b8c4ff1235761140f2dce0
 DIST rspec-expectations-3.6.0-git.tgz 193897 BLAKE2B f3fc2b06a317e77838e2d483416ab0e05aefed8a129058ceaf1a80d3068b41e81abc9fd85576433fd1577e6114ccc65130734b850997f89310b80b549f80d679 SHA512 5c784eff2c076623f471bcfff6e014420782c8d52ff54a68adc9b4d6b60a91726da36e3989535f4ab7f1fcc6b1e2a3c3a63ee330f8ea55f475711741762c0f07
 DIST rspec-expectations-3.7.0-git.tgz 194071 BLAKE2B 67c8db15c43cc1141b19c6eb99390eaaf2535ec03f0fdc7b05576daa463d252f56ff251d40f5771726ee6451d57eef206c893f2593b01d413b5d96cdf21f0daf SHA512 bdd3222089299e9bfdd6f17a2b8af81d5e695290a3ce976630d586d51ff2df5baf76a3887b8adb31294bd6623ba85f8c2a4a31ac520046515aeeb81fa3a1bd5a
+DIST rspec-expectations-3.8.0-git.tgz 198184 BLAKE2B 4bd191885a7944ca4909a1275618726cd0fff95352ef7e88f05d94e5f7088632d2c9ac7a9f47ea94c79e3665198482098daf7f6fc286c59563c8efbdee585241 SHA512 7157dcf09c18d2b56156ba4c1b0bc1a11cb98ab05e43ab9cbd65eea3f796cadf3319711d4e9837905cbba8d70cf297aea47f1f8631fd7a97be763dd33ce08002
+DIST rspec-expectations-3.8.1-git.tgz 198732 BLAKE2B 243dccbf1771bda4a445abdadfbb79e67ad2e3a2a92013bcefdf746bcb6a3c99c1c999c15cf3a0ed324d587463ce57676785670ee5b2fa85ee216359b694bb64 SHA512 91d637210ccc4322073ce3e258b923de0e69f0a6eb0f07dd31bfe41da0a0ff18685c289e02c3ccabdea0f332ad55dbcb197fc16c7d6b144958e11cc90bfc8496
 EBUILD rspec-expectations-2.99.2.ebuild 1696 BLAKE2B c613aa21e9d76decaf26954bf8be2357a12dc92960ab966ac587883a91d023a79d5c9fd4e8e00ffdec9a647cf2483e2aeda03c3a851e2a43dcf5bb340caa7ec2 SHA512 54646cef1a0b856616797a8c11ae5bc684b3c3d9db2999f2a3e6e78b2254ae7efcbc22a924fa069d4b560c407a4cf010d4db3bfeb10851febb90d23d7f032ef4
 EBUILD rspec-expectations-3.5.0.ebuild 1322 BLAKE2B 79d4a73c87e4e93e1c165255ee391915c7b2252fcc7ed308994c170ce4f8e3a163a7df0ca59ef24952b53130dc5d0884dcfab319739d0cb1c026a7d26dfe86f1 SHA512 5a56eadd7f68b0b57eb153e5e14bdb2f2d653bad26d84a266dd3d2d34ffa8a2e9a97df5292fcb35cbadab5cec5e86fb6cbbe18c7810c7f1d976019c0dbcaf1b7
 EBUILD rspec-expectations-3.6.0.ebuild 1332 BLAKE2B 1b4630caefc66ed48b2401186b7c514b2f2a8abe2222d9332b3d05e067e55b9b3d5526fdaf541bf84a469cff86c76f2dcadcedba1312d69e5e555ad651e8865a SHA512 d5225b85ec5b30602b1a8d9e0d25af1c65613afcd3ed8259fe99a2571f42814c022a05ddbe3f3bc7ae237183f450f1854c7b6d2f84a26055865a015bdf3371f2
 EBUILD rspec-expectations-3.7.0.ebuild 1376 BLAKE2B 1c49478e03eb5037247f7e624787302ba6827527f403b7edaa02497e315a367492a6bc3c4a8ac267cd6932c7b8477f7d8ab9d347c685c233df8a6042ed825551 SHA512 3a534370174f697e10bd4bc593564154539ac4e562c4fc9188c3ba032e4b17022d997e27f9b2e4f8258a4eb3f90b6d4df9c1ea31bf8ea5196da9e2757049132d
+EBUILD rspec-expectations-3.8.0.ebuild 1314 BLAKE2B 87b3d58a0bac222a68e6c240f510890b875c31847e21935748ed79f4a8d5618d299023df9c133e868f81ea010e2338e6ff3ce8dbb2721c67c6345bc5ed1a72c4 SHA512 08796e9a1fc9fdf1bc13d3806ac91f9b841158107bcfe4a862e379a0d7da1dd8681d81b99afcaee3034bc97b6843120723a42afc9510a14c7893e73ab8429fdf
+EBUILD rspec-expectations-3.8.1.ebuild 1314 BLAKE2B 87b3d58a0bac222a68e6c240f510890b875c31847e21935748ed79f4a8d5618d299023df9c133e868f81ea010e2338e6ff3ce8dbb2721c67c6345bc5ed1a72c4 SHA512 08796e9a1fc9fdf1bc13d3806ac91f9b841158107bcfe4a862e379a0d7da1dd8681d81b99afcaee3034bc97b6843120723a42afc9510a14c7893e73ab8429fdf
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.8.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.0.ebuild
new file mode 100644
index 000000000000..f478350c65ef
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.8.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-expectations"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
+	=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-mocks-3.2.0:3
+		>=dev-ruby/rspec-support-3.5.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm -f Gemfile || die
+
+	# fix up the gemspecs
+	sed -i \
+		-e '/git ls/d' \
+		-e '/add_development_dependency/d' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.8.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.1.ebuild
new file mode 100644
index 000000000000..f478350c65ef
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.8.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-expectations"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
+	=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-mocks-3.2.0:3
+		>=dev-ruby/rspec-support-3.5.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm -f Gemfile || die
+
+	# fix up the gemspecs
+	sed -i \
+		-e '/git ls/d' \
+		-e '/add_development_dependency/d' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 90115c0e31f6..6ac5235cc85e 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -4,8 +4,10 @@ DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602
 DIST rspec-mocks-3.5.0-git.tgz 186806 BLAKE2B e412feafba03cfe8c0efb68dc778885f0603c3b5fa415568c11e7b31168c57ea11245048fb78c34688b65d5cca95bc0a90aeb18afa19fef0a575219441fbaccd SHA512 b7dcb4ce0eac894d6652be45fea981cb7ade47a739ad926a87aa41d8a34fa9deffc45f5718d1634f03fbedaba82a77005466fa83155dc433fed6a19f8a897c4d
 DIST rspec-mocks-3.6.0-git.tgz 189000 BLAKE2B d8fcc25983eeeafdba69bce80bccac2ff9b1e269b739bbd41a87f4839468fe5e4bd3298d2a63aa315d87422a9f30aaf1a776cb9b90ee1fd58ca05b5a08ea032e SHA512 42cc4870fde8eba0a6da7df4ab07e4d59c6447bb8f52e0172e7f231d47304c20c6e2edfceee698d5d344bb78384acbe3df4bb67de784cc24a63fae02ed1d4a7b
 DIST rspec-mocks-3.7.0-git.tgz 189170 BLAKE2B a0a622ac593660c673cd80b3f3caddd2ac389000f42a7ed1745e1fcfd28d1986e61e83c265d736f3ad0649531973719bc9c5f6ab07e289cb2da89c4482e64184 SHA512 8673726571ccf8a901281e44faeb25ffcb59579dc380138f0557cd9310192cd340081e5e8ad65ae281777727b502cca2f6877134b0fb48f2e0ea40b133002aff
+DIST rspec-mocks-3.8.0-git.tgz 191102 BLAKE2B a8dc3794245e4508fb57874ba11a753db5622abda2d34a022c6f01b2e95bf43dd2df8612abcb84c32cff632f70083ea9d76171de73720d00dd929d562fa5993d SHA512 0649c3722479013aa1a20f750b3a83a9b426e5f79cb0edff995b09d1e2fa674fb8e91c0c94e7f9513f338c3c2e9c5b824a9473e91955cf928542324b8b1463ba
 EBUILD rspec-mocks-2.99.2.ebuild 1532 BLAKE2B b8cf9d6afcc3f38d304daf6abd0610f4fad1e21f1985a01c906e476a35f50f129175fbe7e457509a7eb65f6a09cbca301deb84c9c70abfec23b48016e52d0356 SHA512 98dadc99f3a3bd894ccca1d2763526acb9754646e5b13fc471672d86a96efc10921742f626ef1090d6285faaf6e7f047abdeaee3217d681e7f4583b19ca774f5
 EBUILD rspec-mocks-3.5.0.ebuild 1346 BLAKE2B 1799d6cba41bcc4cc28e1e1778020c52fafc6a16b7515f72cf31e7bb347007ab3a96c88aa71f121e31e3785fb63518324df72b90e6a0ac464727db2d3338e0b8 SHA512 40cae4ee52db2cfc0274c6961f32f654e9f09291c3a9410756f3dca4a1d42b32e0bf54cd8a83164b7f06cc57ba410aaef478390019e0d1d0b7a0630884cb2a48
 EBUILD rspec-mocks-3.6.0.ebuild 1356 BLAKE2B 8044d89b4d5d102f995c5c60485d4bc0537997fdae87aebd80fc5a63fc37617a751e882a5219b5c0866798c35a126bae706541de3cdce46d032338b97d5f8170 SHA512 41d2e89579bdb0ee062581e9aa37ad1c3223e3b665948f5377e6fdb66372123f29736851dc03d405fa90cb6b2641586df50de7e4c152439e27994839875851bc
 EBUILD rspec-mocks-3.7.0.ebuild 1436 BLAKE2B f25095d08605676528048e7f28c3e5f91872d1f49f3075b147cf01edad4d212c0e09da4eeab6e1554220a015d4e1bd67596d44e93240971372fdff84ac16e639 SHA512 99818678324074efd4a4f2f8132dc4cad1de97dc19fc05d4e967362b47111b98375601835e03deec41bd024b626aaafaf7b42aca7966117c11b9a1ccf3f50ad5
+EBUILD rspec-mocks-3.8.0.ebuild 1338 BLAKE2B 0fce9a9428a6c5b74bca18e7656c1afa984b02b01861e723e56a5731d2d6db10835b9bad5b0421adf4c7945b262f40daee9c49c4531411fcd85d2f10e2254edc SHA512 bb9988586bc908dab6aceef3f930c453d0bdfeff8708165d5cdea81ca4a75cdbaa0ec301963b629df42f457a032102de361898df02370076467d439a1d6acaea
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.8.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.8.0.ebuild
new file mode 100644
index 000000000000..ea1c46353888
--- /dev/null
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.8.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-mocks"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
+	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-core-3.3.0:3
+		>=dev-ruby/rspec-expectations-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm Gemfile || die
+
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm .rspec || die
+
+	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
+}
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index f16da1454e6d..ddf1f5a5354a 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,7 +1,9 @@
 DIST rspec-rails-3.5.2.tar.gz 123642 BLAKE2B 7580846be34bfdf542f2c15f83e4dcdea98929b5d2feb04c645b905497522f5ee050ada800ceab975204c9671e8833b9c3fb978e4b55d6cc75b2291a96a1fd60 SHA512 4f7f03c740d7215591f9ac4fc9fb77f8d747b6446a831580518db2974b07806eab8ed29ade78afbdd981236f3c64b0d933f04be7cccf72c5e57fb85795dc7df4
 DIST rspec-rails-3.6.1.tar.gz 127123 BLAKE2B 9dd03d8483c1ef94ca7c7e561ca2a6aad82fb8400cfd5a48f40e3feff7597aaaf2a877d72d356ffca2455e6f3069a2d60c23ebf2ff3bdb8e95d954ff88832a3d SHA512 4d83f04ab640fdee6da5d6eab2c2a3bf8e04ad2f55e1a31f1dffc3a85ea3e731f1a0ffa586825e12972120568226d52fd6c26ce261412ad69dcc73ed879e763f
 DIST rspec-rails-3.7.2.tar.gz 129851 BLAKE2B b37619b4a953fa44ef402a0dea1531837932dc7bc147c08b29bf85dcad61c7ca72b30f28edc391ae05d5040dcc902d6571342bb51559de84ed0c93244deffbec SHA512 a1dbbde3539b09c33d85c9307126df09c508fcf39abc25a6438fb0582ec19049ee1888d7d17d256d33bba08c29792a0ec30dabc37d870a369580a58cb7ef03df
+DIST rspec-rails-3.8.0.tar.gz 134290 BLAKE2B 2d148a62fb92bf73728da5a18d5d8263bbd38e2036d1c47a2bdc2823ff72cc2c4a1fafee1c66d89665b21ce9b9a907a9bdaf726cafa7345b84ab49d0d3053426 SHA512 810dd372d6889847fd5d47a29d359a72fcbc4fdca5d1b35bfbe75fefc293b208ff062d88e2159783eda152a5ab1657d3a55619a9a11dd8bde5993cd807ca37da
 EBUILD rspec-rails-3.5.2-r1.ebuild 1448 BLAKE2B 3b208f678509b6812b5bc2bfd7dcc6cb9480848d71ba4a0d01646e4e09a7fca274926d1dbfc5ba207301d444a2c0ccd54c070649b94da7eb6675b5b2b5bf434d SHA512 92ce74b24b1a330b83132f2c9c79829c1a172709a96b8735279688a015178e98c3979385b86ebf4ca6c1841dd744be23947e5b5951964559ea512df0fcf18e18
 EBUILD rspec-rails-3.6.1.ebuild 1448 BLAKE2B ab0ecb95e96eedddf57dbc1e254df43b97cd3d9a0930942b3bdc3554b7b277e8823dd8dc77eb32b58f339736b0b71f0b307202996edbc9970233c44cb3fbc3e1 SHA512 4f28e6dbf5fb2f4e188eced4b308d470c8e4275154a20ac869e2c4b4539b83f4a56c80338376d4dc00f8d8c150011d9c2ede6ad3f849389bc528b63fe5a69694
 EBUILD rspec-rails-3.7.2.ebuild 1448 BLAKE2B edb9e628276bc97d90ee7f9272145da0f03fc50d3736362e45851b113dace36b93544fef8c8a4cefe68d93d265d2bd7bc4e4ab9c6f523147a19c265f20e60c40 SHA512 b8a8b28c585ea62e3d29c07b01e0758503647561b3f0b798354ff3097433890245baf3b4b83491620b1575d77f5941867adfc4c5bd27e0957cf224def09ab466
+EBUILD rspec-rails-3.8.0.ebuild 1426 BLAKE2B 15d65f277c53fe44b4086cd3f193ef8051903ceba8794778fe6ed225023ec69ffb1ba983975cb504403827d5e3244400d634a336bdec210dbe94480da420cbd0 SHA512 47530a113d3250174a4a4741c951189d4051894e07cdcd856ac01a7a4104faf44f80a472ba502eea3003377b9a6d70cefef9cfcad99d2a59a1fe060759383933
 MISC metadata.xml 343 BLAKE2B 3c1684a27906b05d1f72b32ec225db0fcd6e051bf9d6a3b4f83e3cc1ff63201410594a6b2a2664ca008b7756b6e98cbbcc3981136075dcc41a622f3ad3566b36 SHA512 bc9d8d9978e4bd845b10fabf5256e53a1a0c3835305f7e72502d1074e2692fdeaca15b2ecade251be8dbbae544167072a920db14a964644b70782f37b9d91369
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.8.0.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.8.0.ebuild
new file mode 100644
index 000000000000..a3f9572b0019
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-3.8.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="RSpec's official Ruby on Rails plugin"
+HOMEPAGE="http://rspec.info/"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
+	>=dev-ruby/actionpack-3.0:*
+	>=dev-ruby/railties-3.0:*
+	=dev-ruby/rspec-${SUBVERSION}*"
+
+# Depend on the package being already installed for tests, because
+# requiring ammeter will load it, and we need a consistent set of rspec
+# and rspec-rails for that to work.
+ruby_add_bdepend "test? (
+	>=dev-ruby/capybara-2.2.0
+	>=dev-ruby/ammeter-1.1.2
+	~dev-ruby/rspec-rails-${PV}
+)"
+
+all_ruby_prepare() {
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm -f .rspec || die
+
+	# Avoid bundler-specific specs.
+	rm -f spec/sanity_check_spec.rb || die
+
+	# Avoid broken controller generator specs for now.
+	rm -fr spec/generators/rspec || die
+
+	# Avoid loading rspec/rails explicitly since ammeter/init will also
+	# do this and loading it twice causes an error
+	sed -i -e '/rspec\/rails/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 97e89e6e92bc..cb6f9697a555 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,9 +1,9 @@
 DIST rspec-support-3.5.0-git.tgz 59824 BLAKE2B 8e970af2f060344f842664e3afad7ba18d6884ef4a0e5b47ca3f2544f27a80df7227b98e853fea5a1091a6727d075d6a033e23dae930bbad854a181f8aa1662a SHA512 246d86c131dae12d6ca9040dba800ea5e378cfce083b1840492cc2c968e4d17fe67617332aa77d46817356113f81d8d9584698e4fe9e4873291d18ebe04eacbc
 DIST rspec-support-3.6.0-git.tgz 64987 BLAKE2B 9337da63047a1b33e8534a74a6dd4004287f0f057278b78160465ad66d43d5b543b9039d68e3488752e963308764b74a1343868f692b0ff26559b0c90cd3b674 SHA512 550e23ad2da53b445fa5e496eab243ad8c00db69949e50fe9e6c391b77166bbdc94261aae3a2b49c7f2f598abefe40ea4e93940cb493017fcdcc501675c8476e
-DIST rspec-support-3.7.0-git.tgz 65675 BLAKE2B abc204f641014b16cbb433c10b5d5953c8fb1f94491bec359febb627ce1864776ab59e0b706ca908d00c79e75d8c95dc5c8673937c4bb24a2c7c90e6ec5f4e7e SHA512 a4a3fc705d4c31d760777513f86d8b0ca4c9e540b0a6f4b6d1152676f252e1276fedebe7cd259f0dbbb60b447cc179eea194f3a3e5bb023907923cbf16fc8033
 DIST rspec-support-3.7.1-git.tgz 65831 BLAKE2B 8595c496bc8d13e36fdfd4a8be8e055db4ac1e85af63f99158d191c9ef9e0a6ba0a2972ad7661a63eeda959e2969139a99ded71219777fd493544b711b6fea53 SHA512 a5760d696048897d76c665a756474bbb1a1995891e577c989cf68a205644c8608c538bf3d87c558428e2c412e02d3552d47567a0679cd4f8793c06f43eccf459
+DIST rspec-support-3.8.0-git.tgz 68415 BLAKE2B c1b13d639213e03c4e334de5520f19136da0e25e96a93b685776a691a84dc1daa66e4dacf3feb83b01032cb1364ba16cdfccf19e738264bbc3bef20882a89d8a SHA512 e16cc7bcc3de797e78c4f6ed475b0e60d492d0442dc048b4b2769a4819b80d1fb4a12aefaee3cc6a35f08d35f5fea82e00cc0fcf04363e57e74a6f5ed73d0693
 EBUILD rspec-support-3.5.0.ebuild 1327 BLAKE2B 0573e7a4db15827ecb994b4f3cb1597b781e8e5faa9b6cbc1ab65ea6940b943f3cfa495d378e72b939472ec0481e014d69a222464aa8e7cb117877e620acf4ca SHA512 4d9e61775a435d1cd2af88e98257b13f21584368903cf3c941b29adcd265f49e5d840268d378fda884c30d7532e16975c7bdb009870abe96181e02a216978db5
 EBUILD rspec-support-3.6.0.ebuild 1344 BLAKE2B 2d1c0f196b5066e1834d89542082d4afd5f1f2de2539af27c9c54d2918dd840c94fcc20901f15b1cd8841b7c8bca0b621512ba33ed40b8ea27569ed3431cda6c SHA512 9cc9f2d0317dd7ab9c183ef91d8d2eb6de0e57d64507c6044cc80c46a190401f74a13729a6da4bb411392480d69fc2a600e4fbdf1b43a927cbd3c69d53e338dd
-EBUILD rspec-support-3.7.0.ebuild 1336 BLAKE2B 69fa85e41eb65bbeee3a4e3781d239d6fa489660f1aa8dc0326d4adb989ca8640ab11cea76730d2d707950e91f3616441720ba4c43d54a425c40e4b27fa0380a SHA512 143f1f5e7462a9cd2f61e690cce3bf6d228db73f3adcc9343032c8c88eb112831d993bac92a52571d0b2ca0ff1056c58a3d8c136a6cc1a2205c5aebd5885a1d0
 EBUILD rspec-support-3.7.1.ebuild 1343 BLAKE2B 951484a84844e5042cda10591933a2857b756ed93e45fa54adbd11f31bb8aec6c60748050f8a95034de08c83815a01be065b25a28d6c723c0a0b7436a88fa95f SHA512 d1afec7a788a72076737aea3cce0a4ca0ad0ee1f22d28936343c2ada2185db20ddc65f792e0bad5623fee5118c24455a074bae9ed8b35b84a137d7ce11cab48d
+EBUILD rspec-support-3.8.0.ebuild 1344 BLAKE2B ae82168cda3923ceb6413c3732d25ff912d434e199db6282f793963626b4d7924975c8bdb969f95de8b13804cb0078c3f31210febeef4d7287778879e279c7c8 SHA512 9ccf1d142e570c78e9c1d92a867b6c0aa705434bdbb07d8cb244be76a7ef9721a7f2d3c1460371160283f9b2533b8630580b951d2a3192bba906d9020bd33788
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.7.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.7.0.ebuild
deleted file mode 100644
index 859e41514bf1..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.7.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-support"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.7.0:3 dev-ruby/thread_order )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove spec that, by following symlinks, tries to scan pretty much
-	# the whole filesystem.
-	rm spec/rspec/support/caller_filter_spec.rb || die
-
-	# Avoid spec that requires a dependency on git
-	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
-
-	# Avoid a spec requiring a specific locale
-	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
-}
diff --git a/dev-ruby/rspec-support/rspec-support-3.8.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.8.0.ebuild
new file mode 100644
index 000000000000..d41d78ed12d4
--- /dev/null
+++ b/dev-ruby/rspec-support/rspec-support-3.8.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-support"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove spec that, by following symlinks, tries to scan pretty much
+	# the whole filesystem.
+	rm spec/rspec/support/caller_filter_spec.rb || die
+
+	# Avoid spec that requires a dependency on git
+	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
+
+	# Avoid a spec requiring a specific locale
+	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
+}
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 9f7c771f7eb4..97751b67b1f3 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -2,8 +2,10 @@ DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a67039988854
 DIST rspec-3.5.0.gem 10752 BLAKE2B 8c28574420f7beea0a8ff2a2c0237ea84c83dadee14edba229e8215e8620d801be941d5474cfd53357552f4210907cb15ba853bb88e3ad9b72d35b86c617c3f4 SHA512 0500f09e46244746967f5efebcfbc96d4cef14c5f68e6ad3d510e151ed83c865a3478ae6e42dec0f0793db7db52ae2394768b6b331ea5ca8d30bc19523cad5b0
 DIST rspec-3.6.0.gem 10240 BLAKE2B 334fb89dcc8926b264999dcdae231916dcf9c45515192b9a053a22a240a2da3830b46cb87430bc3f4a7368bbd0788e987f992e0f4dac3872233ad7d0e7f3fc6b SHA512 ff0208209fffe205038e75ea410d0a0c140d35f9dcf46b699d9359bb17b8d6e92c4c3643b8f99d741921dd4a4b9bc62e639f5d48f46e4e9c656dcab0f62fdbb2
 DIST rspec-3.7.0.gem 10752 BLAKE2B a0e15d557b0d9089a886d04c917feda80c7a8e5eb70a50f4635947689215c0c560d313a6728ccea751697ead97c01fa1e3b7217f202ad18d4ddecf62c4dfa4ab SHA512 5c10a878e9697030783c987ee9a6244b36cf85a2a3fb8c28bf9771900a3259da4f19c7f159180b5ff9140ab715b38b5d90cd5e0014ac1862f478c32a95e7edfd
+DIST rspec-3.8.0.gem 10752 BLAKE2B 14b1710fb64fb2ab46d59ac692ceb95dbe7f5e2f5c54e4f97170bd99c2b0d32e1977250f69160ab191367c8016663ecf5cd4e0c89941ff12c727ed52e6118551 SHA512 aa3ecee499240a26866797c00461c7e63915bb84a9a29afce75bd4e7864027588bafde05b108aa7b6d988c1a123265587db807567a8e0f3d03527b0f2d8329ba
 EBUILD rspec-2.99.0.ebuild 796 BLAKE2B 1f7e76cf83dabe36056c164d335150f56d9a666b389d02e5878ff15464fb50084053f8a4feb545bb314aecafcdaf54d417d94bece5154854e539768e063889cc SHA512 85040ba6e2d27ef48d167ce1365e8301812dcfd1917d5bc84d2509a5fe51fcb2d44c007834fd0fb6e77843f5263122c6f1f045649a9e18b091e3300b63545163
 EBUILD rspec-3.5.0.ebuild 667 BLAKE2B 3df4ec8bc0263ff263cc1d938f614d62d1a27c45f3e1a8eb3fcc5dd1c3455dc8dfd026d9a3104813157c9f8fc29964962fbdf9a7b46d6c5acfaa6ad288dafdf2 SHA512 e10338a61d1af33eae298f1a663c93199b2d871cc2de1a2fc93299657d813b2137dc34f81027314f68de5f80fda2670cee851978f437ddeba1c9156cbeec9de1
 EBUILD rspec-3.6.0.ebuild 677 BLAKE2B 15be2f8f16772f7d6601ed6bffa8972da7cb1e20e466e46a9f0c12837f3696e6cbc3a5135402e7ad99f7793c98bab416747262a14d32d865c7eec1ed20a67b23 SHA512 a0946f4aec87f860a282ce7dde23bd55c605e67e14d5e5de2dc3b97afa05c9304a908bf4215ab9a006190cefe2d170b001b15c8bcf65647654403baf19114dad
 EBUILD rspec-3.7.0.ebuild 676 BLAKE2B d7297f23018396e07c9480fb1c70b939a2205a78f4644ee8ad88d272df9307d6efe20d9ba836262cc6c7c2c531af272e4fbffc3e57d2c3de6ea080eb781672ad SHA512 1dfd1ffd741ea3d48104f64e12dd9ff262e98818152cc2a68dec46f8234247e57b2cd7b812553e5c0529d8cd4b8943650e911ef9a7d3685750cbbc615997cdc3
+EBUILD rspec-3.8.0.ebuild 647 BLAKE2B 9f8105a18f3a68e80fbe8a506fc5c29427834cd5efbb38a235bde485d88c9278099ec54e54d989ad8d99535a280095208bd0d28bf77c8498945262c4c477fc8d SHA512 fa6975b9a59f2afdc201c97ca4f811561e3f93d00cb4373fd47f136f11269676247b39f71f32172895316252df976ce486d2aa2d5de25e0001fc23f1bdf68106
 MISC metadata.xml 337 BLAKE2B fd99a128031819f061bb4b2fea336d7b14b26b7a986d782d8a4e2b9b9b7ce4c703242ef724cc9bdd98cf0219973dfcfca2a2eb7979b446f879d2f337b566985f SHA512 0a9165edcea2906fb370afa35ef77b74a4b833539959e8f28194e4d02ab7685f23dd16f04ea7e18873d10bf607236972610c49cf61ed97e5df7b4796ec9a66be
diff --git a/dev-ruby/rspec/rspec-3.8.0.ebuild b/dev-ruby/rspec/rspec-3.8.0.ebuild
new file mode 100644
index 000000000000..17f8f7cf8ca8
--- /dev/null
+++ b/dev-ruby/rspec/rspec-3.8.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-core-${SUBVERSION}*
+	=dev-ruby/rspec-expectations-${SUBVERSION}*
+	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/virtus/Manifest b/dev-ruby/virtus/Manifest
index 2837ebec9ade..08374264f3c0 100644
--- a/dev-ruby/virtus/Manifest
+++ b/dev-ruby/virtus/Manifest
@@ -1,4 +1,4 @@
 AUX virtus-1.0.5-equalizer.patch 8422 BLAKE2B 939c71ea56a77c1a654e7baf11e0f2ee40b044ad0dde0c1689a0e8c50789b6adf2f8586467f662c3d20e2a9643cda21ff9af865ee19c40ccc3e48069d43e1932 SHA512 70db78b928e1dc23df126bdd081db2664dcf75379e92d3480ad0dad951df9a91d0feaa40de570a6116a71708342d891c073b07395180d85cad50e9e3dd509020
 DIST virtus-1.0.5.gem 49152 BLAKE2B 24f422d96b10c38f9599c48a2018dac5b5bb8979acce1ee206b11d64d74a852ffbd276b78bd55b3b184cc109eb00d27ff1347d143695a4e06edfb94a3e87fd5b SHA512 468b74d6a49410bb4e59c535b9f7736cd5e4743817f19f97483247b0d259e17b069044bd5ccc787d72df972d37903eb7c9a9d6ca0c6642c550f1c84a3bc71825
-EBUILD virtus-1.0.5.ebuild 847 BLAKE2B 2f77089213e99544974a8742b2d19e96342a02b948a5beb3e796eb7558b9e7b5822d44274bf6cd44fc9228f061c1d9a7abbeff4762e8f5ef4986d1479ad5b1e7 SHA512 a0c00a9c32d9acfd803a55c5ab27a10df6185c8617b1daee90e5b63fdae1b4c50ed977c75e6a1728abc3d0202aa871d304bde8e28ddc00db27491f0356d86b4f
+EBUILD virtus-1.0.5.ebuild 847 BLAKE2B 19b542a5dbbcf6bd63b0f601354ed028872833d46421c47cb5cfbfc3394d138e17a57536d8dc83af8155646a3e2adbcc76fba3b16aa97ecf1297fa0bdbb81432 SHA512 ff043d1a735b3113432b217eb20a60465694345c670907def1306e4d5c7c737ad8669898cc04bdd349959bd6b352d0ccee8982edcf6f8ae1384820c8dda6ee86
 MISC metadata.xml 389 BLAKE2B 19ea2d5c5c25b7fd2c9d4cc23141907def94233ae9d6e82cfa45817950fff4e8a927b361c46d1d370c6a418831f2ca8423d51fa29fd20d2929bb0efea283e996 SHA512 b8ce763b943ae56ae0ad2f49f87608d010a39f2a1bd8800572ca799d9ca28e419de8545bc5b3e813e10d0a352fb0e2253d2dd4d0ee601ecea0ec3a98e524c0e4
diff --git a/dev-ruby/virtus/virtus-1.0.5.ebuild b/dev-ruby/virtus/virtus-1.0.5.ebuild
index 33a923897c78..630526e81364 100644
--- a/dev-ruby/virtus/virtus-1.0.5.ebuild
+++ b/dev-ruby/virtus/virtus-1.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md CONTRIBUTING.md README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/will_paginate/Manifest b/dev-ruby/will_paginate/Manifest
index 8fe0cb5976a0..c6dd63c902c5 100644
--- a/dev-ruby/will_paginate/Manifest
+++ b/dev-ruby/will_paginate/Manifest
@@ -1,3 +1,3 @@
 DIST will_paginate-3.1.6.gem 36864 BLAKE2B c6babf7125c20d7ed646930b7df39db864d0d46fd89d743daab73ba35254650ec0b4c7e203c5d5a2b00439d928b95508c1a82107db142f8cd77d27a14be00e7f SHA512 50e0fed5a3ea6a62f8620db3d30046a7a4cc602d9d7936a265d0c20a50eb267ecebb2c7d3bb07f3a514f70e556dad78085971bb80f94e1f4baf7048d6fd34c11
-EBUILD will_paginate-3.1.6.ebuild 681 BLAKE2B 3d5417cab8dc2379621df378a0e767ef5a0e9e2f5aef78ac17496d8cf7c313c4693072c66ff36745576acdef5b21ad504a714959da090383c4711ab80599369a SHA512 606e40042db68a5b7d22d96e85d38caf8684b56f4a3cfd3b9a3d04f7568d946b826bd80bddfa10e048e5b49bd9b1f996ed891f93b3687db8f6c4cb2d075ff8ad
+EBUILD will_paginate-3.1.6.ebuild 617 BLAKE2B e2a2e320967a85f4897a173278089ac573ab644b25fbe200e5950eaf7bdef0f8aec4d0fa29f27cd2fc9dfec2f6f07bbf0084dafd1b50ce1b5373297b279749dd SHA512 4f503381427a42251b7739e9a18ffb05b1952140b6b7818ece0bd3a93f1ed2db8d1a464c5816a22ebc62ee63dcc0f980c4717fc516cb20197c1c3ce2cf196f91
 MISC metadata.xml 346 BLAKE2B 859514393fc9d9ac988a812dbb5fc126a269616351c6d8fc32c6ec0f25d685c835f4c1d27ce818807bb330fdc50839b81e6f63d0eb4d77d8f6a95f2da3d849af SHA512 2e061bf277b39327fb84988df2dd9cf548c87dc0bdc51e63b47aeb816c099a4a7fa5b95fc1f3ba35e15c7499d897770397c6f6f2f4d3c1b03733f16f1d0556d3
diff --git a/dev-ruby/will_paginate/will_paginate-3.1.6.ebuild b/dev-ruby/will_paginate/will_paginate-3.1.6.ebuild
index e9964593ec26..4d75f1b64d29 100644
--- a/dev-ruby/will_paginate/will_paginate-3.1.6.ebuild
+++ b/dev-ruby/will_paginate/will_paginate-3.1.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
@@ -20,14 +20,12 @@ KEYWORDS="~amd64 ~x86-macos"
 IUSE=""
 
 all_ruby_prepare() {
-	sed -i -e '1igem "rails", "<5"' spec/spec_helper.rb || die
-
 	# Remove tests for unpackaged ORMs
 	rm -f spec/finders/{sequel,mongoid,data_mapper}* || die
 }
 
 ruby_add_bdepend "
 	test? (
-		<dev-ruby/rails-5
+		dev-ruby/rails
 		dev-ruby/mocha
 	)"
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index bb783bde5855..c1e9cf863c91 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index 69d21ca216a2..9368a8924c9f 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -1,10 +1,10 @@
-DIST racket-6.11-src-builtpkgs.tgz 122307703 BLAKE2B 395b14c15b73dfda7b6e863a83530b5266ec2f132b3b8ee23ee60bea0083b42e1dd67c60cbdfca2cac93c343e3a4edf132677c707aed62d85c43ae27edb2de74 SHA512 2b9f6b478880a9ec176018f34a3015f5e84ceb11e61519d9ab9f7df8d4b8dc664fa9103ca787664ffcd86909410fbf6812838a59d899f3487dea278e39eb597b
 DIST racket-6.12-src-builtpkgs.tgz 119736428 BLAKE2B ca462e69c29c33e56e8e92dfc88e18c0643e045a52d50b288139b2d439dac9e10c3a5d0226236a2e2103b9d0c74871b97c3edfb242b49822d92893acc9ea42d7 SHA512 31f3f9b3f69a80601569cfdeee1610a49a2931c2c11a9daf9ff14eb8828dc48cb0befd05fc1b0cc53cc1477a04841e850f2dc89614dff58dc8e9e5da7b717716
 DIST racket-6.7-src-builtpkgs.tgz 116773863 BLAKE2B 786552b296449cd105450450f7232ba5468aba0ed6d96aa6db058cc3eb655808f031259ee69d1ab8abb9a751151e28e923d4388860ed37d74a1f6a637f740f0f SHA512 63fdc18e72fa152434d0fb83e926c28d2b2d16c93a0a2be0c14d445671c1bff5daf500e9917e41fa2f60454377de0cc10d226c321402abf4bad55a15ac74f127
-DIST racket-minimal-6.11-src-builtpkgs.tgz 11208413 BLAKE2B 17e979ab6e4c99f781994d48ca90e206618835e2ecfa875d0966efe2909a440c509fe9706cccb7f377675a0bb4d76971ed4dd73de2c088ae40660df50b6cf7cc SHA512 f197a645e7da04c120f1cb61d98a1cd47824576467a2fa12753576b72f258d1229cc99243f91ed87cf37be63062c26844b44469987d7ac4bfeee853aa7cb6e66
+DIST racket-7.0-src-builtpkgs.tgz 122544008 BLAKE2B fa6eddab17fbdec1db1dac2debb2da72fbab064f10fe0f49eda5b0ccfc635b2f86cef2eb103675988d281459f4fdb19841e27f154b803b38631ee21a2312799f SHA512 e872bb935146027bdc78dd7d22ea07cbbf78a23c761d584770d9ded3ece71b74954a317b799de16b0ba762219a46f0e66f41ceeb4d6741d0b1998bc6abf6b20a
 DIST racket-minimal-6.12-src-builtpkgs.tgz 11251582 BLAKE2B c8ed5c562241f37297e0e88d1c8d60ceaf35c2a7010ca68cccca8b8ee007819822149cbda4f3b5c0ec93093901593b2722a22b9f8e46a083b207022877ce45f5 SHA512 6eb23ec16c710c661171f545b8dc5a53666e8a16d1db7edf1a0713693c99b79a779c4d7c6765dc3107f699c31e29238ddbb3e08b1eb62832292af0d4a1b5f465
 DIST racket-minimal-6.7-src-builtpkgs.tgz 11213736 BLAKE2B 1661fe1818d0b2c0d2c058aead61e25c5df01201d3ccdb31fccca14e9c1f2f822c18bfad6be3c1b7446d692c252129b63340b37e0311848269a914197416eee9 SHA512 59c885b535ed8e91a3b2a524bbc38661a5c19848ded935cc9f068c3fd6c8da39fc0755ef8df3a69cce3d50b96ee30d91972d6a4f6d5414eefb80bdc1ede6a285
-EBUILD racket-6.11-r1.ebuild 2330 BLAKE2B 0d4a3e2b8951efd9b0ac721ad3e26f877eeb3ee1dd9782d97f6fb9926778130e989897f96654156a48c2043c487fcb871d893bf1c47be0ea4479193bee8e02a6 SHA512 bf9bde5de6c04e458a657abc34a347d8327099d7a6f054da3759afdea06c99adb7f6c52b206e2f172a3e0a4281bf798b7c755ef5b1ccfea1dd6aa5dd43b97bf5
-EBUILD racket-6.12-r1.ebuild 2330 BLAKE2B 0d4a3e2b8951efd9b0ac721ad3e26f877eeb3ee1dd9782d97f6fb9926778130e989897f96654156a48c2043c487fcb871d893bf1c47be0ea4479193bee8e02a6 SHA512 bf9bde5de6c04e458a657abc34a347d8327099d7a6f054da3759afdea06c99adb7f6c52b206e2f172a3e0a4281bf798b7c755ef5b1ccfea1dd6aa5dd43b97bf5
+DIST racket-minimal-7.0-src-builtpkgs.tgz 12215529 BLAKE2B 4e9d2b137edf6b188c71dd32771753a16589ab49884aba1641fac5a5f82b9016843fec3257de7d59a9b00971a7dd455e99897782794800e14a656bcb22a17080 SHA512 976fd0ab96f4bf99eb7c63f7f213af91f91de4dd2498c4f8f1440743f7571194090abf0c4037e436970235f737d0add116f5689bf495688b3667a91ef95e8270
+EBUILD racket-6.12-r2.ebuild 2463 BLAKE2B 22b06238a0247070b9309b4eab76fb78c60dbc16a8bc52bd61855f20750c72d23720fc0305cca754c788dbc2436008a720f7389c62b228a526786a28d5b6fc49 SHA512 f908ea31d8b28a70750324f29c9d81750d1d897e5ba09067786425496bbcc63e4bff7895df76ce728dd5b8b95cd04ff133ec1b1906b74d2420ee33ae4ca7a4fd
 EBUILD racket-6.7.ebuild 1845 BLAKE2B 950444100a4aae3fffc7980e85923b9fa6d672c0689c54f6151b5942d944eb41a83cdb8139bec52539551254fadd2e5653a4a6ac4100334e36be88ec0b0939d0 SHA512 d301c1021bd33fa3f55923e7d0fa073c0d1e2710b0921e59b56623b91104cdbf3e4082e790cce3a1aee845cc4c11791167fa28004183bdbc16319b9b506e56ca
+EBUILD racket-7.0.ebuild 2463 BLAKE2B aab7eb789413ec016da6bd7263fd97142386d2d980d7111f511394d2e85781f33d4b9c36d565ca7b12a942edfffb9b8630de4985c1d4df25b6f1afeee4df8317 SHA512 3dd30c6044a13e9d66763be18411f20f6de18110c311db7112bf58a9602bb6e108e0c21e158e283a05b8c4dd9d025dfd253e2342bcbd796e94892616f68bc91f
 MISC metadata.xml 1575 BLAKE2B fe1e4b2308e5f676ce39f2b2f45c230e47f1fb690eaa57732cdb9a3e2dbfd11bfbec178d06655974eff966b165ce7643f8d1badf60e79ed3c97b64a338c2f6b6 SHA512 debfd31e91802544fce5a38936849b540aa2299d4a6a473fd55307ce4305b52bff0f99f6513ba5b343469a8740830f91879be4ee9e6086f63a00e2f3bc21cc64
diff --git a/dev-scheme/racket/racket-6.11-r1.ebuild b/dev-scheme/racket/racket-6.11-r1.ebuild
deleted file mode 100644
index 0ce238ca01ba..000000000000
--- a/dev-scheme/racket/racket-6.11-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils
-
-DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
-HOMEPAGE="http://racket-lang.org/"
-SRC_URI="minimal? ( http://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )"
-LICENSE="GPL-3+ LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc +futures +jit minimal +places +readline +threads +X"
-REQUIRED_USE="futures? ( jit )"
-
-RDEPEND="dev-db/sqlite:3
-	media-libs/libpng:0
-	x11-libs/cairo[X?]
-	x11-libs/pango[X?]
-	virtual/libffi
-	virtual/jpeg:0
-	readline? ( dev-libs/libedit )
-	X? ( x11-libs/gtk+[X?] )"
-RDEPEND="${RDEPEND} !dev-tex/slatex"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	default
-	rm -r foreign/libffi || die 'failed to remove bundled libffi'
-}
-
-src_configure() {
-	# According to vapier, we should use the bundled libtool
-	# such that we don't preclude cross-compile. Thus don't use
-	# --enable-lt=/usr/bin/libtool
-	econf \
-		--enable-shared \
-		--enable-float \
-		--enable-libffi \
-		--enable-foreign \
-		--disable-libs \
-		--disable-strip \
-		$(use_enable X gracket) \
-		$(use_enable doc docs) \
-		$(use_enable jit) \
-		$(use_enable places) \
-		$(use_enable futures) \
-		$(use_enable threads pthread)
-}
-
-src_compile() {
-	if use jit; then
-		# When the JIT is enabled, a few binaries need to be pax-marked
-		# on hardened systems (bug 613634). The trick is to pax-mark
-		# them before they're used later in the build system. The
-		# following order for racketcgc and racket3m was determined by
-		# digging through the Makefile in src/racket to find out which
-		# targets would build those binaries but not use them.
-		pushd racket
-		emake cgc-core
-		pax-mark m .libs/racketcgc
-		pushd gc2
-		emake all
-		popd
-		pax-mark m .libs/racket3m
-		popd
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	if use jit; then
-		# The final binaries need to be pax-marked, too, if you want to
-		# actually use them. The src_compile marking get lost somewhere
-		# in the install process.
-		for f in mred mzscheme racket; do
-			pax-mark m "${D}/usr/bin/${f}"
-		done
-
-		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
-	fi
-}
diff --git a/dev-scheme/racket/racket-6.12-r1.ebuild b/dev-scheme/racket/racket-6.12-r1.ebuild
deleted file mode 100644
index 0ce238ca01ba..000000000000
--- a/dev-scheme/racket/racket-6.12-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils
-
-DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
-HOMEPAGE="http://racket-lang.org/"
-SRC_URI="minimal? ( http://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )"
-LICENSE="GPL-3+ LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc +futures +jit minimal +places +readline +threads +X"
-REQUIRED_USE="futures? ( jit )"
-
-RDEPEND="dev-db/sqlite:3
-	media-libs/libpng:0
-	x11-libs/cairo[X?]
-	x11-libs/pango[X?]
-	virtual/libffi
-	virtual/jpeg:0
-	readline? ( dev-libs/libedit )
-	X? ( x11-libs/gtk+[X?] )"
-RDEPEND="${RDEPEND} !dev-tex/slatex"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	default
-	rm -r foreign/libffi || die 'failed to remove bundled libffi'
-}
-
-src_configure() {
-	# According to vapier, we should use the bundled libtool
-	# such that we don't preclude cross-compile. Thus don't use
-	# --enable-lt=/usr/bin/libtool
-	econf \
-		--enable-shared \
-		--enable-float \
-		--enable-libffi \
-		--enable-foreign \
-		--disable-libs \
-		--disable-strip \
-		$(use_enable X gracket) \
-		$(use_enable doc docs) \
-		$(use_enable jit) \
-		$(use_enable places) \
-		$(use_enable futures) \
-		$(use_enable threads pthread)
-}
-
-src_compile() {
-	if use jit; then
-		# When the JIT is enabled, a few binaries need to be pax-marked
-		# on hardened systems (bug 613634). The trick is to pax-mark
-		# them before they're used later in the build system. The
-		# following order for racketcgc and racket3m was determined by
-		# digging through the Makefile in src/racket to find out which
-		# targets would build those binaries but not use them.
-		pushd racket
-		emake cgc-core
-		pax-mark m .libs/racketcgc
-		pushd gc2
-		emake all
-		popd
-		pax-mark m .libs/racket3m
-		popd
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	if use jit; then
-		# The final binaries need to be pax-marked, too, if you want to
-		# actually use them. The src_compile marking get lost somewhere
-		# in the install process.
-		for f in mred mzscheme racket; do
-			pax-mark m "${D}/usr/bin/${f}"
-		done
-
-		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
-	fi
-}
diff --git a/dev-scheme/racket/racket-6.12-r2.ebuild b/dev-scheme/racket/racket-6.12-r2.ebuild
new file mode 100644
index 000000000000..42b90a44cdbd
--- /dev/null
+++ b/dev-scheme/racket/racket-6.12-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils
+
+DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
+HOMEPAGE="http://racket-lang.org/"
+SRC_URI="minimal? ( http://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )"
+LICENSE="GPL-3+ LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc +futures +jit minimal +places +readline +threads +X"
+REQUIRED_USE="futures? ( jit )"
+
+RDEPEND="dev-db/sqlite:3
+	media-libs/libpng:0
+	x11-libs/cairo[X?]
+	x11-libs/pango[X?]
+	virtual/libffi
+	virtual/jpeg:0
+	readline? ( dev-libs/libedit )
+	X? ( x11-libs/gtk+[X?] )"
+RDEPEND="${RDEPEND} !dev-tex/slatex"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	default
+	rm -r foreign/libffi || die 'failed to remove bundled libffi'
+}
+
+src_configure() {
+	# According to vapier, we should use the bundled libtool
+	# such that we don't preclude cross-compile. Thus don't use
+	# --enable-lt=/usr/bin/libtool
+	econf \
+		--enable-shared \
+		--enable-float \
+		--enable-libffi \
+		--enable-foreign \
+		--disable-libs \
+		--disable-strip \
+		$(use_enable X gracket) \
+		$(use_enable doc docs) \
+		$(use_enable jit) \
+		$(use_enable places) \
+		$(use_enable futures) \
+		$(use_enable threads pthread)
+}
+
+src_compile() {
+	if use jit; then
+		# When the JIT is enabled, a few binaries need to be pax-marked
+		# on hardened systems (bug 613634). The trick is to pax-mark
+		# them before they're used later in the build system. The
+		# following order for racketcgc and racket3m was determined by
+		# digging through the Makefile in src/racket to find out which
+		# targets would build those binaries but not use them.
+		pushd racket
+		emake cgc-core
+		pax-mark m .libs/racketcgc
+		pushd gc2
+		emake all
+		popd
+		pax-mark m .libs/racket3m
+		popd
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use jit; then
+		# The final binaries need to be pax-marked, too, if you want to
+		# actually use them. The src_compile marking get lost somewhere
+		# in the install process.
+		for f in mred mzscheme racket; do
+			pax-mark m "${D}/usr/bin/${f}"
+		done
+
+		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
+	fi
+	# raco needs decompressed files for packages doc installation bug 662424
+	if use doc; then
+		docompress -x /usr/share/doc/${PF}
+	fi
+}
diff --git a/dev-scheme/racket/racket-7.0.ebuild b/dev-scheme/racket/racket-7.0.ebuild
new file mode 100644
index 000000000000..206f8c7836fb
--- /dev/null
+++ b/dev-scheme/racket/racket-7.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
+HOMEPAGE="http://racket-lang.org/"
+SRC_URI="minimal? ( http://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )"
+LICENSE="GPL-3+ LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc +futures +jit minimal +places +readline +threads +X"
+REQUIRED_USE="futures? ( jit )"
+
+RDEPEND="dev-db/sqlite:3
+	media-libs/libpng:0
+	x11-libs/cairo[X?]
+	x11-libs/pango[X?]
+	virtual/libffi
+	virtual/jpeg:0
+	readline? ( dev-libs/libedit )
+	X? ( x11-libs/gtk+[X?] )"
+RDEPEND="${RDEPEND} !dev-tex/slatex"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	default
+	rm -r foreign/libffi || die 'failed to remove bundled libffi'
+}
+
+src_configure() {
+	# According to vapier, we should use the bundled libtool
+	# such that we don't preclude cross-compile. Thus don't use
+	# --enable-lt=/usr/bin/libtool
+	econf \
+		--enable-shared \
+		--enable-float \
+		--enable-libffi \
+		--enable-foreign \
+		--disable-libs \
+		--disable-strip \
+		$(use_enable X gracket) \
+		$(use_enable doc docs) \
+		$(use_enable jit) \
+		$(use_enable places) \
+		$(use_enable futures) \
+		$(use_enable threads pthread)
+}
+
+src_compile() {
+	if use jit; then
+		# When the JIT is enabled, a few binaries need to be pax-marked
+		# on hardened systems (bug 613634). The trick is to pax-mark
+		# them before they're used later in the build system. The
+		# following order for racketcgc and racket3m was determined by
+		# digging through the Makefile in src/racket to find out which
+		# targets would build those binaries but not use them.
+		pushd racket
+		emake cgc-core
+		pax-mark m .libs/racketcgc
+		pushd gc2
+		emake all
+		popd
+		pax-mark m .libs/racket3m
+		popd
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use jit; then
+		# The final binaries need to be pax-marked, too, if you want to
+		# actually use them. The src_compile marking get lost somewhere
+		# in the install process.
+		for f in mred mzscheme racket; do
+			pax-mark m "${D}/usr/bin/${f}"
+		done
+
+		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
+	fi
+	# raco needs decompressed files for packages doc installation bug 662424
+	if use doc; then
+		docompress -x /usr/share/doc/${PF}
+	fi
+}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 57abe0dad273..b322bde99747 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest
index fc9ff2db8b95..da151d0daddb 100644
--- a/dev-tex/biber/Manifest
+++ b/dev-tex/biber/Manifest
@@ -2,6 +2,8 @@ AUX biber-2.4-drop-mozilla-ca.patch 6398 BLAKE2B c15e736f17164e1f7753eab0fbee30b
 AUX biber-2.7-drop-mozilla-ca.patch 5146 BLAKE2B 4380345c27ea3e3a23c787a820486b7fc620cc6b1d3ab5f3ddca35db2c33003f0e490ce35777a3da29b42f675fc3a9c41e31cf3724290eaea2112d50161b0c7c SHA512 83295ada1516e18d4d4f1bab50c70304c1df9c88113a215b31f4bc8c9b250244f4bcb8e5b5f4958b1086327796967b27681c5d574c6dd15ddf73f35092e8cf3a
 DIST biber-2.10.tar.gz 1310096 BLAKE2B 2316c526ebe751b67ff61f0b04c53fbd1c023c473a4b1f9e332edc5d8f6dde12bb3b8ec4b571dcdd3613797d835db6d52a0f3b78422c79cb4ceaeab58b262568 SHA512 1752abff4ff1703309a4cfc9bc15cd909d580584690eccf702e4d44cc4ed39d34eb3802e7b2301cb1f57d92e069919633b58656f5635dc82fd986d1c12747d42
 DIST biber-2.5.tar.gz 1247783 BLAKE2B 9e20195cab8ca2cf0c84026ddd66c6012c9d362b0f1930eefcf66091c7353a3cd8041d651003c2b4f0f6a97b68421856a9fafbdd5217ec20d61f7fa8fd0dc688 SHA512 5b67aa221e690f17d33ab918e041e8a542e1fdfb9733d99eb41abc87ca9c10b193072e5aac5bc70c19c5f68df009b93be879a4cdfa51392ff63cf755adac90dc
+DIST biber-2.7.tar.gz 1274716 BLAKE2B 216ad69cf536a79e3a8c46d945fee76bf0532097b5e269bf9318709e3bb2f11732c9fe0700115cb5a8e4f66d325b4938cc274f7c5c2c0450894e26447c015987 SHA512 a62c116d4278b177c9e05a1cac857358dd0ebc6283465e74bb557d13fa343843d8b84050a466b2308a309345309bd584ccd2e90ccbbefbd01f2203a8eea77609
 EBUILD biber-2.10.ebuild 1715 BLAKE2B 3b4b0534bb34abf448550d1ca0858b7305905d8fe444f27ea9ea6b3ce2240b1e77cabd3e401653191089b526d8cc618fb5aec4f1087c359ef578bf8e882dc993 SHA512 002f535723dd728e6f39cc98b39a520fffc7f16fab9b17262de8e533939d53f7d641c89c1b74f866c1f6dabbe6c4e24930a59375a46e5b5f383311a207fcaf91
 EBUILD biber-2.5.ebuild 1814 BLAKE2B 64bedde24d8a741a5d5f4be58f3f311b8e719f0b27307ffc1cd34144b493f8ac39ff5d7b7470d1b5ece2cd92197cb061d1a8f19ceb07d1b71ab8274ed569bffd SHA512 68ad03ea8ebc34b89af5d365a050fa5ca5cd000f82c44d0818dc738e728ac9de14b696e0c394394f64f90f0fe6626edf9906fc1971b3cc85c18918f7cc68af24
+EBUILD biber-2.7.ebuild 1676 BLAKE2B 1741b4ffb27f8f25f5ffc3cb1719873b46869fd61ec68ba04e13177d8734c5bd0b993c14fdf348513dc846cd8b3b2ac07f2f3e0497ba325a7f790141c2f35377 SHA512 447edf5de5750018ae4d82ffd09f73e6c4e37cae74ed1706668aa81ba1caa86b4e34b333d6bebc554013852cbb81cf29a63ba49af76b167655ce26f6600f28e1
 MISC metadata.xml 517 BLAKE2B d9b10c6ee36cbd1f0d5ddd33d0944b4ba73b31c8dd7bb0537285bd2c0656d12f74f90524f3688d4d9b20c9bca2d3b3bad02be473ec1a87c4a8d66791fd77dcf2 SHA512 5b580b01df44df89406b9e845416ce043bc5ede5239c9024380348a7aa43f4c436485619e73fd12b4f0b5ea0628b9f8ab55142b5861e2a227fac02385c179533
diff --git a/dev-tex/biber/biber-2.7.ebuild b/dev-tex/biber/biber-2.7.ebuild
new file mode 100644
index 000000000000..4e8ada3cfa53
--- /dev/null
+++ b/dev-tex/biber/biber-2.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-module
+
+DESCRIPTION="A BibTeX replacement for users of biblatex"
+HOMEPAGE="http://biblatex-biber.sourceforge.net/ https://github.com/plk/biber/"
+SRC_URI="https://github.com/plk/biber/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-lang/perl-5.24
+	dev-perl/autovivification
+	dev-perl/Business-ISBN
+	dev-perl/Business-ISMN
+	dev-perl/Business-ISSN
+	dev-perl/Class-Accessor
+	dev-perl/Data-Compare
+	dev-perl/Data-Dump
+	dev-perl/Data-Uniqid
+	dev-perl/DateTime-Calendar-Julian
+	dev-perl/DateTime-Format-Builder
+	dev-perl/Encode-EUCJPASCII
+	dev-perl/Encode-HanExtra
+	dev-perl/Encode-JIS2K
+	dev-perl/File-Slurp
+	dev-perl/IPC-Run3
+	dev-perl/libwww-perl[ssl]
+	>=dev-perl/Lingua-Translit-0.250
+	dev-perl/List-AllUtils
+	dev-perl/List-MoreUtils
+	dev-perl/List-MoreUtils-XS
+	dev-perl/Log-Log4perl
+	dev-perl/LWP-Protocol-https
+	dev-perl/Regexp-Common
+	dev-perl/Sort-Key
+	>=dev-perl/Text-BibTeX-0.760.0
+	dev-perl/Text-CSV
+	dev-perl/Text-CSV_XS
+	dev-perl/Text-Roman
+	dev-perl/URI
+	>=dev-perl/Unicode-LineBreak-2016.3.0
+	>=virtual/perl-Unicode-Normalize-1.250.0
+	>=dev-perl/XML-LibXML-1.70
+	dev-perl/XML-LibXML-Simple
+	dev-perl/XML-LibXSLT
+	dev-perl/XML-Writer
+	~dev-tex/biblatex-3.7
+	virtual/perl-IPC-Cmd
+	>=virtual/perl-Unicode-Collate-1.190.0"
+DEPEND="${RDEPEND}
+	dev-perl/Config-AutoConf
+	dev-perl/Module-Build
+	dev-perl/ExtUtils-LibBuilder
+	test? ( dev-perl/File-Which
+			dev-perl/Test-Differences )"
+
+PATCHES=( "${FILESDIR}/${PN}-2.7-drop-mozilla-ca.patch" )
+
+mydoc="doc/biber.tex"
diff --git a/dev-tex/biblatex/Manifest b/dev-tex/biblatex/Manifest
index 50f862a2fe0f..a1a4e3501179 100644
--- a/dev-tex/biblatex/Manifest
+++ b/dev-tex/biblatex/Manifest
@@ -1,5 +1,7 @@
 DIST biblatex-3.10.tds.tgz 19660675 BLAKE2B f02f5f6b5e35354804a752d29d4670d523bc63a0485239c9b46861e7232cd332c258c22c26d3c95afff0033b0e87867a1129ad62f60b49e2ccdadd644b2b3655 SHA512 0bab1c5923db071b0a625c713716fe7836210637fcb60768f4bec417b06dd599bfcaec765e0e49d21f93d33ef1e9275ff2b21cc1269b64fed1222439a6d0b161
 DIST biblatex-3.4.tds.tgz 19279991 BLAKE2B f387b43f0a3b40dbbeff82bc5523fccf6d3299d09132b884adf718c4fa9bcf11656684d02cbf37382631ecd504f999ebb4d77d59b53a0f9659293b52fb5db1b6 SHA512 9b7c4692f4b98df7bf36f8a90e67720cb4f9dc7e47047e0c181b7e95323dd037ba38bad4c77bbcb5d88b1f366e15b579b5e9410055873a160d7728db9d59ac56
+DIST biblatex-3.7.tds.tgz 19378703 BLAKE2B 1265c73689c803944cfb54ba69918d7076370bb8edd81b9735bb316bd726f33243867e1092b8fb7e339d1614fd0dc05c09b2058d3b29739d7661f0845714f02e SHA512 d81a67b2b29e86e7017919ae1836da7b55da56698fd38f56cfc9377e6c15a8dff6ac28288c6b98a70b570f7db25504f18064093d6e21816c161dba155b6cc8f4
 EBUILD biblatex-3.10.ebuild 945 BLAKE2B a526271f85d64ab5ae4d25e868cac47882b3884e4d2af7cdfb4c3489932be86c7ce6bf3537e3449d810836ea5254d650152244de5b88b6128f972493cb37f8e6 SHA512 577aaca4ecd44338e2db8e1e3cb0473f28ffc2022e6f74270bc23c68a42d3d7f16af8a71fd513b26ced8d5b17acada0101f19ef7d5770da1e7440d2a44ce53d2
 EBUILD biblatex-3.4-r2.ebuild 883 BLAKE2B 25d05a799152bb0b4f9cba53b48f14661647dc12838c3d818baba87606e7a334751bf7045071a831272a1ed54cac4b8e0144c6c5d8bfb74c1332e90b2ad780c5 SHA512 d610e13174042af49a68fa97de275b6684088366e1c10dd0efd08bf656d08d564977db2711671553f7c0958319f98cdc23bce8fe98ee6dd6dc0005e29dd691a4
+EBUILD biblatex-3.7-r1.ebuild 938 BLAKE2B 19fdf92634342dd321c07a6a4ba6783402d7b7d2fd61d0af11b52510aacefb97e8ff5577d9b5b86c7a7cc7ce06f2dc237197bfd3ad45d3d7d40d68aa9a842b13 SHA512 ec823586dc0775327839ad0c5ef61198d6fd2fdfd7d8e2d7572e21350e487287025fa4e2280be365d6e46e6f2979c129387bdc6b51bc2a5e287f5158f3c923ae
 MISC metadata.xml 716 BLAKE2B 6e420e4597f650ed11755b5d08ee8d248be5bcb2d8845a4a13994b34f8cd8e16e229b5ae5291f04a0cf51483c1ae8b1f01c1f15eb3eb175f2962fe01bbf0dd3f SHA512 0ee786fb0f7579efd62c9fae58e9454812aa75636de55d9b9df24503b9ebef2108e625e9ad2cd1f301c34b5379b8e9ee6babed0ab8b1a03193b587935ba28bc3
diff --git a/dev-tex/biblatex/biblatex-3.7-r1.ebuild b/dev-tex/biblatex/biblatex-3.7-r1.ebuild
new file mode 100644
index 000000000000..f7e711e1dcd8
--- /dev/null
+++ b/dev-tex/biblatex/biblatex-3.7-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit latex-package
+
+DESCRIPTION="Reimplementation of the bibliographic facilities provided by LaTeX"
+HOMEPAGE="http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex https://github.com/plk/biblatex/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tds.tgz"
+
+LICENSE="LPPL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+biber doc examples"
+
+DEPEND="dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-latexextra
+	dev-texlive/texlive-plaingeneric"
+RDEPEND="${DEPEND}"
+PDEPEND="biber? ( ~dev-tex/biber-2.7 )"
+
+S="${WORKDIR}"
+TEXMF=/usr/share/texmf-site
+
+src_install() {
+	insinto "${TEXMF}"
+	doins -r bibtex tex
+
+	dodoc doc/latex/biblatex/{README,CHANGES.org}
+	if use doc ; then
+		pushd doc || die
+		latex-package_src_doinstall doc
+		popd || die
+	fi
+
+	if use examples ; then
+		dodoc -r doc/latex/biblatex/examples
+	fi
+}
diff --git a/dev-tex/latexmk/Manifest b/dev-tex/latexmk/Manifest
index 24901571de41..f274f17ab23a 100644
--- a/dev-tex/latexmk/Manifest
+++ b/dev-tex/latexmk/Manifest
@@ -7,6 +7,7 @@ DIST latexmk-445.zip 447045 BLAKE2B 16caa95f1331468a0e535899b9e5c8fb1e3bcd6b7ee1
 DIST latexmk-448.zip 452245 BLAKE2B 4b033a6eecdb366e4e5e4b8accfc839e7638c1fa79091eb9888bfdb393e6df01edec5ac11cbff5b0c9dbf28c1783f0108372c240f45305329189abedc211af8d SHA512 cfa5c4a95a902baf1d4c56303500e5d54369b68abaa52e904a62bbeaeeb356bfe711ea040f0f02067a40e3fc88a12b46136a3a6d9708a34c177a4bae0bb6b986
 DIST latexmk-452c.zip 391327 BLAKE2B 1cde3f3005382958bba10c6bd513e3887eefeff5114bc5ed327a528c56b3b77bf9a1b51907c8bab0d50817f6bee63d15b4373e83799231a815000f6b797c0053 SHA512 164837066a285e3ffca938eb735c35b253b2dba2addf1ae2b2db5155b0586f6f4e626faf86eb630f97ce296c03c5c1c2f0f3c61445a75b9132aff009d683aeba
 DIST latexmk-453a.zip 368805 BLAKE2B 5bca05dd0196c43a1cc1e58e8036b66d8ce5825e2fc53e824cf6028c47ab4c420f0cff6b9e2ca205377d1784ce955bd24ba1be1a89f304b296550b5ca76d40c3 SHA512 401789383f75ecd78820dadf968e60ede762be0d9a781488e07a0a8239e213ae04959777a6ea87fc6b2bb64315ce00bdda25f7f25542370b5edf2ae5af9ba46e
+DIST latexmk-456.zip 425179 BLAKE2B 1cd2fcaff070bb9809a263763164f364f13146ba4a5115494824dfe422b2b58906aa9e9ee7ce02238961c77da2e828e6a73a56e7397efa77003b8237fa949fe5 SHA512 ff169ff677367125b32e7641e9fabc66d9fb015e6cf1433d39c598baf17a926e0d29c975c4a8fa8ed482b4bc57ff177cfedc058ebdc83a3abadde50f9a490d91
 EBUILD latexmk-435.ebuild 823 BLAKE2B f76d57c1dca70970280442aad0aea880c1efd319d6b3210cd8e601cd9d67d02302cc70bf412e1c83fab703382707a81a4c8357d484de191e35db1d0f63b6af69 SHA512 1c291ff62796125eb6cdcf9aa0c975cacc7b709f5d96820a87bd7505f93bb1cf8d627f830bf5ba8ffcf4d72c92f923f338c2a782ab7c0a8f06d185540bfba073
 EBUILD latexmk-441.ebuild 826 BLAKE2B fac6e4aa6eefd05ba8eb1237ae562f034e35f729ad919ff2a8212520a733e93398d6aefc0fd3c00d90415a401a700ebe442633964971b9ef7cf416b8eee9459f SHA512 605699979bfb4fdfcc9a1dbd532a1b1e66c4bcb96279231621218358664bdc1337a69b196875f11f7516ededfb2d9825c2303fa9fda890c33f00d6bccb4c8f13
 EBUILD latexmk-443a.ebuild 834 BLAKE2B 794c6d22827bc35c98523933fbc511a9fcdc481c70529efadc55cb0813db96cfeb29fcaff7b31abb55f096a0683f67399e3d3ef5be95ebf09244dc7f7bb0191b SHA512 fd900c71322366f046476326de83ba0388fc8ae0dc18a11e66dcf7cc1a177a98b5202d099f3196131a02b0b41483211c42cdd1fb137fa14629c57e66a0a007ba
@@ -15,4 +16,5 @@ EBUILD latexmk-445.ebuild 834 BLAKE2B 078d5f77c875944fac14b109faf77a47823b8395e1
 EBUILD latexmk-448.ebuild 834 BLAKE2B 078d5f77c875944fac14b109faf77a47823b8395e1e0d9370a4330185b666cca15884af6494d142aa55cc359eedbfe5c44d1038afc393c8864828b8b9ff8b0d6 SHA512 728f54035bb904e8355a5cd87a0b8548dcb567e65871d6c40ae587e3cd177137259f59474851e7b7041e753a4b53073e713110336c4dc4e784fe9162fe9c698f
 EBUILD latexmk-452c.ebuild 830 BLAKE2B 5915d23d18d9dcd0a8259f1d8e10f32d2bc581d93c2ee963c868b7c2114b7ae9fae90d197d7a29bf1203b29afecaf5abf439f7cc87671bf5cdac76dc4192823a SHA512 e3d1ef467665ff76428284031cc29d9ee4d9c6660a4b03a838adca2cce17184cc44808bd062d0df36056f21e5fa11fa22db46febb40976fb109d8a4fee57b9ad
 EBUILD latexmk-453a.ebuild 830 BLAKE2B 5915d23d18d9dcd0a8259f1d8e10f32d2bc581d93c2ee963c868b7c2114b7ae9fae90d197d7a29bf1203b29afecaf5abf439f7cc87671bf5cdac76dc4192823a SHA512 e3d1ef467665ff76428284031cc29d9ee4d9c6660a4b03a838adca2cce17184cc44808bd062d0df36056f21e5fa11fa22db46febb40976fb109d8a4fee57b9ad
+EBUILD latexmk-456.ebuild 830 BLAKE2B 6cc820ea5e009936627cdfd26e085915c36873691865af787ee30690f4196287f93e5ba9625647a0f40fc99707ecfa2aa6998fab328f6ac87a47fb5972f98c0c SHA512 82272935691784550c366e88f48dd148ec2a9c7c7b835f4e46de2fefeb9dcd2c7278eae3e02de4dc0dca707c822a21adc6c4ef2e96c53f6d007537af4e86b725
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/latexmk/latexmk-456.ebuild b/dev-tex/latexmk/latexmk-456.ebuild
new file mode 100644
index 000000000000..19b2d48eef83
--- /dev/null
+++ b/dev-tex/latexmk/latexmk-456.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+DESCRIPTION="Perl script for automatically building LaTeX documents"
+HOMEPAGE="http://www.phys.psu.edu/~collins/software/latexmk/"
+SRC_URI="http://www.phys.psu.edu/~collins/software/latexmk/${P}.zip"
+
+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 ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="virtual/latex-base
+	dev-lang/perl"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+src_install() {
+	newbin latexmk.pl latexmk
+	doman latexmk.1
+	dodoc CHANGES README latexmk.pdf latexmk.txt
+	dodoc -r example_rcfiles extra-scripts
+	newbashcomp "${FILESDIR}"/completion.bash-2 ${PN}
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9290b65452a3..8a35ae596318 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index a78fe5316106..8809096e399b 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,5 +1,5 @@
 DIST astyle_3.0.1_linux.tar.gz 172483 BLAKE2B 4c80491cbcc976aa38ff294014df0dc01b39685eafdac6989bea082b1f61120c3985d14ff6db9f76606bbe8da1aaa344c2e0c9c2999a014f5d54384c0420cf97 SHA512 3e8d617c0ec89682bfb076081bb63ae9d44e897de0c85d5109b28adbbfe0620d5dacf59a4bd96ac30a5a4fcb3be136758e9c6fe2c69258b37956c212890a7158
 DIST astyle_3.1_linux.tar.gz 185589 BLAKE2B d0bc9bf3403de89d207f33ac885c7cd57fd1e71314c947e1593ee24ade9ce36c83c6fd8e7021f44d8d3b344ea3add63fa5a7b246c40f10193dc38b51e7ad36bc SHA512 2e8f13d291abda66bbba30174c364c81a81a490e0a21376f7da7cf471644c22caa37b9eefb100d093bf26d1a8bfa9d2f14b4c2a9b75b3cb84428b4514e277ff2
 EBUILD astyle-3.0.1-r1.ebuild 2401 BLAKE2B c27dd1d6b4e886cf68a795563d15d3fc942b62480aeae96116f108ea70dc0c6383a2d4efa5622c2aab03dda4d8ecb8d202eb7fa95c4ada8e2f8229be0f5a98dd SHA512 868aa688a44823004342598fe128af286aa78a071612cecdf335410cf7ccd88ebe91774d3385afd68c29f00fb5d26e95c235f0a2c4afb0650c75b2d802aef67a
-EBUILD astyle-3.1-r2.ebuild 2409 BLAKE2B e3e29396801ed158bf96660d80617ed202b4482e989491ecd31c73605e95f65239a7179498ee73e29f5ed08f371d258bd3a0195ddaa5c2ec4be171af68580bbf SHA512 1682a25a8327cc5bb7fdb0ef23c4341946926b27a119d413f33b0c4c8808520ae5dbb7d24704549c0acf3442d991ea6b4b2d9e17ef56dd1b118efe943db3f52e
+EBUILD astyle-3.1-r2.ebuild 2399 BLAKE2B f0739bdf63c8a7559f46b2bd0a3be11ec76f123fee5b38e745d028fd12dba54c514c9795da7d1ba38d814a5a9e97a8463c1222ea43860b1064d007c4ad5cbb0d SHA512 03845b6e959eafc6cbdd6f01357b8df7c241883ea961237630d3c2d87dc69998ca993f617264957c9260cb1b2244cc80f146d43f9a31bcecce0773211109a8fd
 MISC metadata.xml 753 BLAKE2B ddd9b5eb1eaf20f626bdb0b568c856f6e2bb548fff3b6271bd163d6b1f711e66635d2e3fd839c67421f92232a7a8c7343179a4a95e39266dcf44b91bffc0c2c3 SHA512 2896e9eb1f69dfcef21bbc4f622e0ee7e2a88ab882d1ed91623642d4b7ddabb3b9e4e060e1662254e40cd4cdc77f189dc6888dd509ca40633c1f197fb2e4610b
diff --git a/dev-util/astyle/astyle-3.1-r2.ebuild b/dev-util/astyle/astyle-3.1-r2.ebuild
index 4394e1defb22..cc2092626326 100644
--- a/dev-util/astyle/astyle-3.1-r2.ebuild
+++ b/dev-util/astyle/astyle-3.1-r2.ebuild
@@ -54,7 +54,7 @@ src_install() {
 
 	local libastylename="lib${PN}.so.${PV}.0"
 	local libastylejname="lib${PN}j.so.${PV}.0"
-	local libdestdir="${EPREFIX}/usr/$(get_libdir)"
+	local libdestdir="/usr/$(get_libdir)"
 
 	dolib.so "${libastylename}"
 	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(get_major_version)"
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index a3c168707c92..499a65552906 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -12,9 +12,9 @@ DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6a
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
 DIST boost_1_66_0.tar.bz2 85995778 BLAKE2B 9ab1fe396b10ab85d7e4084ec7abb8d785ecd892c8f51aea5a401cb565b111c256533364fe028da74ed376534889f43c5ccbdcd703cd236526ae66a064220765 SHA512 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b
 DIST boost_1_67_0.tar.bz2 87336566 BLAKE2B 85ea00fc2197b1bbfc35d69427c87f23ea43d7592f1c9ce66e2afcde8476bdec86f6debdac815b23de59f4665a8e0c7f1519ab66a31d39df629723bc45710058 SHA512 82bf33d7d2c3db109c9d1f12d40bc2d364c8c95262386f906ccd1a71cd71433bcc01829e968b4a13a5003cf0b50cbdf0b435a1d76530cea7bb05725c327411e8
-EBUILD boost-build-1.62.0-r1.ebuild 3917 BLAKE2B c54fa707afefaf95f734f0af209c5394fbd1840be1b17d08f85e19c490754a640742a418c1cba77ce7e30b7e8bc0ef3eb6bcd49f09997348deed50e471380c6f SHA512 c6d588a903e3b717665b93ffdf0d815ebc769e527d6e14df9a6d0726885b26e1e932862928dc246e661c32765315932c5e5b956aa3c32cc32bd39ebdf5c8bf17
-EBUILD boost-build-1.63.0.ebuild 3841 BLAKE2B 8a1bec9cd61ae7ebd6692c30372ff5f21bb766b6a91cb5cfd95879c1faa18f02b7c1b44a42d6be7ed806a5c0a6920732cd366e08fb7a8a54427415579221b54c SHA512 fd427ff4dcfcb7bb8dbf2bd3fe795dc163c55167245febcd57220fab383088b44e646d715edf44462f5db3a8ebdafb8f0396f25ebe18038d560ce6b90dd428ab
-EBUILD boost-build-1.65.0.ebuild 3841 BLAKE2B 56c4453ea28c2c183f39564a9585abb3b1096105045e22e0e14cfeece72796b7ac49f93038bd1069cf96ae90fba6a1e4f1879fcf3efc0c9cc88e19d4b6c1c3ae SHA512 51bb46c6ecf0ee0447dc1cbaf15088f077159def1db09a5ba92ecffce7a53ced2992977b8f6105461fd1e86b43fbb44f0ca37e205c928fd31dd7e8bfbc8bbcb7
-EBUILD boost-build-1.66.0.ebuild 3910 BLAKE2B b39850bbc32ec01db2976436f6e8aecbf7d72dad9c4f0dac7172864f3fbd1b67eab9f4ef181c3a6afa577dc9480b72ca8e88233a967fc9cb7c629f2cc303bac6 SHA512 47806a8831a7335fdf60da7bbb87a703ee5173b1fe04b3725ce60362c16305e787848092cbbfcde4f0333e50c3eef84078ae3c9341463877195f4bc0b4290c63
-EBUILD boost-build-1.67.0.ebuild 3877 BLAKE2B e4b673623836afcdef5a07ddd53c1fdd0a4f3500b766f6a51cbf1d6d467a68c77c9abd610f3a70d2130149f58208c3ef18bf54702ae854e3c45a5079d540fc0e SHA512 1392b87927e890688acccbac89adcf7cd0a7167cf96aff4b4ac03b8a1f9eb495deb22126b8f83f83fb7d564f0dccf0925bf5823f177757f7c7084fb573fe9698
+EBUILD boost-build-1.62.0-r1.ebuild 3903 BLAKE2B 043936d2e52800edb79e6c69180e0c5cef1a237c0e3d2297da3bd70e230bbdd24342f288c959e476d5f38e2f93a5c643fb484878d39719d86fd0fb4535644142 SHA512 5c2ade13e563b52163e9ff072f8c2c98efb2ff95a9c30f1d9c590a02271570db15015e852df297aafecfcdc845d18e15db878d3fa81a4a1619f67808e9411efd
+EBUILD boost-build-1.63.0.ebuild 3827 BLAKE2B dd1f7ad44ffdac1565e7314be8942393c58aed3cd805464c04b7ce6d09a6b15d1c2b391396e45a55725a95b971e1a589a7224acce922e9af4dc63bd546ba0092 SHA512 7108fd0049da3be73d5a0423094ad63b50d1e1209cf0570046a4ffeebb7dd944adf0fb6497a06c88e68af0a61636a8cd48d5a3c3379307eb67cc1c65ed6da3ff
+EBUILD boost-build-1.65.0.ebuild 3827 BLAKE2B 7a19192a568f013a256fcfbaf5b6338a6fa4b93500989657f2b12b311dfec3af38fa1c508bd1cc4113f4a4109ec652c64d1d492cbe1cd17ae9a5263dda30c202 SHA512 615cf675233757e540dc60259332d1579069e71f1240f7e19c79fb82b94d7bddcb00a73123c1deca2b7e05c193cb539ac487ad4425f5901f1629b122555900b5
+EBUILD boost-build-1.66.0.ebuild 3896 BLAKE2B c5f6d2b2e9f943553d864928b6f3750679641654bb97b1dc37431190d81bfb560f015e7e36b373997d95891bbe97a72c4cfc456301f406df668e874b2121c76e SHA512 f33deb81bd957925d730b2224df5e27ec24279376bc49d3d6e2d9e538edbcb4c7f89c0de66c38d609748ab7469065bad61aa7a7518b973157f885185e3386465
+EBUILD boost-build-1.67.0.ebuild 3863 BLAKE2B f409a586844fbcc0dc898cfb051682e9ab06f9f9e5e66ecc05c7a9af03c167e52c1650745d518b952a866d52d163c3689796a2611b1dac9cf20f789b4a6cf58d SHA512 27c84fc912d0ddaf8ea3d3a7ded91f3a80994f052652b46272f5ad1482afd1f29979193adaa52715872c27a0afd08d8c7817fdb0a9bcb62278a483731f313cf5
 MISC metadata.xml 334 BLAKE2B 09d121b81646b5e49bdeae195df0aecab1b0ca738a29c7a89e254efca4655a0a74c1a724003ece1e4cd3363c98496a16c38dda9707d6568861590c58049628e6 SHA512 bc1fa12d69f5711c380a938546914a325ac9dee1b35b2b75136144bbf90190fdc7e113a8eedf26a5c23d1564baf71f936141d71ad715ad6f212f32226601706e
diff --git a/dev-util/boost-build/boost-build-1.62.0-r1.ebuild b/dev-util/boost-build/boost-build-1.62.0-r1.ebuild
index 55f8756c65ed..0178c2e3dfba 100644
--- a/dev-util/boost-build/boost-build-1.62.0-r1.ebuild
+++ b/dev-util/boost-build/boost-build-1.62.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit eutils flag-o-matic python-single-r1 toolchain-funcs versionator
 MY_PV="$(replace_all_version_separators _)"
 
 DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+HOMEPAGE="https://boostorg.github.io/build/"
 SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2"
 
 LICENSE="Boost-1.0"
diff --git a/dev-util/boost-build/boost-build-1.63.0.ebuild b/dev-util/boost-build/boost-build-1.63.0.ebuild
index b9a786d1e299..070a8e4d6032 100644
--- a/dev-util/boost-build/boost-build-1.63.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.63.0.ebuild
@@ -11,7 +11,7 @@ inherit eutils flag-o-matic python-single-r1 toolchain-funcs versionator
 MY_PV="$(replace_all_version_separators _)"
 
 DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+HOMEPAGE="https://boostorg.github.io/build/"
 SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2"
 
 LICENSE="Boost-1.0"
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 fb56a57e3cef..44cad29af789 100644
--- a/dev-util/boost-build/boost-build-1.65.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.65.0.ebuild
@@ -11,7 +11,7 @@ inherit eutils flag-o-matic python-single-r1 toolchain-funcs versionator
 MY_PV="$(replace_all_version_separators _)"
 
 DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+HOMEPAGE="https://boostorg.github.io/build/"
 SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2"
 
 LICENSE="Boost-1.0"
diff --git a/dev-util/boost-build/boost-build-1.66.0.ebuild b/dev-util/boost-build/boost-build-1.66.0.ebuild
index 0349d767faef..ec3e64b01f92 100644
--- a/dev-util/boost-build/boost-build-1.66.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.66.0.ebuild
@@ -11,7 +11,7 @@ inherit eutils flag-o-matic python-single-r1 toolchain-funcs versionator
 MY_PV="$(replace_all_version_separators _)"
 
 DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+HOMEPAGE="https://boostorg.github.io/build/"
 SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2"
 
 LICENSE="Boost-1.0"
diff --git a/dev-util/boost-build/boost-build-1.67.0.ebuild b/dev-util/boost-build/boost-build-1.67.0.ebuild
index aa42085c97ea..87f9bb674395 100644
--- a/dev-util/boost-build/boost-build-1.67.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.67.0.ebuild
@@ -11,7 +11,7 @@ inherit eutils flag-o-matic python-single-r1 toolchain-funcs
 MY_PV="$(ver_rs 1- _)"
 
 DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+HOMEPAGE="https://boostorg.github.io/build/"
 SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2"
 
 LICENSE="Boost-1.0"
diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest
index 814b6c2d6840..2d097c10cbd2 100644
--- a/dev-util/cargo/Manifest
+++ b/dev-util/cargo/Manifest
@@ -1,13 +1,17 @@
 DIST aho-corasick-0.5.3.crate 252052 BLAKE2B aba67d996b22c336165be78c89f53a2164605544f82587ceb1145bdb850326c2889d1bdcc3e95a6c5bb1dc0a996902130ab8425a7b0b88b38daffbfc9f58e309 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31
 DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
+DIST aho-corasick-0.6.6.crate 26330 BLAKE2B dbdfcba15832736cf1ec65c9f93943e7ef368fc71e5545e1481788428ce1ebacaf87b4d045cb22695c1738ac6a0c579b38e886a461bd665b07898ca3a7f9e808 SHA512 6ac654a3e670ca53350ae6a4b21f7cc50335a42ac8557f34712575e9e9871991d29e45a45280f8c32a8a44340a54ac33585e7f1ab9b549462002e0ec24da2caa
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST atty-0.2.10.crate 5962 BLAKE2B 36a2fe57eb500124f20464a7d67f86bc6270c2143f8273683011599adee180ee71fb0ea565c38171b9d471479d63041e4bbba4f713dfb92239b7d298e9d89e7e SHA512 76cbf960475073101d617bdaf12ed1e93dfdd96e22182674e1ec04c955fb1de2e3aa132345c50a1bebc579932d43c74c9aac64ae64107e98648a0f1f6562285b
+DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
 DIST atty-0.2.8.crate 5708 BLAKE2B e88f1155f51dd36eb38364994eeffc84683b43b8010909e058d9fd80fa492092ed49d6d05b5b7d10fd2585191dd1b6efdccf30be298f53dcb832027fd6187508 SHA512 d6aac03499b5e8187ecacd6060d34d3ad8747eb680c9f59ba13e00253d422b2d7d092236fc8eced93358f251d46672013463e3bfdc0aaa9e9e7c5c8e08a22195
 DIST atty-0.2.9.crate 5898 BLAKE2B fa8b45e670fc4147f0407e4a059569e3d4ec31f79aef01ef581c03396a73aa449482dba200bf49d6f60887853eadc8ccf483c0fa0ebcba9f219557cee9a907ba SHA512 2d7d2e52f3d3b66d4280dc3a2509c0125b1cf7dc136f3cc81e1a91aee0dcebdb4444544f631bccf299580f24ac8687f9b61e3b08fc961c040146959eeec1205c
 DIST backtrace-0.3.5.crate 27636 BLAKE2B db71be18b39a7aa25d2e1850fd907d3ea96d30af66b72c7b2b12a37acf6d6f46cdca1b9de884167e7567584848ea2ca4a1b03468e9158a62a3fde6aacd0746c8 SHA512 b554fd616780c706d8f6e7afef4800625a9fec5f7825e995a534103d1b773f0f28e09d49a1163eef9059681d669953ed1b7a8fb33209ee3b7be1fdeaa2adb3a1
 DIST backtrace-0.3.6.crate 28437 BLAKE2B 63f056086b8c56707e7a3f9719e211a70368584c85a6a3b05ed8ad31cf3ac86f6fc091c826392439fcaf9a0f4066de8da00449a9715d90c1585d450fff63bbdd SHA512 c42e9891a2297aefa08e6ec627520bfd3f93f7eddc2782cb5eb277092d588b1d84e75ac724d29548eab77de19de3400748b90bf2eccfed5ce1e20a979dd210e6
 DIST backtrace-0.3.7.crate 28432 BLAKE2B 5478adb8e5a028a5d5af62b2f6522c2a7bee65bcbfa76da252c57e4f17b682db486f3aff96501d49943d86567eb8187f1e37a42f324b3cf3181788d0cd760b15 SHA512 a3f0d8bfef2158310c65f41e246323b0953147a017dbe47143b8dc2e1734c945f13b49732a16f1712a3b5a27a23f27a38778d8185c64a7982948aace69c079af
+DIST backtrace-0.3.9.crate 31054 BLAKE2B 5d90d098d149198eabe4665b1eb2cf41c5f392ddc1c5cc499047dd72533d79b679943781445f7d86f269a15d3f8ca2775dfe89123935d32ccef4b8151547283e SHA512 edb485ad27d19e0cccea123cc6a9db5b3222831e48722d8fcec7349fd1c4b62b67ab1f488fea4973da82c8f17a86aeba4ea8f2fc1aa60f6528833cda39efa637
 DIST backtrace-sys-0.1.16.crate 283418 BLAKE2B d15f9c692dd805c61dbd219c70f0b47bb6d2a18bdb2657bd5b5bf6f94f1df621f6be56e2774d2d5d218f044c1358b1af4251705123c5d48ce5575ff3a2f3b50a SHA512 2fd32fee7c13d1c83be5e86341a4c1c0da06876a73a9fb74c680994132510eac9a3444144c97ddcb78919da044e628650d604a20a06ca7852289168da8d754b4
+DIST backtrace-sys-0.1.23.crate 522263 BLAKE2B fa5f2e1929dd4a0fd0c38abb52fee514315e4d8711b17cb880cd78007ef82093796e9249e73fa0296455810059ee4fe9e09ba05c5d2c0a9dde206ab601816455 SHA512 29c3f317ba7907e8cf0f23990f450e0d3a0ba27479c3c7bbedaa3bd3aef177eea6e8393bc1051a60f2e18fff6d329790f2706eddc27bf6558ebc2d05e0f173fc
 DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
 DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
 DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8
@@ -32,40 +36,62 @@ DIST cargo-0.27.0-armv7-unknown-linux-gnueabihf.tar.xz 4059300 BLAKE2B 2cc0aeca5
 DIST cargo-0.27.0-i686-unknown-linux-gnu.tar.xz 4570084 BLAKE2B 9f62bcf03d8eefdc5681929fce4f7835ba5c4181324fcb43d2594cf61bd2e460496380abd8da37df0b2977a02e3c027a436297f06b6ca28da82e6b540df9f35a SHA512 212d5634e369c913612a2023cd0d1b81f4f1d8f37e504a07ce855573a6dd0fb2084ec9a0e00a86b457adb7e08b46215f73ede9222ad01213e4c9e5a4ff99cca9
 DIST cargo-0.27.0-x86_64-unknown-linux-gnu.tar.xz 4524080 BLAKE2B e2a65dafed7ce552f6fbf8b641409cd6fcd924c10e0779c7587fae5c3cba23626f7913cab3b8741d9bc9aac471c855e32b8647769a3750baee1d377031e9eb9b SHA512 c0609edeaebd3e851c94933b3e5c56e8fd394c5b3a572bdacdf32dba5a2de9bdf6468879017f97002bea990c1ec1a970e017d1cf2fbcb22f6cf1ac39dbd1d947
 DIST cargo-0.27.0.tar.gz 728885 BLAKE2B 1966e381b9c286786f8b28257f155d2a10d23727978f4f0a1954294c1b82ab0d2aecd511a72e39f9c6fe955bb237cee4e53f8542270eee8c2eea3cb7dc956fda SHA512 8b984a1a64427d09d29ed82cc736abb0a2e936a253ef3ec05b4934b2b541758bd4e3c68ca21c80649de83eac2742f84f2c81f29fe62d85a150ad0cf2c50a990e
+DIST cargo-0.28.0-aarch64-unknown-linux-gnu.tar.xz 3630240 BLAKE2B a001a4204b964a2a2317833c4edeeb217354847b9db64cad48e3f7cd98f614be4c311690e32f5b4c6b358f5882e684def220c4fb96a83e6fdae14c6b4e143aaa SHA512 be4424dc71ab984b51e74d957254bea9169021f5225dceaef3e808ae7cff262ad951cb164ab12c8b63c4a6d260bfdd0a9de37390aac623c3f0895d28aafbd4d5
+DIST cargo-0.28.0-arm-unknown-linux-gnueabi.tar.xz 4238948 BLAKE2B 2426bedfdb0bdc15a9c64eadca62481cab169c62c6d6093f626a1e17d95083b103b32534f43d28de223d21d35c363a7a79728bb4f6953873e870de158b3656e9 SHA512 f95eca6ebd922dfd3960eaccc950be7aa2e43f60081b88eb830c870d5d3f39e7211c38b7f5b570e3b07b7e13e82229281e8bddf394637a68635237ef6ca48886
+DIST cargo-0.28.0-arm-unknown-linux-gnueabihf.tar.xz 4275940 BLAKE2B 44c1d890dbe4af6097ceb7c289ed5c9cdb65ebb72a92ea49a14ce14efa2da4b90daa71784d18be9a3a0b5bde4e36bb80f8647de9c17b939a719b732d0455b731 SHA512 c1224a81e1446eb423a1cd065115711c8f0f889c7ab458cd80c3bd224e4cf0ddb529debf3f1ddf8ad2aa66370193c24e4f09b1d410bf95c74c386629bfb35fe7
+DIST cargo-0.28.0-armv7-unknown-linux-gnueabihf.tar.xz 4234156 BLAKE2B 2416916ea70f916b9d505e3b3a8c0adbc047312e917590729ac62fbf7a37ddb4a66f4ebd28110619e2045e9446a95824501f9eac695087907d6f603fef3e8331 SHA512 00f6ce2e241177b36dbe868c92ed5bb9c66ce89736060588300d6759ea04b1b782cd412b8231bf0cb83d9eb4c7e00e8d92a334e8c65623c048f46031480cecd3
+DIST cargo-0.28.0-i686-unknown-linux-gnu.tar.xz 4781764 BLAKE2B bddd2d2bf0dc6b30784b390a4810ccd1941d0d92be60ca1c2a1412c81c2578486b8feaddd35fb5654b216594d891f3fbadf19fa3cccff97c9057fe2aa8e78bd6 SHA512 6eba4e64a18df6139e9ff2e1f3ad10bed0211d8fed7633337f9b654276149b1c62f8d3ae2e7bccdea911c712afeacee75a59fb61c50b20d6a3ae2621be8ddf68
+DIST cargo-0.28.0-x86_64-unknown-linux-gnu.tar.xz 4751256 BLAKE2B 48e9198b493d4a2c6564c3618ccb24b0fbfa838b36e8846397d421f19270bec5e4f625a5b544024d7cb32933ae9fb07ec15cffa5c7aa881f48e69cdac5f3b295 SHA512 d1ec117c7be1ad040fd88ef64da9b9c84b11ed6f19ab2c5e60c586c004946d84c26792efdc9946e9a69a878224b5f8d6b4bfdf3100d858f3d2aa170dc7c122ff
 DIST cargo-0.28.0.crate 754146 BLAKE2B 4684dba85e40a3d2bbe13ea18f01c101c4783e132d302897dc95bb89adb0193b24ddca108e1886e8b2f7f292bc94f95826d479ac4daa963ef26db789cc6a039f SHA512 149b721ec91600e201162403773b22bb1c3f1c825c506a4665396e681864e953c3acf53eea0ab319a7932bb06fe0f5d02e82a54d39f6a0fa23798aee93469540
 DIST cargo-0.28.0.tar.gz 761690 BLAKE2B 0dec2524053ce56013108f031e57b7b8c69daa95f4d594fa7a849e91dc317e07ea0540c322c7473242640567c0bf9f565661e9bf91ee8b96008986c9a1e2fd89 SHA512 609ce0b7539511e5dc9f5d426c761dc074406cc3f2f4b4a8bd4b1f01dbd5288b33403b64b2078e5f5ef1cf40d468468099bfab24af751bb5b4d4912cd5f72030
+DIST cargo-0.29.0.crate 775799 BLAKE2B 27bdf1d49b2bfcb2e2463fee7a0fd3755a11e1bb00c793b8da6c66919d3b6d4fb7ae2060641f0d19aed1ce02188b6f56daf322894ec23bc722dca6ed1953d362 SHA512 2a814ead1b863b2e80fc19ad4722ac2ef8469ada9bb9519ad3c4ed6483dcf5b6d96bf1224fdebc284fa3b884827e18fcaa7bd93544833aa3c5160f80fb33d43d
+DIST cargo-0.29.0.tar.gz 780814 BLAKE2B e0e557a81fe8de8758c07233bb4750b2350449c8eae2de3e407593cc453e702e8751233f2b9ef2a00765b9b688e7d79234572591dfa103e42d0404644daa9ae0 SHA512 e02b9f3f4c5d7a36de3fe5062283e69cf027d6f17370f2afd714e75a1b18ec7e080346a72032547fa36f5826f7898a5012ef27e65123ffa9b35cfd284da97bb6
 DIST cc-1.0.10.crate 41311 BLAKE2B 30dc4dc3efa8f2143341a7519c9a6a46b7987faed78b55b338bafac4f7550ac3534f5c876e174a938916d621435396a2066e001794f49d1e59be1e3815605d76 SHA512 b1f492cf2ab1b31ca11524703f02148a16bf54e57a05f2d988dea8b8f75c9e997b8c6ea6569ac9a47dbf0569adcc23b61db1537a0c6e7957fd736c64b9fb4ed3
 DIST cc-1.0.15.crate 41839 BLAKE2B a00d432720c168b0d69fc7d321d3abec3e18662c6e0c44e6092482e7215dc51688b1f01888150f060e57c88f3003e58b5f8985f1dd31731bb259921bd7a45d9f SHA512 220b88ad675b076b6fc322253f4f8de641fb2c3b27814a3fa5fdc2f79c52e93f2de4e6fc176a6d3a0b7a9fff46d9bd2d4396310cfde4a68f7082224510a9a831
+DIST cc-1.0.18.crate 42127 BLAKE2B 158cddc9672713ed156403cf3a9663046978d692aec6b0a0785508d9ee612546e21afcd4cbaf5c9b76aec4c22cc2083615503aea553336cb01533762336fc4f9 SHA512 7e419ed8ad9dd1cf76ac9e7df82f89d93693299a80925f189b96416fd99b0217dd42918e577c0b9dc64c2fd7b6300b81e3b1b4bb176c940cdae4eff4ea303c76
 DIST cc-1.0.9.crate 41193 BLAKE2B 15643c05698e5e9cfb955495db401b11a28c0047fd35945d17ba4656d44551b73451b8c4399cb1338311228c4fa059318c55e3f59dc0ecae2374ba1b577a8d45 SHA512 7423164d85ac2d57782b6f259ea7e7e581fd8ecb7f3cfe4f8767c05caaf6e25d8cd73031123b60f0df96b2cd4c265d92a66933b7aaef4aae998cdc0e179618f4
 DIST cfg-if-0.1.2.crate 6668 BLAKE2B fd1960dfd30b3514bdb9943dba6418957068aaad3548667216d6dd4e4921a0df07d96cc4131f7b5121cacfb91aa59a802a47663a7b04ff401fa5b25ee1d321ea SHA512 ed6732d8ef2c99d99861f5dcfec3bcd2d1b62dcf6e8e4e88ca25148b5566f86418270dbbe9a7d2fae62a8320d432c5e0474059fa25a11c0f66787084e36f36aa
 DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d
+DIST cfg-if-0.1.4.crate 7113 BLAKE2B fe63fee332d08ff50384f5e5d90a30281445f339e29a9d0f036ce2202a72f02c7e78ffc166baa681c3b739afbbbe8727ebf5ca16ea0a6fda2f38e08dd8b94996 SHA512 4a7131fdaec1ab63485b016e0b09d538815dee8b64218bc33230910277344e0631bba80e57b1188ca4fd6247595c6c5e3b2381369614574d7ff17cdb5b8546a2
 DIST clap-2.31.2.crate 194051 BLAKE2B 67ff210e200d387008fb5ddbb4b0a7961f568886a4df57b12b8aa1dd4c87b0408d11d9797980f3dadfbc9aa30bdf71586474a3d905d0d45eee13165692505bb8 SHA512 f43c3e2736a7fcd5c59ba4c80bcdb28fe436b85fe33ef74a53b76b7aab009d9315d2be007a52c1abdee2f754b118ab8132640e6e6954fd60017a17d0cc086127
+DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST cmake-0.1.30.crate 12477 BLAKE2B 23529899687c844e3d0e864272d964d5d4ea1900afbee9e4c323a4712fe9341378f41667463cd3b9e6944bc56c123c6331161e25e8816143a8efc3109164e14b SHA512 c27e7b6e50e77409f1e7481a88839e2de64ce6d94345cd955e9b3ff6f5720a090f02adcc1067113471cd48125b236952c0177920be7e03cf15bf2baa323788b1
 DIST cmake-0.1.31.crate 12480 BLAKE2B a861b9481636ab9ecdcdfa13d599cd081924394fc60268e7baec36ba875e7c61a7ceee423fb97e44a1aa28db005f1ed3f855a8490dcfbcf86f6e637445a9468c SHA512 72523416f52e253fc4d5ab9b4fbf56cf6870ec21d71199c7dbe9c0ea09fd32a226c5eb5677347b32f8e82b40b9335ddbbe77a08ea8fa2c4f0db5f3cb5e6f319a
 DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
 DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
 DIST core-foundation-0.5.1.crate 22519 BLAKE2B bc411c7a7bd1dcb00b4f02d75cbdb9d8422c2802cd6a3aebb7ac5136b19756f7ad5e48553e15b6c5a7ff85fa3f4f3fa98e8644a0eb13b4525fe2edd3a5b3daf4 SHA512 209b06bf889ef75451b9d055505dcd19eeb8ed6b6f57f7b3288556ec9be90fbe716175679f7d0a650c1d55644b3c56eee9b1116f2c8b533b4b4580008c79cdb2
+DIST core-foundation-0.6.1.crate 23398 BLAKE2B dfd3cdecc24229370e746727ac277d21e83dfd48a98a63cd6bec6c4e5c6e37e319ab53db91a929fa1086fdc8e0a572f766fdaacb8e04b46805ce8038ae2652b5 SHA512 631049ad936180bdcedae7cadc79767c62ef133ef728a6877c977017cf4c3efc0bdb6484e0f5ccebb69de3d0f4e49bbb4aa0fcf088b14dfbb5dfd15989e1f3b9
 DIST core-foundation-sys-0.5.1.crate 15974 BLAKE2B 5065520f9d7661523edd7018e77d43346f39bcdef407ffe7bafbdec019e39389118b90a11599d5afb4f78c8b454dbf4530a6c81c834fd9952557529f87cdcb0f SHA512 9cb023399eb660ca318c9d3461b9f177206792c3542564d990c08ba4788dc41da2f2c6070f0b55550b2ded0278c3f3d21a159212a20d18c12997658df3df5052
+DIST core-foundation-sys-0.6.1.crate 16197 BLAKE2B 66e43660b26c9a1f9c9d34817574c2da93f688f542d7e9a1abf7cdc1d4bbf99952425be34838b54a7f82206c12bddccd67296eb38edc396babab754d8fbd5033 SHA512 f633f7d7ba6f8c0797dcb597d1ba306c4713fb1d2b17bd9f8fa5a42a615cf6746628b9921e1a8488dfecd57b327b325538542409cab79658706913b31cf7c975
 DIST crates-io-0.15.0.crate 7833 BLAKE2B b51ed4a15d22a45d94ade26ab3d522ca13449ea1df93ef5ece2d4d7b99b85e95307f4cefaef91e1edb74cf4204ce3e0f3509ecb6597eb57f31f29edf964b6490 SHA512 86cc22ba197085978bd0928402e311bbf4f72356baed452c0f6ccbc7b95912944f4ed86a668d99f3ef7b0a20b20059b31c3b6c587c7c5ff6bedfe39cff5b8c96
 DIST crates-io-0.16.0.crate 7823 BLAKE2B db647566008661348dec4259ffd4eb52ce8acf50d9a23cef74efb7d3596a88c819fa9ef5230e885802e8d6c1bd456703bc9853575ab9eb64269ef1d87468db62 SHA512 2c1a4cc5aee30c922997c456af6794ec1421da7f4511e350fd93146ab8207423cc240102744af5776db26c2f792e1a66f9ee1001e1c6cc4a27c161437301f6c3
+DIST crates-io-0.17.0.crate 7862 BLAKE2B 56a63d3ecddbbf3edec35b65f5cf6519b6d6258f7116f742e82546e40eaef73a181a8f481f0a09ffa7787ffbe6d2fc25415a02d443c57c2574b9a97c5afa2dd8 SHA512 06d31f47c9b05317961f985acf7793e25ae7909f819222c482e099b5ef1e86505be3e7498df896c8623e15c6a130f35910f1b33cf4f46044a3bc0823de8dfcb8
 DIST crossbeam-0.3.2.crate 33440 BLAKE2B a5fe9d77b3fcb4ac890b3ccf4e2548cf82c99571961d3960326210ce63dbe8b04e4a5917b57dbb657777288942dec1689387b73e41175b86e013307e057e7257 SHA512 e467a84c3a3655ed1108e2af2ee75dc1fd7bd435dc28fa29e43c055edd26d24d8a5d95edac86fb428e52ba70fcca68ac960952442d0a451568877c371057f0e9
 DIST crypto-hash-0.3.1.crate 7858 BLAKE2B adcd2b397a0226df7b326625a6ed179eafa2f550395782018b5daece122f0d02c68529dfe802aeb933e7ccbd4c969ad9fc0876673002b57ee23b881abcff6e72 SHA512 4c4002a08e68a03409096da5b3f3c8c4db9a23bb331c54c7f4a615ad0be64e3fdca3291f4a20b682dc4bc6d13b95950f02a306423c4cecb48664df05c46209c3
 DIST curl-0.4.11.crate 70262 BLAKE2B feae6f6cf51fe4ba32b93090bac7c341daee4b973b789e8c130e5e9986864d8ee69950b464aa2b73bc3643b063c47143241434dc85895de32546405855a43cdc SHA512 5ddcc26690e2cf1b655ca8699b8e67da8ee8a57249ba6c8a736c59bf40dce3511ca7442d58b087b42f7422b0bcdf1d4ac6c3522aabe15e575b6a22d8ca21970a
 DIST curl-0.4.12.crate 70906 BLAKE2B 9b431f249f697608b3c295f385f90c452bb576f1cc0f34e17ad938f54c39f03575406061cbb9d55429c0c8a276d8fb81fb87b7c04453564bd2251604ea7e3cea SHA512 0f40d32b113787e89d5e9b12d84db77e629e67db6b0dea01eeb4a460299be4649221e286ae116656b314171a6021cfea68ccaaae5b27c242dffe8fa3e4f45434
+DIST curl-0.4.14.crate 71005 BLAKE2B 85e6d8f5af8cea96237ebfc95686953ff6337e153c9b6659f6835e6ae9169cff438679a1c981eeb7750fd519857cb144bcdfc37dd64b1e4b16f88ce53cf9e713 SHA512 8065a51a00f02f088dd989cd66df2d8c8b7490368c1aec6374f78144cd3da446d902b643f65a62dd64c6af398c52fbf289c0be10ed38882686f2fe89570f9efe
 DIST curl-sys-0.4.1.crate 2982935 BLAKE2B 339b91b1634fd502b48d4f26923e1c9d8a3c9071f640442863cc811d02e03b018beca901b2a466467ec6d9ec1206b34db3e406763b8b3934aae1fa95c89f0d44 SHA512 74de40a631db102e73e133c9bad6bc093d7da744090e818e1173f237a410fe173e87fec937a902a6182e224c7e336523b73c42e136ef3b724949d3f407e78f03
 DIST curl-sys-0.4.2.crate 2983033 BLAKE2B 96967d56a7b6a412fe8cf927383eeae16786169b6f5b9254ff116fc85ed3ff2d38bd5766fded8d7972780e6c88c1b229658cc414b2bed9f301c13d6b91fac7b3 SHA512 3d7f9f089dbeda1bfba878cfd10ef3bb14096ee1701584c83c7d99ca859a60cef95ae46fc8b35e2845063fdf50ff8807501d2d45915bfcf827e3e2f6556d1632
 DIST curl-sys-0.4.5.crate 2983237 BLAKE2B 07f111f6274051bee5ce69c680b067f687e4fd741c6ea155535fc24bd447345529475eb4c329010f86fa30b3a08dafcbb34eade53ab341240674a9376b98fc4c SHA512 04b7213d82037d80676f553c2595ea0f3cc69f22f8a85a389075026a1d2325cb61c4f4c5ff6a2842e1a0bbf44d4617f18c47eca5c6686394c6e1e01b67a4d18c
+DIST curl-sys-0.4.8.crate 3391998 BLAKE2B 580477d0d92a67a5b2142d5a0ada707400161c0362dad1db67905aba669cfe2dbe1f704b1070f02ffe860f652ce229b43d30d579b449238a981046ba15b36304 SHA512 198fbd16722f3a60ee727233c442439519ac0fb9358ad0ac7e65c838dc494ac44d3ba4eb974f326fe67004fe47b38a4246111273c7481907dd8a42f2221ff03c
 DIST docopt-0.8.3.crate 42774 BLAKE2B 91792f94920a39aa1cb1014493bf2a31367e44db62c68386df3112d4f8f058f143d8238048fefb2f2d1a1e489664c1ac7341e9bea17a00fc95ea62cd7c8f5dff SHA512 0af5a548640f06c408ae1ef0eef804aee5154d677648de9bbc3dff0f637c26cf8b2e212f472a6d30353a92e2ad2cf8d8efbda163f9572b28f867f2448a0bed8b
 DIST dtoa-0.4.2.crate 14227 BLAKE2B 7edc0b203a58586aeea84326cce66105e21e3d7efcffab8b80fbd5576dc19a181304571d1edf932873ba05254a36f44bc81377fa4aa79d9bbfd6a90e75a33468 SHA512 a04410f8f67e846dbf3c72c0d15096e529c60174c6403931c9b8df67b41a59b8c06c675bc3222d0111f642d4153f7dd72c0631805d40386bded28695e38c7f0c
+DIST dtoa-0.4.3.crate 14456 BLAKE2B e310c71454a3ebe77e9b3f479b45b8dc15b988823eeea4549198df1ef3dbce05888ca6f34701b27dc5e8c0748d99e03a14af96e4901be740bc98ba1342589ae6 SHA512 e400efb07317fd605e93fad6670bb4569f52abc66139042649a4112ad1eb2bbdf4b819ac5771fae133a60248da7a440e30109e68e919867d3fd29853618d7315
 DIST env_logger-0.5.10.crate 24849 BLAKE2B 2c386f8367aa940d41ea710652ba266cda7c12aac43e17ab859646d81264fada28d4b98bcdda46377adc86d6850b6f58559f9fe38fe9847b745e2544de9c9b41 SHA512 0943ec9707f187db4a6669b157c2bc5b606c865a9893eae18086cb9a6319b79b71fe3d97b4248339d30bd6daab2de5991f373a75a95c8fcea3afc293f333360b
+DIST env_logger-0.5.11.crate 24948 BLAKE2B 4a64465d5a594c416e5b006e52756d5f45e4c43f33ba7ba69bf62a028d4ab2660d46befdd6ee79c6608d78a81279e527d41f54cd1465f245de0b06e3f12a0312 SHA512 4a65e4ff9af4576d659a0362e9bb9005259f3733cdb7241cb9a6926b1584b4a2e47892acef189412b2c9940861ccd62e8deea6bcd19b093f7a06369702d0a1fa
 DIST env_logger-0.5.6.crate 23933 BLAKE2B af51e6dd5eb9a26773ad225346c341e8292f1a1b79bf140660f1c2c10f62750300cd5c3c96bcbcbd832a11b8a14ea1f5e16575e65db602f0eb72896f050714b0 SHA512 3f7507cc5a2251570dc061a0603bc69a91bfd13b5d61cf85547076415140215d3d322408187eb216f1588ceb5fea3579b9645bc6faa3bdfb27a230c9bd1c59cc
 DIST env_logger-0.5.9.crate 24834 BLAKE2B 430c10faf85b96a38fa9f465cd72193ae750e620815e52061b9a5c43261be2dada182e99cc8a4b10b3bfb8b1126fc91e0297b5faa294c80f3044186dff81b2eb SHA512 f73c6258a69289ae795241669aa16af8612e9a0c734adcf804389082a8d1c32520c9234551bcee249d47bfe43772d5c7d8c8b311a722b1d77001aa9ddb93a4dc
 DIST failure-0.1.1.crate 26782 BLAKE2B 6e00d30bc0189325e540a0a9290e517747ebbc79a94a884540de1f46fc0a64d257b59604725cdc30e62731b51e45b6aec215d2d488bffea6511b6ff53be50a0b SHA512 3c4075dc13c3ea6557582455ab3bb35ea81bd43892de5fac103e7dbcdf24ca3614e3b3673f694256d9fb9c6bdf97375ea17fbe290148881599403c01dab0e5e4
+DIST failure-0.1.2.crate 31820 BLAKE2B 8cb6574450790100718d353878da4fc4ed8cf4626b8c95f428ba7a2cde8a422ad053e49e107e153726302318c26bdb480b3dec1b9d85f6ecdbe02a13397593a8 SHA512 248d0e61f7a1d87538e7c774eb294808b1a93325e992ab0a2b2df9c0489506a25c4227b20b706eaa5104fd22cad21b0db8a61cdc4a7def32559b2955a60cb0be
 DIST failure_derive-0.1.1.crate 9312 BLAKE2B 14dcb7bab17f874e5f3efa9abd059e079a4580d918017825de104851fab0b0cfb88aba4f71513f387ca645ab74a3199c5f0268853c156111c67351e1c7e9327d SHA512 885b45ebe5098f04699bc0c7cf2b6816d3afec6f111f8d244b0fa824c0198127ac3062e23c052186e196832755e9e0b271e5efb005df35e6d1e4d671640b8e91
+DIST failure_derive-0.1.2.crate 4326 BLAKE2B 7bd8693ed01e20a70678dab39bf32df8184c79a1f763d75b62cede84316dbb939ff1c69843bc6e3432b6f213f671c1754c896fe9b0c73a89daab0b9e2179943c SHA512 244392baf1923c6a53b7db9cb72f88dc78c74ae4bd5a1df321c54bab7283f5623ae5c4f862156ad4fa32284b4e010d042a27aa4ec4a2881e1d7d1284d4f48c5c
 DIST filetime-0.1.15.crate 11211 BLAKE2B ee1661d356f7b6d7cf20cc0dbc822e04ea7e558118b41c29f060f02df4987ed7bdf69be5dcf66106c1573ed586b03dc0b0196be7716227d97c7fc857f81fbac5 SHA512 81d6e80f3da3ce12295ce8d85bf174eac3ee3dcc7d57e5a65f2ae91ab4f3dcf294582788af24db9ce2f18cb0e43080fb1baac76929dacec32d5ba4d09928b962
 DIST filetime-0.2.0.crate 11717 BLAKE2B 2e42a0499832fab0759a2edc54762bbbd5b11027df9f8b86bd62db3363bc4ef520831a5a1ac8435767eb136624bdc21af16ee73ad1078d2036174e1c30598d26 SHA512 a78d227f17b04800d8796511709db518daf76047bc7dc7dbd3a56419ab1b1a34cc063a6656033b893edc42729d2a08cf85b344e133b6da3fa6ad38eeffd536ba
 DIST filetime-0.2.1.crate 11797 BLAKE2B fa8f886afa7f7fea0f543e425bc06ab0bdbfbaccafb7a5bf5234fa1a3433d90398dc42bb24832132d042032e20042495fdc2763f81b8b7244c6b8d8a5e660367 SHA512 749770e2b484c7d1e94beec490ceef2552b7294e3cb5ea67033488800babf7d48898b5d6a0874b113dfe95004322476553249d57349dfc3cb575c26d4ebf5a9d
 DIST flate2-1.0.1.crate 61869 BLAKE2B 3f9b94327ae0d044f962759fe498776d7bef014fb93328e3454f5cd8f37c8ac8c8c5d3f38825e4744a07dc873f93ba5fb420450677a55622afca8492c9423057 SHA512 2be6cf3228e9df76643e7b45ab1ea4956e7618e90e9bf8cce62f6d0bac864e2bd7a808aad1b54728797831b170801acf43a6a254d9268c8fc57052f1e2d172b9
+DIST flate2-1.0.2.crate 65153 BLAKE2B c807436553d72045fba72aba284eb351aaa79b08b96833a59aeb8e4a004e33b06284a965fe56fd64753174c35ba49ccb77a79f58fd568b5d4a598551efed1446 SHA512 53a18e56641531443a9f0524d23b7645ea5eee3fb4c76c0322773e4cd423b4107a252a09bcc679a5d384d21b0c8c5dd90e6c7440fc73197ff3907a62a9900ec9
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
@@ -74,11 +100,13 @@ DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e409
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST git2-0.6.11.crate 138769 BLAKE2B 47ff0b7e572cdc87a4e8ea9f7daf2b2e9fcd34e2b8cf0353d355b75d73f8843a9c7762492311aaeb640f1aeedbf25d58b7a57e64ca6f4e9fd92e1ff8b499413d SHA512 3319cb6230c4d2913a2194dd35f1c2a8665c892682ede92e9b5c73b4d53a1dfb572d2e05ffc97ebd1bebba52311a708f4c5697d3238a71d35633a869f495fac2
 DIST git2-0.7.1.crate 141487 BLAKE2B 290fc93f04efa9eb826475fc1236bbb6451bf5ea50d7af3e20c4900d500d4a0c339938093502051b82e8656b42d3de4096c1aa98fd12fa910ff11b5a1944fdc4 SHA512 efe7a12d877b995b8cef59c0a419f86c17453ee10a356d7b1e58cad8d3ca14e1883108b0137a3cd9b4d651d4e4233388686d91c9cdca8b1d942cfddf477f74e2
+DIST git2-0.7.5.crate 145895 BLAKE2B 668dcaf167d5544a165d4609bfe278d84bed307239d0351f5fb1d56ebaedd874f11520a164f956af88281f70b48477df735fbb844b869c4155ca0676fc467580 SHA512 94d6ee17368a8476ff415dd4de61b02a19b756de44084a787d093323fb11692d17d30aadfc5c1037e7f70b0e5f94aa0d1b6639c9f9afa17c19d6638b7cdcee4e
 DIST git2-curl-0.7.0.crate 4097 BLAKE2B 95d80cbb573f8e71bb47317c029b39e309cdd3d113db85334c4ce3f3a48f3bfee17ff1bc67828fa8c2884b2b51620a607f6a18a50901828c77da99c1d6463551 SHA512 b6adfbe6f75afa1fcbbc0a38f9dd13db87bde6e81eb6403a3f47c4d25a26301677614af82f1c7cb4a4a2122910e0f6450d7555f2bbe9ac97dc1da1243eeeaf0e
 DIST git2-curl-0.8.1.crate 8903 BLAKE2B 83f58faa5555a0a3a653db1e0a002008a7e2d6c216d2ac7014b06ddfedaab8f114cfb10d2577d799f77610032b64d786b64a82d31ca38c981192899ddc054496 SHA512 014a3f124ca633a572d4bdfe38742fe4b0fdcdf52ad170b82078c8cfeff1bace87540d3ae41d0457fca922bdcb1a25499fdd30e704eaee69da14e4282a9be1a7
 DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
 DIST globset-0.3.0.crate 21315 BLAKE2B ff971a15dd85f7ab420c60f1ffcd1f2b772ee35e7743b8312fd4b45ee6e2160c783458173dffca540f5f7a4c7feeafaf31932ec775e8a99a6c6aaeebc87e98f1 SHA512 53cce0854058e70c869c4d7803dc040866028bb91ef2a5be59f3d93de18452898ec958b035961d536821fe967ad52c074114dcf23d62e0d0a5317b32d264e8bf
 DIST globset-0.4.0.crate 22113 BLAKE2B 609c707ced976adcefd109bb43ff6bb7da21f385a46585d86b22cf76bb1f5addd744a19daef3ed2f9f4a31cd74b7f990af5f6a942ae77398da18e3f445ad916c SHA512 f24b8d9aa298859bba38f8a5bbacb8f2cb6a8f6fe165a14409216d27d856885e234220a15d66c133725cba39a802139c6242f2e5f3787154f929b92152f4d1a8
+DIST globset-0.4.1.crate 22363 BLAKE2B 8a2c7fbe083bfdb470866bc954579f50944c11d4460ef3d2115f7e523935ba8375c1073346f42d564d1d55f32e4e8fe51fe42fa2e5c31697bd943befefe7c303 SHA512 3cc7fb4b296ebc8c0a20d8080a9cf913ec61f2ed14bd45c2aebd0c73101514b3895123a93c5e1b5037362a74e18057fd6deefb5c91ff3880aa88ca0e1fb9095c
 DIST hamcrest-0.1.1.crate 9217 BLAKE2B aead0773fba00b44ca6634dfafdfdc9c1856cf0fd8c6f32de7dae4be1285021ff097a140b8aed28d1f5d5a279681f95d24de96f45f14aba205fcddd0bf301f0d SHA512 6d6557cec99f482d6a738835d32504252e0a666c1318f6f0ac0f811afa7c087c048960ecd2fad22b403fae9a00b06f742de643a7b5ded1f816c118272232ec2d
 DIST hex-0.3.1.crate 8365 BLAKE2B bce1c771913e57ef72a24fed523a36c1fb741025c24a2ba3a4e236e19b9c575b7553eadaddae2e7f50a6e9078b0d363b0b71311301ed6ae19d064dcf052e4056 SHA512 beeb497718212f5f4683cdcab257c555554f6682eb1a1675738aac849968768d4f3f03bbb00b74bcb391b0559772e6d56ec38496dea5f7aaa45dfaae5e6355d7
 DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
@@ -86,22 +114,31 @@ DIST home-0.3.2.crate 4069 BLAKE2B c6fd346774ea9de716389d33b0884eca9d06bdafab14c
 DIST home-0.3.3.crate 4043 BLAKE2B cd15b8d83b386fb9ce130edbf21307917050865242230af141805b8892d8a295cfb2be0db09296025d75a9c8ee24f6e83188e525ca0fd8753accf1dddc07c7ba SHA512 674f782528c7fc9087d80ff73c224fb5c43d7e14146026064e633841ac08feb342a6a7cc45f29e7da5585a2c920fac8eadd5f143bcaeaec4bdfadf6653ba7b5b
 DIST humantime-1.1.1.crate 16689 BLAKE2B fe9d8ef8ad396bb8452f1e28c4a122e3918c61042f0cee8c5769683f9b321f82514474a100aecc5bfc39422bfaadacfb35bf9f14bd3814d1de62fd0b7517e67e SHA512 b18608d088519df5e0c531c8756635f41bb6515ed7463891e6145b9a78ca2bc45c0698789015c093463c704b240434d1b54ab327fc4182a06a8b1d01f50430c6
 DIST idna-0.1.4.crate 289112 BLAKE2B dfd3449388dcf894188bbc4bf36f82afd640a13d6aa091a876e6048ccd47f4f4e4c44510a27187ae978c9bb8d71fbd76058c2e501618dcd3b94f8762e2333721 SHA512 45e04b1e4619be105866ed098e486700951e1765ebc4aa84122266fc3995ceb2a99f30465ca9202cc5f35db049c7a64711b77f347e9c983b11c0840f7654a9a0
+DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 DIST ignore-0.4.1.crate 41806 BLAKE2B 0c311a0c552d0a4fedd6a410d6482815469caf6ba318714e247d1056426eea803ad8fd15c5cc364b779b162467d482d7eadf1cd0fdefbe266983ba5326b51022 SHA512 3ea888576957cde216c07e003e3a2401d7bb27edf8cdf045e8f37f51488c0d9aeafca71281991109a0d291741a948f0577c4d24e189f448e474fa79829f6f79a
 DIST ignore-0.4.2.crate 42184 BLAKE2B b16d3f333a4d689bca22f448d744fe3ddb871a896e59b7b3dd7b07a5325530244166933d5dc5df3fc54b54099b0d44d3137d47109dbf6955b2b121f7c68ec88a SHA512 8b10cd03b6a46066695742d14386b19743ebf0e1172c3e9370b88b3a450de0ab02e00f8ecb95330551753a968bd2592b49d7af53d7a86e64e7e6fc2823cf69bc
+DIST ignore-0.4.3.crate 42827 BLAKE2B 0ce4296d6a16b2b3f17e2e79c372325408f2ffcbf617024720b600843e91499f00088a74b377e98deb712f0b9aa38c19cfc44857f47f5ad21b7736a4f342de0d SHA512 a4372de85ee945e68c503e743f28621d88e19facd2ec0af5dd2cfccc45c8ad25abc655c16020427a4357bd0c07f48348ccd2d19dc7d6b9046d13fcb33973a06a
 DIST itoa-0.4.1.crate 10563 BLAKE2B dd8ba6399c4f9b307c296b83043cf4172463ab361c8edc11ec0486863ce0a7a1be968989e1676821a20de69c383c1aab55a9eb4a61d74d63710811e0463391d4 SHA512 f2efdad4fa250a1a453d3a956b478aebaa4cf0618f77da1f8206d3ef4e37b153a485de6a2873662acd0649fa9b8599cde8c99ed2096b7606166de90fb5ac77ee
+DIST itoa-0.4.2.crate 10581 BLAKE2B 4ef219ac121ff82d0bcb9fbf7a0d44cb268b40564ba656d88ff52217061f33935172e23a76c5e7ee6c0531b4b0fcd551001ab951c0def39ff52350e0681c1b1c SHA512 d7201f9bb44f5dce15a90dedfbe6b722aadecf15c3defe1eb1fcb5f8fe64300a594c9acef4f14538129a787044374c71d69e69dbef76d1bb780309fe7d55a796
 DIST jobserver-0.1.11.crate 19687 BLAKE2B 1ab784f253bc3a0108c30f1ebb02106e6c7d86f1654973d65c84adccc52cf4cc1f48447e8d40bcc8b9ab5cbbc9dc0becf35f9e7c81c8c6340b1dc41121b4dd9a SHA512 daf8e7e994fcbf7df5265e78d3d95f2e1d3e26d2deaa43213d75e33d5a2bc1c7c7bf66aae42a0ecde7aa59514cf70d16bcdc6198fd84f244d197bb1d09f15fd3
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.0.0.crate 12611 BLAKE2B c7ffeb553b82cacfeacf214ab069cd0abbc6b83d670ad84704ecd30919c390055b3679ddc85e9a7d0add530df588f6cba4cfd7c5e44e9158b609edef2fe85e4e SHA512 73044fce4d00002d35931d4b28810feb5c28c3debfb7bd570d9a8434cf15c29c17f0daf29ac04d748a32f52a205d5f52ecf69aa395f49d46b825e3fc0cbcd41b
+DIST lazy_static-1.0.2.crate 11431 BLAKE2B b427dcfd4a1acfd2f3a1e353e5550d439a3a81f038365b6065d21ad74def83d3107abbc6759a22087c59c141612e17b93b54c3e5cbc268f9715a4af82ce5eb94 SHA512 43ceb14b418143ae6bf46d5bee378e419a005ecf772c5ced809ca79be292568a3e70cca8a0652e5d06fbd76e1a9057adf44831705b2fc564bd4ef7446b2097fb
 DIST lazycell-0.6.0.crate 10099 BLAKE2B a0746580ca979298416c595c6e5683ec1c1f17c3652a18a393589441b8632a7c8a369af4991b11fd857b5c4cb533219e1e21635159e651ab0dd480936e38b811 SHA512 3e3267c6b64a32142b1ed7533073dff1a9dd4304528a13838efe9fd6165beda40a2ab0613fca44ae639e67d94b4aff1c004039c52f2990a741c84358db1dcd84
 DIST libc-0.2.40.crate 327272 BLAKE2B fbad5d1e07d6ad43cf0c94d1e5e1ae9dc11490d7a500a796060fadef39b4b58778aaf9eea27c6bf93b9481b3d94cb807e192860eb074c682ac559349de9bf9df SHA512 21dfb230796885d4459b1119de31f2615ee4f1020578e74d2e07fa5340777fde4c2f60aabba7444f00434519c95f12e6e1a3bfc496b83c11cea582a219005dd4
+DIST libc-0.2.42.crate 336080 BLAKE2B 0de0726bfb00ff42d67abf06efa26c1a4f8132b29be2f957b9089da2ef3e4dfddddea49ea23af3449a367d262dc563b70968c6b2b6a1dc81829e6c6a8a1dac63 SHA512 c99a4358805012d7552f416ae68c9651dfd260599bf0cd618b55036acd08ab8eeda8aa18c18b893f074c9613694ef6562e87f032639eb86b86514aa0fd815870
 DIST libgit2-sys-0.6.19.crate 4663410 BLAKE2B f42d0f08c248ed5783f8a5cc2a08051c6ba881a28bf6af433ea632e88377ccb7acbc01f69cfeb0e3844172c95bd1660d7d92287d4353f0446040733a2e0f6d97 SHA512 3c5823ecadfb8633d3880552e6881265a21a3bc395120bc51c93424ef8fff6be6d4c1b20930d7f94ea5f826e005778878f61512ae4fed2b2b8e35d8fe1852495
 DIST libgit2-sys-0.7.1.crate 4717492 BLAKE2B 9e35b9e317b0423718bc28a87f66095e7c3f0758481868b55bc44044b698b2c91d9adad40c45c1f92ee8a41a4a964f25664715c9966e20a0edac81002a1187b6 SHA512 fb5ce69031dc07ea20a8ce03fcff05d44261f41f40f3c7db603b5afd494772c69e9b7d220714916774ae50b5b6f85015e048f02699a23d090ce4fc934a033460
+DIST libgit2-sys-0.7.7.crate 1177185 BLAKE2B be1d4b1a20c22b26aa1d96fff9aa96e5f06f883eeffd8593b31e9729f7099cce2a702a468ad4b417f8482aeb92bb767e5e2670b618ff1e7c2c2b208707e6c915 SHA512 05a3755fdc2c3afe85bbc3cd7379311f8eeb628fe0b6df4cfc01a5b09dbdd665a04c99136b8bee825a1079e2750e612c6eb46b14e9c6fbac4230b41bd06b2da7
 DIST libssh2-sys-0.2.6.crate 412381 BLAKE2B 17b16a73f2c3042891d26bdaac836e35f9839c8e500643d7b2bf8ade562b0af5f2f90dd7728b1b04861b40deaac69184dd8edc9791ff0c9fa97ee0a3b9065091 SHA512 2a02abf0b29025137d73d4b97a6287142f5677383f22085d3d49f76fd0c8324ef1baf5e9d763b6cc2dd1e339f697b9466341ded5ae2c8cfddf6eeb74e870f8ab
 DIST libssh2-sys-0.2.7.crate 417647 BLAKE2B a19d1af25964594c3c460febd469725740fc0954eee4d51dd204697f97d8149253e7eb1f90d4c08f3617642e3dfd33e80197cd1efed4ce7ae9525a7940713342 SHA512 817d6897aeaa92fea77ed5b23df68f5f10760f2f342947b178aa460fe3a75aee6913ec1ad7e34d52a1523637b7f3672a8e28f59c05ed03db1caee256ba76a45d
+DIST libssh2-sys-0.2.8.crate 417770 BLAKE2B db096951131ef568c8aa3f0323260aac2001e46cf39b42a66eb006f8210fc9fe069da86a99349dbd91aab293e27b956e976031720430bd7b4584734bade30079 SHA512 78390949c1adfde166b164da83e1b4b3c1e6c8fcca339dc12fcb57b96c49159a7aaf375bccbb279fe3fb604541386d242e4c8c5652306c18927f122dd9dc0051
 DIST libz-sys-1.0.18.crate 632715 BLAKE2B 3c88d321f22d8c49a17d2af04361792247f7590e4b21163033e5de7b726b75f91ee15d4e9a8824f4ae894ab8a1856c637982e5f1c70de8dbd543b75de2d1af94 SHA512 fcc9e5bd9ffd5eb4f302d3c271f86370f04fe9fcb3b818ac8d605241a701e9d0c40cfe729ad8fcbe7bbb07df66539503415a00360c56831a511142ff225d0d8c
 DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
 DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0
+DIST log-0.4.3.crate 21629 BLAKE2B 0656ca6931f7be89fb5c551b33ce2800f0c20f804884ea88ea04eaad27ba595988d6f7cfddcf07973bd2a58d6fa6b2092c3736ae353da0323727336116499555 SHA512 bb92f3ce23ef7361116964d2d0d6d9aca192d99c231385da71b23d0e4d1ed71fefc2ebdccf1f40f047916909df26faeef777aea68edb960298c75799765dfa2f
 DIST matches-0.1.6.crate 1916 BLAKE2B 0ed7a81450fc9f639755f4dde72c226e107d8f5d9eec7e191efaaa4423d0739e3778ea358294b17eb35f3ac2918bc04b4009aea52d7c5f4335144180b444e881 SHA512 0a613c6daba26056da06cbc4a8a66751412b8e5709bf0e24e45caef76e308b918a2f6038342f3428633e388fe7631fc3978673560829b0842c9ceadb4037fa90
+DIST matches-0.1.7.crate 2262 BLAKE2B 948d30b9031e70a4ceda31c5312a93c4a43d17440dbc4de78805642bafa6949ecd709b5831a4f0e5f07e3df651fe9c5641ca70d74377ebbc3d7d74adb22fd91a SHA512 aed30cadda69ad6013f94b238b7ca499d899e10ae5350b5dfe9e69e95998323d8ad490ccf6a3c4f68ec49815801a6b452b160ba83673ee7d9883bad30627db99
 DIST memchr-0.1.11.crate 6977 BLAKE2B 44d270a5ad4916dfeb186b3997168cf80556f2afd1727b1e4c796942d48e8e453ea6182fd47526ecdfe5c6edf33ea9329b5a3864db9e681420e8c76cb726a9bc SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab
 DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
 DIST miniz-sys-0.1.10.crate 53357 BLAKE2B 88c511d46cfd47fc2053bf618180d6da3e7912bc9d0e84e4f904506daeaa5664c5f7c5036f3536c8c6def2a5b2d0615bb3bcd309653544c236ac3be64987cfaa SHA512 d7a6f0bc462cf10a5f630ea20f4c991830059b359f67780e160a662671a8bab21bbc29aae2220694d008817b1227b9b8e0c3c458b99a29ad2e5d141241c60844
@@ -114,69 +151,93 @@ DIST num-iter-0.1.35.crate 9013 BLAKE2B adfc4bfb7f390e2abbed94fb64348f4f4e7d6652
 DIST num-rational-0.1.42.crate 17253 BLAKE2B a3aad3fac51192e00f00a4489590c1358adf1bc7d0704dd069375501fb820c1413089f542900ad5593745d4c5f775f7101a38d65c1e2fe892dedf3d6f83245da SHA512 f0ad3c6e807db1cccb5260caa1b2abce354d1aca63e765c0bb2d18401e941d57a47c8edbe485ff0d67ab363c937592e2adcb89538132b5a2d6d4408141f17ef7
 DIST num-traits-0.2.2.crate 34777 BLAKE2B affa210c22e3c27f743d6b23393fc61749e37c066fb4503f7d9d5e634a2236c2632bb9fcb4130be10aea64a583e15160d33e28570fbbaf8ef935b1864fc0a9e8 SHA512 2b2baea40084f4b1c7b4aace26681e92f0d4fc40686ce248849ca9672b2e24f545dd168e37f33ef162b07663e192d81c9b1f2ede1cd45afa5910fe9aa2c365a5
 DIST num-traits-0.2.4.crate 38463 BLAKE2B 9a44eebea444c2184855cb41b39b88716773be2d2f146ee603c999c377f3249b4580133608ec4ba968e27a976307b030414c23eb9dd1ead655c3aeb70431abc8 SHA512 4d1f378ea4ca6edf934ad92526b7556944dddfa00d77f2f6795c65bfb5aba4a20a747e01cbd1fb8250e565eb541a48dec8aab00d6505931b5cbc25be0dbf929c
+DIST num-traits-0.2.5.crate 39136 BLAKE2B cbac31ecc18b9617dcac752fcc45ec1d0e46597f5b0030d21a8427d66bac2211254d5783982403fa9376b57019971c8e616590b4ebad45075fd979949d78b3b0 SHA512 0c99188724984b37943b20375f111bcbb1ef5db2a41c6cfb22df4ba4702b43fdb03be6fbeba868761a62a3fd2997922a22db49ba4164d867cac95e765772b10e
 DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
+DIST openssl-0.10.10.crate 162102 BLAKE2B 1b4245daad0f8f8c6c0afa3028bc08c36eaeb95db446f5c06a563a5a45d14c354393198f22db436572802735ded99fb9e0e0aceb9a836206b65c8f8007b85b9d SHA512 1ef29eebb6cd968fd0ded6e68bfa2baf07ddbfa4767f6db250a0b1b5fe36f6f2e756de8f00f4a690509a51dc23fc78d13390055be35bc32c316d33f4b1d36e01
 DIST openssl-0.10.6.crate 158082 BLAKE2B 2a9e6b77e8a6c55c2fce9b0961c2179cd6ce2534e714eff9c3c07d9d70177ec30e5f47092e18040c8dd9396563ea3f05e5a022af035ee359a1f16ec4e2b8c86c SHA512 9e4051c1c4d4b5143c9148f46083fba8df5c9e88e8a2d60398af21012d79b7a65feb5d6a6d1a704445b0ab74e9d23ebcf95d97df33a76ca488c3f188c9126e9f
 DIST openssl-0.10.7.crate 158397 BLAKE2B 4ab202e9f3bf989c3d22e57a016de5e11aec92e68a9ec9dee6e6ff13b29f6c50a720d3800e27c0c9a0c5232ff8b3bed2a53d2e4f0b5f70e5928c7c5d80ea0fb7 SHA512 17299119ff9dad330a0a060283a485d28e2ab85beb27ddbc2f156526780831a5d135e00721bd2d609994da3c0bde94c51892d05f5037b7066ad0b83fd3b9da28
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
 DIST openssl-sys-0.9.28.crate 40560 BLAKE2B c5a1f34ed11f37b8d842b4971810f83eb6e24d74ffae931224a5c9ac992030bd9f034ae057f0ce9efac3d4f2f20898f8c4ec33d5290f8747fed575c0d003c036 SHA512 a156e682dc7c7d8075842623b58a3f3386c330162cd9489ce96a33f72e0368a381e4d0e83c43885d221a29edf1926a11b106dbda273c863845ae28a51e2648b3
 DIST openssl-sys-0.9.30.crate 40910 BLAKE2B ac7d2d33e002e225665cbda05bce46affbf733361dfe2345ee2a0c846bae1da54d16d64de12aa0ee9358950be239a5900c0b487d16544d0c699afb16a6820bab SHA512 0df144ec31e665e406bc731cbb938763fbb023dc9076a1cf9c423fcbb8b230b639138bf16b563d2a3e9e6c2c2c89f04dd92d90afc043982ea0ee94785d2cedde
+DIST openssl-sys-0.9.33.crate 43333 BLAKE2B b99685e8764fa8863fcb3774a4889d8560c8915460fb74c31de577dbde4ba2b58c471e053f7b688375a4be8f9cf74ca254f17dc77f72bdb530efb1a9a0be9e59 SHA512 6190fee6c28501940f0bf86f9425da92e9936cd331e85968bc3bfad0c492b796842c0d58db8351dbf61c3024fd4fb47aadad0d6ed8ef650f9156c05d43e9fb56
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST pkg-config-0.3.11.crate 13227 BLAKE2B f22a748d9330848379d9bcc32026c9ba4bcffc043495b864af95dde36ce3fe71344bf5b0534aa61574f677b9a3d1ec0e09f774dea0ee57c1810f1e6bd7edc1e4 SHA512 c5e53a9dd777bce55889fdf7028418443896890ff120beb2fda5e5fcc55624aaefc2ac058c2b4bc88519d48bacc477351b0ab1c4d4a65b4e4bf66a69a419aae6
+DIST pkg-config-0.3.12.crate 13494 BLAKE2B 1e2d5513138e1dbf4254695f94b27e5fab336d6f9f651b47b0de97c7d24865ba9a0bce55a6958d881038a78665337a102fac02dc6b49859e90d66d2a6cb8d39b SHA512 31f562d7eef569669e32041d46db1f34addb4622f63dafb49209c36aaf3a61c57030d8dca61c7424597943a79b7d561063edf1fc639c48f8743d806e74ec1e22
 DIST pkg-config-0.3.9.crate 11055 BLAKE2B 8c8c9a4badcb2d2691a953b06a6c479794eae97e40d95509051ae34665ac467554849f050eafd83c03070c9239709b7873e1c33604a06acce396ddf678c96e34 SHA512 084e18e8c91ba6a1b305624d16c06f8f7df994c93cf86ccf443bc8f2669368a15bfa9875bc4f2933e94aa268e15fef783235c98558ba596cfc79dbd31f0b69d1
 DIST proc-macro2-0.3.6.crate 22845 BLAKE2B 1491c55e9e417900a12e9b2ddef34032f2141eda9f3863bcd0fa0deaddc106157e366976fcc185f2fbf6bd8e5036c378775e39d1ef1b21a1561425f56b374910 SHA512 4999d6f4916005e6691f3d865cd6d58fb26e672319e9d941d9fbc6403e10ca2b6ea761e5e2d84cb60324f235ec6a57dc2acb064997fcfbf63b90b48b1d0df9ff
 DIST proc-macro2-0.3.7.crate 23402 BLAKE2B a6c5eec8384611c7f6a0dd9840ebc6b292eb6f7711c6dfdae1ab376bc4a8231dd7006744a27ef5703f04900e0b5aa58998b1c02cf341607be130612f1d99d957 SHA512 dcc923271886a33df34e2385a72b3654b66081f97082ed8ac5d9e65cdcc9352a31812c18c958e2a0d00797b98e02b34e0d40b98ebbddd6773f51628b26ca6640
 DIST proc-macro2-0.3.8.crate 24412 BLAKE2B 42895039c67122199619256b567ea66f6e0b6a45d688440ae1211c8bb45bfb87e7a599f978b04414ddf78384df3147ff8faadcea662bff647256567ea6be565b SHA512 df6d48a5d9c2b7c3f071de3336343ac00c61427c74675512c457ce23d30879350fc995809154289fe9c2d08b7bc39a9137898f651bed8c3646695abfb8368a9d
+DIST proc-macro2-0.4.9.crate 27912 BLAKE2B 9d270b7ddba5407d21b2a2dad1032cc15b7aa11b00fdde467a688dbf9527261c3f95de089c0cbbc86c18885044c17fc3b5e6e5b786ba1b2f04892e2edfc9b963 SHA512 af5f32c2f2147a7b3d5bbecc27427c2f5b7dd572cee0cc550d2fa5b730a7559777660d46a8bf9f3eba8fc1456dc0379650161b21f289295fe3909904d5f5be65
 DIST quick-error-1.2.1.crate 15112 BLAKE2B 615254207c47928c1053a4ecd1b1a64a32e9e550c8d74ad5564b31404469460e063aaeeea3e3a8d48ec2416edecfbeefb8f84fbb8f2d9eaebd6121de2d5ad9b4 SHA512 86242dc5a5b68d4d4df50db54b629256d8d33f9637c457c669d874685dd5218f96d0a2dbb16b5c77cca67480e2bc485b3aca6fdd100f615b4bd00004910d2ce3
+DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
 DIST quote-0.5.1.crate 14960 BLAKE2B 123e12032797c8335ddc182c2e95016afc866cfc041f26d45e3482c6f689719bbbf6340ed07523acada93953a9ec672914b648d71e45008dacc033f72a7de5a2 SHA512 bbf670fbfdeec126de0a083415f11b2cefbefa30db8390c2b7b80a2e541030cfb8153f2cbd2641dad6d35e25eab9cc3143861ffefe536bd2d119f8d967bbb44b
 DIST quote-0.5.2.crate 14982 BLAKE2B 5600742b8da27015c0a461c04414dd61be208cad10a3a1212e43d7a2aa3a8fde947b700ca230f79d9d8c13da1742a7caf70810d4b6ebd6669b020513be00974c SHA512 66c0469bf1970164e87a4960791932ca06726c79bc522fe0bdfbd41ed23428e32448aa01a0f02066169c165364465eacbd19cdde47e96b4dba017a491842e6ac
+DIST quote-0.6.4.crate 14184 BLAKE2B 3edde1a12453d23682133a30cba9f2fa1355417d900890120fd4d8c44e8ddb00ca584a3be5e8c8159078495f531a49e9a9b911d8b76ca049e0d15f9c9468ad1b SHA512 418f95da963e00b262d9ed3f4e31f2644c8aa3bcb0c019d6d30c5df4b0715a940796e354d207e81d5212e97539e9d61a878e1a6bfd9ffc83fa6754212e9484f8
 DIST rand-0.4.2.crate 76170 BLAKE2B 28c9965519db48357f23517b5ac43a641d1f0ffc4396c42933d22181fda3c6df1cfe08dae66a188e60df0708112839781daaa5b5cbf667d6850b10bcc4448f99 SHA512 ac6eaf9f0914fd966c835a04ec644c5a8d62a4a634187d538cecfb711955a977234dc5fe487cd4d351514bc0de4f51cbd0f09a8f6aac56aa0467ae5eb17a4fad
+DIST rand-0.5.4.crate 137389 BLAKE2B 90b9e71c8e79e2137c7e6c3e3e73626f5129a2873ffea25bc667e1fc7d0484374c5329a82d635c24637e2149b022efe6c231a6c78b7de7b7e0e07413aa30a59b SHA512 2a4e0d573f49946d736209187938b6750588c0f867cef2a429457d20bbc80be44fc6d1a7e99bc459a834b27a0572da744902bc0dddc0b751ff8240db3b56d797
+DIST rand_core-0.2.1.crate 19262 BLAKE2B 6ab239b11f08b79f5319e0d278ec56985f4c91406f938c206f017f706508d73aa78ed3ef799ca7f20a9bf3ab860f76c5527bf14fb2464db914af3dac55ac0b64 SHA512 5e919f4229ee2e7d00f47f8bbbb7fd27e11f34aa5bd85a9d9e34d45af1601bdbe2507d9b0182b5af7a6eb4d93da3004d2708729f7e864b6c66ce9b3274fe1c64
 DIST redox_syscall-0.1.37.crate 13980 BLAKE2B 9896615b819ccee17b18093c28a778bf6b4e0b4f6986f071e9e956a9bbc9724e151fd497d394c669d0feb8dcb95c3258a4103af9aacfe8381fc930cd5a1acd8a SHA512 147e48d44227cfe8ea190d543f9f8ab1e49fe2336c80f7e2b83546e617d0eeb8a1e94ce6e4d6f633b92ca72241cbfe0aec082425bc5f7b63d5efd164b51d5e48
+DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-0.1.80.crate 185806 BLAKE2B d1bb6b363584528a11f0de67a0ebcda1d07a43d890acc7b5b8417f946e236d318708c6483fc6c7efdcb82509a116183400b39d939aed227821c9f5badba1c2a6 SHA512 a160d80f4ac9f1e17d1debe163584f2c6c2ba7a8c49c34a7e11ed945614fe1923714880515a31a1501566e254edad23be40307b452f9216915fa03d3dfaebda0
 DIST regex-0.2.10.crate 208632 BLAKE2B 8380f1e91c99c73e12d125bcb7f97c8851d55e509b3c2ee3a87c7cf6c8d432f800535cb200f4c65276a9752ee2a966b30e70af41b20ae70038579ad66d584ff7 SHA512 2f2a2c0f7ffe4c9711a689b156b732b5ba58774a0f2064a64527e1af29ad9fb8ade6580f10b52f912a9bea373422bdaa995b83d0f2620aab9280e43330953614
 DIST regex-0.2.11.crate 209507 BLAKE2B d8e52b078e96c64663a730208d14af4808abb62d7f2ddc21026410d78305bcf45c8fa5bd6bc28a61a62dffc3dbed6118562bf5294d176f04a9aa8b3eac295a5c SHA512 e0f48ab9a692f7ebd83a21bc70060aed0a7dccc9aaaef6995262fa4e2e33f4404a04a217588b72025820b1a0e4697c076ad47a017e7c51cdd4b6c1909c015ead
 DIST regex-1.0.0.crate 210131 BLAKE2B 487f8a384f341718be0f4ff6e85e9f100e4cf089dd8b1d3d9bcae0760955cc496660aca153fc43a6fd47045b26031954f9ed97f8fe443fb7f741fd3ec274beba SHA512 857e7406415c4f212c79384a0b2b6365615b9f49a4493146028b04fee3b6438a68fb57b08e77e041f776476fa71c50399508ce0c8c0c53069d125a5c8ec055ad
+DIST regex-1.0.2.crate 245163 BLAKE2B 11db7370515901dd40aab09cf37af555b2a48474b4afbe2bf9bc299b0cc0366c42af4a948cd8fed26d4462c090570edd0c1b0e2e942e148330494d8188c55e82 SHA512 546d38e992c4474d6cec812c1b6f57c7a1991f27cc0d5772d814a21f670128ce11f1ea1750a6ade402fba8b31a8485a61891a9ccbccdc8483054316eca84a047
 DIST regex-syntax-0.3.9.crate 117427 BLAKE2B 81b0fbd7565902c6b87619b5f66bab9a7e3fc5d64e4085a2b600daedaaa0a294add31790bfca3c653ec79033272f14c89f34f5f49b32dd9991c0199b209eeb24 SHA512 85513709816b148a163b73495b1e0100203da6c37d50a7d64368efb82fdac45fdd083d31bce4b193e1aa5926943e5278eaec5b23b174c425b5954d7b716fa506
 DIST regex-syntax-0.5.3.crate 233364 BLAKE2B 1862f7545e92a06b156a65a998f6c42009400787875e7728a458868275eeb4564807de5512560c9cc646ea0a0d661c67ea6705252d8adbf5e9ac09558b2076cd SHA512 03034432b2a27c5b7e79ca072405ce4639e097843fe9861f0b8a0f289b37ff28e03c2454be0e815181882da7590ac1e8a356beefccc2bac57d02dfdd1f404d65
 DIST regex-syntax-0.5.6.crate 233912 BLAKE2B 828c35471d8a91be9fbcad00e036c40ff0e2c38d008c5d916cb096f0a6856f124a64a203d547fb5ef45cc296565221e5f96343754413cf6bf2fd1463c7e02f1d SHA512 4ee43272d0d6e5cc0b554816e20e2d93b0ee774fd71643d5edae06627b295d374769ecdc3c1233a688d306d1cb86a83b6850ffe4022baa3db78beeea1190b455
 DIST regex-syntax-0.6.0.crate 233363 BLAKE2B a48ae00749fb9c9f066da54bddd14e8568b12d73a3a2c9006f875d676c926bf2638c29b1ee1221260e031f7d38cec1def47989cad02f37d3c8753e8b65a20253 SHA512 1db2f8f4e397b434502629bc6a726c23f4ddd493c653a694153bfc3d84f8ca759ad20e0191b990dbcbb3e584858070d32d8ad050536c818a99e912911531b162
+DIST regex-syntax-0.6.2.crate 238572 BLAKE2B 0fcd5a6b20260a2dbd8f4dc611bb8ad8f0eb747ab4ac88682515bbbdeefba5ab149301da4e86e28ccef0fabca7f75258037613ba770b6c45d6024c63bd38f406 SHA512 87ce094b8cf61dd8c026b983199728b8eab876766580d3a8074aee780c8f4f6fc0777f1060652f843e87ba7ed21905bdbcac411f736ff8ae0943900d71f6d068
 DIST remove_dir_all-0.5.0.crate 8651 BLAKE2B 4ce249473bc67b5ab0c3e04665a67b3c73224565071cb2055ddd461a775fef18ce0e973f281e53f5416bdad506e9b53da184078986950be3a07c534360b4544b SHA512 876681ae98ac9a9cf0447397446ca7afb4e254cf0cfdd7a9b8702eb94cfda5230ac4daeaa067a3f07ae303b920d1a97fa4a0da76b80b4545eab1080bee8c1574
 DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
 DIST rustc-demangle-0.1.7.crate 10681 BLAKE2B 2679a27863f3172712d13d24cc76e13c67b61ae018cdb1ce01296625a2aa4b53c3c44572e9d2bc639ce9f663e221fed8e91f79296bf721a3934b8d4267587b86 SHA512 75dd8581fd0dccfcc8cd2afaf18b9f44a5cea95f6c6573bf9e0b23d79cf5e959b3565bea0e9e26ee5b80f3142a16b549eefa99f5f65aa0ca9c780307091358ec
 DIST rustc-demangle-0.1.8.crate 10737 BLAKE2B 94496f2ef9bf40f3f25ad507119d24e1207946642e3cce081d36946713bf32d1813491c79ad15a6c7cd871c32ecfbf02fb416316fb0309d8726b23b3888343a5 SHA512 ca3ffc2872a608f13fa795d97d2a5e43da978ecf4c16973bed372a0b58334a70616087308ce00ca729932c5dbd9fad3a7b7dfcc76d16008fbe9cd882b1b3df31
+DIST rustc-demangle-0.1.9.crate 11463 BLAKE2B 3f03fab938d2778f4a74c101da6adec0eed5033bf06e724a5978de16cabf0341790df5da9c68376ba1d85a048575ff644e14297767950ef15d68c337a5d865b8 SHA512 7047907a0246384eb672bb8fd69a201a205b18460bab857e481606d1b9e25c2629c2898118edd72391da1d1f83b6caf4fb2a78eda19edb6dc7025eadebcc13f1
 DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
 DIST same-file-1.0.2.crate 8870 BLAKE2B 0c723d2f7377e7837babe62ee55807943bb12f013d8608c895701e78f873785b0beb4a2ea84e83e3b44848dcf032b36b573a31be7e4ce9932578fb6ea6a51b7f SHA512 56c923ebd529308c5c1efdeae0314c150ec6fc3d68fe3057ae1a9ec78520f96a78e151985bcea2568775d0d59e4e04e262837d2f3965b175b71569fa703b0951
 DIST schannel-0.1.11.crate 38229 BLAKE2B 37ebced9870387d38d57f83abceb9ee37103fe7141469022c895c7b0beaceb1ae2102d5d29616d75131275b91d0d4ce9c6d8d8a9bf69d44de2f5a9d4ee664e17 SHA512 b46cc854eced92c1e55d97b45459305295c266a9a9a7f71d94bfc5b95fc1f7fe85f02188baca7880fde5ec675fd3e9fd5bd81a8fd1124b24a563be2077212c55
 DIST schannel-0.1.12.crate 38498 BLAKE2B ec67cfea467925e2bb31ae6afb3502689bc0bb89d6afc19efb1ecef52fe02aaf3f6523194a249a7f61b475104b29eb86177290af341af103f3a1e34268f193c8 SHA512 9599a2793ff16b14252300b8040d337d230e0e5cd003167c6e453d98de61736a694a5a48d39ee79a2c7b96da914abbb10e8de8ed40505522a62781ad59ea81ae
+DIST schannel-0.1.13.crate 38808 BLAKE2B dc74813c2524b29cf27b3e175447ad25f399c3d8e9a1ad2ebb6236e0c3279505c417f953422fa0dda342c30dd8a61b95aa7634393f391a94be8fe52dd64aa21f SHA512 da7a550522e644b719408099671c0193be9f44dcbbdbde9701b6ef620852a0855b3e8c8a0e9d58aff63f0e4141df286f6794e4e372e22241ad2d0b70e82c17a3
 DIST scoped-tls-0.1.1.crate 9080 BLAKE2B f0008e0f08159cf2b8a7cc3c0fa23ce998ba2930cdcffe0b41d7fc0baa7e5f51949049961536b79c29371adbf4af756a24312e7c716b57918ade598796bc3895 SHA512 6feea7f837713c90189d50b06d025db266a81dacfbc0bcd97e4dfed1900cc9d03e74e6d66864236a0652f04c80d57f6f8cb760ee6942c51a3e351e7cb88ad9d8
 DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.37.crate 66879 BLAKE2B 6ba8dd40f90ddd8b282654628b98e775a8f51cd22fc51ddfdb93c01e3ffd62cf92055671009dff42eb3207775e406f3844c72b1defd57cd6b473049900aa1c68 SHA512 53a3d08285e1d40707972b7ba1d60109207a49c73322a866485c6d057ef9a23babd1cbe3a9bd693dfe2b477e599b75982103dbd0cca11f8d6fba31b63d5be989
 DIST serde-1.0.55.crate 68121 BLAKE2B 5b83ff645a24af82a1befcb511154da57f9974594df8fb1d9728e58556b46a21444566c4a7e771f2f05b86300f5ebee94ccc69db990668e46a919fbf8ac84ba9 SHA512 d1d0b80696a3dca08878768953fd43cc315527bcd1bb19358fe861ea1419b8cb057b319b0aec33811e5f6067b25f26d2727fc19a11a70fe11f977c98d373f1a5
+DIST serde-1.0.70.crate 72036 BLAKE2B 13fb028569082806b88ec8afe308c34f0b41f66d5368e60daeef96106bdcf39d99ed5c3a7090b35d1f081fe7d7c604a9dbe90d2df0b06044bf10d732e82fbf85 SHA512 d74012944b5a1792a173d5c84f98d7a7d75701d02ffd71965f138d7dab87b63a587e680deab075ddf4f93c2de2fb4197e9b9dd90121a637134bad228c7ba11b2
 DIST serde_derive-1.0.37.crate 29589 BLAKE2B 9575eed9c305247c4291413d3e504dcc2562ab228abc181358b8a8fce2b565ac6131dd6767499c73b83b9c0e04c07aecbcff5d1c13db21faf84c583476ff0806 SHA512 bb9ed046b4e626a5f0d4e76ecbb74be28f8ffa9d18d2533db493adcca33291416d4eb00161231817e67b93aca91548dd5dff25f4730dd59de8eeac17d394f23a
 DIST serde_derive-1.0.55.crate 45154 BLAKE2B b6d31b8192192e4ee152c1da3b9d559d1fa870d21b190184b206531afd81c12753476a36f79ad8cdfcdf6cdda4f8c752e7362ebfaf9075b63f06d3a74884a37b SHA512 e4815c04376c24f98a57d9feb625901d2d5a7ccab35deb5ab9b7a38dfb683c01ce96b0abba6c808b98a1b2ebba4af622c6156e6874d9c5ab522fe7cdcd00aad3
+DIST serde_derive-1.0.70.crate 46016 BLAKE2B 76158531d7fd4fafffc74aec8b1f5570d04835cbab2dcd3abc743ff6153634703b46c3a5c6a4e9f9d819f665cb84c26e270e4b970ef8fcf844510a26ba34518f SHA512 5856ffafa5b505fa93a59ac5c9e5c72240c0baa56f69c8e0b83f3685bcb2c1e4ac921fee7a978a340cfa01ed7e114b2e51c4ba09980bd5b882ff98daa58a3fa8
 DIST serde_derive_internals-0.23.0.crate 19939 BLAKE2B 6b13dd310cb6af94ee3021fb85f8aa19d40b183f8cb06e23ea14143439e628ce2a321e80b7b31c3957bd02b21a9f901ea4a06578b340eb7683e9bfe06d7a2dbb SHA512 c976ac6110ac6bc98a0b36c27afb7dda3c3a13afbce291eb912e8d0e48ea9faaa4076a60563b937c9c7b48c7ddc459e7b1b4018135b198e9c345f9e245453434
 DIST serde_ignored-0.0.4.crate 9533 BLAKE2B 07d08459a3333fb30a9413a882169b5c5b49f26f58128dc8f0458c3e7e668948f3a84d3e5c4dff78905f51604f4f317d76f96c3a900da85d669c0c9065e6191d SHA512 29911d05145b33ddfdcd5c86d57af331262393cd445eb5c464df07f8853032a156b0b1be7b90b66666748e0383831272cb53252cad7778fdd3ea20f2a04e23b4
 DIST serde_json-1.0.13.crate 63744 BLAKE2B bd694199e1eddacd6db16ba0b5255c651e4154d5be4771a23e990d51a2894731b4d4831a26dd3c838629b40d7100092f715d4d3d0b41abca5118a3e69f115b69 SHA512 cf9f034d8117b1900cd0f3daecef920b3d4ddf061c9cc8cf42005593621c0460da70ae12608d8704e180578488b5f2e7d57791ac3ec06a2842e47a2e5b7a9eed
 DIST serde_json-1.0.17.crate 64689 BLAKE2B 292c0826674e837fc909b7ca3011c0593948d646982a96e355fe2f806fb058a7180bde72ee7c9d2aa6ceb3fc5b4ec52a04ba450e3a6ad64e1e7e04fc4be2e31d SHA512 69f036479c3133490c918b79db3304c728e2d5b54022c67062b01278e7567d3d5109d4e19686a5a902c64d4ec527328a1eed21a7c7637421d8cb08d4a3fd83bd
+DIST serde_json-1.0.24.crate 65102 BLAKE2B 3b53ec7c95f2be0e5789126a157c0b09854530e8c8da6610405d8a2b7ca58c35b4d9cfd7f3a46cfc376cc110e31e029235b354078f06f1862223491d60812def SHA512 8abf4c13c420f628a80ad47f28cb82185e47ecee5edb93ed7179f0e3787b00663fea7560d231db8e593e6a8f9841890cefde35fbc019faef03fa7b2ff0d8b4c6
 DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
 DIST socket2-0.3.4.crate 27946 BLAKE2B 13f9ea9aa296dbdd70303f8525b2f8ad90e647456aaf0529bd54e061f4cb248eb9c85d0b9cf6a4c8e3e3787de0273ea337f88ca9f32018d01afb34130295a075 SHA512 460e80bea03bd34b8673146b577d7ddc90a0e00bd4313389a560ab4f7d109bdda68cbebb63232f20b4bd1f772da0070351fb78a1d7cca250273a25005e50016a
 DIST socket2-0.3.5.crate 28077 BLAKE2B 1259aeec8e0b1b02abd45916b19f94d8eb9127e59b56c279f33bad703e3cbf7336e119c2d5eb9ae8f54e8ac74f16495d26d51fb579ebff9a53947b101cd3c4b9 SHA512 66c8e975862dc4e1498abc47199485c802a8ef09ddb1f9fb0af7613d794f98aaaabe96490d7923d3a3f0cae91864ffc1edf89b77c56231f363c2a1cc820edc63
+DIST socket2-0.3.7.crate 30361 BLAKE2B 6577c645f23f385948f2eea396a0afdaa6b21ea9e1f69c9aab58c8077e4ce2ee83cbf0eb94ee1ec220aa87a407ace7e0297c38e0a85ff90ad1ad067e1991e6af SHA512 8f1244ff7b8a100026736eb1a873b3de219e9cb9beadc92a889e083579c4eb93145f987cc91a32440f2216402b8a3591de6afd6b0285a4b75dff7711fb3659a3
 DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e
 DIST syn-0.13.1.crate 133086 BLAKE2B 6c23e6c0474c316c8ca420a5463401ab8fa5e8f4e774a5f3041cb2cabfa4ce3894bc36bc077d3dceeec438e3f19725fce71f1c860b74583bb3fd8dcfa05078d3 SHA512 0c08ad8438e2dd2a067ad857128c19719339dd697e5860c6280247229211c5abf56a82ac10a87b1d6fdd3f3c6026a4477cdad1cc63d22db6f407b058ffb5b25d
 DIST syn-0.13.10.crate 134334 BLAKE2B 34ee50a42310d088052145c588e7c7401bddc08a48c3d1eea2f07a19c6b242425f5d235a2f477c8a75d18eb572b00d0c6114eb085b1e17a65817e12af83fedf6 SHA512 7ee41788cf98f7b74880a4935f526e7d152d17159d9a4be185a46e4e6eab3a22dbe31ca57e5cb0001041aa8ff0b15a21ae6ef4fe9bc9117b612d0e60add29d5b
+DIST syn-0.14.6.crate 135522 BLAKE2B a061efa87391701acdf4f3f8a35488151d45144fc3b6d28b5a848adc1e3f73c34f8411c602604fb83bbba756429bfa5b06898e510613d8c9b6dc6f93528aab75 SHA512 c79e82dc2ef75385f7b27fc494e31d77a1761f2d30353c9408683c185e4f64d71e08015cf70754a22ded0f6d92561c941bb755e98a289591602eae8d5d49b753
 DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
 DIST synstructure-0.6.1.crate 11257 BLAKE2B 28a71b4f0e49a658064dd5b4eee0f1a61ef5502a24de4edb7aaa0f0741529a7640b874d19400757feef527ff78432e29fbe8574732e19a7395d13f2cef23d39d SHA512 e3234d03a99373a7c35a33611e7d5383b282f232a17c592d630dc2ef5613ca272d3f8419a87d40cf1d50f3ff982a01086d9b7a0202c5a819463d157f684d41b9
+DIST synstructure-0.9.0.crate 17651 BLAKE2B 8401b93fcf2db68f69fb1b61a246bc989029aa960dc7ce5d41a22467d275233c26fa75da669a25c0bce65c77df2f53bac87bf114df1bae55415b42742ff0998d SHA512 ad688b367317230b876d0a3fff6539a04d976d3d7025fb6161a0070acd38cc4ac1507a85313c4e1e804c778b3f9973957bb8a80ad2828096a31b5b53a899c605
 DIST tar-0.4.14.crate 41988 BLAKE2B dbbc3f1517c817827f7cebe84918cd3aba9a3aee65a503b9da7647b187f1b4f0a173649c97bbc7ff3dc0e93486881f00a49b9a24c70c9df249d26a9f13cec3a3 SHA512 b46685caadf335ec296a6d7ff5c2bae31a50395a3681a733998dbdf6295a4a55e7b094340b4679f9468f430f5c92734e08b75123de935dc5636b36d06c498b96
 DIST tar-0.4.15.crate 43037 BLAKE2B 999e3ccf528e5e72bdbb7c1fbf1c3704e55c15906f757cdb83bc04a437623058c4a204a4a7c4b423ca383babf8b2e07d06586b811834d11a5fee57a0129c2a1b SHA512 b5e95534836e99ef749dc4d517e60f799ca6a88a246b30b7bf9731afa3fe5f207ad14ecd11435da43f7d634ca16bd3766dfb94fe7ee0cbb1611773aecc46b060
+DIST tar-0.4.16.crate 43935 BLAKE2B b6844ea8dc8a974a40cde9931f3417b318e2a2dcea34f36c36dd3ed18623fe9fa185ed0ffe63ee72533ede9b207b4ede210e54733abd2f455dd0be4b3e8c8c58 SHA512 db156b336e522b7b6f94a03cba410e47374a56890fd4c70a53a3afb86085c05e3a22a73123e6f16ad0b19263067296850ebff667a1a02062ba5af82155f493ce
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
 DIST tempfile-3.0.2.crate 20825 BLAKE2B 0165940c98b5a28dcc087bdbaebd94dffe532fd571b7f28c440583848fa2368029c9416be914291f3ff0366066b2c99b8a241f3e581209f73fbfbf8c71188530 SHA512 8ece130a10d4a698884d3d29530c925944ef6d9bf8375b87abdad890cf1baa196b0c80b461b6ff436a8fb29931e181b4d0acba50e851ebbf4c0e9aa512e823c6
+DIST tempfile-3.0.3.crate 20806 BLAKE2B 0eaabedcb1f68dddafa72a454f82e6b1de6f8cceb8af3cb52f459e8775e3df1ada5b51120ecd9f52bb6f6da3fc3e698da339bc7e39d12497fa9f7efc418b018e SHA512 2bcc90ba3eed8a830b33de169419e222c16f9e0209734cdcf919422fdb504b29fc75f30dff7243bf19eb81cca12c80c94b80a622be8bac7b847242a58595873a
 DIST termcolor-0.3.6.crate 13548 BLAKE2B 4d7faffc3be9ffe4e6da0ea20e6b244c0d9e488ff1c97851dfce073622e68f041e1c77d3c49c769a5e6525c28dfcdd998b381a5abcaa5c4ea63b0acf0e28bf2d SHA512 cfb8e0172abad994da27b1474ab0de244db782ac9c7fcd877d9f1727eaa2fb95036638edbab6b69c3302d1b880eba14cc7282ae0ec78ada1d31a9ef682d4cc90
+DIST termcolor-1.0.1.crate 14228 BLAKE2B 795c4c9020d3ab31f59e909640e9de5012d2b2c8af122b072b125172086cccb65743bae6a88e248e9fce62c68b497e33ecbc56d51ede7adbf3d9a71f37e21512 SHA512 4498f619e736501cbad0d242cdb7e64592de8109ed8d2dd1fc51ade5493ce21dfa9110e4ca96a603410348d61a8029e8df33d17e29e53cefd94fa662f0cde320
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
+DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
 DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
 DIST thread-id-2.0.0.crate 6108 BLAKE2B 616ecca5907d78d8ce4326d69cea3e4af6d7076f701f59865c0c67f3ef2b62b5d9cdcc5fd0f4806ea4d4010afce2fbc288809d590330308818616faa9f6a862e SHA512 9fc73cb13dd70f6f323161667f7a253b48c4e11d074457fa033b3617dcaf7ba9aa95f12801c4c045e7e9c07dd4b63a83f79701b489a9d97aefde07970064d9b0
 DIST thread_local-0.2.7.crate 10954 BLAKE2B 70a8545a0e9ab525c4246409d7b6c35e8675dffc58799b74f6286ee81f6b3a13a2d2d6a2fa38ed13cb83b5d6aad7e54d9896f004a8e623788d928d6cac975001 SHA512 adc9be75120fd9e27429d0116cc6774a519ed9a2348db122ea90864947e4c1e1c98aeef740e7f8d28861b1db0f4a9340e58e13c1b3ece1fb3320058ea7a47b35
@@ -187,25 +248,31 @@ DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b
 DIST unicode-normalization-0.1.5.crate 290328 BLAKE2B 47611127735629ab5ca8eca6a32754b3d14f0da384310b9915fff3f988c28590ce83b757258c7d09a1640e65b2b4307a1d5af96f39ee4f6a70a7aadfee955905 SHA512 e3a8d69080d7c85c140406fb7514c70c6af3c3c847d2a4d029d6494035d2a77f093b9d96e26bf59ad973187ccc8dfef1a4fadcc2eb2977b16ecad9f64bfca941
 DIST unicode-normalization-0.1.7.crate 330545 BLAKE2B abffe09db26d75c7ff8d09a485c0966e3a6ff1192b5edbbf4fd1e6915bbc9214242d6ae9d99dccf304c0d75b61006b4edbcd680d7823cdd47b8ed5a7075ef685 SHA512 4b4d3737244b1425ef8000318316decf8e167d3c92524e92bdd3c34798cf6fd1388ba7651da67d565f07d4640e9881145334fbcdfb8f20c33873d6e40ef3630e
 DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
+DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 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-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
 DIST url-1.7.0.crate 67909 BLAKE2B 342d0a01774102625e7411c067e1949d0d5fdcd11e2381aaeaa416c9123f977e5b8c1b988e94007a4abf654fe58c9723f3b1bf8644515473e79976da4c0327c1 SHA512 080c4b3a7e576fd4cd269605a5bd51c3e04fe9157200f7f411fc10d6f5a86b49c0e5c1dbb0bd522fe4be652836785ab716a80fd73474476040a0a7055772d90f
+DIST url-1.7.1.crate 68266 BLAKE2B 306f49703d68cd3f4e0e0ccf7fe3f4e79b176b2dc211ae00ea31e1078254fb129ec6d0873d5976751321c5b8d18eaf5a3cab9e34950491b80746143d6edd4018 SHA512 912632e35c7ec076f29c02b93010d72f56989e2a8155d6b341c95cb79d65ffdeb32d31fa53ef59bf3d39683e1c51f4be1156c1d0c88f6b86a1bf42cd0ae00c71
 DIST userenv-sys-0.2.0.crate 1749 BLAKE2B cbba1af566a05a27ba571b25be6e5bc47b98cc1710d89083023586704e8111158f3433214d7bc6a0d72af40f589679791dca9a99f73d17cd29cbe75281d4d476 SHA512 97065d57b63045876685797b6cfe600d65a7d3a3b66a356ca86df735f19de373eec24d4eb679c013ec8bbc22954e8c258863ddca608bedd830fcb55df01438d2
 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 vcpkg-0.2.2.crate 5870 BLAKE2B 32331747341e7e2bdbb896a6f4997a3f8ce5f261a9f2eed4309ed2639ab55660f9b81496e1f42d6c2ad9d3ffeba6275ed4c7d1d6a29fd148abd1e8784abd29cd SHA512 e56ca76a699a6a857d77e9710c1b0b0ab7a64b6f7128a9221b9a3fafb7365b3a008c7eb2a2323de449ffd5287d4b5664b9e6d0e1204e9b5a722ee848bdcdcb18
 DIST vcpkg-0.2.3.crate 6015 BLAKE2B 8259f1e9c137fdbbc0277976bfaec28074af3ce87149fffb441a5692c84b0e4a9c70b61b57d82c82d7603569fb3a9a86244a68a1834797e4745f179b941d1ce6 SHA512 ff1440f2d7d2e231fd959a328fc07ac1d4e4041f42723d2edf2226b74024aa13016eaaa364d7221ca8440381769ca03c24bc1c8d49aa2b5708871541b8a9ef0a
+DIST vcpkg-0.2.4.crate 9571 BLAKE2B 1ebd2029c481961f45ea7cc9c62e83eb43b1f8b1c2a1b01019d54773a1143c1f87915f222c515e973ef39cb4c9e82009e2ef6d88ff1acf69faf76ea98bf4d925 SHA512 cf5ecb0fb60f655d36de3e9363f8b7be4b98cf1a99264977364a03bcdb488e2c1fee8d7c9ecbf4b32d3d1acc0952b68578cb1749bc5eeefadf8623c854dacad7
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST walkdir-2.1.4.crate 22695 BLAKE2B 87d989088a5f4a28c6e7a96c534092ed9574525e711a3d5f7e1abb9a7aa3d347da155f5f0d98cfe6653803b1eabae78dad01594beacd7e5281d6187d7c2db5e4 SHA512 db8a52b2708fc344833a0cf67ef96eea77dd0471337d49c806e7418e18b6c09dafd0034bc3c2ac62dcc360f4292c3634f5a20da3f10a071bb734ec8a121a4387
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579
+DIST winapi-0.3.5.crate 997942 BLAKE2B 7482b6c313129b1a574d499393a32b9bf4b857dcb6d380baacf3455fa43ec2d18061fad25b83c2022ffa36e30132358f3abf3bfdc74dd3fba6a5b54cf2eb5d10 SHA512 6d79a5cce1a234b5645fd1798d580602f89a202adb0672a213bd2fe54aec94c75b489d3c47320c6d5f53d415766a7cf628874f0713a347d9e3017e904449bf2f
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
+DIST wincolor-1.0.0.crate 4777 BLAKE2B 843d2b3f9d56b332504de707879a490169a790ccb515311d32114c43122f0b13dc8c360f9610361f810b2e23424da35b2918fd30480b7daeeb2a9b2689b5ecbb SHA512 c5a6c6c01fd4cadbd0967d95f69e28b5f6aeac38a7e5297f843be4ebdbed2253db3d5d38f58a91eb2cc7055bad5884a199350a52ae17b06ef11232167f610b04
 EBUILD cargo-0.26.0.ebuild 4718 BLAKE2B 5e6e064d0988f196816a726ae1cb46dd962ca7a3e3d6ea6edccb219c42448adb29ebd0e90f695ef72f244891fccdfa6d2f3e75baf133124d30bb39bbf25eda88 SHA512 6328f4196c0ab5ae4edb45237fc9a315a1b27be5ae77e7ef39eeadaa50396c98393fcbbe64d1bc938d681a87628e0813f3086869cb2d01290e969a5aca95c65f
 EBUILD cargo-0.27.0.ebuild 4499 BLAKE2B 5012de1e42da4a97744a48cd571e3a69c93fd6107bd6a53096bb72e96a6a9e19e126b5460f3ef321aa0d08db9ea0460780e8f8ee3f450d6852a6f51ade8fe49e SHA512 7df8362d68fe3a909d2f7692b45065652166c2230652168cf77ada8bf3465bb5b5ee97a41e435fc0526da575e6d2ac42ef60b41d917dcf5e547322e6ea3cb3d2
 EBUILD cargo-0.28.0.ebuild 4483 BLAKE2B 2846345ee39c15208ec01edb2a56e89141bdb5f814646b0f735932af519a26bdd9ceabf0a83c3f5cede74793bb683ef59f4b824512a1f3983847cff8364b65ab SHA512 62ec6d1dda78ba805de615131a2deb6da1cd248e411ce186f11ec24f148e663daeb7d0b1ad385e8a3c009cf92c8ae693b93d9d5dc0cfc3cdb059d9fa3e4b933d
+EBUILD cargo-0.29.0.ebuild 4471 BLAKE2B 8a5f77039222373b98fca1a928bf5dc69b0440ade41161c84aff50326b90465940f5a50a9ac04861ef7579a3d76105b6d8c72e6223fb1ab7cea371e6958e1cd6 SHA512 972e5d657371e6feb3085170c88ecfb6ab3419c42d04def96292b52266db5a86ef9b48e92069b9770c8cd23e7636ac57497fb8daa2c29d4853c2f5f145103957
 MISC metadata.xml 334 BLAKE2B 492ad458d72b54f13c18357d77a28f82fefde1c581c34a19b5da9d6dc1c32ecf47675aa3198ccf8a934d25f494f9c6ba42bba0dd8d32d2c4f62e6411426ba3bf SHA512 7d50f6dfd848ac87a1411295bc5133289a7576d7cf3b82c88fdc3e17ba5371e25c4ccd5f2f404ca31ab81531d21e8d2023236f81608078a1ed32832d005653ab
diff --git a/dev-util/cargo/cargo-0.29.0.ebuild b/dev-util/cargo/cargo-0.29.0.ebuild
new file mode 100644
index 000000000000..d807759842b4
--- /dev/null
+++ b/dev-util/cargo/cargo-0.29.0.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CARGO_SNAPSHOT_DATE="2016-09-01"
+
+CRATES="
+aho-corasick-0.6.6
+ansi_term-0.11.0
+atty-0.2.11
+backtrace-0.3.9
+backtrace-sys-0.1.23
+bitflags-1.0.3
+bufstream-0.1.3
+cargo-0.29.0
+cc-1.0.18
+cfg-if-0.1.4
+clap-2.32.0
+cloudabi-0.0.3
+cmake-0.1.31
+commoncrypto-0.2.0
+commoncrypto-sys-0.2.0
+core-foundation-0.6.1
+core-foundation-sys-0.6.1
+crates-io-0.17.0
+crossbeam-0.3.2
+crypto-hash-0.3.1
+curl-0.4.14
+curl-sys-0.4.8
+dtoa-0.4.3
+env_logger-0.5.11
+failure-0.1.2
+failure_derive-0.1.2
+filetime-0.2.1
+flate2-1.0.2
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fs2-0.4.3
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+git2-0.7.5
+git2-curl-0.8.1
+glob-0.2.11
+globset-0.4.1
+hex-0.3.2
+home-0.3.3
+humantime-1.1.1
+idna-0.1.5
+ignore-0.4.3
+itoa-0.4.2
+jobserver-0.1.11
+kernel32-sys-0.2.2
+lazy_static-1.0.2
+lazycell-0.6.0
+libc-0.2.42
+libgit2-sys-0.7.7
+libssh2-sys-0.2.8
+libz-sys-1.0.18
+log-0.4.3
+matches-0.1.7
+memchr-2.0.1
+miniz-sys-0.1.10
+miow-0.3.1
+num-traits-0.2.5
+num_cpus-1.8.0
+openssl-0.10.10
+openssl-probe-0.1.2
+openssl-sys-0.9.33
+percent-encoding-1.0.1
+pkg-config-0.3.12
+proc-macro2-0.4.9
+quick-error-1.2.2
+quote-0.6.4
+rand-0.4.2
+rand-0.5.4
+rand_core-0.2.1
+redox_syscall-0.1.40
+redox_termios-0.1.1
+regex-1.0.2
+regex-syntax-0.6.2
+remove_dir_all-0.5.1
+rustc-demangle-0.1.9
+same-file-1.0.2
+schannel-0.1.13
+scopeguard-0.3.3
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.70
+serde_derive-1.0.70
+serde_ignored-0.0.4
+serde_json-1.0.24
+shell-escape-0.1.4
+socket2-0.3.7
+strsim-0.7.0
+syn-0.14.6
+synstructure-0.9.0
+tar-0.4.16
+tempfile-3.0.3
+termcolor-0.3.6
+termcolor-1.0.1
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.5
+toml-0.4.6
+ucd-util-0.1.1
+unicode-bidi-0.3.4
+unicode-normalization-0.1.7
+unicode-width-0.1.5
+unicode-xid-0.1.0
+unreachable-1.0.0
+url-1.7.1
+utf8-ranges-1.0.0
+vcpkg-0.2.4
+vec_map-0.8.1
+void-1.0.2
+walkdir-2.1.4
+winapi-0.2.8
+winapi-0.3.5
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-0.1.6
+wincolor-1.0.0
+"
+
+inherit cargo bash-completion-r1 versionator
+
+BOOTSTRAP_VERSION="0.$(($(get_version_component_range 2) - 1)).0"
+
+DESCRIPTION="The Rust's package manager"
+HOMEPAGE="http://crates.io"
+SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+	x86?   (
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.xz
+	)
+	amd64? (
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.xz
+	)
+	arm? (
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabi.tar.xz
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabihf.tar.xz
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-armv7-unknown-linux-gnueabihf.tar.xz
+	)
+	arm64? (
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-aarch64-unknown-linux-gnu.tar.xz
+	)"
+
+RESTRICT="mirror"
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="doc libressl"
+
+if [[ ${ARCH} = "amd64" ]]; then
+	TRIPLE="x86_64-unknown-linux-gnu"
+elif [[ ${ARCH} = "x86" ]]; then
+	TRIPLE="i686-unknown-linux-gnu"
+elif [[ ${ARCH} = "arm64" ]]; then
+	TRIPLE="aarch64-unknown-linux-gnu"
+elif [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
+	TRIPLE="arm-unknown-linux-gnueabi"
+elif [[ ${CHOST} == armv6*h* ]]; then
+	TRIPLE="arm-unknown-linux-gnueabihf"
+elif [[ ${CHOST} == armv7*h* ]]; then
+	TRIPLE="armv7-unknown-linux-gnueabihf"
+fi
+
+COMMON_DEPEND="sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/libssh2
+	net-libs/http-parser"
+RDEPEND="${COMMON_DEPEND}
+	!dev-util/cargo-bin
+	net-misc/curl[ssl]"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/rust-1.19.0
+	dev-util/cmake
+	sys-apps/coreutils
+	sys-apps/diffutils
+	sys-apps/findutils
+	sys-apps/sed"
+
+PATCHES=()
+
+src_configure() {
+	# Do nothing
+	echo "Configuring cargo..."
+}
+
+src_compile() {
+	export CARGO_HOME="${ECARGO_HOME}"
+	local cargo="${WORKDIR}/cargo-${BOOTSTRAP_VERSION}-${TRIPLE}/cargo/bin/cargo"
+	${cargo} build --release
+
+	# Building HTML documentation
+	use doc && ${cargo} doc
+}
+
+src_install() {
+	dobin target/release/cargo
+
+	# Install HTML documentation
+	use doc && HTML_DOCS=("target/doc")
+	einstalldocs
+
+	newbashcomp src/etc/cargo.bashcomp.sh cargo
+	insinto /usr/share/zsh/site-functions
+	doins src/etc/_cargo
+	doman src/etc/man/*
+}
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 3413cd10a53c..528c34016bbf 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,5 +1,5 @@
 DIST catfish-1.2.2.tar.bz2 98956 BLAKE2B a04c7c62745eb5ac5bc8a169fa01e9a943e319cd0d96db44485b12367838f5ec587a7fdf2be4cba4c135f8d301fe2b72c26646f0f97cb69404b7e6b682f817cc SHA512 dad407f1e818b8d537b73e9f832c39ca4f9527b9d636da18493a685b03d2fab56982a11872382fd457b9a1a0ffb33d29ade4aa317561c3b2ee82c96728705e75
 DIST catfish-1.4.6.tar.bz2 150331 BLAKE2B fb59dfce5770ddfb7740f1f7b2deb22928f3bd49a1ac323827143fc6c41586adbe45521daae3b26bf748f14c859051bae43ea4f94a0be37c84b30f933f7a2bca SHA512 1c50375a9b36554123327a138c50de47abbbfd2fb334b91773312e9001e4bbc936550c2b23ad658b29fe9f1537d59997513b01bf4e2c31ce0286f5650776f8f7
-EBUILD catfish-1.2.2.ebuild 1500 BLAKE2B a2128982cf591a4c427620d61ba7d466f811dd617afba0358cee3248e934c8850d2c40f6dd63f6c742d6daec9bb2ec029beb489325538348f5bc5eeb904e1d64 SHA512 3166f58ed1488a8c58a60d9200160586dfeded3b3e1e19aa342330d9d7e58f9a5e094be49e82a6b1ca021614ab7e3897ea7606af33a00ee50fad3d32189ffbbd
-EBUILD catfish-1.4.6.ebuild 951 BLAKE2B 57b8baac3ba1aebd7aa7ca6abf50251e677beaa2fc9fadc405f358b33c24b32c8b4c4b28e25ad4ee96e802de815b0ea7a20a5b5c5f6a14525f664c117d0f7568 SHA512 29436a35dbd60cc9db378d5399be658b4d83773cad25594cdf4bb6b54c013bb66e1b1bc9dcdf01261cb99635e08e0c8d16e3ee0f4f34e3cf1e35f98ccf820e65
+EBUILD catfish-1.2.2.ebuild 1505 BLAKE2B faa976f3a9b71d1e3c61e3ff34a6aa994572d0f5e948e0d8b12cd09a6bc078d9e4d69d3bebfca9acbb64fd7e9a85ec0f9389fa407b35966a63663f3240cc73d4 SHA512 ad5ae1955a0fd0607bc42c40d05dd0fe7442a57ccdee60e150016d9e6fea7c7b8dcebda300dbca14db701a0589feac2ff8a4a8917c054eafd4a76d113daddfe6
+EBUILD catfish-1.4.6.ebuild 956 BLAKE2B 0cb8364bda30e1ba713fa6843c2b9e7b9b414ca54c27c54f5f8e1915a62b28f0b6aadc600664fc5191cebf04b8141522fa6d9cdf1ddb48f1766d540ac62d8df3 SHA512 fbd0059498c09846fc21ac2ac651535f984f90c097a2f180c0b437ef03984e303d4effccfc570eb0a89a4d9c1dbfa912032bd25cb2d10336556448d35cef0c64
 MISC metadata.xml 216 BLAKE2B 9fe308faad3ff5d9aac2a6d04341fe2b775153198ea734e1b17d15eab6b9eb1f781686089a6487ebc2e9cceddfd3f8c4ad1513baaacf931802201aadbe9589f6 SHA512 780eab488d269f38416e3bfc9c02d1a6bc70cee7755ac7cdc9b0bc42a3a50bb8b0b403da139629767d2f0439b15edce7d7b4078a6f528a4e04cecc1aa9bd01e7
diff --git a/dev-util/catfish/catfish-1.2.2.ebuild b/dev-util/catfish/catfish-1.2.2.ebuild
index 5c88f81f8558..42bde6bcd260 100644
--- a/dev-util/catfish/catfish-1.2.2.ebuild
+++ b/dev-util/catfish/catfish-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=5
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}-search/${PV%.*}/${PV}/+download/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/catfish/catfish-1.4.6.ebuild b/dev-util/catfish/catfish-1.4.6.ebuild
index 034f5d1e4621..62bc7cee54e3 100644
--- a/dev-util/catfish/catfish-1.4.6.ebuild
+++ b/dev-util/catfish/catfish-1.4.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 044314cdf4b9..210ed23a5deb 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,5 +1,3 @@
-DIST clion-2017.3.4.tar.gz 331195446 BLAKE2B 5d868de5b1d97a80dd2d63977dfda8d3ab56840c95e4cdba5b8e55cf626dbd68e1015fd8dae664dbdf8161853a96a492ce43a78e0e6bd13138144d28e1146f78 SHA512 044e713e2ab3724b891b48a1d75936dce1580be0fded174101f768f6976f76f2557768128fd596cc8855c15f27dbd9a1e9d4299b947ad00ca458c537d81fd0b8
-DIST clion-2018.1.tar.gz 333789580 BLAKE2B 026ebe63049f3b80c2924079092707379d07fa838b532b7e191ee5fbc66dfa50dbc97ad78cbafd6794f99bc29ce66f4d54882d0bbc1339e08a2f35bd5f195bc5 SHA512 ac95b5d346f077ab26882ff4c0f71420c6fcd0a929aa33c60b427d0a10839bec3a2e5363d8cd18d9e2d6988da17dd0deacd9fd3b3c5f0619c9925acf263f56bd
-EBUILD clion-2017.3.4.ebuild 1675 BLAKE2B 7f783320aa718aa64c41d88665428cef1007d96e63a0862b871fc7efb73b6402fe4a934e841a42733588d166107872c84c39f3caebba41532b237a092bcb4690 SHA512 dcc1430ceb9e5e137e11601503ef47f962644b06ec9e2785916dc4dbe0fbd9c6d71e9d193ac6601b87a4f665eae031afc697dbcff313f1be6c5a624448abbe3c
-EBUILD clion-2018.1.ebuild 1675 BLAKE2B 7f783320aa718aa64c41d88665428cef1007d96e63a0862b871fc7efb73b6402fe4a934e841a42733588d166107872c84c39f3caebba41532b237a092bcb4690 SHA512 dcc1430ceb9e5e137e11601503ef47f962644b06ec9e2785916dc4dbe0fbd9c6d71e9d193ac6601b87a4f665eae031afc697dbcff313f1be6c5a624448abbe3c
-MISC metadata.xml 470 BLAKE2B 839c416b941a14b2025a68ad5bf7cb1ea2d1be8b5f7cff2cd87cb5eff6ef73d37a462b868ee56ec70d9270d9ed15fc01533fb3a217fd1273de9b839c6dc8af82 SHA512 9aa5a4724a19a45cbd03c4d71005265509546d8e3134dbf634ed19ae4d7d3d56f2cf17edd9d7e3d2882e57c2f07a1229f0b76af11f2c95a3cfd56dd0db3b6757
+DIST clion-2018.2.tar.gz 456219123 BLAKE2B 1cb719596568b7208658f01c9495b2948490c2f27f9d3eec6bb652d65e60374232b286b6fc889510c88855cfdd890c516e268c783b1d3ae5e54c42fbd68c047e SHA512 ce21c94e89c7966784a4ebe07c2324cf674187e67eb9362af9bcd6a299b1ef69f45c8b95f91db244db4a2a70e72d849a752741b2c9730477df35f09ab13ab807
+EBUILD clion-2018.2.ebuild 1987 BLAKE2B 9ec201c1a5a15957b26c727d65fcbf44867d05577727a9e8e78e3f4d52cde3261eff87246c9fd7bb0e36b04b866a12b6004001dc84df57b05ddef278dd5cbb1f SHA512 454565193ae4f63b472ab6c7edf4331a6b15186d9b17fc23b8d545c86974cb3dbf12fcad179eb6e95dbb1d099b8ffb75068213ce8c8820bb5fa6fa6a55f84fc6
+MISC metadata.xml 557 BLAKE2B 39fdc63d65191a426d3a51303810cfe941fe4f11f36c650c8538e2035ac1a93f42aa537f23d9384ac5a0f6db90a2e1658f35618918d692940832926fe830d5eb SHA512 a9e80ae43985b3921ea1b3a292da275c49cf8d7a965573e55a116fb2efc6e108a111de64fb6f21c21ec3f3ce3c7d0e960c79909e5699d9903db0a6eb92d64871
diff --git a/dev-util/clion/clion-2017.3.4.ebuild b/dev-util/clion/clion-2017.3.4.ebuild
deleted file mode 100644
index 376319ea602b..000000000000
--- a/dev-util/clion/clion-2017.3.4.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
-
-inherit desktop eutils
-
-DESCRIPTION="A complete toolset for C and C++ development"
-HOMEPAGE="http://www.jetbrains.com/clion"
-SRC_URI="http://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# RDEPENDS may cause false positives in repoman.
-# clion requires cmake and gdb at runtime to build and debug C/C++ projects
-RDEPEND="
-	sys-devel/gdb
-	dev-util/cmake"
-
-QA_PREBUILT="opt/${P}/*"
-
-src_prepare() {
-	default
-
-	local remove_me=(
-		bin/gdb/bin
-		bin/gdb/lib
-		bin/gdb/share
-		bin/cmake
-		license/CMake*
-		plugins/tfsIntegration/lib/native/hpux
-		plugins/tfsIntegration/lib/native/solaris
-	)
-
-	use amd64 || remove_me+=( plugins/tfsIntegration/lib/native/linux/x86_64 )
-	use arm || remove_me+=( bin/fsnotifier-arm plugins/tfsIntegration/lib/native/linux/arm )
-	use ppc || remove_me+=( plugins/tfsIntegration/lib/native/linux/ppc )
-	use x86 || remove_me+=( plugins/tfsIntegration/lib/native/linux/x86 )
-
-	rm -rv "${remove_me[@]}" || die
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.svg" "${PN}.svg"
-	make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	dodir /usr/lib/sysctl.d/
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
-}
diff --git a/dev-util/clion/clion-2018.1.ebuild b/dev-util/clion/clion-2018.1.ebuild
deleted file mode 100644
index 376319ea602b..000000000000
--- a/dev-util/clion/clion-2018.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
-
-inherit desktop eutils
-
-DESCRIPTION="A complete toolset for C and C++ development"
-HOMEPAGE="http://www.jetbrains.com/clion"
-SRC_URI="http://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# RDEPENDS may cause false positives in repoman.
-# clion requires cmake and gdb at runtime to build and debug C/C++ projects
-RDEPEND="
-	sys-devel/gdb
-	dev-util/cmake"
-
-QA_PREBUILT="opt/${P}/*"
-
-src_prepare() {
-	default
-
-	local remove_me=(
-		bin/gdb/bin
-		bin/gdb/lib
-		bin/gdb/share
-		bin/cmake
-		license/CMake*
-		plugins/tfsIntegration/lib/native/hpux
-		plugins/tfsIntegration/lib/native/solaris
-	)
-
-	use amd64 || remove_me+=( plugins/tfsIntegration/lib/native/linux/x86_64 )
-	use arm || remove_me+=( bin/fsnotifier-arm plugins/tfsIntegration/lib/native/linux/arm )
-	use ppc || remove_me+=( plugins/tfsIntegration/lib/native/linux/ppc )
-	use x86 || remove_me+=( plugins/tfsIntegration/lib/native/linux/x86 )
-
-	rm -rv "${remove_me[@]}" || die
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.svg" "${PN}.svg"
-	make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	dodir /usr/lib/sysctl.d/
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
-}
diff --git a/dev-util/clion/clion-2018.2.ebuild b/dev-util/clion/clion-2018.2.ebuild
new file mode 100644
index 000000000000..d000021e40fe
--- /dev/null
+++ b/dev-util/clion/clion-2018.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils
+
+DESCRIPTION="A complete toolset for C and C++ development"
+HOMEPAGE="http://www.jetbrains.com/clion"
+SRC_URI="http://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="splitdebug"
+IUSE="-custom-jdk"
+
+# RDEPENDS may cause false positives in repoman.
+# clion requires cmake and gdb at runtime to build and debug C/C++ projects
+RDEPEND="
+	sys-devel/gdb
+	dev-util/cmake
+	!custom-jdk? ( virtual/jdk )"
+
+QA_PREBUILT="opt/${P}/*"
+
+src_prepare() {
+	default
+
+	local remove_me=(
+		bin/gdb/linux
+		bin/lldb/linux
+		bin/cmake
+		license/CMake*
+		plugins/tfsIntegration/lib/native/hpux
+		plugins/tfsIntegration/lib/native/solaris
+	)
+
+	use amd64 || remove_me+=( plugins/tfsIntegration/lib/native/linux/x86_64 )
+	use arm || remove_me+=( bin/fsnotifier-arm plugins/tfsIntegration/lib/native/linux/arm )
+	use ppc || remove_me+=( plugins/tfsIntegration/lib/native/linux/ppc )
+	use x86 || remove_me+=( plugins/tfsIntegration/lib/native/linux/x86 )
+
+	use custom-jdk || remove_me+=( jre64 )
+
+	rm -rv "${remove_me[@]}" || die
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier{,64},clang/linux/clang{d,-tidy}}
+
+	if use custom-jdk; then
+		if [[ -d jre64 ]]; then
+		fperms 755 "${dir}"/jre64/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
+		fi
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.svg" "${PN}.svg"
+	make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir /usr/lib/sysctl.d/
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
+}
diff --git a/dev-util/clion/metadata.xml b/dev-util/clion/metadata.xml
index 4f7225e07bb7..fd24c2d5ef8b 100644
--- a/dev-util/clion/metadata.xml
+++ b/dev-util/clion/metadata.xml
@@ -12,4 +12,7 @@
 	<longdescription lang="en">
 		Fully Integrated C/C++ Development Environment.
 	</longdescription>
+	<use>
+		<flag name="custom-jdk">Install and use IntelliJ's custom JRE.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index 8eef84257374..4cb88ab6058e 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,3 +1,5 @@
 DIST d-feet-0.3.12.tar.xz 184308 BLAKE2B 1e0bb31c768cff357db735ed924cd0d768cb0412ccb6b722569c906671fd4929f67d62cbc09d37b1176755dff228c659013c1ec27d785c4175e534a4458c3fd3 SHA512 ef7a8aa57893cc210327420e954d39d256733839e6a171b8e035f15089fdf963c708a39c3b931b8a85d9faf78a1be324576c5fa2440db8305c1bfc8a8d9e991e
+DIST d-feet-0.3.13.tar.xz 174700 BLAKE2B 66d2a8735011c64985889edf1acbb37e1547d6af52fc6499124ffae09d8cfd876051e12f231c26a1af848939b9a3e9c36d1083e8afb240575d4f580ea92fde65 SHA512 b5a4eb995e883406a13e8a4137b1ed751cfbfd0fd80fa26eb81cf6f8b69bca63f3a4ad940b1aeaed0a57d48d81c582b62f6c3880e7038136f2b40a1eef25328f
 EBUILD d-feet-0.3.12.ebuild 1371 BLAKE2B 4d4ec516e42720b5953b57803139b9abb87bd4f648a7e7cbaedb76c7672059f2a1a225d2078ddd9e2fc44b2a26adc7d2e7668d3e16aea050fd767ecfc6922ae6 SHA512 ca9ee296ba275e6404d8ec6534fbe408f34c54b14bcd34d0e93d545feccaa364fa43d76fe883b17d83aa06f318be9b5ff1ff0282b59974660038915430fe7c64
+EBUILD d-feet-0.3.13.ebuild 1373 BLAKE2B 76710316ddcb2cf75dff7aad6209c6562fa67ca9ade16ef2e6aca1397516e5ae962b87e39a2860bf78ad00d27c2572a411499de6ebf89e05ec38041a24c088aa SHA512 205a35c3e0c24296d0e62a025b995d94ab3695870f19e3c2d8431666ee6358b78ca942bd20159066a870cde6532120f20fb9f8bd4b15d4e841f59c89e4792d66
 MISC metadata.xml 432 BLAKE2B bdc09ed75743fc3fa8155849638634790a2eedc0b58330991b7a6d0a05eb201cc64743033d35586ab6b91ec85c385b23f9ea744d826bf41ffc0cff3a493f8a77 SHA512 0cf318c10b2e7b85135560df21bde6857dcb101d101ae51f384dc613681afb29c15303de0ffd23b8478b2b81dbd5faa051e816df71155230e1eef1b6a99bc699
diff --git a/dev-util/d-feet/d-feet-0.3.13.ebuild b/dev-util/d-feet/d-feet-0.3.13.ebuild
new file mode 100644
index 000000000000..553e81b24062
--- /dev/null
+++ b/dev-util/d-feet/d-feet-0.3.13.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 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 gnome2 python-single-r1 virtualx
+
+DESCRIPTION="D-Feet is a powerful D-Bus debugger"
+HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test +X"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.9.4:3[introspection]
+	>=dev-libs/gobject-introspection-0.9.6:=
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	>=dev-libs/glib-2.34:2
+	>=dev-python/pygobject-3.3.91:3[${PYTHON_USEDEP}]
+	>=sys-apps/dbus-1
+	X? ( x11-libs/libwnck:3[introspection] )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.40.0
+"
+
+src_prepare() {
+	python_fix_shebang .
+
+	# Do not run update-desktop-database (sandbox violation)
+	sed -e '/^UPDATE_DESKTOP/s:=.*:=true:' \
+		-i data/Makefile.am data/Makefile.in || die
+
+	# disable pep8 - checking python whitespace style is not useful for us
+	sed -e 's/pep8 /# pep8 /' \
+		-i src/tests/Makefile.am src/tests/Makefile.in || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# disable pep8 - checking python code style is not useful downstream
+	# (especially when that style check fails!)
+	gnome2_src_configure \
+		$(use_enable test tests) \
+		PEP8=$(type -P true)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 148c918b0ff4..ac936b3ed81f 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,7 +1,9 @@
 AUX ninja-uclibc.patch 526 BLAKE2B 732fb8dc79b326a1a4d453ef7d7210dedaca436f19ed2bb2d19b5a588d566522e4829896c0f3862fd396d23f731da186e7a9ad369af00a0dbcb7c8b2e3cfbbeb SHA512 180c3390001a6bb49deef4f459d42fd7141a5cf68a7077cfe3b5b1384f7b40911f9e4d871ffce07f51b347deb2c2568c266c5a5d1d113010090cd4f65eebeb6e
 DIST ninja-1.7.2.tar.gz 180611 BLAKE2B 9e0b5faaed9dd0c01b3cb22e5927668e985f897c4a448871b3147d4383d562b91f4e4fe304cb61a31d5ee096b58f0c4e4a7c1907ed9637658faa1eafb31cdd72 SHA512 29900d07364d87ad8b9614b82bc1b0afda5ca6522563ab73fb228f206ed6b29b70cf034a3caf5a9b2c0b105d1e076c6b425d93b5d14aa3ca3730d75611212a64
+DIST ninja-1.8.2-fortran.tar.gz 203848 BLAKE2B a6002abcfe4003dd5c9ccb8fd504b98736a6bc249323ca7afabc042a5091b9e7f0c0c19853cd7a270e00b0825ea14a7ba47c1b35d15f725c7b4866de1a79c07a SHA512 74f42181a2a712653450b0ab7ce5ad93b5ec010f4ab8411c732f682be5a6a991a7481ae1649ad70a7b903c45427b1e238b001aef29702f0896a1ae393ee22bec
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
 EBUILD ninja-1.7.2.ebuild 2667 BLAKE2B c0bceb36d03edc78a846331ff9923d2ed6243b807db4a6af66892e25744cf2b09ae3479263b1b71891901a4a82500838600e0f9f72d6a6f6b02a276709d76303 SHA512 579c59e32df4104703b3bc703af7fa44fc8f800c874d2b817dcba646ecc461be5d94576efd6e2979f21e5778e5b2112c75963cf879b7f37180cee0613f1cf224
+EBUILD ninja-1.8.2-r1.ebuild 2731 BLAKE2B b4197d9c861712b1481da846bf949153071b8b5e136f6f2be60066fb0c08c90203faec1db2347704891ea9ac9a5a6d0fb74fd23ee220280c1980f4055e6f886c SHA512 822a0e3feefef7ef77ca471aeca77faa13b165da21bf1175c8329c0104361b36d062f151754c245aa4a565eeeadf858bd8371a133e0fc6eea3743e3bed99c85a
 EBUILD ninja-1.8.2.ebuild 2636 BLAKE2B acfea7108a4a6f83b80f67cd6508a38752fa3e482e78eb248aeb20fb0a7c60bae82baea3357d44a2bfe70c1e6c417289ffc477e274394e70fd9274868b637e30 SHA512 9e132040a4d3c39371c38e7533ec4d4718f013b2894f38162b80038284df72bcc8719571d5403311844736fd521dd38d943880fbf9760ab8d1ac1e3a514c0923
 EBUILD ninja-9999.ebuild 2630 BLAKE2B fc04da58337a300929fe2394beef0b18d2e2633f5c94e508e4f0b8cbaf3999713bbd59ecf2cc65a5ad0860f379b68744ddba5a5c26338c1d1fbd3d87c96247ab SHA512 bacf92b4d5d5c569866b6af4284094e1ac92144c426c029cf3b4959b1a5b8dac73f8f584e5f1313c05716df0d830f90dd6cc64edff9f75e0ee623f6c822ab6a1
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..caa2bb8e6460
--- /dev/null
+++ b/dev-util/ninja/ninja-1.8.2-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 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 bash-completion-r1 elisp-common python-any-r1 toolchain-funcs vcs-snapshot
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+else
+	SRC_URI="https://github.com/Kitware/${PN}/archive/v${PV}.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz -> ${P}-fortran.tar.gz"
+	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 ~x64-solaris"
+fi
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax zsh-completion"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	emacs? ( virtual/emacs )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+	zsh-completion? ( app-shells/zsh )
+	!<net-irc/ninja-1.5.9_pre14-r1" #436804
+
+S="${WORKDIR}/${P}-fortran"
+
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py uses CFLAGS instead of CXXFLAGS
+	export CFLAGS=${CXXFLAGS}
+
+	run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		"${PYTHON}" configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
+
+	if use doc; then
+		./ninja-build -v doxygen manual || die
+	fi
+
+	if use emacs; then
+		elisp-compile misc/ninja-mode.el || die
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		./ninja-build -v ninja_test || die
+		./ninja_test || die
+	fi
+}
+
+src_install() {
+	dodoc README HACKING.md
+	if use doc; then
+		docinto html
+		dodoc -r doc/doxygen/html/.
+		dodoc doc/manual.html
+	fi
+	dobin ninja
+
+	newbashcomp misc/bash-completion "${PN}"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins misc/"${PN}".vim
+
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/${PN}.vim"
+	fi
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		newins misc/zsh-completion _ninja
+	fi
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ${PN} ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index c6fd0b36506b..63592b367f77 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,7 +1,9 @@
 AUX radare2-fix-syscapstone-2.6.patch 954 BLAKE2B 9dd8ebb65f8830643a46c2302e769018ea78045eb18da7ca98adff00ebba63975b5c97eb2398d0eb33970a4102090fdee19734115170f4cbb0c4cd3863c74bbc SHA512 4412c99facdcf15bb6f3202c15e7c0a581df6eda67e5476b70f95e21540d253fdd2dd5518009c139cc7723d589f0d903a2a98f3d6ed33578b0bed2e5c2bf4242
 DIST radare2-2.6.0.tar.gz 6306317 BLAKE2B 213ed0ac92f5b4b9cfc2ba93c5cda9168746cffb0016e1368c4c3939d694bffccf689764c60e0e59a52b70b6b7d49407516c9ecd6e62c59ed0db37c6f72867f5 SHA512 44e7d0c10e17b40d4d71af851cf462c159b03b3242dfccd786bd54d3cf9f92441084f26694166dd1385e84c00626f45dbe09d1fe713595721723c468ac47b01b
 DIST radare2-2.7.0.tar.gz 6483865 BLAKE2B 4052a601eb154240fb57c64bf2351063685a25e7d8ca46ad721398cd98b5e8bbec6a6daccb9f2df8e222bad74a0ffb4edc72186d7ca51b69ffbf480a7eb576ba SHA512 4a40e4917967aeef34de6ea69dd3c6d07a215e1f1272221db9af92d898e2d44997e339016b3342d69a276eb99f2d0a1e640ce8e9c889fe728dd86865e917a0fd
+DIST radare2-2.8.0.tar.gz 6513419 BLAKE2B 51ee9fe82c09693e729b49e97b79a54e2b9f7de95ecf93c5e22107f68260ddc9fdee9291f200dba2770315487a85d1541abbb76281e6934d25c677a95e6882e3 SHA512 968c61eb5102125b232f9a74362fb90b0409da80b4cd4f109d11e49d02c80a5beee9e73065ef3b4a22fb8cdf43f86338fd21b648ddfa34001ed6cace47335803
 EBUILD radare2-2.6.0.ebuild 1187 BLAKE2B bc87ba5b9e174de19a2588bcd567ecfacd53cf8c3852242d9eaf23258369f4fee7484647c3753eb52b026117b596c2cd261f164d93b647bdb486bbb26955067e SHA512 c22851603eff958ad681d981631a58ca28dc3f4ed704d0c516c542d43a2d09a47509fee62055da4e864c2b5d258cda5c31368f52137fd7b3d7653ea49e8fe79d
 EBUILD radare2-2.7.0.ebuild 1128 BLAKE2B b5491982ca5801b848892d5c6d9b06cf52f1faba10aef11a4da986ff39d554af7f4bf8dbe848901050d8878460c09c239de88093ee16ce9cc0ad380bb469d3ec SHA512 941c05b0ab8db1a3fdf0752754340b2dc0c3cb48ae373c6bcb9f5f5a52407a31dc03b715b00df6895c0e181ca57f06366384d259fb79f0b745cd3e0dc26ab651
+EBUILD radare2-2.8.0.ebuild 1128 BLAKE2B 7b86d678bb0af73cad89f9f08b0145516ca053ef26eecc0b74841aec9e9d293d190ad8cb98ebba6885afccc28d90b2352a8fd4a18ced82ae9cb32713506c969d SHA512 37f3f8bbb0c38251772e57e204d66b8f3ad06ae02a7c2b0931ece82a73319ca6a5eeb0b7e635bcefdb5ad2f09b65f963d4a6307ab812b88bb9a70f4d7904a1af
 EBUILD radare2-9999.ebuild 1187 BLAKE2B f526fc8a5b74fd80de3291aebe2a3805bbf7bceda29552772b50fb1ce3a3dab0dbdbbbe2c1895f596dbf79f52ce27445efa43bffcc18a333951b2367db1510a6 SHA512 358c0f8116b15555cb34aec3ccc4ddccfd6c6211a1b9b882242c779f6ea0ac358c7e5dc946bd4d82ed871bfc7a01d45c621eb59ded303ad6a3cb23c1b18c8f56
 MISC metadata.xml 472 BLAKE2B 9eac8a52ecd7dae41e0cd32ff13bc02d7c936d0d36bf52309d28b9d03168ec55655ce3588df2c330c08f0779fc8c1a095c972cd6ee3deecb68a9c333d4811421 SHA512 110f9ec2d6dddd20703b9cf6ec8cd77e2459f67aca74065211dc30888cea9c9154128da8a2f15810063de9c4867e3e1a31658d3c5cb27be44824342784b67365
diff --git a/dev-util/radare2/radare2-2.8.0.ebuild b/dev-util/radare2/radare2-2.8.0.ebuild
new file mode 100644
index 000000000000..a3d09b6f37ab
--- /dev/null
+++ b/dev-util/radare2/radare2-2.8.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radare/radare2"
+else
+	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+	dev-libs/capstone:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--with-syscapstone \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d $d ]]; then
+			rm -rfv "$d" || die "failed to delete '$d'"
+		fi
+	done
+}
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index d65af4e9b20a..b4d7d7e0432d 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -5,5 +5,5 @@ DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b
 EBUILD rebar-2.6.1.ebuild 631 BLAKE2B 767d3538242b6c7165543ab2030fa1af1d16779dcabf35d745e5702fc9a9ba58517e116fc623b287d128a4e1dd983b3d926112081895839e4f46a6d0e2e21b08 SHA512 f6e545bd98f66499f9fe846c19bff96dc121748fb99d6e6b9c5b74adec066e1d5b035ed4df9da3577d93c68c0b72713070fab19ae48ec4c8298d5005d3366da9
 EBUILD rebar-2.6.2.ebuild 630 BLAKE2B d87812a6f7ecc61dac7dd67614adbaab35949b5daf4ceeabdf22a1ebcc27a5ac1adf02646017e069e21e3be054231cf61d42a1c0177d56332804d374707f6743 SHA512 ecb5f24a95aa823ceb1d0bce71306238ec07a0d7285bb7941102a1b21b3f9855c0429730455e2783c84d0f7d662aeab863cc9bf07c2c670f027647dd3dc78512
 EBUILD rebar-2.6.3.ebuild 630 BLAKE2B b40491513b9af0575404a09408f824af1aef080abdb267689df21c944c5b8e47983dc50c9c9d22b9be29092779e143c2c9f65abea1f8dff2dd0a8711db4cc84a SHA512 c5889bebd569f588134f0146ab62c7292cebb197a19478e89d3073d5afa364984a03674dcbe4f5ba481dd01be5d87c7e3ff0ae27903d5df3f0953a55103931cd
-EBUILD rebar-2.6.4.ebuild 627 BLAKE2B a852cb28105e1ffe1e48f99fdac2ff4fe2eb425d64474a775cd91f913c24197bea6aa7340982779c792fc35e60eafa0ea509af4f8d79ccc4cf83b8fe012cc369 SHA512 078f490dc9d359495d3d26eb4c4b93a70782cc7f6fb2eacde5072de1fe10bdaa23bbd53047a56d1b1eab159894bf543cf5c759caf5d18a7e5c6c26773fdbec43
+EBUILD rebar-2.6.4.ebuild 626 BLAKE2B 5c7f65683ba78b63f10b388ee8f4b275d46feef079e812156c59d959649d4dc565402a0d7df138114c636592063d6281aabc1018ca385374c328d73a653f48a9 SHA512 f65c8a717ff9d5874a902873a8c4ce28aa1ae68fafede6f031f88ee772ccefbdff97e52831c927425675f62e8711457864bf314a756664437bf7b90cdd77ecb1
 MISC metadata.xml 248 BLAKE2B 404382bd4b92d22cc627b066d14310ac5f538e3bcac366e8cddb43c871c13d4efade2036bb49f5e8ac3c7511f28e6eae58a1e350bc48ef8b9f2031b460c741c1 SHA512 c6b32cd3a892084eff028d3afb657fef0e0921e6636628cfc2d81b7bada9d0c7d03005f8c8ed1ffddc7d491bd6725c771506dd3da20dc5a60619efaccf0974aa
diff --git a/dev-util/rebar/rebar-2.6.4.ebuild b/dev-util/rebar/rebar-2.6.4.ebuild
index ed807feeb1ab..76adb5658e10 100644
--- a/dev-util/rebar/rebar-2.6.4.ebuild
+++ b/dev-util/rebar/rebar-2.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/erlang"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 50e2416a4f47..2f24094723e4 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index 64e6940a99b0..655d37578e55 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -7,6 +7,7 @@ DIST gitolite-3.6.4.tar.gz 180619 BLAKE2B 183769c8dce0d4fcba10ad57b29b56913493b3
 DIST gitolite-3.6.5.tar.gz 182496 BLAKE2B 478bed0642886ee8b79b1e6c2091482a43663a644c46758ef3c9c55308b10bfa4c4608456e24214bad04607c49487df213e5bff84abb5529c9b0759c39f9288b SHA512 60796663a87c2b169c08e4e26edfb76408428887d3e932677f4ca95a8c7f82e9e300a7400d3d900c371628b23972be063444b7c036218f6ff0ab13626a886f90
 DIST gitolite-3.6.6.tar.gz 183469 BLAKE2B 91b1b04820f8abe427c7d6a81131a9fce1ff3df8d06c3f1d7515ead91b654048ef24b391fc28f2fe9c6dd0e502e24064a55b5fee8c1da34e3d07974c8f203c26 SHA512 1529330ed2afa315fcb650c55d515e5d4b61921f46b4d763a759537434492959f100d2219ab7673e568d46f397a25a45d4388fe3827ea988333fc8719820f8bc
 DIST gitolite-3.6.7.tar.gz 186298 BLAKE2B 32ccedce5cfe877d69f66ccc354300b1b363de0ac16bf8ec6d97010441d1e5a95e63252c833604d7e4e5b90dd4d84b4e262ee5ed092df80631e7478500e3da97 SHA512 d22bf5c34834f82df771e6d4527496a302da312f7f78dfe81c1284f5a1ea05de90ec217e03e94918d69a006a72fa16dc0006b1f555826ad6183d9dce2dd9d425
+DIST gitolite-3.6.8.tar.gz 197551 BLAKE2B 9788c06885fc7fc8edf422080628f465b33dea2aec8090daf330206041e4776bbae7189b343fc604b0959be556a15016d656b4df133f784d55bc7a6b701ad8ef SHA512 f65d4e4354079f868c9f9a943efb84ad4e29f96c69a3792c13dda383dac0133baa3d93925967c6be71e923b27e0ad91b57b5f1245cf64eeec0f0b719cbda4270
 DIST gitolite-3.6.tar.gz 156481 BLAKE2B 4cb36e631c458c529d51689bb9612ede34b352d523b62afefed70ab90fadbda1c1d954400c5ddf407ef57a3df8371814c73fdcc526bf3750dad9bfa10f1e7747 SHA512 91606a5fed202f0da2194310bc7da8e5d35cdfa2924b009ed3447ba41e2fd856b9043f1b57d16600ec44f17d640e9ee988b4086bea032827bf5fca83e5ff024f
 EBUILD gitolite-2.3.1-r1.ebuild 1647 BLAKE2B cf918594448f8cbb0d381118c5fdc6ba3bfcd3669a26b3ca5264f66deb2e4273c29554ba7edf0a04e350619fd45a8083e69017793eb48bf7facf2e4f4d3bb25f SHA512 77347b4575a9236a5e259e9c67eb29ecd023092c2713ca45d8871af2303222d827296405168126f7f88ff45c8bcb96427325391801baa5740a90b2548bb25da4
 EBUILD gitolite-3.6.1.ebuild 1868 BLAKE2B dd6c05d7831b14bc2baa3de478f6382ef57bc1a6d9dcf6b81b22a881df3ed53dd5499222a8bfa38a4231a55acd87eff35acc6be4be05f11a108f6930e6b05f91 SHA512 816b9b4f1dbb13bc08de4511c8770b3ca0e43487793ffc06cb4b2579d0339c6b2c7d51c18e474bbdcdce7a6c7ffcd1cc1803d9b4b5ce5d23780efd354fb22788
@@ -18,6 +19,7 @@ EBUILD gitolite-3.6.4.ebuild 2352 BLAKE2B 7bc3ad034046f8c2bcae2dc1aa7ef3a312e242
 EBUILD gitolite-3.6.5.ebuild 2358 BLAKE2B c414943bbddd70c1d8ac111b11d6cc8c740a2468f64c1f292a3818fbb5877899a49c37429abebce15ca14ad6cd207d887da56fde9ba8f67bf87d54725f5a5b50 SHA512 f86cf6dbe5ea43932dc240868d5c5f098484cc4585ca1b5a21ab657f665d866ac44c87152dd386fff35e0833e5e3d7a66934c481d3dd31f087bc24d243b71111
 EBUILD gitolite-3.6.6.ebuild 2431 BLAKE2B 3d34e9ddf77bb044de9a1bd1984082e33d8f6fd6cafc71e63bf4860c2cf94e934dba75346b0648badf0637cbbe77a57c9bce5971c1e4d01c597c9d951cfe0164 SHA512 8b4cf676c8a3434e97962301be3608b7ea10b48e8b5f0f8d185b274c1d9e2bc3d6f7c046879d2b825d16bdc5d514d9c790caa6bb4922b1a1d5a5827a17858c3d
 EBUILD gitolite-3.6.7.ebuild 2398 BLAKE2B 864703fc35faa76894bb8a7c82dd97fe80cc5ebd02a607cab670ebf168eaf6ca97b10ca93824023da02974f5fd740002084f0d08f9eb6411c6b2082bcae16f95 SHA512 1584babccb49c0d491bc749d804bf6ff5e3c4adcb1dfdf80d04d577a076e11315ceec5989f7e9be0e410b86b450aa8637d2cca177a75216a66bcc8577a28384b
+EBUILD gitolite-3.6.8.ebuild 2430 BLAKE2B f383d1280a6a525da61d8b616b986264ba96ed49b9c0935ae7eaed6bd8f84987f3d4a20b4bba0a2618af1106768436c7be624edce1d62ce277b1b89e87a73f1f SHA512 7cfaa7d4b3c4a5e22995f6db00ecbfa040c440df8534f98d951d106cf332df8dae1a6dab4bcb7b9e7e171e03597fa0950987cee34c6fa887514d487832cbfeee
 EBUILD gitolite-3.6.ebuild 1866 BLAKE2B cd81d9ee5108877d42a2cc3ccf3f6ae57f870838c2a11b17638e49d47ab56e6dd54c31481a226b31c8a22fb4c2d1407153d0e7b349c492831614f271a917818b SHA512 be5e90a8996a7c9f433d28e975de5d1a462fe57b134f903572069c43a373f81b6ba4253395f62b66e467a8b3de4e8036b6db37dac3dae9b1c1d4cacc94365b58
 EBUILD gitolite-9999.ebuild 2358 BLAKE2B c414943bbddd70c1d8ac111b11d6cc8c740a2468f64c1f292a3818fbb5877899a49c37429abebce15ca14ad6cd207d887da56fde9ba8f67bf87d54725f5a5b50 SHA512 f86cf6dbe5ea43932dc240868d5c5f098484cc4585ca1b5a21ab657f665d866ac44c87152dd386fff35e0833e5e3d7a66934c481d3dd31f087bc24d243b71111
 MISC metadata.xml 780 BLAKE2B e496a65ffe9f06db9f4ef1c74a16fafb434c9c8a7309f0effc02515270bcc0137b1bf7861ac11f6dd1a7c06fd4ef4eb7d72b27b60a73ed535ba4fad3e08a2066 SHA512 0a7c6ac8bc127892e5f6fe24774f095cb0bcf5971926c65b4d8a52748cfb7ae22d1ddc47365ece99612bc64853dfa224d42ded5093f0cd0976a2ae1b544eb5c8
diff --git a/dev-vcs/gitolite/gitolite-3.6.8.ebuild b/dev-vcs/gitolite/gitolite-3.6.8.ebuild
new file mode 100644
index 000000000000..8d75699aad73
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.8.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	SRC_URI=""
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!app-vim/gitolite-syntax
+	!dev-vcs/gitolite-gentoo
+	selinux? ( sec-policy/selinux-gitosis )
+	dev-perl/JSON"
+
+PATCHES=( )
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	default
+	echo $PF > src/VERSION || die
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/vim/*
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
+	fi
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index d0572b7e4841..aa062f43edd1 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 799b0618bd25..53efd0e16595 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -11,8 +11,12 @@
 if [[ -z ${_CARGO_ECLASS} ]]; then
 _CARGO_ECLASS=1
 
+CARGO_DEPEND=""
+[[ ${CATEGORY}/${PN} != dev-util/cargo ]] && CARGO_DEPEND="virtual/cargo"
+
 case ${EAPI} in
-	6) : ;;
+	6) : DEPEND="${DEPEND} ${CARGO_DEPEND}";;
+	7) : BDEPEND="${BDEPEND} ${CARGO_DEPEND}";;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
@@ -22,8 +26,6 @@ EXPORT_FUNCTIONS src_unpack src_compile src_install
 
 IUSE="${IUSE} debug"
 
-[[ ${CATEGORY}/${PN} != dev-util/cargo ]] && DEPEND=">=dev-util/cargo-0.13.0"
-
 ECARGO_HOME="${WORKDIR}/cargo_home"
 ECARGO_VENDOR="${ECARGO_HOME}/gentoo"
 
@@ -119,7 +121,7 @@ cargo_src_compile() {
 
 	export CARGO_HOME="${ECARGO_HOME}"
 
-	cargo build -v -j $(makeopts_jobs) $(usex debug "" --release) \
+	cargo build -j $(makeopts_jobs) $(usex debug "" --release) \
 		|| die "cargo build failed"
 }
 
diff --git a/eclass/pax-utils.eclass b/eclass/pax-utils.eclass
index ac64ee35fedb..f6f9623cc900 100644
--- a/eclass/pax-utils.eclass
+++ b/eclass/pax-utils.eclass
@@ -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
 
 # @ECLASS: pax-utils.eclass
@@ -50,8 +50,8 @@ PAX_MARKINGS=${PAX_MARKINGS:="PT XT"}
 # to https://pax.grsecurity.net/ for details on what these flags are all about.
 #
 # Please confirm any relaxation of restrictions with the Gentoo Hardened team.
-# Either ask on the gentoo-hardened mailing list, or CC/assign hardened@g.o on
-# the bug report.
+# Either ask on the gentoo-hardened mailing list, or CC/assign
+# hardened@gentoo.org on the bug report.
 pax-mark() {
 	local f								# loop over paxables
 	local flags							# pax flags
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
deleted file mode 100644
index 4c16be0f5a49..000000000000
--- a/eclass/qt4-build-multilib.eclass
+++ /dev/null
@@ -1,848 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# @ECLASS: qt4-build-multilib.eclass
-# @MAINTAINER:
-# qt@gentoo.org
-# @AUTHOR:
-# Davide Pesavento <pesa@gentoo.org>
-# @BLURB: Eclass for Qt4 split ebuilds with multilib support.
-# @DESCRIPTION:
-# This eclass contains various functions that are used when building Qt4.
-# Requires EAPI 5.
-
-case ${EAPI} in
-	5)	: ;;
-	*)	die "qt4-build-multilib.eclass: unsupported EAPI=${EAPI:-0}" ;;
-esac
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
-
-HOMEPAGE="https://www.qt.io/"
-LICENSE="|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3"
-SLOT="4"
-
-case ${PV} in
-	4.?.9999)
-		# git stable branch
-		QT4_BUILD_TYPE="live"
-		EGIT_BRANCH=${PV%.9999}
-		;;
-	*)
-		# official stable release
-		QT4_BUILD_TYPE="release"
-		MY_P=qt-everywhere-opensource-src-${PV/_/-}
-		SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
-		S=${WORKDIR}/${MY_P}
-		;;
-esac
-
-EGIT_REPO_URI=(
-	"git://code.qt.io/qt/qt.git"
-	"https://code.qt.io/git/qt/qt.git"
-	"https://github.com/qtproject/qt.git"
-)
-[[ ${QT4_BUILD_TYPE} == live ]] && inherit git-r3
-
-if [[ ${PN} != qttranslations ]]; then
-	IUSE="aqua debug pch"
-	[[ ${PN} != qtxmlpatterns ]] && IUSE+=" +exceptions"
-fi
-
-DEPEND="
-	dev-lang/perl
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	dev-qt/qtchooser
-"
-
-
-# src_{configure,compile,test,install} are inherited from multilib-minimal
-EXPORT_FUNCTIONS src_unpack src_prepare pkg_postinst pkg_postrm
-
-multilib_src_configure()	{ qt4_multilib_src_configure; }
-multilib_src_compile()		{ qt4_multilib_src_compile; }
-multilib_src_test()		{ qt4_multilib_src_test; }
-multilib_src_install()		{ qt4_multilib_src_install; }
-multilib_src_install_all()	{ qt4_multilib_src_install_all; }
-
-
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array variable containing all the patches to be applied. This variable
-# is expected to be defined in the global scope of ebuilds. Make sure to
-# specify the full path. This variable is used in src_prepare phase.
-#
-# Example:
-# @CODE
-#	PATCHES=(
-#		"${FILESDIR}/mypatch.patch"
-#		"${FILESDIR}/mypatch2.patch"
-#	)
-# @CODE
-
-# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Space-separated list of directories that will be configured,
-# compiled, and installed. All paths must be relative to ${S}.
-
-# @ECLASS-VARIABLE: QCONFIG_ADD
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of options that must be added to QT_CONFIG in qconfig.pri
-
-# @ECLASS-VARIABLE: QCONFIG_REMOVE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of options that must be removed from QT_CONFIG in qconfig.pri
-
-# @ECLASS-VARIABLE: QCONFIG_DEFINE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of macros that must be defined in QtCore/qconfig.h
-
-
-######  Phase functions  ######
-
-# @FUNCTION: qt4-build-multilib_src_unpack
-# @DESCRIPTION:
-# Unpacks the sources.
-qt4-build-multilib_src_unpack() {
-	if tc-is-gcc; then
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ]]; then
-			ewarn
-			ewarn "Using a GCC version lower than 4.4 is not supported"
-			ewarn
-		fi
-	fi
-
-	if [[ ${PN} == qtwebkit ]]; then
-		eshopts_push -s extglob
-		if is-flagq '-g?(gdb)?([1-9])'; then
-			ewarn
-			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
-			ewarn "You may experience really long compilation times and/or increased memory usage."
-			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-			ewarn "For more info check out https://bugs.gentoo.org/307861"
-			ewarn
-		fi
-		eshopts_pop
-	fi
-
-	case ${QT4_BUILD_TYPE} in
-		live)    git-r3_src_unpack ;;
-		release) default ;;
-	esac
-}
-
-# @FUNCTION: qt4-build-multilib_src_prepare
-# @DESCRIPTION:
-# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
-# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in make.conf.
-qt4-build-multilib_src_prepare() {
-	if [[ ${PN} != qtcore ]]; then
-		# avoid unnecessary qmake recompilations
-		sed -i -e 's/^if true;/if false;/' configure \
-			|| die "sed failed (skip qmake bootstrap)"
-	fi
-
-	# skip X11 tests in non-gui packages to avoid spurious dependencies
-	if has ${PN} qtbearer qtcore qtdbus qtscript qtsql qttest qttranslations qtxmlpatterns; then
-		sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' configure \
-			|| die "sed failed (skip X11 tests)"
-	fi
-
-	# Qt4 is not safe to build with C++14 (the new gcc-6 default).
-	# Upstream has addressed this for Qt5, but while we continue to
-	# support Qt4, we need to ensure everything is built in C++98 mode.
-	# See bugs 582522, 582618, 583662, 583744.
-	append-cxxflags -std=gnu++98
-
-	if [[ ${PN} == qtcore ]]; then
-		# Bug 373061
-		# qmake bus errors with -O2 or -O3 but -O1 works
-		if [[ ${CHOST} == *86*-apple-darwin* ]]; then
-			replace-flags -O[23] -O1
-		fi
-
-		# Bug 503500
-		# undefined reference with -Os and --as-needed
-		if use x86 || use_if_iuse abi_x86_32; then
-			replace-flags -Os -O2
-		fi
-	fi
-
-	if [[ ${PN} == qtdeclarative ]]; then
-		# Bug 551560
-		# gcc-4.8 ICE with -Os, fixed in 4.9
-		if use x86 && tc-is-gcc && [[ $(gcc-version) == 4.8 ]]; then
-			replace-flags -Os -O2
-		fi
-	fi
-
-	if [[ ${PN} == qtwebkit ]]; then
-		# Bug 550780
-		# various ICEs with graphite-related flags, gcc-5 works
-		if [[ $(gcc-major-version) -lt 5 ]]; then
-			filter-flags -fgraphite-identity -floop-strip-mine
-		fi
-	fi
-
-	# Bug 261632
-	if use ppc64; then
-		append-flags -mminimal-toc
-	fi
-
-	# Teach configure about gcc-6 and later
-	sed -i -e 's:5\*|:[5-9]*|:' \
-		configure || die "sed gcc version failed"
-
-	# Read also AR from the environment
-	sed -i -e 's/^SYSTEM_VARIABLES="/&AR /' \
-		configure || die "sed SYSTEM_VARIABLES failed"
-
-	# Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables,
-	# or they will override the user's flags (via .qmake.cache)
-	sed -i -e '/^SYSTEM_VARIABLES=/ i \
-		QMakeVar set QMAKE_CFLAGS_RELEASE\
-		QMakeVar set QMAKE_CFLAGS_DEBUG\
-		QMakeVar set QMAKE_CXXFLAGS_RELEASE\
-		QMakeVar set QMAKE_CXXFLAGS_DEBUG\
-		QMakeVar set QMAKE_LFLAGS_RELEASE\
-		QMakeVar set QMAKE_LFLAGS_DEBUG\n' \
-		configure || die "sed QMAKE_*FLAGS_{RELEASE,DEBUG} failed"
-
-	# Drop -nocache from qmake invocation in all configure tests, to ensure that the
-	# correct toolchain and build flags are picked up from config.tests/.qmake.cache
-	find config.tests/unix -name '*.test' -type f -execdir \
-		sed -i -e '/bin\/qmake/s/-nocache//' '{}' + || die "sed -nocache failed"
-
-	# compile.test needs additional patching so that it doesn't create another cache file
-	# inside the test subdir, which would incorrectly override config.tests/.qmake.cache
-	sed -i -e '/echo.*QT_BUILD_TREE.*\.qmake\.cache/d' \
-		-e '/bin\/qmake/s/ "$SRCDIR/ "QT_BUILD_TREE=$OUTDIR"&/' \
-		config.tests/unix/compile.test || die "sed compile.test failed"
-
-	# Delete references to the obsolete /usr/X11R6 directory
-	# On prefix, this also prevents looking at non-prefix stuff
-	sed -i -re '/^QMAKE_(LIB|INC)DIR(_X11|_OPENGL|)\s+/ s/=.*/=/' \
-		mkspecs/common/linux.conf \
-		mkspecs/$(qt4_get_mkspec)/qmake.conf \
-		|| die "sed QMAKE_(LIB|INC)DIR failed"
-
-	if use_if_iuse aqua; then
-		sed -i \
-			-e '/^CONFIG/s:app_bundle::' \
-			-e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
-			mkspecs/$(qt4_get_mkspec)/qmake.conf \
-			|| die "sed failed (aqua)"
-
-		# we are crazy and build cocoa + qt3support
-		if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-			sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
-				configure || die "sed failed (cocoa + qt3support)"
-		fi
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design)
-		sed -i \
-			-e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-			-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-			-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
-			-e "s:-arch\s\w*::g" \
-			mkspecs/common/g++-macx.conf \
-			|| die "sed g++-macx.conf failed"
-
-		# Fix configure's -arch settings that appear in qmake/Makefile and also
-		# fix arch handling (automagically duplicates our -arch arg and breaks
-		# pch). Additionally disable Xarch support.
-		sed -i \
-			-e "s:-arch i386::" \
-			-e "s:-arch ppc::" \
-			-e "s:-arch x86_64::" \
-			-e "s:-arch ppc64::" \
-			-e "s:-arch \$i::" \
-			-e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
-			-e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
-			-e "s:-Xarch_x86_64::g" \
-			-e "s:-Xarch_ppc64::g" \
-			configure mkspecs/common/gcc-base-macx.conf mkspecs/common/g++-macx.conf \
-			|| die "sed -arch/-Xarch failed"
-
-		# On Snow Leopard don't fall back to 10.5 deployment target.
-		if [[ ${CHOST} == *-apple-darwin10 ]]; then
-			sed -i \
-				-e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
-				-e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
-				configure mkspecs/common/g++-macx.conf \
-				|| die "sed deployment target failed"
-		fi
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]]; then
-		sed -i -e '/^QMAKE_LFLAGS_THREAD/a QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
-			mkspecs/$(qt4_get_mkspec)/qmake.conf || die
-	fi
-
-	# apply patches
-	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-	epatch_user
-}
-
-qt4_multilib_src_configure() {
-	qt4_prepare_env
-
-	qt4_symlink_tools_to_build_dir
-
-	# toolchain setup ('local -x' because of bug 532510)
-	local -x \
-		AR="$(tc-getAR) cqs" \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		LD=$(tc-getCXX) \
-		MAKEFLAGS=${MAKEOPTS} \
-		OBJCOPY=$(tc-getOBJCOPY) \
-		OBJDUMP=$(tc-getOBJDUMP) \
-		STRIP=$(tc-getSTRIP)
-
-	# convert tc-arch to the values supported by Qt
-	local arch=$(tc-arch)
-	case ${arch} in
-		amd64|x64-*)	arch=x86_64 ;;
-		arm64|hppa)	arch=generic ;;
-		ppc*-macos)	arch=ppc ;;
-		ppc*)		arch=powerpc ;;
-		sparc*)		arch=sparc ;;
-		x86-macos)	arch=x86 ;;
-		x86*)		arch=i386 ;;
-	esac
-
-	# configure arguments
-	local conf=(
-		# installation paths
-		-prefix "${QT4_PREFIX}"
-		-bindir "${QT4_BINDIR}"
-		-libdir "${QT4_LIBDIR}"
-		-docdir "${QT4_DOCDIR}"
-		-headerdir "${QT4_HEADERDIR}"
-		-plugindir "${QT4_PLUGINDIR}"
-		-importdir "${QT4_IMPORTDIR}"
-		-datadir "${QT4_DATADIR}"
-		-translationdir "${QT4_TRANSLATIONDIR}"
-		-sysconfdir "${QT4_SYSCONFDIR}"
-		-examplesdir "${QT4_EXAMPLESDIR}"
-		-demosdir "${QT4_DEMOSDIR}"
-
-		# debug/release
-		$(use_if_iuse debug && echo -debug || echo -release)
-		-no-separate-debug-info
-
-		# licensing stuff
-		-opensource -confirm-license
-
-		# build shared libraries
-		-shared
-
-		# skip recursive processing of .pro files at the end of configure
-		# (we run qmake by ourselves), thus saving quite a bit of time
-		-dont-process
-
-		# always enable large file support
-		-largefile
-
-		# exceptions USE flag
-		$(in_iuse exceptions && qt_use exceptions || echo -exceptions)
-
-		# build STL support
-		-stl
-
-		# architecture/platform (mkspec)
-		-arch ${arch}
-		-platform $(qt4_get_mkspec)
-
-		# instruction set support
-		$(is-flagq -mno-mmx	&& echo -no-mmx)
-		$(is-flagq -mno-3dnow	&& echo -no-3dnow)
-		$(is-flagq -mno-sse	&& echo -no-sse)
-		$(is-flagq -mno-sse2	&& echo -no-sse2)
-		$(is-flagq -mno-sse3	&& echo -no-sse3)
-		$(is-flagq -mno-ssse3	&& echo -no-ssse3)
-		$(is-flagq -mno-sse4.1	&& echo -no-sse4.1)
-		$(is-flagq -mno-sse4.2	&& echo -no-sse4.2)
-		$(is-flagq -mno-avx	&& echo -no-avx)
-		$(is-flagq -mfpu=*	&& ! is-flagq -mfpu=*neon* && echo -no-neon)
-
-		# bug 367045
-		$([[ ${CHOST} == *86*-apple-darwin* ]] && echo -no-ssse3)
-
-		# prefer system libraries
-		-system-zlib
-
-		# exclude examples and demos from default build
-		-nomake examples
-		-nomake demos
-
-		# disable rpath on non-prefix (bugs 380415 and 417169)
-		$(usex prefix '' -no-rpath)
-
-		# print verbose information about each configure test
-		-verbose
-
-		# precompiled headers don't work on hardened, where the flag is masked
-		$(in_iuse pch && qt_use pch || echo -no-pch)
-
-		# enable linker optimizations to reduce relocations, except on Solaris
-		# where this flag seems to introduce major breakage to applications,
-		# mostly to be seen as a core dump with the message:
-		# "QPixmap: Must construct a QApplication before a QPaintDevice"
-		$([[ ${CHOST} != *-solaris* ]] && echo -reduce-relocations)
-	)
-
-	if use_if_iuse aqua; then
-		if [[ ${CHOST##*-darwin} -ge 9 ]]; then
-			conf+=(
-				# on (snow) leopard use the new (frameworked) cocoa code
-				-cocoa -framework
-				# add hint for the framework location
-				-F"${QT4_LIBDIR}"
-			)
-		else
-			conf+=(-no-framework)
-		fi
-	fi
-
-	conf+=(
-		# module-specific options
-		"${myconf[@]}"
-	)
-
-	einfo "Configuring with: ${conf[@]}"
-	"${S}"/configure "${conf[@]}" || die "configure failed"
-
-	# configure is stupid and assigns QMAKE_LFLAGS twice,
-	# thus the previous -rpath-link flag gets overwritten
-	# and some packages (e.g. qthelp) fail to link
-	sed -i -e '/^QMAKE_LFLAGS =/ s:$: $$QMAKE_LFLAGS:' \
-		.qmake.cache || die "sed .qmake.cache failed"
-
-	qt4_qmake
-	qt4_foreach_target_subdir qt4_qmake
-}
-
-qt4_multilib_src_compile() {
-	qt4_prepare_env
-
-	qt4_foreach_target_subdir emake
-}
-
-qt4_multilib_src_test() {
-	qt4_prepare_env
-
-	qt4_foreach_target_subdir emake -j1 check
-}
-
-qt4_multilib_src_install() {
-	qt4_prepare_env
-
-	qt4_foreach_target_subdir emake INSTALL_ROOT="${D}" install
-
-	if [[ ${PN} == qtcore ]]; then
-		set -- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
-		einfo "Running $*"
-		"$@"
-
-		# install env.d file
-		cat > "${T}/44qt4-${CHOST}" <<-_EOF_
-			LDPATH="${QT4_LIBDIR}"
-		_EOF_
-		doenvd "${T}/44qt4-${CHOST}"
-
-		# install qtchooser configuration file
-		cat > "${T}/qt4-${CHOST}.conf" <<-_EOF_
-			${QT4_BINDIR}
-			${QT4_LIBDIR}
-		_EOF_
-
-		(
-			insinto /etc/xdg/qtchooser
-			doins "${T}/qt4-${CHOST}.conf"
-		)
-
-		if multilib_is_native_abi; then
-			# convenience symlinks
-			dosym qt4-"${CHOST}".conf /etc/xdg/qtchooser/4.conf
-			dosym qt4-"${CHOST}".conf /etc/xdg/qtchooser/qt4.conf
-		fi
-	fi
-
-	# move pkgconfig directory to the correct location
-	if [[ -d ${D}${QT4_LIBDIR}/pkgconfig ]]; then
-		mv "${D}${QT4_LIBDIR}"/pkgconfig "${ED}usr/$(get_libdir)" || die
-	fi
-
-	qt4_install_module_qconfigs
-	qt4_symlink_framework_headers
-}
-
-qt4_multilib_src_install_all() {
-	if [[ ${PN} == qtcore ]]; then
-		# include gentoo-qconfig.h at the beginning of Qt{,Core}/qconfig.h
-		if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
-			sed -i -e '1i #include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
-				"${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
-				|| die "sed failed (qconfig.h)"
-			dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo \
-				"${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
-		else
-			sed -i -e '1i #include <Gentoo/gentoo-qconfig.h>\n' \
-				"${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \
-				|| die "sed failed (qconfig.h)"
-		fi
-
-		dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
-		mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
-	fi
-
-	# install private headers of a few modules
-	if has ${PN} qtcore qtdeclarative qtgui qtscript; then
-		local moduledir=${PN#qt}
-		local modulename=Qt$(tr 'a-z' 'A-Z' <<< ${moduledir:0:1})${moduledir:1}
-		[[ ${moduledir} == core ]] && moduledir=corelib
-
-		einfo "Installing private headers into ${QT4_HEADERDIR}/${modulename}/private"
-		insinto "${QT4_HEADERDIR#${EPREFIX}}"/${modulename}/private
-		find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins '{}' + || die
-	fi
-
-	prune_libtool_files
-}
-
-# @FUNCTION: qt4-build-multilib_pkg_postinst
-# @DESCRIPTION:
-# Regenerate configuration after installation or upgrade/downgrade.
-qt4-build-multilib_pkg_postinst() {
-	qt4_regenerate_global_qconfigs
-}
-
-# @FUNCTION: qt4-build-multilib_pkg_postrm
-# @DESCRIPTION:
-# Regenerate configuration when a module is completely removed.
-qt4-build-multilib_pkg_postrm() {
-	qt4_regenerate_global_qconfigs
-}
-
-
-######  Public helpers  ######
-
-# @FUNCTION: qt_use
-# @USAGE: <flag> [feature] [enableval]
-# @DESCRIPTION:
-# <flag> is the name of a flag in IUSE.
-#
-# Outputs "-${enableval}-${feature}" if <flag> is enabled, "-no-${feature}"
-# otherwise. If [feature] is not specified, <flag> is used in its place.
-# If [enableval] is not specified, the "-${enableval}" prefix is omitted.
-qt_use() {
-	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
-
-	usex "$1" "${3:+-$3}-${2:-$1}" "-no-${2:-$1}"
-}
-
-# @FUNCTION: qt_native_use
-# @USAGE: <flag> [feature] [enableval]
-# @DESCRIPTION:
-# <flag> is the name of a flag in IUSE.
-#
-# Outputs "-${enableval}-${feature}" if <flag> is enabled and we are currently
-# building for the native ABI, "-no-${feature}" otherwise. If [feature] is not
-# specified, <flag> is used in its place. If [enableval] is not specified,
-# the "-${enableval}" prefix is omitted.
-qt_native_use() {
-	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
-
-	multilib_is_native_abi && qt_use "$@" || echo "-no-${2:-$1}"
-}
-
-
-######  Internal functions  ######
-
-# @FUNCTION: qt4_prepare_env
-# @INTERNAL
-# @DESCRIPTION:
-# Prepares the environment for building Qt.
-qt4_prepare_env() {
-	# setup installation directories
-	# note: keep paths in sync with qmake-utils.eclass
-	QT4_PREFIX=${EPREFIX}/usr
-	QT4_HEADERDIR=${QT4_PREFIX}/include/qt4
-	QT4_LIBDIR=${QT4_PREFIX}/$(get_libdir)/qt4
-	QT4_BINDIR=${QT4_LIBDIR}/bin
-	QT4_PLUGINDIR=${QT4_LIBDIR}/plugins
-	QT4_IMPORTDIR=${QT4_LIBDIR}/imports
-	QT4_DATADIR=${QT4_PREFIX}/share/qt4
-	QT4_DOCDIR=${QT4_PREFIX}/share/doc/qt-${PV}
-	QT4_TRANSLATIONDIR=${QT4_DATADIR}/translations
-	QT4_EXAMPLESDIR=${QT4_DATADIR}/examples
-	QT4_DEMOSDIR=${QT4_DATADIR}/demos
-	QT4_SYSCONFDIR=${EPREFIX}/etc/qt4
-
-	# are these still needed?
-	QMAKE_LIBDIR_QT=${QT4_LIBDIR}
-	export XDG_CONFIG_HOME="${T}"
-
-	# can confuse qmake if set (bug 583352)
-	unset QMAKESPEC
-}
-
-# @FUNCTION: qt4_foreach_target_subdir
-# @INTERNAL
-# @DESCRIPTION:
-# Executes the given command inside each directory listed in QT4_TARGET_DIRECTORIES.
-qt4_foreach_target_subdir() {
-	local ret=0 subdir=
-	for subdir in ${QT4_TARGET_DIRECTORIES}; do
-		mkdir -p "${subdir}" || die
-		pushd "${subdir}" >/dev/null || die
-
-		einfo "Running $* ${subdir:+in ${subdir}}"
-		"$@"
-		((ret+=$?))
-
-		popd >/dev/null || die
-	done
-
-	return ${ret}
-}
-
-# @FUNCTION: qt4_symlink_tools_to_build_dir
-# @INTERNAL
-# @DESCRIPTION:
-# Symlinks qtcore tools to BUILD_DIR,
-# so that they can be used when building other modules.
-qt4_symlink_tools_to_build_dir() {
-	local tool= tools=()
-	if [[ ${PN} != qtcore ]]; then
-		tools+=(qmake moc rcc uic)
-	fi
-
-	mkdir -p "${BUILD_DIR}"/bin || die
-	pushd "${BUILD_DIR}"/bin >/dev/null || die
-
-	for tool in "${tools[@]}"; do
-		[[ -e ${QT4_BINDIR}/${tool} ]] || continue
-		ln -s "${QT4_BINDIR}/${tool}" . || die "failed to symlink ${tool}"
-	done
-
-	popd >/dev/null || die
-}
-
-# @FUNCTION: qt4_qmake
-# @INTERNAL
-# @DESCRIPTION:
-# Helper function that runs qmake in the current target subdir.
-# Intended to be called by qt4_foreach_target_subdir().
-qt4_qmake() {
-	local projectdir=${PWD/#${BUILD_DIR}/${S}}
-
-	"${BUILD_DIR}"/bin/qmake \
-		"${projectdir}" \
-		CONFIG+=nostrip \
-		LIBS+=-L"${QT4_LIBDIR}" \
-		"${myqmakeargs[@]}" \
-		|| die "qmake failed (${projectdir#${S}/})"
-}
-
-# @FUNCTION: qt4_install_module_qconfigs
-# @INTERNAL
-# @DESCRIPTION:
-# Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} files.
-qt4_install_module_qconfigs() {
-	local x
-	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
-		for x in QCONFIG_ADD QCONFIG_REMOVE; do
-			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${BUILD_DIR}"/${PN}-qconfig.pri
-		done
-		insinto ${QT4_DATADIR#${EPREFIX}}/mkspecs/gentoo
-		doins "${BUILD_DIR}"/${PN}-qconfig.pri
-	fi
-
-	if [[ -n ${QCONFIG_DEFINE} ]]; then
-		for x in ${QCONFIG_DEFINE}; do
-			echo "#define ${x}" >> "${BUILD_DIR}"/gentoo-${PN}-qconfig.h
-		done
-		insinto ${QT4_HEADERDIR#${EPREFIX}}/Gentoo
-		doins "${BUILD_DIR}"/gentoo-${PN}-qconfig.h
-	fi
-}
-
-# @FUNCTION: qt4_regenerate_global_qconfigs
-# @INTERNAL
-# @DESCRIPTION:
-# Generates Gentoo-specific qconfig.{h,pri} according to the build configuration.
-# Don't call die here because dying in pkg_post{inst,rm} only makes things worse.
-qt4_regenerate_global_qconfigs() {
-	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${PN} == qtcore ]]; then
-		local x qconfig_add qconfig_remove qconfig_new
-		for x in "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
-			[[ -f ${x} ]] || continue
-			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
-			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
-		done
-
-		if [[ -e "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
-			# start with the qconfig.pri that qtcore installed
-			if ! cp "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/qconfig.pri \
-				"${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri; then
-				eerror "cp qconfig failed."
-				return 1
-			fi
-
-			# generate list of QT_CONFIG entries from the existing list
-			# including qconfig_add and excluding qconfig_remove
-			for x in $(sed -n 's/^QT_CONFIG +=//p' \
-				"${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
-					has ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
-			done
-
-			# replace the existing QT_CONFIG list with qconfig_new
-			if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
-				"${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri; then
-				eerror "Sed for QT_CONFIG failed"
-				return 1
-			fi
-
-			# create Gentoo/qconfig.h
-			if [[ ! -e ${ROOT}${QT4_HEADERDIR}/Gentoo ]]; then
-				if ! mkdir -p "${ROOT}${QT4_HEADERDIR}"/Gentoo; then
-					eerror "mkdir ${QT4_HEADERDIR}/Gentoo failed"
-					return 1
-				fi
-			fi
-			: > "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-qconfig.h
-			for x in "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-*-qconfig.h; do
-				[[ -f ${x} ]] || continue
-				cat "${x}" >> "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-qconfig.h
-			done
-		else
-			rm -f "${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri
-			rm -f "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-qconfig.h
-			rmdir "${ROOT}${QT4_DATADIR}"/mkspecs \
-				"${ROOT}${QT4_DATADIR}" \
-				"${ROOT}${QT4_HEADERDIR}"/Gentoo \
-				"${ROOT}${QT4_HEADERDIR}" 2>/dev/null
-		fi
-	fi
-}
-
-# @FUNCTION: qt4_symlink_framework_headers
-# @DESCRIPTION:
-# On OS X we need to add some symlinks when frameworks are being
-# used, to avoid complications with some more or less stupid packages.
-qt4_symlink_framework_headers() {
-	if use_if_iuse aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-		local frw dest f h rdir
-		# Some packages tend to include <Qt/...>
-		dodir "${QT4_HEADERDIR#${EPREFIX}}"/Qt
-
-		# Fake normal headers when frameworks are installed... eases life later
-		# on, make sure we use relative links though, as some ebuilds assume
-		# these dirs exist in src_install to add additional files
-		f=${QT4_HEADERDIR}
-		h=${QT4_LIBDIR}
-		while [[ -n ${f} && ${f%%/*} == ${h%%/*} ]] ; do
-			f=${f#*/}
-			h=${h#*/}
-		done
-		rdir=${h}
-		f="../"
-		while [[ ${h} == */* ]] ; do
-			f="${f}../"
-			h=${h#*/}
-		done
-		rdir="${f}${rdir}"
-
-		for frw in "${D}${QT4_LIBDIR}"/*.framework; do
-			[[ -e "${frw}"/Headers ]] || continue
-			f=$(basename ${frw})
-			dest="${QT4_HEADERDIR#${EPREFIX}}"/${f%.framework}
-			dosym "${rdir}"/${f}/Headers "${dest}"
-
-			# Link normal headers as well.
-			for hdr in "${D}${QT4_LIBDIR}/${f}"/Headers/*; do
-				h=$(basename ${hdr})
-				dosym "../${rdir}"/${f}/Headers/${h} \
-					"${QT4_HEADERDIR#${EPREFIX}}"/Qt/${h}
-			done
-		done
-	fi
-}
-
-# @FUNCTION: qt4_get_mkspec
-# @INTERNAL
-# @DESCRIPTION:
-# Returns the right mkspec for the current CHOST/CXX combination.
-qt4_get_mkspec() {
-	local spec=
-
-	case ${CHOST} in
-		*-linux*)
-			spec=linux ;;
-		*-darwin*)
-			use_if_iuse aqua &&
-				spec=macx ||   # mac with carbon/cocoa
-				spec=darwin ;; # darwin/mac with X11
-		*-freebsd*|*-dragonfly*)
-			spec=freebsd ;;
-		*-netbsd*)
-			spec=netbsd ;;
-		*-openbsd*)
-			spec=openbsd ;;
-		*-aix*)
-			spec=aix ;;
-		hppa*-hpux*)
-			spec=hpux ;;
-		ia64*-hpux*)
-			spec=hpuxi ;;
-		*-solaris*)
-			spec=solaris ;;
-		*)
-			die "qt4-build-multilib.eclass: unsupported CHOST '${CHOST}'" ;;
-	esac
-
-	case $(tc-getCXX) in
-		*g++*)
-			spec+=-g++ ;;
-		*clang*)
-			if [[ -d ${S}/mkspecs/unsupported/${spec}-clang ]]; then
-				spec=unsupported/${spec}-clang
-			else
-				ewarn "${spec}-clang mkspec does not exist, falling back to ${spec}-g++"
-				spec+=-g++
-			fi ;;
-		*icpc*)
-			if [[ -d ${S}/mkspecs/${spec}-icc ]]; then
-				spec+=-icc
-			else
-				ewarn "${spec}-icc mkspec does not exist, falling back to ${spec}-g++"
-				spec+=-g++
-			fi ;;
-		*)
-			die "qt4-build-multilib.eclass: unsupported compiler '$(tc-getCXX)'" ;;
-	esac
-
-	# Add -64 for 64-bit prefix profiles
-	if use amd64-linux || use ppc64-linux ||
-		use x64-macos ||
-		use sparc64-solaris || use x64-solaris
-	then
-		[[ -d ${S}/mkspecs/${spec}-64 ]] && spec+=-64
-	fi
-
-	echo ${spec}
-}
diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
deleted file mode 100644
index 34309373d13e..000000000000
--- a/eclass/qt4-r2.eclass
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# @ECLASS: qt4-r2.eclass
-# @MAINTAINER:
-# qt@gentoo.org
-# @BLURB: Eclass for Qt4-based packages, second edition.
-# @DESCRIPTION:
-# This eclass contains various functions that may be useful when
-# dealing with packages using Qt4 libraries. Supports only EAPIs
-# 2, 3, 4, and 5. Use qmake-utils.eclass in EAPI 6 and later.
-
-case ${EAPI} in
-	2|3|4|5) : ;;
-	6) die "qt4-r2.eclass is banned in EAPI 6 and later" ;;
-	*) die "qt4-r2.eclass: unsupported EAPI=${EAPI:-0}" ;;
-esac
-
-inherit base eutils qmake-utils
-
-export XDG_CONFIG_HOME="${T}"
-
-# @ECLASS-VARIABLE: DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array containing documents passed to dodoc command.
-# Paths can be absolute or relative to ${S}.
-#
-# Example: DOCS=( ChangeLog README "${WORKDIR}/doc_folder/" )
-
-# @ECLASS-VARIABLE: HTML_DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array containing documents passed to dohtml command.
-# Paths can be absolute or relative to ${S}.
-#
-# Example: HTML_DOCS=( "doc/document.html" "${WORKDIR}/html_folder/" )
-
-# @ECLASS-VARIABLE: LANGS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# In case your Qt4 application provides various translations, use this variable
-# to specify them in order to populate "linguas_*" IUSE automatically. Make sure
-# that you set this variable before inheriting qt4-r2 eclass.
-#
-# Example: LANGS="de el it ja"
-for x in ${LANGS}; do
-	IUSE+=" linguas_${x}"
-done
-
-# @ECLASS-VARIABLE: LANGSLONG
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Same as LANGS, but this variable is for LINGUAS that must be in long format.
-# Remember to set this variable before inheriting qt4-r2 eclass.
-# Look at ${PORTDIR}/profiles/desc/linguas.desc for details.
-#
-# Example: LANGSLONG="en_GB ru_RU"
-for x in ${LANGSLONG}; do
-	IUSE+=" linguas_${x%_*}"
-done
-unset x
-
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array variable containing all the patches to be applied. This variable
-# is expected to be defined in the global scope of ebuilds. Make sure to
-# specify the full path. This variable is used in src_prepare phase.
-#
-# Example:
-# @CODE
-# PATCHES=(
-# 	"${FILESDIR}/mypatch.patch"
-# 	"${FILESDIR}/mypatch2.patch"
-# )
-# @CODE
-
-# @FUNCTION: qt4-r2_src_unpack
-# @DESCRIPTION:
-# Default src_unpack function for packages that depend on qt4. If you have to
-# override src_unpack in your ebuild (probably you don't need to), call
-# qt4-r2_src_unpack in it.
-qt4-r2_src_unpack() {
-	debug-print-function $FUNCNAME "$@"
-
-	base_src_unpack "$@"
-}
-
-# @FUNCTION: qt4-r2_src_prepare
-# @DESCRIPTION:
-# Default src_prepare function for packages that depend on qt4. If you have to
-# override src_prepare in your ebuild, you should call qt4-r2_src_prepare in it,
-# otherwise autopatcher will not work!
-qt4-r2_src_prepare() {
-	debug-print-function $FUNCNAME "$@"
-
-	base_src_prepare "$@"
-}
-
-# @FUNCTION: qt4-r2_src_configure
-# @DESCRIPTION:
-# Default src_configure function for packages that depend on qt4. If you have to
-# override src_configure in your ebuild, call qt4-r2_src_configure in it.
-qt4-r2_src_configure() {
-	debug-print-function $FUNCNAME "$@"
-
-	local project_file=$(qmake-utils_find_pro_file)
-
-	if [[ -n ${project_file} ]]; then
-		eqmake4 "${project_file}"
-	else
-		base_src_configure "$@"
-	fi
-}
-
-# @FUNCTION: qt4-r2_src_compile
-# @DESCRIPTION:
-# Default src_compile function for packages that depend on qt4. If you have to
-# override src_compile in your ebuild (probably you don't need to), call
-# qt4-r2_src_compile in it.
-qt4-r2_src_compile() {
-	debug-print-function $FUNCNAME "$@"
-
-	base_src_compile "$@"
-}
-
-# @FUNCTION: qt4-r2_src_install
-# @DESCRIPTION:
-# Default src_install function for qt4-based packages. Installs compiled code,
-# and documentation (via DOCS and HTML_DOCS variables).
-qt4-r2_src_install() {
-	debug-print-function $FUNCNAME "$@"
-
-	base_src_install INSTALL_ROOT="${D}" "$@"
-	einstalldocs
-}
-
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
diff --git a/eclass/udev.eclass b/eclass/udev.eclass
index b7c6461dd8ff..63120c14cda6 100644
--- a/eclass/udev.eclass
+++ b/eclass/udev.eclass
@@ -46,7 +46,8 @@ DEPEND="virtual/pkgconfig"
 # Get unprefixed udevdir.
 _udev_get_udevdir() {
 	if $($(tc-getPKG_CONFIG) --exists udev); then
-		echo "$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+		local udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+		echo "${udevdir#${EPREFIX%/}}"
 	else
 		echo /lib/udev
 	fi
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 73dac64eb818..5656548cbf67 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 19ca4a0b2b8f..cf7410235d82 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -8,6 +8,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20180702-6937.tar.xz 14703496 BLAKE2B b1028551621bf12cbf8e6b0626cfb9634aa096d59a9dcc173cdb89614e68006d56468e2507e8f44f9c7a81e3c2bb392b79ccdafda420d456e169f135f78e106b SHA512 f219c30c6b5892846cc1f2a025e192d868610607213671658a62bcc833a5e0d8f5a3841681475574451e9938a8b8f47410e5f7f34267b618d03a2f154539cfef
-EBUILD eduke32-20180702.6937.ebuild 6076 BLAKE2B e3e92d3a8fbca3591855495294ec06bedd7b545f8d618f3730e9544df02a7559229291915db32ed0ae236fdcd0c9eb058c3ee2ec6345daabfe7c469e20ab88e2 SHA512 ab65151e77139a4805a6a2292540e6c30c8eec695195bc28d2ff294ddac29fbbac42eacc00a35e61e4270aa25dbfe483b2c0448cb265421e1d5b1439d2c5e2d5
+DIST eduke32_src_20180802-6963.tar.xz 14704448 BLAKE2B f121667d424ffac60f3239f260b65faaaf3b11377ebffc60b14c08494451f03151ab46c4fcb984e1abe45e6fa3fd5d3df04c3c557e0679e25d41de87ee42f4f7 SHA512 5afc34889f41b2fe2469b787a799c66a6bbc20b15552c052f21017a30ed9ecefabd94222b8e5bbc4745ab736e69143ea4c0f3b031713c17f70215907d10c746b
+EBUILD eduke32-20180802.6963.ebuild 6076 BLAKE2B e3e92d3a8fbca3591855495294ec06bedd7b545f8d618f3730e9544df02a7559229291915db32ed0ae236fdcd0c9eb058c3ee2ec6345daabfe7c469e20ab88e2 SHA512 ab65151e77139a4805a6a2292540e6c30c8eec695195bc28d2ff294ddac29fbbac42eacc00a35e61e4270aa25dbfe483b2c0448cb265421e1d5b1439d2c5e2d5
 MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a
diff --git a/games-fps/eduke32/eduke32-20180702.6937.ebuild b/games-fps/eduke32/eduke32-20180802.6963.ebuild
index c42e95c4417b..c42e95c4417b 100644
--- a/games-fps/eduke32/eduke32-20180702.6937.ebuild
+++ b/games-fps/eduke32/eduke32-20180802.6963.ebuild
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index ba8f268b31e0..7fd16a5b4d5e 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/five-or-more/Manifest b/games-puzzle/five-or-more/Manifest
index 16cc1ab8480b..963dfa696db7 100644
--- a/games-puzzle/five-or-more/Manifest
+++ b/games-puzzle/five-or-more/Manifest
@@ -1,3 +1,5 @@
 DIST five-or-more-3.22.2.tar.xz 3297904 BLAKE2B d727f18946b9ce26351db1b98c9396b9b4d79db0c412ca48c8a08266f162c47639af1612a27bb2ba0b513719a88574126c54da856df35c9e80bb01fbbb763cf0 SHA512 a809e227f7ec59912915f4808676c25777a0264268a06dcc7524d121b943e32fc95cfb815f2153aa0960aa0cdd0b3fed054c15d9d0c12d89ed155f0352fcb6f3
+DIST five-or-more-3.28.0.tar.xz 1507188 BLAKE2B 992bc75847b7e51cb5b5a23c3d3aad89a6daee00546711cf1d273663d2ebf8c2801c7a42f2aae1154114715d56ab1395def074beb30944762e9c560311880377 SHA512 33bf396426401dde2b326af8e7d137c23679589568e78f8b7e0020c074169318ba7925ecbd23bc18a2cfe0abecfca05c3090b78f1f86801c84e6fa385ca23f8b
 EBUILD five-or-more-3.22.2.ebuild 605 BLAKE2B 18af18d9d82bcd7062e3868d16f916850bdf7f4eb3da62181d402ca433228286b9c1cb068f1ffe2f11d81b59d89525e18ef085c36c5f716f6d11449f46118cca SHA512 7c470d8de623350a26af84eee5c0bdc755d361defbec0a5b18187871ff8e037cee18b08b64b39c1bd2867cc903f25b55815484e82d77ab504f5bf6c2a6ec29ff
+EBUILD five-or-more-3.28.0.ebuild 607 BLAKE2B b0bc4f528ff0e6dd8e4c09572b18449ef728ed32a8c45d1f8ef8c704c78b956aa80689dfd4de030dc1b04a5674a4d0b819645df0a01a36c423972f29b76640cb SHA512 62f3ea2d90f695b0288f0ab4ac0f3eec9b9b98779b3d3a36ce317570c37f244ed3ea2f9aff4e4bad2ecc29ce0a4751ad7d48be36e046fb79e1bf11c34a33bd73
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/five-or-more/five-or-more-3.28.0.ebuild b/games-puzzle/five-or-more/five-or-more-3.28.0.ebuild
new file mode 100644
index 000000000000..c10bdf876e00
--- /dev/null
+++ b/games-puzzle/five-or-more/five-or-more-3.28.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Five or More Game for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=gnome-base/librsvg-2.32:2
+	>=x11-libs/gtk+-3.20:3
+"
+RDEPEND="${COMMON_DEPEND}
+	!<x11-themes/gnome-themes-standard-3.14
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 2414af966efd..a8c830d177f0 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index 518f357e2ab2..e4fb74575591 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1,5 +1,6 @@
+AUX README.gentoo 602 BLAKE2B 53d39bd63283a570b0de64481de26a4eb481b84f00619f34fceb7b2293c837ea6dc0aa057da45450c2157c65164d8b567d84df1abc96b570225c0bd756f4f601 SHA512 16100671cdb2885aec89f725d1061eb17090a7df2fdc4fb9717012f119c975e026d42a68fd721ec6fd6947af11fd2712af807eaa34a28a31e6d9ee980d93ff60
+AUX minecraft-server-r1.initd 1374 BLAKE2B ae0ed543d16978656f7307fdbaef0376b6b34baa256965095ae10d902c72ee0f468c1f27fb1ce4fc1847865944c5905a35acc29e4f5c81f327d98e1fb1c8b6a6 SHA512 ccbb743059394ef199412906d9b72384c5565efc9ab2280be14229d3d0b0bb0808c2ab9bc1ab8ebf798c4d2903a2f31db1b36cc409b42c80652b4782dfb5ec61
 AUX minecraft-server.confd 318 BLAKE2B c4ae9a7e68e0db71f9cf648aeab10030264a544927f697d005016662a402bd1d64ea02779eb6b645c16845cec6b22842cf08c51734d608f90eb0d45f6c786a67 SHA512 bad9df2874a862f28a2a34f70509c34086ab5d63e6bfda79905f4058a029141ada592dc435d9773b6aa6332447c875675d68e7152ddf18b55a6157b81ed82f95
-AUX minecraft-server.initd 1421 BLAKE2B a59a6ab1270fb8110ec0ede580a52373626ffa2c42a75f63dc7508fc07b6f4e05ee85d04777d3f1a04a23229632f4de088164121bc351d7a38ea076b7e463e28 SHA512 6ef9df7d33cebb60981fc4fb4cbf1c4d737f3d957902effd02f8a278a6d4cedddd38fd89ecec0ac3ff5e25f236fcf484715fe3583d0f8865a83a1ae673775aee
-DIST minecraft-server-1.12.2.jar 30222121 BLAKE2B 91733822789405dbec5d335fc67e47d3278138929280c4fdcf6053fb0824651474c8e2310c342862fc1aefdf74f55d0a21d78b3c34f32484ec8196b7c5921d72 SHA512 327196bfb833160ae6fb7d12b7d372d031bc0ffbac3455481c1635b01e00f0d5502d4698fbc4f8e7ee59cc3902d56c41261c45d1f1c8f3972e192631f504a0fc
-EBUILD minecraft-server-1.12.2.ebuild 1865 BLAKE2B 5392b409ac7db38a997d5c4218f1de34120215b9732bec6aad610029ac548ffae220d328c98319911d6d89b173daa5296e841499015a94e417fb6baa5e6f462a SHA512 686219de7fecbf02b4f2d4957d5dc048d05aefe4f7ef1aec303896e9184ff1f1c6e4177194436a06a701bd7858816a33855501ec74939d9765f5dad705e8bb5d
+DIST minecraft-server-1.13.jar 32649675 BLAKE2B c137e8009ea201fafe148277aa2d81f7683b99653f74f335659ec239a2cdb3b1271eea290bbda58967fd81075f76edf14622d64d4f25e92e92bb186348acea5d SHA512 726e9775163338660429886dbf940e9ad43d75fa315a8bb2936d23491e8c5717fbd365490b91ff74f876eb498a3674b88f41a526b06a64acbc33d8670b48c342
+EBUILD minecraft-server-1.13.ebuild 1265 BLAKE2B bcf25c76f33402ebbe2822068645ddb18ca590867d12ff36ce857f759bdd1502d3a8ed0478e00833544c348781b6a7013ce684d3beafdedfe107735c729fe82c SHA512 82d695f73fc3c8138da3d42a5a61eb7f457fa2a880d89dec505520a44244dc7dd628d884f4d689ca852af3779951e18cef12a0d6965d1cc27e9ac5a89c3d4455
 MISC metadata.xml 614 BLAKE2B 78e166781dd7310c6e8a148ba0bc1e36c8e6a21a64587d65b5239f43e7dda4b494b77b254b420e3c1317390debad03ec35847eadbf345aec3c0ba1a6d759f546 SHA512 0deb2afc6cfcfc57351b210f21506ffb5dca43e51aeda268a92781640d8940ce71024ed71a8de249b4ac135da92fd5e741bd8be5e5c00cf0d4b26100b838ac10
diff --git a/games-server/minecraft-server/files/README.gentoo b/games-server/minecraft-server/files/README.gentoo
new file mode 100644
index 000000000000..ae8c62a9cbf2
--- /dev/null
+++ b/games-server/minecraft-server/files/README.gentoo
@@ -0,0 +1,20 @@
+This package provides an init script and a conf file.
+You don't have to modify those files directly,
+but instead you can make a symlink of that init script
+and a copy of that conf file.
+You would do this for every server, you want to setup.
+
+For example, you wan't to setup an world called 'gentoo',
+you would do:
+
+cd /etc/init.d
+ln -s minecraft-server minecraft-server.gentoo
+
+cd /etc/conf.d
+cp minecraft-server minecraft-server.gentoo
+
+After that, make your settings in
+/etc/conf.d/minecraft-server.gentoo.
+
+If you don't make a symlink, but use the default scripts,
+your world will be called 'main'.
diff --git a/games-server/minecraft-server/files/minecraft-server-r1.initd b/games-server/minecraft-server/files/minecraft-server-r1.initd
new file mode 100644
index 000000000000..872885ecd643
--- /dev/null
+++ b/games-server/minecraft-server/files/minecraft-server-r1.initd
@@ -0,0 +1,47 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "minecraft-server" ]; then
+	instance="main"
+else
+	instance="${SVCNAME#minecraft-server.}"
+fi
+
+minecraft_command="/usr/bin/minecraft-server"
+minecraft_logs="/var/log/minecraft-server"
+minecraft_path="/var/lib/minecraft-server/${instance}"
+name="Minecraft Server (World: ${instance})"
+pidfile="/run/minecraft-server.${instance}.pid"
+screen_name="minecraft-server.${instance}"
+start_stop_daemon_args="--chdir ${minecraft_path} --env JAVA_OPTS=\"${MINECRAFT_OPTS}\""
+
+command="screen"
+command_args="-DmUS ${screen_name} ${minecraft_command}"
+command_background="true"
+command_group="minecraft"
+command_user="minecraft"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_path}"
+
+	checkpath -f -o "${command_user}:${command_group}" -q "${minecraft_path}"/eula.txt
+	echo "eula=true" > "${minecraft_path}"/eula.txt
+
+	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_logs}"/"${instance}"
+
+	if [ ! -L "${minecraft_path}"/logs ]; then
+		cd "${minecraft_path}" && ln -s ../../../log/minecraft-server/"${instance}" logs
+	fi
+
+	if [ -z ${MINECRAFT_OPTS} ]; then
+		eerror "You must define MINECRAFT_OPTS in /etc/conf.d/minecraft.${SVCNAME}!"
+		return 1
+	fi
+
+	return 0
+}
diff --git a/games-server/minecraft-server/files/minecraft-server.initd b/games-server/minecraft-server/files/minecraft-server.initd
deleted file mode 100644
index 630c88871d76..000000000000
--- a/games-server/minecraft-server/files/minecraft-server.initd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "minecraft-server" ]; then
-	instance="main"
-else
-	instance="${SVCNAME#minecraft-server.}"
-fi
-
-java="${JAVA_HOME-/usr}"/bin/java
-minecraft_jar="/usr/share/games/minecraft-server/minecraft-server.jar"
-minecraft_logs="/var/log/minecraft-server"
-minecraft_path="/var/lib/minecraft-server/${instance}"
-name="Minecraft Server (World: ${instance})"
-pidfile="/run/minecraft-server.${instance}.pid"
-screen_name="minecraft-server.${instance}"
-start_stop_daemon_args="--chdir ${minecraft_path}"
-
-command="screen"
-command_args="-DmUS ${screen_name} ${java} ${MINECRAFT_OPTS} -jar ${minecraft_jar}"
-command_background="true"
-command_group="minecraft"
-command_user="minecraft"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_path}"
-
-	checkpath -f -o "${command_user}:${command_group}" -q "${minecraft_path}"/eula.txt
-	echo "eula=true" > "${minecraft_path}"/eula.txt
-
-	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_logs}"/"${instance}"
-
-	if [ ! -L "${minecraft_path}"/logs ]; then
-		cd "$minecraft_path}" && ln -s ../../../log/minecraft-server/"${instance}" logs
-	fi
-
-	if [ -z ${MINECRAFT_OPTS} ]; then
-		eerror "You must define MINECRAFT_OPTS in /etc/conf.d/minecraft.${SVCNAME}!"
-		return 1
-	fi
-
-	return 0
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.12.2.ebuild b/games-server/minecraft-server/minecraft-server-1.12.2.ebuild
deleted file mode 100644
index 5b0f749a4556..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.12.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="The official server for the sandbox video game Minecraft"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://s3.amazonaws.com/Minecraft.Download/versions/${PV}/minecraft_server.${PV}.jar -> ${P}.jar"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-misc/screen
-	virtual/jre"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	enewgroup minecraft
-	enewuser minecraft -1 -1 /var/lib/minecraft-server minecraft
-}
-
-src_unpack() {
-	# Don't unpack that jar, just copy it to WORKDIR
-	cp "${DISTDIR}"/${A} "${WORKDIR}" || die
-}
-
-src_install() {
-	insinto /usr/share/games/minecraft-server
-	insopts -o minecraft -g minecraft
-	newins minecraft-server-${PV}.jar minecraft-server.jar
-
-	newinitd "${FILESDIR}"/minecraft-server.initd minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server
-
-	diropts -o minecraft -g minecraft
-	keepdir /var/lib/minecraft-server
-	keepdir /var/log/minecraft-server
-}
-
-pkg_postinst() {
-	elog "This package provides an init script and a conf file."
-	elog "You don't have to modify those files directly,"
-	elog "but instead you can make a symlink of that init script"
-	elog "and a copy of that conf file."
-	elog "You would do this for every server, you want to setup."
-	elog ""
-	elog "For example, you wan't to setup an world called 'gentoo',"
-	elog "you would do:"
-	elog ""
-	elog "cd /etc/init.d"
-	elog "ln -s minecraft-server minecraft-server.gentoo"
-	elog ""
-	elog "cd /etc/conf.d"
-	elog "cp minecraft-server minecraft-server.gentoo"
-	elog ""
-	elog "After that, make your settings in"
-	elog "/etc/conf.d/minecraft-server.gentoo."
-	elog ""
-	elog "If you don't make a symlink, but use the default scripts,"
-	elog "your world will be called 'main'"
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.13.ebuild b/games-server/minecraft-server/minecraft-server-1.13.ebuild
new file mode 100644
index 000000000000..2ef64c02f1a4
--- /dev/null
+++ b/games-server/minecraft-server/minecraft-server-1.13.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_PV="d0caafb8438ebd206f99930cfaecfa6c9a13dca0"
+
+inherit readme.gentoo-r1 java-pkg-2 user
+
+DESCRIPTION="The official server for the sandbox video game"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://launcher.mojang.com/mc/game/${PV}/server/${MY_PV}/server.jar -> ${P}.jar"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-misc/screen
+	>=virtual/jre-1.8"
+
+RESTRICT="bindist mirror strip"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	enewgroup minecraft
+	enewuser minecraft -1 -1 /var/lib/minecraft-server minecraft
+}
+
+src_unpack() {
+	# Don't unpack that jar, just copy it to WORKDIR
+	cp "${DISTDIR}"/${A} "${WORKDIR}" || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
+	java-pkg_dolauncher minecraft-server --jar minecraft-server.jar --java_args "\${JAVA_OPTS}"
+
+	newinitd "${FILESDIR}"/minecraft-server-r1.initd minecraft-server
+	newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server
+
+	diropts -o minecraft -g minecraft
+	keepdir /var/lib/minecraft-server
+	keepdir /var/log/minecraft-server
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index c120aff8efcf..18699b8c0bdd 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest
index 8ef0066a6143..f81c436a16bc 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1,3 +1,5 @@
 DIST dconf-editor-3.24.3.tar.xz 503520 BLAKE2B 57b0b0de36e2bb5cef33e0171e77f506f16f240d5ab4ab79d7689b7541ce445bce4d87753f312cf9353b2aa44d5cb2f7c734050a5f57ba2b7eae9894fb74d0e3 SHA512 10c98df210cd465e21601342963a19cd5a255abfaa6e96c833070db52d13531288237a129471bf9424d7ea8fef4c2cd4954652850bbb57dd161ce9cf99265361
+DIST dconf-editor-3.26.2.tar.xz 542828 BLAKE2B e7bd35b39d7b0124105513d44f3a24d005f1c6daf2dccb1d3eeb324b65038adfc11e5ee83078058489b1e918222538a97621c74fb0a0ceb20e1a708ccf5a82bd SHA512 25a6536c97b4f6fc26890915e2d0ed3ff1d2247175fd25a7d86e44f33da8667064415b22890c799d3586cd0f08becc90414f02bf3d988aa1d02eee90d7e45ba5
 EBUILD dconf-editor-3.24.3.ebuild 720 BLAKE2B e172d4b725df1313465113df6b9c3e2a3147c751b80546ed76bb5d895799ce6e6ed8d747cc268bb6cfb80977edf30f21587b169bee7e1fc53bb8b3fb5c584577 SHA512 8092ff30e165e70ce074f3cd5ca08b6a8bb5f1717bdc467ab498a8716c59c750a5c968e99e0b876cc1ae829636a30f15567e7cf9543f5d6fa67835f7b3aef1fb
+EBUILD dconf-editor-3.26.2.ebuild 722 BLAKE2B d85cf51fcae9353be0c90b0d3811479a4c15d6bfa0c3cf834534aa8549ded6a96312e4a69c45934d6eb3e615e29b19040e69a20ea9e18885265461e972517867 SHA512 eeefeb556f173d00e867ced46f675b40aed0c3b85a26c997b2bb56f04dc6d5cc0217e9e06bf359e2734bad16cc558aba35f60eab71c55b876f0f0e3f33f7f959
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf-editor/dconf-editor-3.26.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.26.2.ebuild
new file mode 100644
index 000000000000..919e9dfa03ec
--- /dev/null
+++ b/gnome-base/dconf-editor/dconf-editor-3.26.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="Graphical tool for editing the dconf configuration database"
+HOMEPAGE="https://git.gnome.org/browse/dconf-editor"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+
+COMMON_DEPEND="
+	dev-libs/appstream-glib
+	>=dev-libs/glib-2.46.0:2
+	>=gnome-base/dconf-0.25.1
+	>=x11-libs/gtk+-3.22.0:3
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/dconf-0.22[X]
+"
+
+src_configure() {
+	gnome2_src_configure \
+		VALAC="$(type -P true)"
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 47142fe3179f..be5917694e35 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/authenticator/Manifest b/gnome-extra/authenticator/Manifest
new file mode 100644
index 000000000000..3b5a8c7e2b53
--- /dev/null
+++ b/gnome-extra/authenticator/Manifest
@@ -0,0 +1,5 @@
+AUX disable-failing-tests.patch 784 BLAKE2B 67367ef35234046a2fdedd8d82c0c2037ecbe8005e9972d05c9654645225f42d23a4fbe0b819daa6fdf219d4852284fc068d24227a89bd4afc4c15e4792c2d8d SHA512 226bce7609fedf6cf9a3459d5945f0ca31004df595fd6717781dce142bd53f5c552821031b3de516964a97abc91efaadf902b943aa0a149ed3603ae26aa0355e
+DIST authenticator-0.2.1.tar.gz 147693 BLAKE2B b9f3a7fd5b3b7867120b9ed17b90cea4c07a271dc4d75a845ad539e15453a606d48e8637d44d12cecf9b91e5fb351d081c1add48c1a4a955444f39addd51b075 SHA512 aebf3ce147d5ccd404de6af52e130e9a85a3d5d86140d73026dac00219853652e7aa1e67db5838f9ac4d147021cd07b3ebfb86a1ab4b413ec3b98360097d1d6e
+EBUILD authenticator-0.2.1.ebuild 1135 BLAKE2B 2a6d45a38a6d6cfa038e43d55608435a4a42305ded96868a87c9e48afa22a60ced6dc8befc5af05e2bae7ecca4194f97400c46494c942c0c9abf271473cfc584 SHA512 b0c5aa1d701e714e754d396474d25b0bd98b4169020368ffc2aceb97abe208cebb169c0d431e843663ff77ee8964e3997846a35a926556fb120d6311cc8b6e58
+EBUILD authenticator-9999.ebuild 1135 BLAKE2B 2a6d45a38a6d6cfa038e43d55608435a4a42305ded96868a87c9e48afa22a60ced6dc8befc5af05e2bae7ecca4194f97400c46494c942c0c9abf271473cfc584 SHA512 b0c5aa1d701e714e754d396474d25b0bd98b4169020368ffc2aceb97abe208cebb169c0d431e843663ff77ee8964e3997846a35a926556fb120d6311cc8b6e58
+MISC metadata.xml 615 BLAKE2B 6e7f20b374a19cf14cfaa2df3ffcc4f98df79bcdb2c2bd128482dbb9a44d118295b8ac76dd668c4675aa900ac24fc0d38115967ff73cbaa4b4771e62ca0434ac SHA512 9e6e905369b669cf8e2d337db0ea84f600bd874ca24d3624fd3a37a08ac5d132ca0f9b12bb1c80105fdc46a8a15bc85d4af2bd0681b128109de92536d83bd2e7
diff --git a/gnome-extra/authenticator/authenticator-0.2.1.ebuild b/gnome-extra/authenticator/authenticator-0.2.1.ebuild
new file mode 100644
index 000000000000..880d0174f52e
--- /dev/null
+++ b/gnome-extra/authenticator/authenticator-0.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit gnome2-utils meson python-r1 virtualx xdg-utils
+
+DESCRIPTION="Two-factor authentication code generator for GNOME"
+HOMEPAGE="https://github.com/bilelmoussaoui/Authenticator"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="https://github.com/bilelmoussaoui/Authenticator/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Authenticator-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND="
+	app-crypt/libsecret
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pyotp[${PYTHON_USEDEP}]
+	dev-python/pyzbar[${PYTHON_USEDEP}]
+	media-gfx/gnome-screenshot
+	x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/disable-failing-tests.patch" )
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+src_test() {
+	xdg_environment_reset
+	virtx meson_src_test
+}
diff --git a/gnome-extra/authenticator/authenticator-9999.ebuild b/gnome-extra/authenticator/authenticator-9999.ebuild
new file mode 100644
index 000000000000..880d0174f52e
--- /dev/null
+++ b/gnome-extra/authenticator/authenticator-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit gnome2-utils meson python-r1 virtualx xdg-utils
+
+DESCRIPTION="Two-factor authentication code generator for GNOME"
+HOMEPAGE="https://github.com/bilelmoussaoui/Authenticator"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="https://github.com/bilelmoussaoui/Authenticator/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Authenticator-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND="
+	app-crypt/libsecret
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pyotp[${PYTHON_USEDEP}]
+	dev-python/pyzbar[${PYTHON_USEDEP}]
+	media-gfx/gnome-screenshot
+	x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/disable-failing-tests.patch" )
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+src_test() {
+	xdg_environment_reset
+	virtx meson_src_test
+}
diff --git a/gnome-extra/authenticator/files/disable-failing-tests.patch b/gnome-extra/authenticator/files/disable-failing-tests.patch
new file mode 100644
index 000000000000..0c17070d9106
--- /dev/null
+++ b/gnome-extra/authenticator/files/disable-failing-tests.patch
@@ -0,0 +1,24 @@
+diff --git a/data/meson.build b/data/meson.build
+index d21a6d1..b2a849b 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -50,10 +50,12 @@ endif
+ 
+ appstreamcli = find_program(['appstreamcli', 'appstream-util'], required:false)
+ 
+-if appstreamcli.found()
+-  test (
+-    'Validate appdata file',
+-    appstreamcli,
+-    args: ['validate', join_paths(meson.current_build_dir (), meson.project_name() + '.appdata.xml')]
+-  )
+-endif
++# This test fails because screenshot images do not comply with restrictions.
++# See https://github.com/bilelmoussaoui/Authenticator/issues/67
++#if appstreamcli.found()
++#  test (
++#    'Validate appdata file',
++#    appstreamcli,
++#    args: ['validate', join_paths(meson.current_build_dir (), meson.project_name() + '.appdata.xml')]
++#  )
++#endif
diff --git a/gnome-extra/authenticator/metadata.xml b/gnome-extra/authenticator/metadata.xml
new file mode 100644
index 000000000000..3950af1a3351
--- /dev/null
+++ b/gnome-extra/authenticator/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>oleksandr.trotsenko@gmail.com</email>
+		<name>Oleksandr Trotsenko</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bilelmoussaoui/Authenticator</remote-id>
+		<maintainer>
+			<name>Bilal Elmoussaoui</name>
+		</maintainer>
+		<bugs-to>https://github.com/bilelmoussaoui/Authenticator/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index d22a5ba141e7..26b231c58e4b 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index e6ba4efeb519..b2ccb6eaf2ac 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-calendar-17.12.3.tar.xz 284008 BLAKE2B e88d748d5640fd5906b3f4d843d50da59841f9e3dd6f15ce19e9bca32112597300d85e257ba77ca47b6c4a556a14fd2177c6ea7ef3e8cacc0ae6b9b8d8af9791 SHA512 456f67e88961c1187d5a347f2651665848468b3179dce91bcdef2dbbcca7fdb7d760bdf25f8dd8de9b41ea2794a069385c1cfbac407b6e187b0c6f3e460638d4
 DIST akonadi-calendar-18.04.3.tar.xz 335956 BLAKE2B bc7e59e3065b7e7550aa88d0e0210861cb599a393bfedbc7121a4db93e8c7e1585f82d6542f9b21bbaf61021fc696bd045ddf834efa746db936e93ee36f9a0c1 SHA512 f062222a7accf95611296830ffbc0cb1a6ac1fa48e5eddbb9bcb6b9d8a5969e393308da25ac9a636cc79baf454ee75670713720fce1c5c270d7c1c3ca3e3f26e
-EBUILD akonadi-calendar-17.12.3.ebuild 1119 BLAKE2B a425c6af9addb555435ba7cf30701ef49f06d8bd3612d227e0965215149833a96f7b8d6078b573d373793f0ca393ef379dd0626abe9383d1fcaa5e6530d46c44 SHA512 e4fd44158d5fac5b7e6d3a9642c2a65bcafeb3f23303277aeb054bfe44680b662138a3fc8ea44f111cfba4f7c30b137b23a8f8784239c9f2165401fda45b08e0
 EBUILD akonadi-calendar-18.04.3.ebuild 1155 BLAKE2B fbd50b9902607eabe6fa5984436aefa4ba2ce15af282718ed1ddb526bf204c2d54c777bd7976aeaf746b8eb399b18b6041212b20a0a3fd2541ed1e4cf77827f9 SHA512 1e419fc8296447fac68f95291156d6e7d12247c6f67d4b1cd8907763b05cda30ad3599ad337a6db3c5d34424fb46994ffa6d1fb93e8b6246c649044c887428f8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-17.12.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-17.12.3.ebuild
deleted file mode 100644
index 75d80032fe7b..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-17.12.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi calendar integration"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(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 kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index d8ae2e780791..4932f3a97b6a 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-contacts-17.12.3.tar.xz 345296 BLAKE2B 2f249c14dd8ea549eb1a8aa8c5508dfb9ba43f4521e979b3ff9a76d50a5337a7df6a7d4ef18cfe821659c45bd7f7c691ef301c32dadca93c9cfcf06eca9b85e1 SHA512 37e621015ebbc80d765e4668cd720901b815c55b84f78ff39c163ec90dafdd50ef46567c6091afa02d434d339d4b172e5332d8954a134a50215a12bb099822bb
 DIST akonadi-contacts-18.04.3.tar.xz 392228 BLAKE2B e56204b67cc0918be38c543aee83cb1a239698d3a2e06e3ea1615456029210d8ac06481a0317158b07a0e801babbf68a5b539592ffb10a05779159656cc5e252 SHA512 3334bad8cf9ee9b79253260ec62cab527d8fe823131fdb212f1e2dcc120892715c24aaf0a5d977939a69d47e458034b405e8be4da27a12022b94488332ae7683
-EBUILD akonadi-contacts-17.12.3.ebuild 1058 BLAKE2B ddef52c6bf8a3ddbfee6a98071854aa8d75d78e7cb214e2a4db9fdd24fb91f236226418bd337bd3de8c4bd1efa12d147f23a2498124f72c62212775a60e01bac SHA512 49290735cea6df0b8b5c617db7486bc480fe7afe0953cc09d7bdca9c33008ba145c1be3991b925f7c05c08f6b4544692873711311cd3ffaef8fc02ee9612c75b
 EBUILD akonadi-contacts-18.04.3.ebuild 1061 BLAKE2B fc6d584e48427474a9434d3d85e0702c6b7f2a5fcc8165d7aa2d875325dfe8fc6615cd34c124e3eed38ccfd6887d1604c65996deea1eae6f7dfa58bb2c27656f SHA512 1d24643b16f55976c3e48c0d6becb2416b07235b3c9ee41ca0c20620d9cad590fea4c602280f4bbc5a93ae3b64d2c33fa040efa6fb88b95b309179d838f87377
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-17.12.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-17.12.3.ebuild
deleted file mode 100644
index 7bea16d9a0ea..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-17.12.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for akonadi contact integration"
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	$(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 kiconthemes)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 80d055e00d4a..272b2de7e749 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-import-wizard-17.12.3.tar.xz 436656 BLAKE2B 149488e7c5188df4edd78d9d3d58565b5eb629f25cb7a2e759ee8f6fb6e1112948cbc7e953778ca744616739b3ad86f4707c1680e87e1509c35aab64fb46f5e2 SHA512 3c3001803921c2860bf1c16c73db5cffadd5ae1b77f0577d1bd0eb05e19b4632657ea4524088698e770b9843cda69faee9071c8a4269de158d65ed730b8fa074
 DIST akonadi-import-wizard-18.04.3.tar.xz 436604 BLAKE2B e490232039c094272152b91e4158a70bc4a999de933ee6f76d85dfdea0eda9f7f011e394f050178b398ce1c5c47378cff0415b0f1ccc1a7b93fb03476161a545 SHA512 ca43762f84f2a8df30818ceec0225c105366a68e4d9c0407897c6d4974ff4e1ea40989a500d7c174f4ce94076766d78784dd11a6c60567998237b1477b9e0750
-EBUILD akonadi-import-wizard-17.12.3.ebuild 1092 BLAKE2B a3c04404c27a3c23943e62c613292d92c84b8b7d5dabd7f29e31000622d41f40cdd722413a48e295b75a656b289be45a8acc25fdf4c06c2a39fe179f379cd352 SHA512 850a96332b61d3054856ba2e35863d128a9ba3422fae734f405f273c7d309bdcabc780f6d201d3fc7824be9c6ecaf8c418e5632417229f7690f3f2d1afaed7f1
 EBUILD akonadi-import-wizard-18.04.3.ebuild 1092 BLAKE2B a3c04404c27a3c23943e62c613292d92c84b8b7d5dabd7f29e31000622d41f40cdd722413a48e295b75a656b289be45a8acc25fdf4c06c2a39fe179f379cd352 SHA512 850a96332b61d3054856ba2e35863d128a9ba3422fae734f405f273c7d309bdcabc780f6d201d3fc7824be9c6ecaf8c418e5632417229f7690f3f2d1afaed7f1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.12.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.12.3.ebuild
deleted file mode 100644
index 6945c5158840..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.12.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 9ea3c6c8c84b..9cb29c268e42 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-mime-17.12.3.tar.xz 129916 BLAKE2B d0aafdbb9b2ba2e39dd33a6e8f5e7638b840c4b7a67731ac87c1c33d986a240b38fe18e467c0987f54b8aea51b42c7078b3eda588a349cbc439031dfbc8b4cb1 SHA512 5f260b00ddb5949cb924e62b1781ef4d6d3b23fca310ef120440345f6095ab678a41672287b139c8e0ac7c3d5a7dc0aaa15cfe9d59ecf75b51b1c09de7d952b7
 DIST akonadi-mime-18.04.3.tar.xz 137320 BLAKE2B b25bbd2e20028924b3cbd1a0ca6196ca34c8edc224cb14b431b58f4a3091423398abcb290bad7206dd929120b6e792eb1d33ae1c1326e05999d220130e55fea6 SHA512 85160394bbf9e6d922148ae3adc9cec1d0204a826b05db3c291e81d076cb08a1c14aed1e7ef031da9e0bbf043524f4d314b7f5f23639717b41911cdc2f1c5de2
-EBUILD akonadi-mime-17.12.3.ebuild 854 BLAKE2B 5e2093113fd022f6defade297d54d8b290882949a864e607ec996acb69c3ab6d42aec8c5bc92c12f988d53b6c57387706ed4351770d41c0d299a65ef14a81e57 SHA512 f58ce0841389e462c36a82572177e19a14116f4a4d31b672e0bf7967aad2528492cc2b55096caddc6322e365ddd20a501736fde32368266afffe54a0884edbdd
 EBUILD akonadi-mime-18.04.3.ebuild 890 BLAKE2B 6773f862e5404c2d0b76be62be5fd19ba57999bc0ed8926431b4c4a13bb7848a4565041d83a87752aba4aaaae782113df4859d7f90072453f507894e3fe41c14 SHA512 fc86aa337a4295ea96734ace69c925bfd8a9f83bca3e62e4c4b6928d113dd88e22a13cd3cdce41f87907bf28ae03ab1bdaff46dbf04a0f242c7268a4d01e331f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-17.12.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-17.12.3.ebuild
deleted file mode 100644
index cacc06c7ce0c..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-17.12.3.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
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi mime types"
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2+ LGPL-2.1+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libxslt
-	x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepimlibs:4
-"
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index b6bfa9842cfa..e9078e4298ba 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-notes-17.12.3.tar.xz 24520 BLAKE2B c37debede8bcbf97a6f2bee6d7195ddda69f466034b6ba60299bf93485dee1826930a7d029ebc39df7e6317c9124db57a8b7d97a6713635f4fd266dbc1dcc93b SHA512 306fafd7ef59f541cc30b111f4ab83cc2d218c8949ed14805f8116388a328ec8d522194408afbf455d133ef8a40153c04b9dbf907e4b0e784458f9fe2aaaae62
 DIST akonadi-notes-18.04.3.tar.xz 24600 BLAKE2B 4a711c483814e1fc7a7f9931305f472854223e93b931437079c1c11b277d7ac0543827a7403b5bb7c2d10f79e635c5364d24e1a701e0465914b6eb00ebed878a SHA512 0aecf012ae8bc03ffc2ba5ba68893486d4ea91cc2d6efecccc3fc60b7f03a51596475285e0fa2e1b9b025b3b046cdca4f4d248e8aa00fb08c0176269ca067177
-EBUILD akonadi-notes-17.12.3.ebuild 565 BLAKE2B 2c4c204454e138dd32186a05beb3fabdc9e52ab2173c3624c7b3b0eedd6cffdb78b6474731a16ae204d542263086c47e31cfea34aff9343714f856b8b76fe6c8 SHA512 2d16befdb5691c46a816b6c0b659d83f3dee26c9f02704870eeed720a1cbf78012690af2172a4e4194cd0929e71679f074bc6ea7f913663fe83cec665ac3dd98
 EBUILD akonadi-notes-18.04.3.ebuild 565 BLAKE2B 2c4c204454e138dd32186a05beb3fabdc9e52ab2173c3624c7b3b0eedd6cffdb78b6474731a16ae204d542263086c47e31cfea34aff9343714f856b8b76fe6c8 SHA512 2d16befdb5691c46a816b6c0b659d83f3dee26c9f02704870eeed720a1cbf78012690af2172a4e4194cd0929e71679f074bc6ea7f913663fe83cec665ac3dd98
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-17.12.3.ebuild b/kde-apps/akonadi-notes/akonadi-notes-17.12.3.ebuild
deleted file mode 100644
index d5d264749f81..000000000000
--- a/kde-apps/akonadi-notes/akonadi-notes-17.12.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi notes integration"
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep akonadi)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index bb0effa36ea8..52954e72dbbd 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-search-17.12.3.tar.xz 81872 BLAKE2B bcbc5cd5d2cf37bb80c890164c45f0141d7d668c59ad099888831efb45781d15d8d34ffac2c18a9dde4fc697cf02dfe0493d01c60bc687b137dcd6cbdb11f6da SHA512 3c227f25784069bca95abe43657fa2964049dac840629f6ceeb8ea7378f4a8860b4dc2346a7cf1069d9cd0950ceaa65c1aad772199a4e15b27d099ca16c46689
 DIST akonadi-search-18.04.3.tar.xz 82440 BLAKE2B 9bd8fb4a8c0e319d8606741efcda247fa4b4bc3c647ecd5dfb2746739bb954e3e2ca68394464fb7c696722eaf5aceeae21e3c68c322c870a1b8af1fd1cc1dcc9 SHA512 5b353542f6e32b9a71ddecf36a358a7e261626e8f58e011d40cdde71afdc7c03abfed5e1b2c047eb7f01a57744b7d2be0af8cf53398f4fabb31413224cb2946e
-EBUILD akonadi-search-17.12.3.ebuild 1083 BLAKE2B 03df45067702dc1038267a895a4e54ea43da89761757bd719311f7056d6dde47f658774046e5527fc3f82b47a29fd13b3c124d519a3f1354dd4a5efe392c9bb1 SHA512 2f9ba09ab02ee26a096a82a0150cf82fd9c116969154e3b3727147822293087716b865f0dcdef4c850dadd27d2a4d8041468fbe1e0209d79591b6cc48b70fb4d
 EBUILD akonadi-search-18.04.3.ebuild 1073 BLAKE2B 61a3f53f239027c4635498c4c19bc31c70b8d977f01d99d809f82c8a9b349a6ec3bd29e38ed374b2e50cfe7bc77a7c3ef3174c833616a1573ce3e1161c028595 SHA512 2c199dacbba1ae04b6e37aaede09be77e777f2b5e572c961cf840badfe96a46739bb7cb4cb7117e9f770fa0e697978c2318ba1e047772a5bc0239feca1f3311b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-17.12.3.ebuild b/kde-apps/akonadi-search/akonadi-search-17.12.3.ebuild
deleted file mode 100644
index 868eae1fbb9b..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-17.12.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/xapian-1.3:=[chert]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 444aa4b7ac03..c9f5836439b3 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,6 +1,4 @@
 AUX akonadi-17.03.80-mysql56-crash.patch 2064 BLAKE2B a4107b5732d0147e3001484c7c4c5e3bba64909d21656686142cf9d58304d7496dea8d11b72836bbdeee09691d9c1e160445ecf94fc280cca3c35f45c078d969 SHA512 35e89ac8fa7640354a0a0f50abff06ec34075722e4e8f3b6297da7384a3deef62f7826c1a7a08aef72329ab0b6ef3b20b1bbec231674e20733fa15fd388195f7
-DIST akonadi-17.12.3.tar.xz 1521576 BLAKE2B d4809ccac14a18d922f04bf772892aaf7f43209b030880ec72d7ded662a1dd03bd768d71a30c1655a1634ad7b20f3c24c176d4da9a5beb1e9c543c256dbb4b97 SHA512 410b72dfa6eb3272bb8b959f7e0ba5951faef598e7c73696844bb6e33d4f5edb0bed4dc5ccea68111a7eef3c9f7a776acf8823c9a138b6af28d819ce8077595f
 DIST akonadi-18.04.3.tar.xz 1526416 BLAKE2B 094195355ee2906e85211bedbeb99eb4064b41a37c43d231ddec4e7295182d73fb5da6142fb123484108de0eddd79fb66c2439326cf0e1c0ea52be7a5c6d6173 SHA512 dc4111d2198c5ac8a11613c60e4cc330b1d337179c917354a059c3f843b218e5c465bb44ae924a9db712f985d0d044625a56634481faa474a0e92888d098e49c
-EBUILD akonadi-17.12.3.ebuild 2913 BLAKE2B 11de71f1612a4719b972280d9d5c790cba36f5e35ea84d7491518a69793df1d782b61ecc893b395c6b6ba510b2e32f78e361713b400d39784958fdeee8fc3253 SHA512 0dd8a2ba7c8452a00d4d349636b8ab42ade6da7c9fe9dfe0742301ce397a20aa811c6018a0a0c027f4b0a9c8583a616fbbcaf8d09f93fa4570b680cd92935699
 EBUILD akonadi-18.04.3.ebuild 2913 BLAKE2B 11de71f1612a4719b972280d9d5c790cba36f5e35ea84d7491518a69793df1d782b61ecc893b395c6b6ba510b2e32f78e361713b400d39784958fdeee8fc3253 SHA512 0dd8a2ba7c8452a00d4d349636b8ab42ade6da7c9fe9dfe0742301ce397a20aa811c6018a0a0c027f4b0a9c8583a616fbbcaf8d09f93fa4570b680cd92935699
 MISC metadata.xml 410 BLAKE2B 259694dd8c348fbd80f1ef1dd2b2c6e5aa876cfcd2d4b781dd51f3882b22f8899bea347c6c993be3912c5acc3d996bdf88b63f8455bb822490f3d33cc45ce8bd SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa
diff --git a/kde-apps/akonadi/akonadi-17.12.3.ebuild b/kde-apps/akonadi/akonadi-17.12.3.ebuild
deleted file mode 100644
index a520b3ccc387..000000000000
--- a/kde-apps/akonadi/akonadi-17.12.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
-
-KEYWORDS="amd64 ~arm x86"
-LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
-
-COMMON_DEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'mysql?,postgres?')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	x11-misc/shared-mime-info
-	sqlite? ( dev-db/sqlite:3 )
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kapptemplate-17.11.80
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepimlibs
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
-	# reverse driver check to keep the order
-	use sqlite && DRIVER="QSQLITE3"
-	use postgres && DRIVER="QPSQL"
-	use mysql && DRIVER="QMYSQL"
-
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
-		ewarn "or PostgreSQL in your user configuration."
-		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
-	fi
-
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DBUILD_TOOLS=$(usex tools)
-		$(cmake-utils_use_find_package xml LibXml2)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	kde5_src_install
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are:"
-	use mysql && elog "  QMYSQL"
-	use postgres && elog "  QPSQL"
-	use sqlite && elog "  QSQLITE3"
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-}
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 9620083808bd..02649a669779 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,3 @@
-DIST akonadiconsole-17.12.3.tar.xz 185432 BLAKE2B c4be134ccf31a42f9244d7ad0b717e4cd8e7c89d1208e70339f096b84c64fc22223de318fb4d3e843ed7bf2c0d61ceeed4e4dc10db964c581b537ef9d7f7d0b3 SHA512 f491a16fb93a23cbad1160d5bf63ffe07ee015097211e23464031060247b550399140626f016d2a5336ed783a55f8d803a7aea6c8f4cac9495fcde35b082765a
 DIST akonadiconsole-18.04.3.tar.xz 185792 BLAKE2B 7d9a5132a9ada0ff6dd8816e81b26aa21f72ec0a133d64f9d26dd4fe208bf2363477a9cf4c970ac714077c9cbfcbc46a4af6905b854cd5a7edc23d5353738848 SHA512 c413dfc858a6aa496e5533f1f46dc021c9c5e14582924dbc20a696da01035f2d237f30770a238cc33c4e91def9c1a18274e699185fb5bd6fae881c203687c2a4
-EBUILD akonadiconsole-17.12.3.ebuild 1257 BLAKE2B 6615ac6b229103c846bbd417d3f4e94ef06325e284b9776aab1c75a3f31a8cf0e9998b7e1b25b2e247f3770392eb91e296715ba7b87f8212217444aeee1d64c4 SHA512 810f571af94767290bcc5173c2c12f637374ded17cb99d08c13d9b2e4a0a890b21b761b36e278424128466cd469a4fc8f58f6e2080f59518a9e39a0b3e67d78d
 EBUILD akonadiconsole-18.04.3.ebuild 1224 BLAKE2B da2cafafc1888ded773ab02c76c2418da2afe7c641384d262aba2fc14b6b6f4eb66fca4db394602357ebe383c3c51563f9c6178aa359d20271938b3ba7e72ee0 SHA512 f44f391290590e69a8870be7403864f78b9613c261a5bac3073aaea8d5e921857ff8a70628c3105d34ad97b27f9bad40ff3d1481cc5a5b9f3395048259a962ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-17.12.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-17.12.3.ebuild
deleted file mode 100644
index 40490aaccd46..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-17.12.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-inherit kde5
-
-DESCRIPTION="Application for debugging Akonadi Resources"
-LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-HOMEPAGE="https://www.kde.org/"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-DEPEND="
-	$(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 kio)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	dev-libs/xapian:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index f01b6e4be06a..70b7b04dcd16 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,6 +1,4 @@
 AUX akregator-17.12.2-crashfix.patch 383 BLAKE2B c50546f9897bdccf1bddc00e51d6068282fa4eb04a9ea81f8ef8f566158a013c01ff3607504af2a6bcd1f026415fe8f6274b2268b608caf0a48c8d98b51833ea SHA512 df344cde73e4dd1813214bc3dcd4624661bdd53f2174d8dffb5fd222c10133d83f678f0cac68c84dea21dc09888a8f120cd23b3c6d1f34e320b5af51fa0e3dd1
-DIST akregator-17.12.3.tar.xz 2251784 BLAKE2B b5adb96501b6226817b6aa29a55f47f34d0dc85bacf68d4b971e9c2688a12c9f5ba24b274a5f154ceb2549a3558359cf97fbff176a2af9ac2abb4e6abdee5f89 SHA512 dc047fdedfba0f45b9822378352ae57e8b1ddef6712e669868be65f6820da46ec601483e1ff6b509b84fde236faea2a8fb4317bfd88cbd641e2d7af034a8452b
 DIST akregator-18.04.3.tar.xz 2251168 BLAKE2B 9c57a3e125e5bf191df4fc60b9eacb471942735f5f2890a74f8812a97bbaacdbbf537b070d58f73ca054dee6eb42a575168c3061717c0809e79316b74f80fc2d SHA512 d9f1385c1105be62a7c209510e66b8152ddf3928a55210bff82c679602ef630486f9b7cbbc36d4d28183b7f7667049a5b474d953af38aed0bbbe3c7b00732930
-EBUILD akregator-17.12.3.ebuild 1494 BLAKE2B f61953255f5a9da53b9f4f98f24ec9b9b8150f2248c00223c4edc332fb81b326583c686dc057b2badaa131c78adb04a89b511e7caa210484f1c6cb3596569dc0 SHA512 46e4bcb6178e734884715c85d4369dbfdfee7076a520a995c53d06ad89328b0315d12e81474b61dbcde6b1a7c0a163ef700f0593002999b710c9f1e80c21e3c7
 EBUILD akregator-18.04.3.ebuild 1494 BLAKE2B f61953255f5a9da53b9f4f98f24ec9b9b8150f2248c00223c4edc332fb81b326583c686dc057b2badaa131c78adb04a89b511e7caa210484f1c6cb3596569dc0 SHA512 46e4bcb6178e734884715c85d4369dbfdfee7076a520a995c53d06ad89328b0315d12e81474b61dbcde6b1a7c0a163ef700f0593002999b710c9f1e80c21e3c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-17.12.3.ebuild b/kde-apps/akregator/akregator-17.12.3.ebuild
deleted file mode 100644
index 85f0ff3093b8..000000000000
--- a/kde-apps/akregator/akregator-17.12.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://www.kde.org/applications/internet/akregator"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep syndication)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/grantlee:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-PATCHES=( "${FILESDIR}/${PN}-17.12.2-crashfix.patch" )
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index 51d11598e23e..e127ffb4687d 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,5 +1,3 @@
-DIST analitza-17.12.3.tar.xz 331052 BLAKE2B e250093623dd516051684473fdb03becaed6c3361bc478f633276a16cf5f75f6c6a8e2df5cb98b8a998e570f4619f2a0c32a59170fbad2563ac93e00e29991f7 SHA512 31d461e09736b4109b6d0af37e4ff1af075963566b0363b7801849bea83b411a53a8498d6c7b55778636e7bd22c120e46dd99dfa74d841532269044449f7621b
 DIST analitza-18.04.3.tar.xz 331744 BLAKE2B 41f2716cc8b4affb63ef38abccf51f46141588d27dd4a4980f185b02003489fa239ac659d5c030640796473e3adbd37f9579575684dc36ff8b3214fda0252bf7 SHA512 1eabdba287830723ad6d6c30299c6bebe902a5d0236c70c0435a9abb83442604010fdea064e91a023e7fc8a85e32c6ffc83dc9ae31d287cc71a828cd77dd83e9
-EBUILD analitza-17.12.3.ebuild 812 BLAKE2B 266c4304bbf2c641f6c7a920266a96c9b318de14cffefda537d363a1daaa14e841e994ecd0aee5f81a28a4b582cd0d11cf91dde00cf2332e7af5a747ed6d33a5 SHA512 d3605937b54067d575f07d1189730ca18d0df4f6d33d2f011ef691a6a48892ee3340da088e873bbd4c4b2f2dd5fab2eab9ed010ef4603aaca881259464cc3ac1
 EBUILD analitza-18.04.3.ebuild 812 BLAKE2B 266c4304bbf2c641f6c7a920266a96c9b318de14cffefda537d363a1daaa14e841e994ecd0aee5f81a28a4b582cd0d11cf91dde00cf2332e7af5a747ed6d33a5 SHA512 d3605937b54067d575f07d1189730ca18d0df4f6d33d2f011ef691a6a48892ee3340da088e873bbd4c4b2f2dd5fab2eab9ed010ef4603aaca881259464cc3ac1
 MISC metadata.xml 355 BLAKE2B 1a43036ef3857c12c1f687c3764b29723e20e3816fb4c123ee395f1fbea257233394bb02d9fe35ca9c0a2f3eb0dc78ffabb2c928b2d52f0fecfbdad78d00956e SHA512 cc71d58d08997c2baf094b7ff2dbe5af9cfb5da7fd4ea295315149154d9980d6841bf23b61e72fcd92ecba8533b56e2548aa66577a5fa841451fd1a65d2f84f7
diff --git a/kde-apps/analitza/analitza-17.12.3.ebuild b/kde-apps/analitza/analitza-17.12.3.ebuild
deleted file mode 100644
index a942068a8389..000000000000
--- a/kde-apps/analitza/analitza-17.12.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE library for mathematical features"
-KEYWORDS="amd64 x86"
-IUSE="eigen nls"
-
-RDEPEND="
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	eigen? ( dev-cpp/eigen:3 )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use test; then
-		sed -i \
-			-e "/add_subdirectory(examples)/ s/^/#DONT/" \
-			analitzaplot/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package eigen Eigen3)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 292498bb9d26..bf0dea72d7e6 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,3 @@
-DIST ark-17.12.3.tar.xz 1970120 BLAKE2B b8e14f6b5f541c514107cf76b612edd99d6e0d97dfbe7600349bdcf2bd5afbfd1fcaf256d0358ff0c8838d8334a14ddd1ac5d29ce9befebe960444e0828aba5e SHA512 2f32f0107afa20ef115caddaf3c7ce6be37a575c72ea440f571312309d945a0e0491a4327db379e8ca7622a2b5016c5b2bbbfb3377d3b4272430f85b23fbb911
 DIST ark-18.04.3.tar.xz 1973656 BLAKE2B afa413156233a31a1c7d102799b347b6879453a4c0a870511cb9040c9160c4da4eab30722ad9ec07ec1e9b68e942c137c464e0054738d8ee3632546b49c9dc93 SHA512 39348d3cbd3ed044ecc40a235c3e93dacb638e3ea867f814c722630786fbf7ea48643f967fb46f3358c64966a250306f11ab2a76c9147bc135ba826bcce9d33d
-EBUILD ark-17.12.3.ebuild 1942 BLAKE2B 33c6fa57d3e3fca99e18c2cef0c2505ff239ea66f2f5bbc9fb177b293344c2b16360021902046fcbafc5ec6e71496fc47a96a07a849ae0a9cb75085d142bab9e SHA512 05f9578df0799c444409bac6ef1c7ac1824493a7080af68d9f908ef0a7bd6348722d2c2c2fdfd9e1e57296d7b5823416869cf57438def2e58942857db267e78a
 EBUILD ark-18.04.3.ebuild 1942 BLAKE2B 33c6fa57d3e3fca99e18c2cef0c2505ff239ea66f2f5bbc9fb177b293344c2b16360021902046fcbafc5ec6e71496fc47a96a07a849ae0a9cb75085d142bab9e SHA512 05f9578df0799c444409bac6ef1c7ac1824493a7080af68d9f908ef0a7bd6348722d2c2c2fdfd9e1e57296d7b5823416869cf57438def2e58942857db267e78a
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-17.12.3.ebuild b/kde-apps/ark/ark-17.12.3.ebuild
deleted file mode 100644
index cdcdabb24632..000000000000
--- a/kde-apps/ark/ark-17.12.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-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"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	app-arch/libarchive:=[bzip2?,lzma?,zlib]
-	sys-libs/zlib
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-	sys-devel/gettext
-"
-
-# bug #560548, last checked with 16.04.1
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package bzip2 BZip2)
-		$(cmake-utils_use_find_package lzma LibLZMA)
-		$(cmake-utils_use_find_package zip LibZip)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version app-arch/unar && ! has_version app-arch/unrar; then
-		elog "For extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)."
-	fi
-
-	has_version app-arch/rar || \
-		elog "For creating rar archives, installing app-arch/rar is required."
-
-	has_version app-arch/p7zip || \
-		elog "For handling 7-Zip archives, install app-arch/p7zip."
-
-	has_version app-arch/lrzip || \
-		elog "For handling lrz archives, install app-arch/lrzip."
-}
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index 035da7ce3bae..daf6f31f1d88 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,5 +1,3 @@
-DIST artikulate-17.12.3.tar.xz 3747444 BLAKE2B 69ab847203f3a6ee408435320d3973d48d55501010ce34c329605ea653cd26a0e2c8a082fba3d91e610f153193441db310cd58416ba6f1907d3680f35197f6f2 SHA512 b984eb53a78bac012a9918a24d995dd89413225ebbd0bda29dd6840ccb14f40efc14b80b0ea6a5df335dcf28f7bb45ad8d1af8296a8d761e4ae48288f2354a23
 DIST artikulate-18.04.3.tar.xz 3748684 BLAKE2B ba7c6a78c6e5fb074b610beb60dccbbe3b159a9df90ef2c65e9e7a2d4c44ec6665ef1ca1644043e104624a31c17c4a4e9f8dc9baafb17bb7b9a356d4d6933135 SHA512 4fa7c6d24d0dd13bb3810545426a626d1c84c72b083e410b70524aa4cbe621f577494b8f60c309dbecdab036353cc9fffb6c8fcf71a3607f13469001395f474f
-EBUILD artikulate-17.12.3.ebuild 1117 BLAKE2B bdd3c88ff3d484548cca21867c77ce376faddce842e2f6597843b70cf2b1618cdec825309ce1a64ff0d099dcb1943ff9636812a39620d0e2e307041cdb7d85b6 SHA512 4e4eaa3064916cd463b6c296f4e071295496bdd6bfd916ae60f20393cd1673773991b7970c629f19522eafe21086e1c41a45efc20b283a85c3d6cc220ca79a7b
 EBUILD artikulate-18.04.3.ebuild 1117 BLAKE2B bdd3c88ff3d484548cca21867c77ce376faddce842e2f6597843b70cf2b1618cdec825309ce1a64ff0d099dcb1943ff9636812a39620d0e2e307041cdb7d85b6 SHA512 4e4eaa3064916cd463b6c296f4e071295496bdd6bfd916ae60f20393cd1673773991b7970c629f19522eafe21086e1c41a45efc20b283a85c3d6cc220ca79a7b
 MISC metadata.xml 328 BLAKE2B b873dc7a695e90caaffc9b5f3a8e50813d0cd33d651f0e04ff1fe463ebf335d834cc7e62640d172c5df73e5fac828a5c36a92d77c0738d7807b16cc86e17ce88 SHA512 f00a5a83877d21d15842052479a08ca06ea387656644416d7af400c4b9dabd9e928137afcb3f7551817f94a5aae28422842a80c641cd481374ca92e305b59962
diff --git a/kde-apps/artikulate/artikulate-17.12.3.ebuild b/kde-apps/artikulate/artikulate-17.12.3.ebuild
deleted file mode 100644
index 6e2d98f96922..000000000000
--- a/kde-apps/artikulate/artikulate-17.12.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Language learning application that helps improving pronunciation skills"
-HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
-KEYWORDS="amd64 x86"
-IUSE="+gstreamer qtmedia"
-
-REQUIRED_USE="|| ( gstreamer qtmedia )"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
-		-DBUILD_QTMULTIMEDIA_PLUGIN=$(usex qtmedia)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index 7bef2ffa049b..77df694cb6b4 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,5 +1,3 @@
-DIST audiocd-kio-17.12.3.tar.xz 248320 BLAKE2B cc9fd7471fa91c9cc026f9c7b2bc7dd20e8a507ef92a01b170c5fb0f011af31e562eb1f2f848ad6747ccba665c8144e2db01782ea7008eabe5532200e29db5cf SHA512 9d21ba053acd9d9f717aa8e7c3b3021e1f24610762f332584bfd4ce1b4f61b10daf0c6715ed4168f37bb36d4551d43d88a8eea54da313aac7cb6df862680f2a5
 DIST audiocd-kio-18.04.3.tar.xz 248668 BLAKE2B e4cf5c7f944f6dbed42af6ae749d3c24f48f974086d03494934ec1c9a394304e885177b277bd83ca9a29d07a11cbd53bf79adb7396f4e1d354088382394d4ece SHA512 a7f8a090019420e735471ed0ae7988145701212b453f958f0da3643e85503de236245a3bb24024449bb6fc50883eb475f450cf8674aed2b166a7e4ef4cedf32e
-EBUILD audiocd-kio-17.12.3.ebuild 918 BLAKE2B 04107dc6d19aa76d37d8d58485141014a54a8615b8e3b86e824a5fba56dd46eafac8282daf3c85ff8a4c7063a75a468a138af2eb18999b66dc2e6b84cde05f94 SHA512 1915e62b9cedc9f91237e26e31a9f16539635181dcf965c5bb72f5fda12b34dd1cf7294bfa99a6a717eb6f26abe8912553b64af7e4af083b3de79468871c9a26
 EBUILD audiocd-kio-18.04.3.ebuild 918 BLAKE2B 04107dc6d19aa76d37d8d58485141014a54a8615b8e3b86e824a5fba56dd46eafac8282daf3c85ff8a4c7063a75a468a138af2eb18999b66dc2e6b84cde05f94 SHA512 1915e62b9cedc9f91237e26e31a9f16539635181dcf965c5bb72f5fda12b34dd1cf7294bfa99a6a717eb6f26abe8912553b64af7e4af083b3de79468871c9a26
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/audiocd-kio/audiocd-kio-17.12.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-17.12.3.ebuild
deleted file mode 100644
index 4efdea67c043..000000000000
--- a/kde-apps/audiocd-kio/audiocd-kio-17.12.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="kioslave for accessing audio CDs"
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
-IUSE="flac vorbis"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep libkcddb)
-	$(add_kdeapps_dep libkcompactdisc)
-	$(add_qt_dep qtwidgets)
-	media-sound/cdparanoia
-	flac? ( >=media-libs/flac-1.1.2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package flac FLAC)
-		$(cmake-utils_use_find_package vorbis OggVorbis)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index 66cbfa96e71e..5326e52e1428 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,5 +1,3 @@
-DIST baloo-widgets-17.12.3.tar.xz 151088 BLAKE2B 00cbad49940063cdf3f8b5f6b3cf2c29e81c5c6b2d34de9eef604bdfbcf1e55a2b606aefd6a9616d11dc8ef00c220c7fe7d0da65eacb6b057bb807330cca7677 SHA512 82237401900789b624fd5c7111127e053fad0f13bcd56f9edc063604fd9bb6368de27d5a62fc844c24b0e283da01f5b77135e7a021b880b026931ae1e583a97f
 DIST baloo-widgets-18.04.3.tar.xz 244960 BLAKE2B d8b9d80e7a84958ead24d5371a582c7de8fbe6adaa05faf49c66a4613c03daabd12acbbf9288df80a922e8ce3a611728cc2059a1814cd03d54a3c3e584d29112 SHA512 d267d43d75a6139f78961f47b12882e2cd4dec17e31a60de5b0d0d133a895a36b12bafa68b121f84b7a15f692ebd1219b055197785183fc1b86e59b754eb5e07
-EBUILD baloo-widgets-17.12.3.ebuild 597 BLAKE2B a074d5793edd74e8ce736898612bb7eac439e782c64f522db5b133b84c7d8c107ad2ac9ea11f7a0a78062940fa802fe3aa94e1e79bfd77c878ad5d80be520343 SHA512 a3905e6ca2dc2ac8a3b4b8f03fa3e335820e9a24639af4cd9ae0586abe4e870223783a027ec525e68cdae9f1de91c8b050bab71c4bd3d49d498924ba7b5550f4
 EBUILD baloo-widgets-18.04.3.ebuild 597 BLAKE2B a074d5793edd74e8ce736898612bb7eac439e782c64f522db5b133b84c7d8c107ad2ac9ea11f7a0a78062940fa802fe3aa94e1e79bfd77c878ad5d80be520343 SHA512 a3905e6ca2dc2ac8a3b4b8f03fa3e335820e9a24639af4cd9ae0586abe4e870223783a027ec525e68cdae9f1de91c8b050bab71c4bd3d49d498924ba7b5550f4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/baloo-widgets/baloo-widgets-17.12.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-17.12.3.ebuild
deleted file mode 100644
index 795563e67f4a..000000000000
--- a/kde-apps/baloo-widgets/baloo-widgets-17.12.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Widget library for baloo"
-LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep baloo)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index 2ea4b12212ea..60936e7da434 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,5 +1,3 @@
-DIST blinken-17.12.3.tar.xz 2505872 BLAKE2B 304cf939db4bd4609a0bda247119803d0cedb276d99bd7c3ea4cc449dc85c2cf5db1a474ffa79dd09087fbb9cf8dd8e2e1405d02ee5d8f5d265202dc898556bc SHA512 9cd1ce9f74f94d7beab0192f59114459d3434f341f3ad2d83dc6b659f70e6fbfeafd21ead5ae22f4f07fc03ed2d9da85ad59703f6d6af879355575cf7db07494
 DIST blinken-18.04.3.tar.xz 2507660 BLAKE2B 0b002c616bffba1716837e23aedc31f7401842589d3d8d4f029df5245c81eaa5a0213345619234ac85e0e1ff97091f2daeace65c59b5911f70d35addecb30966 SHA512 55a02b9c1041c8cf554431f338f4117300a25c5976f01c6ba3a3b28e66f0ea9742fb0dcd4fd25cb69a3ba5c41ef3b7633ae1259672a8e8175687ff17130920cc
-EBUILD blinken-17.12.3.ebuild 768 BLAKE2B 02653f2ed7d6bee097378e0afc3e88947aa978bd9027d13bab05aafa1da424e9ef88a4ace0424f134686a207c4a286cc570f708308503ab525c2dbd782940a05 SHA512 9ee30d940c1a3f3cbf398063047ec11fc7406c48751c8e70abd14a54d6fe3febc25118097734ecdc409f80a856274244453e54ec75ec6b6d702ac6fcf923ecdc
 EBUILD blinken-18.04.3.ebuild 768 BLAKE2B 02653f2ed7d6bee097378e0afc3e88947aa978bd9027d13bab05aafa1da424e9ef88a4ace0424f134686a207c4a286cc570f708308503ab525c2dbd782940a05 SHA512 9ee30d940c1a3f3cbf398063047ec11fc7406c48751c8e70abd14a54d6fe3febc25118097734ecdc409f80a856274244453e54ec75ec6b6d702ac6fcf923ecdc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/blinken/blinken-17.12.3.ebuild b/kde-apps/blinken/blinken-17.12.3.ebuild
deleted file mode 100644
index cb72c7438d78..000000000000
--- a/kde-apps/blinken/blinken-17.12.3.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
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE version of the Simon Says game"
-HOMEPAGE="https://www.kde.org/applications/education/blinken
-https://edu.kde.org/blinken/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	kde5_src_install
-
-	rm "${ED}"usr/share/${PN}/README.packagers || die
-}
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index 3ab1b9cf44d5..a1c6ad199c06 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,5 +1,3 @@
-DIST bomber-17.12.3.tar.xz 753868 BLAKE2B e865f2c565eea5def26687c3dc813aa40aca0468e6754f9bbb349266fcceda609f7f8260eb44e2313f253a893892edd00456b517642939028921489b8bf9d3f0 SHA512 3c792fd103b93a2ec5e9b030382256cdba1c05477e04e8d95d0a331dd630d88137e0079fd1b91f267ccbc1c32a60e4c94f34330061380b0a069f689b90efb6ec
 DIST bomber-18.04.3.tar.xz 754288 BLAKE2B 5c30c435dee98ce851fec3723148d62db815ebc3aabc7a76aa5f9ed4357cc55fd2a2d695cdeb68f729d2d93132d1804b0df79ab895b00094d6ff2703c9dbc443 SHA512 40297bfa9c3fb543a8f8903a70fe7e7987d9fd5ba063ab1de2cf58801ced0249f4b9019aa7492ee30f027c74cde8c0fe268888835e37ae56b0621dcdf8f30811
-EBUILD bomber-17.12.3.ebuild 685 BLAKE2B b62f0b52aca8404743df8150b990b75228f9b67ce1aae9345f33ae10f53e15c8617df73966be6c880852c1b36dfc4f2522aa986550edca71274973f42fca44b7 SHA512 2858c6a02e8776a651d23bccad7b432bd4f3bb5386840d39bd11275a0154d65ae73aa0fe264a77f5fa1912b8b57898dc69bf68951ce0aaf265e8257188ef29f8
 EBUILD bomber-18.04.3.ebuild 685 BLAKE2B b62f0b52aca8404743df8150b990b75228f9b67ce1aae9345f33ae10f53e15c8617df73966be6c880852c1b36dfc4f2522aa986550edca71274973f42fca44b7 SHA512 2858c6a02e8776a651d23bccad7b432bd4f3bb5386840d39bd11275a0154d65ae73aa0fe264a77f5fa1912b8b57898dc69bf68951ce0aaf265e8257188ef29f8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bomber/bomber-17.12.3.ebuild b/kde-apps/bomber/bomber-17.12.3.ebuild
deleted file mode 100644
index 5bc17254c158..000000000000
--- a/kde-apps/bomber/bomber-17.12.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE arcade bombing game"
-HOMEPAGE="https://www.kde.org/applications/games/bomber/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!games-action/xbomber
-"
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index 80c2e4c0e292..950d6f19cff0 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,5 +1,3 @@
-DIST bovo-17.12.3.tar.xz 186488 BLAKE2B b3cf4a9d6b168e9197290d9fb50698b60122a07e91a732ba2f75b50ae6821bec9dfea41142c1e40e982db53f61026e82fa9370cfa39cc2edb3d605cac579eb45 SHA512 11b626795fef8bf8bd30f086e759d26a8f63f74c05dd155506121e5251e2f2e07cd67f3f337a6eb0b567b96c73980875cfbf02ebfdec3f5e13062e2aff21fe76
 DIST bovo-18.04.3.tar.xz 186428 BLAKE2B a11d7a44b0d1489c677b1d5fe102ea7e1f5b8680f74c8dfb316c01044e82b87cb6c8acc42529d5948bcad74034f2392a698ebedfb442a0eb040d0ad00ea374a7 SHA512 f2efdb2e1f929febc0c1e7ed896d0067e61b3f8cc08616396718e9b79c60737921ea352d8cd4450358ee7b06d74d7130f5890fa993a4b23ecc35681ca3fcee8c
-EBUILD bovo-17.12.3.ebuild 702 BLAKE2B 85a85acba350d651339bf61165f7b0de15cf9bf996f3ae942e6267b0a35ab58a73196f92e5c249ead409f6814f6f16b7de8ac90d451dc3bc0c2f5763e5fc22f7 SHA512 ef0e3d99b0ad580a20be16a3ee18c2316f00cfa8d54c88f2135cbaee3c4c288d10661739afac12f5ca84fa3d77bbeb10896b4d5804e7be3138ceac936b370112
 EBUILD bovo-18.04.3.ebuild 702 BLAKE2B 85a85acba350d651339bf61165f7b0de15cf9bf996f3ae942e6267b0a35ab58a73196f92e5c249ead409f6814f6f16b7de8ac90d451dc3bc0c2f5763e5fc22f7 SHA512 ef0e3d99b0ad580a20be16a3ee18c2316f00cfa8d54c88f2135cbaee3c4c288d10661739afac12f5ca84fa3d77bbeb10896b4d5804e7be3138ceac936b370112
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bovo/bovo-17.12.3.ebuild b/kde-apps/bovo/bovo-17.12.3.ebuild
deleted file mode 100644
index c6f17a590619..000000000000
--- a/kde-apps/bovo/bovo-17.12.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Five-in-a-row Board Game"
-HOMEPAGE="https://www.kde.org/applications/games/bovo/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS HISTORY TODO )
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index d7d67df545f1..364e13103c33 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-calendar-tools-17.12.3.tar.xz 223424 BLAKE2B 57622ccc637d9a41634d90e764f1c9dfdbe60e7a77d13632397e41222dc1cc5b544f268451132a11f8a3118a9042c701e993eef512ef5ac1df05aeea6bc1d35e SHA512 18c8bc3deb273022543c209410403f7bf7a9b13bcbcf9be601ef011dc9ae6c0335d866d1e696b410fcc4751830cb824a1fe530299ae76fe92e2f785f6886bd11
 DIST akonadi-calendar-tools-18.04.3.tar.xz 221048 BLAKE2B 66dda4fb9e796f12a06a314197d95f33117dfa5c0d962c46edc6cceef225407f4b9ed4acc334ad9927c151f7e4709dcb4deac78d0252b5e62ec78cecc2ae2079 SHA512 25183856d3bc5ee2b1bcff27055479c9694df37db169419d0ef3525adcdebd06dae07134ab7ebadc42afd9d79d7598574b8c5036e6c295b0986af048153b1b9b
-EBUILD calendarjanitor-17.12.3.ebuild 1029 BLAKE2B 19aac37a01db2716f31fcd2a6082a68eea84f8b8fb7a35d76721d2d72cacec48e49fbd08cbdafbb74f6346ed4a8f1084f3e0c62450f04740a9112568b73cdf94 SHA512 beda41c1e93490da51240a8abb47d028f2f1a3cb5b5daa6a11fdbe7e61b58c70941a9d62ddd577a2d7921199787e1dc29c15bdc6d10859214e199fca1f5de55c
 EBUILD calendarjanitor-18.04.3.ebuild 1029 BLAKE2B 19aac37a01db2716f31fcd2a6082a68eea84f8b8fb7a35d76721d2d72cacec48e49fbd08cbdafbb74f6346ed4a8f1084f3e0c62450f04740a9112568b73cdf94 SHA512 beda41c1e93490da51240a8abb47d028f2f1a3cb5b5daa6a11fdbe7e61b58c70941a9d62ddd577a2d7921199787e1dc29c15bdc6d10859214e199fca1f5de55c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-17.12.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-17.12.3.ebuild
deleted file mode 100644
index 4fbc9eb897d9..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-17.12.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="false"
-KMNAME="akonadi-calendar-tools"
-inherit kde5
-
-DESCRIPTION="Tool to scan calendar data for buggy instances"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	cmake_comment_add_subdirectory doc konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
-
-	# delete colliding konsolekalendar translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/konsolekalendar.po || die
-		rm -rf po/*/docs/konsolekalendar || die
-	fi
-}
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index 128a69014fd9..75373e8076af 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,3 @@
-DIST calendarsupport-17.12.3.tar.xz 644864 BLAKE2B 52733e61d06eb1335f5e104daa073be87123c71af99dd2894934275b71b7a61478ac7853954492681327b5047a85dbaf7d634ca7bc53fefd115d3d2148e76048 SHA512 db578210c496c0e127e3c11efeb71cdd1bf56d0e61db6b82528ca036dbe83bb08338598863e51e7c8bead8f83169e1ecfb6080231e2bb97678c3b078fb12ee22
 DIST calendarsupport-18.04.3.tar.xz 647108 BLAKE2B 8088fcf42474e9b876e57135dcaccad97fdf4f433f57fd72886c1d94d7086471f1b76a08aff5df24f2cdb9891da041dfcf444951f908837ebb3aa53bc58b332d SHA512 7631d81bfbd3282448d4d78cf05a4714392736a74e23155b4c75f288a906975ea1bd32e3412e03b8ff74778e85560a071a11482c35cf769a738675c4fedd3e6e
-EBUILD calendarsupport-17.12.3.ebuild 1099 BLAKE2B 6b8b8e7fb0c51e9820cded52e47369ccf5051aa05b3dd014efbf1536d773db9abc7dab18e9d9e579bdcd5164db30c280452aedeb7def43e6e5a504b6141c8c42 SHA512 5b0abb1569c17da4c776639e006fbe19b52b6080801aa0d4273f48271848d9c4334a2a713b2d08801a64bfe5adb6c47cc635e32629d6fb19b60756eefa927ac9
 EBUILD calendarsupport-18.04.3.ebuild 1099 BLAKE2B 6b8b8e7fb0c51e9820cded52e47369ccf5051aa05b3dd014efbf1536d773db9abc7dab18e9d9e579bdcd5164db30c280452aedeb7def43e6e5a504b6141c8c42 SHA512 5b0abb1569c17da4c776639e006fbe19b52b6080801aa0d4273f48271848d9c4334a2a713b2d08801a64bfe5adb6c47cc635e32629d6fb19b60756eefa927ac9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-17.12.3.ebuild b/kde-apps/calendarsupport/calendarsupport-17.12.3.ebuild
deleted file mode 100644
index 7cc918976b65..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-17.12.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Calendar support library"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libical
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 851aab83a2a1..0c38b2e0f58f 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,5 +1,3 @@
-DIST cantor-17.12.3.tar.xz 1066992 BLAKE2B fdaaa42adf45b3013337374b83b6da77d6adfd610e233d56a80965f35f3433b412d4f1279a3c2c3e257a57a69b44d7e190f42e325f0fd3fa5ef4223ce6ddbfb7 SHA512 37d080fa3e87cbd105e33c687b5bc670c0833639873c41e1dcc519577103186ec629c85b5a1875af915267eb7ca3d13f170894bb9c0c882c964ccc02a24cfa3b
 DIST cantor-18.04.3.tar.xz 2179372 BLAKE2B 1f6055359d239bd3f49d4a95975a13db710bb7aabb708b3e045aebc2b95ae8d9ab875486ea6735104d8df6bf53bfdccc6349e627e7ab32596bb0cfda83db31a0 SHA512 2493d2570f69d0f27489dd86b48a11fa454c4b0d42b821a52ee6489ed6914af826b94a152098144cda40122ddf98d7b121b03c2e4e4b46dc85db83643873d2bb
-EBUILD cantor-17.12.3.ebuild 3179 BLAKE2B f65cd049ec6997ea90b23d95ceb780f253abba21471f951cf42c1e9f6d5800261743ff40307c754486ce50f976da3ece31acfa28573bd75ad2834dc86002962b SHA512 6f6c02bceb62668e6deae92804f6de12a842234a8bc2597f65b93f202ae756f18fc91ab4fda4bc82d396030bdc9bbe8b76cb425386293a2f09676c5d12740e49
 EBUILD cantor-18.04.3.ebuild 3179 BLAKE2B f65cd049ec6997ea90b23d95ceb780f253abba21471f951cf42c1e9f6d5800261743ff40307c754486ce50f976da3ece31acfa28573bd75ad2834dc86002962b SHA512 6f6c02bceb62668e6deae92804f6de12a842234a8bc2597f65b93f202ae756f18fc91ab4fda4bc82d396030bdc9bbe8b76cb425386293a2f09676c5d12740e49
 MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53
diff --git a/kde-apps/cantor/cantor-17.12.3.ebuild b/kde-apps/cantor/cantor-17.12.3.ebuild
deleted file mode 100644
index 255635b2326d..000000000000
--- a/kde-apps/cantor/cantor-17.12.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-PYTHON_COMPAT=( python2_7 )
-# FIXME: PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Interface for doing mathematics and scientific computing"
-HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/"
-KEYWORDS="amd64 x86"
-IUSE="+analitza julia lua postscript python qalculate R"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
-# FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*')
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	analitza? ( $(add_kdeapps_dep analitza) )
-	julia? ( dev-lang/julia )
-	lua? ( dev-lang/luajit:2 )
-	qalculate? (
-		sci-libs/cln
-		sci-libs/libqalculate:=
-	)
-	postscript? ( app-text/libspectre )
-	python? ( ${PYTHON_DEPS} )
-	R? ( dev-lang/R )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
-
-pkg_pretend() {
-	kde5_pkg_pretend
-
-	if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \
-		! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then
-		einfo "You have decided to build ${PN} with no backend."
-		einfo "To have this application functional, please enable one of the backends via USE flag:"
-		einfo "    analitza, lua, python, qalculate"
-		einfo "Alternatively, install one of these:"
-		einfo "    # emerge sci-mathematics/maxima (bug #619534)"
-		einfo "    # emerge sci-mathematics/octave"
-		einfo "Experimental available USE flags:"
-		einfo "    julia (not stable, bug #613576), R (bug #619534)"
-		einfo
-	fi
-
-	if ! has_version virtual/latex-base; then
-		einfo "For LaTeX support:"
-		einfo "    # emerge virtual/latex-base"
-	fi
-}
-
-pkg_setup() {
-	use python && python_setup
-	kde5_pkg_setup
-}
-
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
-	sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
-		-i src/backends/CMakeLists.txt || die
-}
-
-src_configure() {
-	use julia && addpredict /proc/self/mem # bug 602894
-
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package analitza Analitza5)
-		$(cmake-utils_use_find_package julia Julia)
-		$(cmake-utils_use_find_package lua LuaJIT)
-		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package python PythonLibs)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package R R)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index e59fb54edd47..851d2e3b86d0 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,5 +1,3 @@
-DIST cervisia-17.12.3.tar.xz 1905900 BLAKE2B 8ada882e8bd19a272eb622a0bdb5e9fa9a20ed0c31c4b05ecde68f969288907ce00ea4ebd1c541aa8f5e51e3ca248b8413cd86611e96ca94e186cd6edd1e70b4 SHA512 fed1fdb51cba8eb2e02139095fc250f4d4cbed261a815cc9e8cb12df193da79440026730aad4fdda73759a4b8571776014a74b5d0517637d2fd2d86432e947c5
 DIST cervisia-18.04.3.tar.xz 1906444 BLAKE2B 3c098bb67c52096edb709ce3dc1e88d812e9b5077feea3cfc3691bc17820353eb82921b9c914bdd168603ecc7274d35f56f2983e06eced6f5a76e6dc938fac5f SHA512 de058407f70e2c7568c925e7ff28ffdd9811065cf9fca9782cddd85650d55652c1a420fe7f89aee99ae01f0373fa52a17759a40f8310496e6af45ae5529b0193
-EBUILD cervisia-17.12.3.ebuild 899 BLAKE2B 0c84459c973444f7472abf611c52ba0ad9eaea41757e8313a80d925e14d41e50f7d24237471ed4b671cf685f77ddb72ce4dd4e25f41a8a7ddfc67818485855d2 SHA512 32c8623e3b2c9afcc1589a5335d772d057341b36fc8d51e2b23d65c9d9436f229576e2c015ab24843bb01cc5df22e917031b2b044e7a9f320c45f647c4681bfc
 EBUILD cervisia-18.04.3.ebuild 899 BLAKE2B 0c84459c973444f7472abf611c52ba0ad9eaea41757e8313a80d925e14d41e50f7d24237471ed4b671cf685f77ddb72ce4dd4e25f41a8a7ddfc67818485855d2 SHA512 32c8623e3b2c9afcc1589a5335d772d057341b36fc8d51e2b23d65c9d9436f229576e2c015ab24843bb01cc5df22e917031b2b044e7a9f320c45f647c4681bfc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/cervisia/cervisia-17.12.3.ebuild b/kde-apps/cervisia/cervisia-17.12.3.ebuild
deleted file mode 100644
index e06fbc326979..000000000000
--- a/kde-apps/cervisia/cervisia-17.12.3.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
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="CVS frontend by KDE"
-HOMEPAGE="https://www.kde.org/applications/development/cervisia"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdesu)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	dev-vcs/cvs
-"
diff --git a/kde-apps/dolphin-plugins/Manifest b/kde-apps/dolphin-plugins/Manifest
index d723b61db187..ce75f69a2feb 100644
--- a/kde-apps/dolphin-plugins/Manifest
+++ b/kde-apps/dolphin-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST dolphin-plugins-17.12.3.tar.xz 187288 BLAKE2B 205db4fddf395f5e1c7ac9db123984f712867d2523b916ba0017525872a56460c2540dacc6b4e49cb3e876d3d504f619ef603372e98622d1634804cf5bee4efd SHA512 fe0e2aabea0870e8f3127178a10c70264fd339391f88aa9e2a1a5238cb25a0ef47ab2c66f60d2da0788a41399cdfd4099542c81d47e8db1ea09cf2f5941fdeaa
 DIST dolphin-plugins-18.04.3.tar.xz 191408 BLAKE2B e27bd189d02f922e55fb216bfb80032bf611ec109a3c3f9e3b2cd2466f831e59d548c2d2861a784972e7dcc676e1e7baf28f9a44e8ce7cf1569846da4d6cb86a SHA512 641562f44750bad8ca431be470cf691ea72647ac2b6c5bef7ff83d1d538bc13b7f8d082589c0d2c8c208c14a6007e412f4be8a8e733ebde7132dca6d5724798e
-EBUILD dolphin-plugins-17.12.3.ebuild 1841 BLAKE2B fae91928416caa376bea9ea1fc58d261665e3777f2d4768b1d2741b1059adc61e58dbd32756301035c444fa21f2f197acc1e0e707cebfe19a2fef8bf07b0db52 SHA512 30ca4eb51eaf61d2bdec582227ff29a1d3ea00264b4f99f22ee593b1a052b3187e75a56792177161d88f55dc677d7e19ef913d08b74086b321080b050b220d9c
 EBUILD dolphin-plugins-18.04.3.ebuild 1841 BLAKE2B fae91928416caa376bea9ea1fc58d261665e3777f2d4768b1d2741b1059adc61e58dbd32756301035c444fa21f2f197acc1e0e707cebfe19a2fef8bf07b0db52 SHA512 30ca4eb51eaf61d2bdec582227ff29a1d3ea00264b4f99f22ee593b1a052b3187e75a56792177161d88f55dc677d7e19ef913d08b74086b321080b050b220d9c
 MISC metadata.xml 532 BLAKE2B f874175daea65b92744c45f776610d0f5964737008bebd51e791dcd308126fa4e943ac51ba20bf8d69ef75c0846d925e4e8e724b6bbc03176c407e09a6d636f1 SHA512 9dda51a623ccbdda9ea7f5eaf24ac67df732bd97f510e524dc23f2cf2785d4c3dd7359f1f208520aa09899f5f049ada99f75ec186f4c89f27a18f4f697a444fb
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-17.12.3.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-17.12.3.ebuild
deleted file mode 100644
index 8cad2a6fe919..000000000000
--- a/kde-apps/dolphin-plugins/dolphin-plugins-17.12.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="false"
-inherit kde5
-
-DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS="amd64 x86"
-IUSE="bazaar dropbox git mercurial subversion"
-
-# FIXME: required in root CMakeLists.txt, but:
-# kdelibs4support only required by git?
-# kxmlgui, qtnetwork only required by dropbox?
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	git? (
-		$(add_frameworks_dep kcompletion)
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep ktextwidgets)
-	)
-	mercurial? (
-		$(add_frameworks_dep kcompletion)
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kservice)
-		$(add_frameworks_dep ktexteditor)
-		$(add_frameworks_dep ktextwidgets)
-		$(add_frameworks_dep kwidgetsaddons)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kompare)
-	bazaar? ( dev-vcs/bzr )
-	dropbox? ( net-misc/dropbox-cli )
-	git? ( dev-vcs/git )
-	subversion? ( dev-vcs/subversion )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_bazaar=$(usex bazaar)
-		-DBUILD_dropbox=$(usex dropbox)
-		-DBUILD_git=$(usex git)
-		-DBUILD_hg=$(usex mercurial)
-		-DBUILD_svn=$(usex subversion)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	{ use bazaar || use dropbox || use git || use subversion || use mercurial; } && kde5_src_install
-}
-
-pkg_postinst() {
-	if ! use bazaar && ! use dropbox && ! use git && ! use subversion && ! use mercurial; then
-		einfo
-		einfo "You have disabled all plugin use flags. If you want to have vcs"
-		einfo "integration in dolphin, enable those of your needs."
-		einfo
-	fi
-}
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 776d3a09b113..bb9ac0171396 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -3,8 +3,6 @@ AUX dolphin-18.04.3-memleak-1.patch 1651 BLAKE2B dff558ec7e3ba2dafe676c43da09409
 AUX dolphin-18.04.3-memleak-2.patch 1180 BLAKE2B 4b546aefe5b1c5342522fae2a0bcf7e74f023f45f0e39950a104188b40e51a480e638d864b953033ec3f3630c89095315fb73a1ab45782c34adffa11b6a0f77c SHA512 533a449113f3c196cac02634f5c4baf25225fbca6747f3d47c6a69986329bfc2f52d95bc20c7a7c603e80e18dfb65a47e0608835fe4eeeea906035136fe541b1
 AUX dolphin-18.04.3-root-user.patch 2198 BLAKE2B e92b053b53f7f1c2c6ce25eb7a81e8c26f5dc9497f9bff6e2d02d125c9b57b7722352d18ee4d0ea001b73a71904d729485544596904229700d4a29a240e1c28f SHA512 c9f419f67ffae57ccf057fb5aa7352e3fb652cec3a9a21459ae5d3e9fba0b1dede993058afe83ced5c3fc036c11649476bc25435a29bc5d910257443e21cb43a
 AUX dolphin-18.04.3-root-warn.patch 1488 BLAKE2B 8e9536926b0b9e9f37c0e2be7e23fafc60f34ca1e25ef83423097d49e5f575cb762008b6c4cbf2c8d664cdbd010db5ed52a15226e812c5988c2e3431770334a6 SHA512 ae763f8fcef45108f812bccdb485d8da31fd27997583195e612c2ded82f041441849ae680f20d7259b3621b9609d55ff12dc6b3044b993e8f3063a1abc85aebd
-DIST dolphin-17.12.3.tar.xz 4841752 BLAKE2B 1f58cb0f1663e131a1b8dc58fc47d40a8a68bcb998fd3c6191f99176263523d40c1d9057b569c10c14e2a6b0be91b2eaaf07a54acdd386984d0da167cb84fabd SHA512 44cf8baaeead69dd5529ce7da96d78f507029fa47ac9ac50de9d77cb15335dd0b0e0c916f2cdd0d5cadc465e461115dbfd02c51af38d03da985d66bd22456136
 DIST dolphin-18.04.3.tar.xz 4850916 BLAKE2B 1d2a5c4f5e94e2f30055804d96c205eb2c03864ad2b6c245d917549986fbac26686e654818dacf93fcb711f59bfe6e7f3a011e578988f5bf9e6b6cb82fc33876 SHA512 167a35225dd4e75b7ff863771287a471273e0594c247ef058adc718682eb07f014ca84bc373e1c3a846e99711aad3d9a16b12aab8543aa3603e17f944b206b21
-EBUILD dolphin-17.12.3.ebuild 2230 BLAKE2B 8e3d435eac7d521830bbd13122d7616bc5c54b786eef8386dad3c9b97447058a843d61c060308518c84e776787cdeb0e1b3399fc099f69faa6b7f055eae79c58 SHA512 b3999175d7bf0672fce3b697104b9fb024c9d0487dad8a40d1f37405ca7d611b2981a76629c024eb06cf7503c900a2a2d70c365d718fd8b173562103f1db975b
 EBUILD dolphin-18.04.3-r1.ebuild 2395 BLAKE2B b19b63b7c8c21be681ebdbffb31f6393d52deb82e84ec57ac0309eb40940e457f24f327c697433127d7e9987b14f01b76ee719d9781e1210a2d0520aba4d4bb1 SHA512 9b2cb58ed674f4a18580a36b18ba1f7ccde9fe440d759304dec97b66c278e3a69ffe1e63772899add41cbc611742f3539c0caf10a47eb7a801ca60db5decdf7a
 MISC metadata.xml 325 BLAKE2B 2526d5a76392c6c3ba96998586cab48d43c3bf87422c698fbfe009c398d2f84b13193f4cebd06e87b3f7856a83824e3ed3a34b902a437671fb9302de2af44674 SHA512 8a728d296c68f8046b32871bb185a467b1b03a25af3c026647d76b40d83d1f8ee959fac135b26ed1fdb3ec15cdb6c58c75d9fd128122331181530637e2d69169
diff --git a/kde-apps/dolphin/dolphin-17.12.3.ebuild b/kde-apps/dolphin/dolphin-17.12.3.ebuild
deleted file mode 100644
index 5b21a06e9889..000000000000
--- a/kde-apps/dolphin/dolphin-17.12.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
-KEYWORDS="amd64 x86"
-IUSE="semantic-desktop thumbnail"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
-		$(add_kdeapps_dep baloo-widgets)
-	)
-	!semantic-desktop? (
-		$(add_frameworks_dep kdelibs4support)
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kio-extras)
-	thumbnail? (
-		$(add_kdeapps_dep ffmpegthumbs)
-		$(add_kdeapps_dep thumbnailers)
-	)
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/ark:${SLOT}" ; then
-		elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}"
-	fi
-
-	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
-		elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}"
-	fi
-}
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index 528b930ddede..483816e78665 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,5 +1,3 @@
-DIST dragon-17.12.3.tar.xz 1464016 BLAKE2B 54360c45227c2260b4b401978e902de4777a5357812f93d73952938e6400196369e4b41777809619aa8cf2c0bf9a840b47ab71fbd3348e61f37de8943d1fd227 SHA512 0ba2e1845d6b6fcb3885e340160f37d924afd5d5b1a8f1f3e196ad5b04db87d55d1460feb447e0845802757e3b81d550fafcfca2e91bf334209953fc4466eef8
 DIST dragon-18.04.3.tar.xz 1729144 BLAKE2B 4832bcdc8d01a97f85cf89e928e2bf503d9b7343a5e374a6c2b20fdef82676fd0263e60a8f2e3adad4f18afb071e42dadf42548fa3d81b08152baf6e8b0046f6 SHA512 5dd3a0157cbac092a0bb224c38dab6706545fd78103e98b060860c5465c6454c4c3a2ea4e646a99f4683a61d8c1248e3a7d2c5f5e69f7e711d6f3ac16ab198fd
-EBUILD dragon-17.12.3.ebuild 994 BLAKE2B 6178094991fce897fefa9626c65c630fc62aba9c716096bd77f74eb7177677f421a4cd6055c4d88d7609730398f9b4d5464d593ca5daeb811306664a07c2fb0c SHA512 adad2bc72bbb13147c70f8bd7c7cf8cc73b9980473f6f7691676d448848307c637b13a5895feb06804888b9827e1d4ed4de97de3c729eda20456667af73d1fc7
 EBUILD dragon-18.04.3.ebuild 994 BLAKE2B 6178094991fce897fefa9626c65c630fc62aba9c716096bd77f74eb7177677f421a4cd6055c4d88d7609730398f9b4d5464d593ca5daeb811306664a07c2fb0c SHA512 adad2bc72bbb13147c70f8bd7c7cf8cc73b9980473f6f7691676d448848307c637b13a5895feb06804888b9827e1d4ed4de97de3c729eda20456667af73d1fc7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dragon/dragon-17.12.3.ebuild b/kde-apps/dragon/dragon-17.12.3.ebuild
deleted file mode 100644
index a68ec0e5baca..000000000000
--- a/kde-apps/dragon/dragon-17.12.3.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
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A simple video player"
-HOMEPAGE="https://www.kde.org/applications/multimedia/dragonplayer"
-
-LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(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 qtwidgets)
-	media-libs/phonon[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 516b0e33b576..a802a30c9add 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,3 @@
-DIST eventviews-17.12.3.tar.xz 437868 BLAKE2B 294cfcbb750ae81714257b56dd7f2c7817be8182331ec3517c96e17858997f1e3c49b3ecbce27e906c9485fdbc2f2bcab94131fc9365a0fc484b799ef2e29877 SHA512 6a51eef25eb9ab0522c95ec4ed800af94e5a1243b597e7aee4619a1494bdcd26b08df4d42d04d837c561f5c0d3434edba9f4a72fdd2433816ad3e9e0e6b6bbae
 DIST eventviews-18.04.3.tar.xz 441572 BLAKE2B 1c9fb9c5e6e23c0d068ed4183c5ea90f459ed23b86ada2955477e89e4cf0d86d95b4779cec63dfa8b4d8743198efee520caf665db2d448ea16d5eea54c962680 SHA512 d6a202a31cfe9f4765f5915c6cf5542b9d1e9ffe309eba40dc00690d6281951404d14b6e4e0d7f71c8d1b9a5ad72ef5ca0bed326e462ebe574678317be34c1a1
-EBUILD eventviews-17.12.3.ebuild 1028 BLAKE2B 9cf70479a89f325ef19a53ca963c62807f1cb7256be93e36ba22c37f4d2cb00e222152a2c211485303cce829a3f78e700665f2ad3f354b715c9fd68e90d07019 SHA512 d48878283f9480486e99291fe6ac62bde34eff6f51220abb2cda9a25f09e89c85be22692095904feeed1db7e3d3e5ab83ef7fe0a383fa2b76480f65c920a74d2
 EBUILD eventviews-18.04.3.ebuild 1028 BLAKE2B 9cf70479a89f325ef19a53ca963c62807f1cb7256be93e36ba22c37f4d2cb00e222152a2c211485303cce829a3f78e700665f2ad3f354b715c9fd68e90d07019 SHA512 d48878283f9480486e99291fe6ac62bde34eff6f51220abb2cda9a25f09e89c85be22692095904feeed1db7e3d3e5ab83ef7fe0a383fa2b76480f65c920a74d2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-17.12.3.ebuild b/kde-apps/eventviews/eventviews-17.12.3.ebuild
deleted file mode 100644
index 806d72859ca8..000000000000
--- a/kde-apps/eventviews/eventviews-17.12.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 kitemmodels)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/kdiagram:5
-	dev-libs/libical
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 404fe7d2efeb..62bd0dd6ac16 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,3 @@
-DIST ffmpegthumbs-17.12.3.tar.xz 21100 BLAKE2B 6f0ee8bd6c8d775c463734e83c44ee6a59cb52d7d8a622aa33b10e57b944f26aee5f453fc2cfe153d6d970114b19d524811681447eb01f5d8b16bd90e1897bcb SHA512 923bd21bc7e27c3ed511c987ae8011066b713acf6f14794c00cb26a0c6c3d8859a88db02c88ec5cfbc4210dd4a252dddcbbbe6e768d386617b26af3ea9b5184d
 DIST ffmpegthumbs-18.04.3.tar.xz 21208 BLAKE2B de6b446436f99ab502eb63a897cc4e62403fd88202b7d3a026d8d3a373e30c22bc65b72afaaecc1a37c543b1951ccff2f48a654228bc94be90493c97d3ceacdd SHA512 5ec858f4829bbc0ae480b908520f2f19cfb3dfcde2d3f8d357e3c671a84cb9734f0e4041eb35a625aecb2abe94e54f18e44bfe7e85afdad00c941e4a1065eba3
-EBUILD ffmpegthumbs-17.12.3.ebuild 436 BLAKE2B 1cacb9973f50bbe7d728a2f5cd98e4069db65f49ef979724130fc1c44e9008a400cb963c348763fc43a2d5baaa989ce6874f612a824d98edc45d9e3c155de843 SHA512 036321d6c9cd10f8b118916926aaef81692b73ee07954c6548af423d03ef8c7ee9f6e07bc1cb533e6ea351c4450f798d97b5838b6c07a77dc097ba0d943f31f6
 EBUILD ffmpegthumbs-18.04.3.ebuild 436 BLAKE2B 1cacb9973f50bbe7d728a2f5cd98e4069db65f49ef979724130fc1c44e9008a400cb963c348763fc43a2d5baaa989ce6874f612a824d98edc45d9e3c155de843 SHA512 036321d6c9cd10f8b118916926aaef81692b73ee07954c6548af423d03ef8c7ee9f6e07bc1cb533e6ea351c4450f798d97b5838b6c07a77dc097ba0d943f31f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-17.12.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-17.12.3.ebuild
deleted file mode 100644
index fd3c069e3389..000000000000
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-17.12.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="FFmpeg based thumbnail generator for video files"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="libav"
-
-RDEPEND="
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtgui)
-	libav? ( media-video/libav:= )
-	!libav? ( media-video/ffmpeg:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index ab2d3c692806..0cada79826b3 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,3 @@
-DIST filelight-17.12.3.tar.xz 654916 BLAKE2B 3543b15b6a1c691769c01aa24bcb8b8b3f1b81d0060ebb7409e8f22749fa6b08cd5ca0eff94e6a950c6f027bf3c56afcf7f43cee27192a34284509e3d6a8d670 SHA512 6c8efe81b54bc5fa0111d94c65a15a6a2beb079790bb741a38f336baff417eb5c8d6d133063afbd538378b5aadea08d221915cfaab8430fc4dc32a889c2057bc
 DIST filelight-18.04.3.tar.xz 659376 BLAKE2B db637bfc183a893cb19d802084c490a983d9e6bab6e9fa7bce9896d6e6e24d93f769e3334bdb667ae656882e3658cdb9d7417618a019a3d44c08850e3a549504 SHA512 a938a23b150d0c3caba453e1a9e60532d5da24caeec7bffbd781363a0b79fd5fc8a2a6875b67a42beb5d9bc9598145bd8f58b9718ef39166f5738a9dcb303890
-EBUILD filelight-17.12.3.ebuild 697 BLAKE2B 325b5ffebbed3e5cb98173fc20fb6a048d35de8cddb9ec8956823e59fd65fa30cc8a84a49ad8fa1f1fa5335c4c2c52a6a22e403571996babb6607ab356468e49 SHA512 6c9e6f0e094463deeb5d1132bb5c66fe5faaf249a80c11e8b5e09f84e89dfafc6b1b610e329c97beb8f7e06b04f562911474b1e0d22978ec8c6f80a4886eeff6
 EBUILD filelight-18.04.3.ebuild 697 BLAKE2B 325b5ffebbed3e5cb98173fc20fb6a048d35de8cddb9ec8956823e59fd65fa30cc8a84a49ad8fa1f1fa5335c4c2c52a6a22e403571996babb6607ab356468e49 SHA512 6c9e6f0e094463deeb5d1132bb5c66fe5faaf249a80c11e8b5e09f84e89dfafc6b1b610e329c97beb8f7e06b04f562911474b1e0d22978ec8c6f80a4886eeff6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-17.12.3.ebuild b/kde-apps/filelight/filelight-17.12.3.ebuild
deleted file mode 100644
index 46fadf65be7b..000000000000
--- a/kde-apps/filelight/filelight-17.12.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
-HOMEPAGE="https://utils.kde.org/projects/filelight/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index 36588557fc35..f45e4d8006c8 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,5 +1,3 @@
-DIST granatier-17.12.3.tar.xz 1959944 BLAKE2B 8b25ade780f0679f722eb3a4e323adc73c2e3c3d774595a934bdb2d6017eb0588e2163b0610bb90dd2277a0dbd9e6df590c2fdc238d36d80e50b335abd8702cf SHA512 9d3b8f53452a345a3c48547dc04bb1e58ab35f8d25b0e7611fba4adddefd04b705b681aa24e7e504e742a65b025b0ef5869d1959de9199f2f6d5681bbf7290fc
 DIST granatier-18.04.3.tar.xz 1961648 BLAKE2B d1a14db7fbb3bc07ec19f4db4a142aab54196e7612a0341873877c6a74f000970e3720f0e2640d3a72cfde6e993058ce9ba0a08c01f2b316f6ba76f323ccd7e8 SHA512 c39fe20c1d88fd8d521e0db91df46535488efbaba27f48faef63e015d9806b3d66a81831edb9b8bb0508954f79822b70ed47b7c3409601a6102c8e7d32304339
-EBUILD granatier-17.12.3.ebuild 734 BLAKE2B 317d5bdc8e04ccd6efc3d3133e84967c29bb68ff65c6ad3001e9a7e28a62495f1db35d5b1ad345eb966b37f06fb337e1be2db9d539d4c10d6ee354424c381c6f SHA512 b3c19a91781523d509800563c93531106cb8455eb02bcc4c6a8bd1efbfcec2c9a3ea1c4fc4b622313e8f85ccc4cd3c27ea506fa5fe4c6b6fc0c4dbed72e58904
 EBUILD granatier-18.04.3.ebuild 734 BLAKE2B 317d5bdc8e04ccd6efc3d3133e84967c29bb68ff65c6ad3001e9a7e28a62495f1db35d5b1ad345eb966b37f06fb337e1be2db9d539d4c10d6ee354424c381c6f SHA512 b3c19a91781523d509800563c93531106cb8455eb02bcc4c6a8bd1efbfcec2c9a3ea1c4fc4b622313e8f85ccc4cd3c27ea506fa5fe4c6b6fc0c4dbed72e58904
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-17.12.3.ebuild b/kde-apps/granatier/granatier-17.12.3.ebuild
deleted file mode 100644
index 5f9b052383d9..000000000000
--- a/kde-apps/granatier/granatier-17.12.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Bomberman game"
-HOMEPAGE="https://www.kde.org/applications/games/granatier/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 17dd784fb8da..4d039bd0c497 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,3 @@
-DIST grantlee-editor-17.12.3.tar.xz 110752 BLAKE2B 2d0e60207bcf1edd1bd4e69e7a959c59e0e63b14117bafd402f8fa57aea2a1c1eb30c152ab3a70498691e854241046d6ca1ee9ffb3c8303393c6a629244c6be6 SHA512 722db8e101c7132717840137d77dc8c0972a2f1692b4b0d8be3e33c296649d0d5f30f55b4cc6e1dfa58778a3c470c93baae0b060d234a99f967e87296e947f0b
 DIST grantlee-editor-18.04.3.tar.xz 111032 BLAKE2B ac0c177c5f2038d941e172e84155ae4de33183a13a5e522b6ff39eaa402ac41e80fa53cbe2c56351943568fcd33ac2de7eefa59489c68f3ca4663cbe7dad425b SHA512 6eb55fe1632dbee7fd2d632642460a8c6471d801e877be241a519fb1f103154844a01949b0e5db0b833351c6fb496e3dd34998acf1634817c1319b173be15acb
-EBUILD grantlee-editor-17.12.3.ebuild 1166 BLAKE2B 2ee5e6679257691d98d7a03e2972fdf33724487bbb69fc3c6aaa3dd7d2682dcff05cd51452f4f276e13e00a6b37d11c8d6ef0a92dc2f715d23886c63b21be55c SHA512 4ceb795d35dc12eecc2dbd69ccacd361aba00b18461340f9a867a0cc0e67fa7187d83e1800f4a8465e1fc82674401145e09585859b0b3b21d07a03227a1f68a3
 EBUILD grantlee-editor-18.04.3.ebuild 1166 BLAKE2B 2ee5e6679257691d98d7a03e2972fdf33724487bbb69fc3c6aaa3dd7d2682dcff05cd51452f4f276e13e00a6b37d11c8d6ef0a92dc2f715d23886c63b21be55c SHA512 4ceb795d35dc12eecc2dbd69ccacd361aba00b18461340f9a867a0cc0e67fa7187d83e1800f4a8465e1fc82674401145e09585859b0b3b21d07a03227a1f68a3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-17.12.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-17.12.3.ebuild
deleted file mode 100644
index e4081d1e526e..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-17.12.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index eee7221e2b42..caf866299e7c 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,3 @@
-DIST grantleetheme-17.12.3.tar.xz 51348 BLAKE2B 89055379524d9273b2db9185c1f0116638e5f45414ba674cb7d2511e9539d556daf489e9a54f39a3c1197a8b1939076ccb7bd932d336c0769b97d2c7e59a8062 SHA512 203fd80f303d4c2c76b9375179da9aa7f040416b397ce576ee5836b2bc8d04109601275bad843a192317971852f97c9a7fa83b48401da14ec820f11706187928
 DIST grantleetheme-18.04.3.tar.xz 51676 BLAKE2B 97db8d46c7e99d1cf3a3ef61dfc579564adfa80d4d5aa21faa29cd94c332c9f3c6ce8e9845a3c6f1555be5a95c7cd603bd8c5372c69f1cf1296bddc96580ce17 SHA512 5f5ded0dcfba8759101807f2fe2148b9af07043da05a5357be7614e4a26660c9f50b41206bd6dfadd9b659ed08d55f9f76c47e076a1cccb3f595209441de4010
-EBUILD grantleetheme-17.12.3.ebuild 735 BLAKE2B 01da5ebbc4f0fd762fd77fc496ca81622924d98e60749f366d4ed068ffca33dbc6111433aaf0b057701f6b683eeeba5a3f1a0c552b34fbce741128f4882c427d SHA512 1ea754208f4dca36e52ec2f2ffa5699350b6de9b19106cbfa00dbe655377bbb596aba4d31f2b4a17135bd48673401a4eaafd2a7d6efc3a9a5b46fc8652bcfa0a
 EBUILD grantleetheme-18.04.3.ebuild 735 BLAKE2B 01da5ebbc4f0fd762fd77fc496ca81622924d98e60749f366d4ed068ffca33dbc6111433aaf0b057701f6b683eeeba5a3f1a0c552b34fbce741128f4882c427d SHA512 1ea754208f4dca36e52ec2f2ffa5699350b6de9b19106cbfa00dbe655377bbb596aba4d31f2b4a17135bd48673401a4eaafd2a7d6efc3a9a5b46fc8652bcfa0a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-17.12.3.ebuild b/kde-apps/grantleetheme/grantleetheme-17.12.3.ebuild
deleted file mode 100644
index a1c9e2a4c809..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-17.12.3.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
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for Grantlee plugins"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtnetwork)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-# fails if package not already installed
-RESTRICT+=" test"
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index ff0d1af8bfd3..d07de916befd 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,3 @@
-DIST gwenview-17.12.3.tar.xz 6021476 BLAKE2B a4142239cfe4d82b26977d788a67286625d7469ce4722a1c091691c02abe75ceb5b852e4754b6c3809fc96219b0a967595cd83910e8b809c553adaa0397ee939 SHA512 7691e07f6ec572a46a8b0c3e63aba93d7a3c2886384370d3d77299c94e7f9cc5f7dff4e45390cc6871bc003da27ce0f90d85d8108a7302657bc3f0175e609abf
 DIST gwenview-18.04.3.tar.xz 6055876 BLAKE2B 5202dcfe597ad1da7d5b18124ec357239a26a30c20d83c37bc7258e0ad4232b53081a8e050017850ea6eeb02fe0d88f90b90b0029e364929375d3e09dc8bf7fd SHA512 a1c36a05e4ae3ee9aff74f4a56eb10c2c27aa89e10886d14dd6753e42329653550e8716965156ec5f50915e320224757bf52d1178986ef10d039e3c622c01a7f
-EBUILD gwenview-17.12.3.ebuild 2413 BLAKE2B fec0d82754f8e01f85946c5d9dd3aaeba2d4b7b934327f8bfd37e3c7cc910dd675d3d5583110088a21a07e780e3a25cfa25f03cf4d866a0d0d05b535922b0ddf SHA512 2dc8646d06e47db59f8ca63b89d73a50b70e00ff33e9f8a04043017cf84579ab0406dfc44ca258fc8d722a2e3eb00da00583ac42895985280e380b9322366d64
 EBUILD gwenview-18.04.3.ebuild 2413 BLAKE2B fec0d82754f8e01f85946c5d9dd3aaeba2d4b7b934327f8bfd37e3c7cc910dd675d3d5583110088a21a07e780e3a25cfa25f03cf4d866a0d0d05b535922b0ddf SHA512 2dc8646d06e47db59f8ca63b89d73a50b70e00ff33e9f8a04043017cf84579ab0406dfc44ca258fc8d722a2e3eb00da00583ac42895985280e380b9322366d64
 MISC metadata.xml 423 BLAKE2B 2e0463d65a7476da0e5a28420f235108b3367b9adfcda7fc2d47c1a5ae0e7f1ca49859d7ac213e3434c7d846c78af041d90da5767bf68e24be5a3e8eb80ad37b SHA512 19d70c59c116bfff13a062076e18d094d77ff06e30a01cc2c1439d464439616f2b758a250ff45c5a792926800906f1de8588a752317b7272e3a1223e543ff680
diff --git a/kde-apps/gwenview/gwenview-17.12.3.ebuild b/kde-apps/gwenview/gwenview-17.12.3.ebuild
deleted file mode 100644
index b353cb2bd0b3..000000000000
--- a/kde-apps/gwenview/gwenview-17.12.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE image viewer"
-HOMEPAGE="
-	https://www.kde.org/applications/graphics/gwenview/
-	https://userbase.kde.org/Gwenview
-"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
-IUSE="fits kipi raw semantic-desktop X"
-
-# requires running environment
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(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 kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	media-gfx/exiv2:=
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	media-libs/phonon[qt5(+)]
-	virtual/jpeg:0
-	fits? ( sci-libs/cfitsio )
-	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
-	raw? ( $(add_kdeapps_dep libkdcraw) )
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
-	)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kimageformats)
-	$(add_qt_dep qtimageformats)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package fits CFitsio)
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	if use semantic-desktop; then
-		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
-	else
-		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
-	fi
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version kde-apps/svgpart:${SLOT} ; then
-		elog "For SVG support, install kde-apps/svgpart:${SLOT}"
-	fi
-
-	if use kipi && ! has_version media-plugins/kipi-plugins ; then
-		elog "Plugins for the KIPI interface can be found in media-plugins/kipi-plugins"
-	fi
-}
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index e47964c17176..1f3ff11a0c6d 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,3 @@
-DIST incidenceeditor-17.12.3.tar.xz 517144 BLAKE2B edbf3e6b3bf7027ca8399d42cb59e5122e8bd85b2fdf0de5e6932bba68fdb1a8b75cc38b20022f8bf3712ac0ee6ac4525b709a0e24609d634cea83d2571bf57c SHA512 b800a3f1f62a195e515b1ff41aae801f17a983549499c2e694f5ad8690bda1a7218aa7ebcc4908b288ee97c6d335df729348d9a34df4400cfea86d4501af2ba3
 DIST incidenceeditor-18.04.3.tar.xz 526824 BLAKE2B 17047dd77fb93c39322cf6c9cf3dd5c3e75bf20fc959ab6594fd6d00c6c7be924027bf0c1964c98ab162b109aeebaf8b738598b76b88e860ddfacb76449d24c0 SHA512 805a0eb76d3047e7520d5915b2210c948474028b6692d19ba74ff32553366bf792133c78a5ebb4d50dc9a5506d53cb5837ba7fb9981f30c3d710e6705fa84fa9
-EBUILD incidenceeditor-17.12.3.ebuild 1393 BLAKE2B 5a1a0e42a5a0b48722407844edf81d56d9ac339aeb509b9d12f37dfd6adcfe9306bbc1bd6ad2ba09cc4418aa5fd40550bb7872c5fead39dc2e3195b55647a7d7 SHA512 244023eee75d28a4cea19b01368bc6fd2d6192cdebc1f71dbaeb029a8d7b0088059084139e80a6361d136828c1553b8a0563c3c6cdcd3158f2d57bedd2ce23ea
 EBUILD incidenceeditor-18.04.3.ebuild 1393 BLAKE2B 5a1a0e42a5a0b48722407844edf81d56d9ac339aeb509b9d12f37dfd6adcfe9306bbc1bd6ad2ba09cc4418aa5fd40550bb7872c5fead39dc2e3195b55647a7d7 SHA512 244023eee75d28a4cea19b01368bc6fd2d6192cdebc1f71dbaeb029a8d7b0088059084139e80a6361d136828c1553b8a0563c3c6cdcd3158f2d57bedd2ce23ea
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-17.12.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-17.12.3.ebuild
deleted file mode 100644
index 8d1a723e466c..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-17.12.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Incidence editor for korganizer"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(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 kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/kdiagram:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index 435c88146026..5ad37ced8c11 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,5 +1,3 @@
-DIST juk-17.12.3.tar.xz 1868428 BLAKE2B e88f8607aa360751cbbb8c72fe04ad52f1d3f66679515cccf048a3802c65212c66e53936c1826c121ae9dd728ace46dfa5d33978818b8c95d088760e2e0a34ea SHA512 b86e8eb68dca55a9a321cbcfb0172a95a4e1536c3959390f62e3e519862c9de32f327db04e55de39ab194a5e46c228614333b22886b5bb2b4578f0f1d6b5cddc
 DIST juk-18.04.3.tar.xz 1872492 BLAKE2B bca7172ddcb8f657d11ee51311b39390c62be31ff996dcdec5557c68f96346b10dddeb9f40d8537a17e4be879861c698b357b6688f3cf2a1220b47108174f778 SHA512 f5492f3edfea4e74f984a1d09d15ec186a96ab536223821795d84f3b5868f45a9b76655121950f69580cd701d1fd6a621e6e4b43a05481c9c05672f02278a35d
-EBUILD juk-17.12.3.ebuild 1104 BLAKE2B 4158dca7ff9846b19c1d4330752ce8da36159dcee898b83732b56dd258dcb8909001b25db96b77d95d3e08020a47b54394f5c7c30adab7fa4787f58367c835b2 SHA512 3888df6be004639a2e0b32f3bc68952c41b3da0182417511a2623960efc959cb0c12b10c4552a1a75a1ff243b8c70a3e50e2c272a6a70ca10ebff99705691412
 EBUILD juk-18.04.3.ebuild 1104 BLAKE2B 4158dca7ff9846b19c1d4330752ce8da36159dcee898b83732b56dd258dcb8909001b25db96b77d95d3e08020a47b54394f5c7c30adab7fa4787f58367c835b2 SHA512 3888df6be004639a2e0b32f3bc68952c41b3da0182417511a2623960efc959cb0c12b10c4552a1a75a1ff243b8c70a3e50e2c272a6a70ca10ebff99705691412
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/juk-17.12.3.ebuild b/kde-apps/juk/juk-17.12.3.ebuild
deleted file mode 100644
index bf26562a4aab..000000000000
--- a/kde-apps/juk/juk-17.12.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Jukebox and music manager by KDE"
-HOMEPAGE="https://www.kde.org/applications/multimedia/juk/"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	>=media-libs/taglib-1.6
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index a5a9b77d1271..78e8e46e2d83 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,3 @@
-DIST k3b-17.12.3.tar.xz 10573616 BLAKE2B e5606f7ef96aa34cf2aba068cd7417bd1783910f759dffa2bb4edab3d2e921788513b22839c8e6156f304db4e81b3a6889d1bdf7b4648f64e2cbd383fe032705 SHA512 05cd1413d99f55c4aca5b75cd51691fa0ca0a975660168ee3effa39774deab36d28ef3e7c71860c726d1e7e02b3ac12e6372e2e47bb64d5fa5e21f58540d11e1
 DIST k3b-18.04.3.tar.xz 10599940 BLAKE2B f5c72ff0ce4fafd15e6c2c954934b7f6e57e8fe31596a0eaa7f0510d919c910882fc8fb5b0d4508a88c43b70d88f22692b34786f9999559be4aa6f334feebcf1 SHA512 744e963537b71d3ac4d529e216a1ece7b858f831e6de5beadcfa42cb690ada80c1d17271080eb5bd753ab3b9325374c382b87449ec9bc816ec32c680b0e7d5ed
-EBUILD k3b-17.12.3.ebuild 3334 BLAKE2B 251c4e4a2a963bad70819c3254a22fc55769635e45d04fbec4bf3bfafc49add2323683a2aa32928ead05075c7d394ee35441a471ce6c3fadd76e3c5a883c1e0b SHA512 eb77b10c097657db00a73a3fbc9cec6709ac4886eb50c538c2d8ee1d7a976ecd6219831c884c7bea49c00fd62ba9a86a9dd9fb6dceb79c421dbad32545876fde
 EBUILD k3b-18.04.3.ebuild 3334 BLAKE2B 251c4e4a2a963bad70819c3254a22fc55769635e45d04fbec4bf3bfafc49add2323683a2aa32928ead05075c7d394ee35441a471ce6c3fadd76e3c5a883c1e0b SHA512 eb77b10c097657db00a73a3fbc9cec6709ac4886eb50c538c2d8ee1d7a976ecd6219831c884c7bea49c00fd62ba9a86a9dd9fb6dceb79c421dbad32545876fde
 MISC metadata.xml 334 BLAKE2B 0af18188f4b2d7ffa34ad43e06154f943c5da262588331287f89c34f737b435ecf6ac092424057440c9de9ccef1228d0d3c0978d457b5bbf5bdfeaefc464863e SHA512 16203cd75177004bb4844f67659dc7370c12e216871272ff8f781ed11172e72271b15f347ad6d59354ef077ebab1fad2bc150f3e2388f370b660b2d2adcb0faa
diff --git a/kde-apps/k3b/k3b-17.12.3.ebuild b/kde-apps/k3b/k3b-17.12.3.ebuild
deleted file mode 100644
index d8d682c1190b..000000000000
--- a/kde-apps/k3b/k3b-17.12.3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/K3b"
-
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="amd64 x86"
-IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata 'taglib?')
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_kdeapps_dep libkcddb)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/libsamplerate
-	dvd? ( media-libs/libdvdread )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( >=media-libs/flac-1.2[cxx] )
-	mp3? ( media-sound/lame )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	sndfile? ( media-libs/libsndfile )
-	taglib? ( >=media-libs/taglib-1.5 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	webkit? ( $(add_qt_dep qtwebkit) )
-"
-RDEPEND="${DEPEND}
-	app-cdr/cdrdao
-	dev-libs/libburn
-	media-sound/cdparanoia
-	virtual/cdrtools
-	dvd? (
-		>=app-cdr/dvd+rw-tools-7
-		encode? ( media-video/transcode[dvd] )
-	)
-	emovix? ( media-video/emovix )
-	sox? ( media-sound/sox )
-	vcd? ( media-video/vcdimager )
-"
-
-REQUIRED_USE="
-	flac? ( taglib )
-	mp3? ( encode taglib )
-	sox? ( encode taglib )
-"
-
-DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DK3B_BUILD_API_DOCS=OFF
-		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-		-DK3B_ENABLE_HAL_SUPPORT=OFF
-		-DK3B_ENABLE_MUSICBRAINZ=OFF
-		-DK3B_DEBUG=$(usex debug)
-		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
-		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
-		-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
-		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
-		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3)
-		-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
-		-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
-		-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
-		-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
-		-DK3B_ENABLE_TAGLIB=$(usex taglib)
-		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
-		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	echo
-	elog "If you get warnings on start-up, uncheck the \"Check system"
-	elog "configuration\" option in the \"Misc\" settings window."
-	echo
-
-	local group=cdrom
-	use kernel_linux || group=operator
-	elog "Make sure you have proper read/write permissions on optical device(s)."
-	elog "Usually, it is sufficient to be in the ${group} group."
-	echo
-}
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index be6a7695d1ed..2a9430130544 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,3 @@
-DIST kaccounts-integration-17.12.3.tar.xz 70824 BLAKE2B 1299d25ac8852362a346edecc9f9d6554cd05e5554dcf58b735bce3b099074de4c0b2f8d77566075d90e775bc7e8a6c5cdac2bcb332207d808641163bac5cffa SHA512 239e273496c6d190a5c07f4fb98d718e435d0d4864f2c58877e90824d8f4fbbefcc4a057bc4a1ea25b4df77da9a111711d18a6111a58febe932844befc0489dc
 DIST kaccounts-integration-18.04.3.tar.xz 71660 BLAKE2B 083248cfd88c7000036351150122bcdb84ca7f340e0a32794a761db3c68f9f18deb8acea86471bbd0402f86846c7e241fd1b8e2c32b668f8f664e6207d592895 SHA512 2b7ff86398f5dfd454be3f8b2792f0abe9ca17cc4cafee9c4f99ad5f4eb63d47a4a7b9a0f43583e1c108d362a5cda52f8428252b0e7f3afef30c67c13b926ba1
-EBUILD kaccounts-integration-17.12.3.ebuild 898 BLAKE2B 9475ceab418eda41c61d749e0a68f555b7885537a8ea181977a24e45ba2070333db6221f44a3489eb531a0a4b06332e13ba8826feeee7e82369599b1e2c8dc5d SHA512 a0cef7b698fd7a977159f8d9ebc10bd2fa99708846486559bb633d59dbd425fa73bda05efe6e4ff910a2bbcbd25edf3168612d53849461d13ce35eac6195fc55
 EBUILD kaccounts-integration-18.04.3.ebuild 898 BLAKE2B 9475ceab418eda41c61d749e0a68f555b7885537a8ea181977a24e45ba2070333db6221f44a3489eb531a0a4b06332e13ba8826feeee7e82369599b1e2c8dc5d SHA512 a0cef7b698fd7a977159f8d9ebc10bd2fa99708846486559bb633d59dbd425fa73bda05efe6e4ff910a2bbcbd25edf3168612d53849461d13ce35eac6195fc55
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-17.12.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-17.12.3.ebuild
deleted file mode 100644
index 555082fc8ba4..000000000000
--- a/kde-apps/kaccounts-integration/kaccounts-integration-17.12.3.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
-
-KDE_TEST="forceoptional"
-VIRTUALDBUS_TEST="true"
-inherit kde5
-
-DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
-HOMEPAGE="https://community.kde.org/KTp"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/accounts-qt
-	>=net-libs/libaccounts-glib-1.21
-	net-libs/signond
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_plasma_dep kde-cli-tools)
-	sys-devel/gettext
-"
-
-# bug #549444
-RESTRICT+=" test"
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 3b05e7b50b5c..3e2be76a14e9 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,5 +1,3 @@
-DIST kaccounts-providers-17.12.3.tar.xz 31740 BLAKE2B 5518d40bbb28a7657ec406b76df35faefda9b6e9a3e8a2c31b27806329b66487d54c8a72fae50795bfcde519fbad96059b58466cc62b1197b2f7e4f2bbebfb93 SHA512 c8eba2caaa4cf3e33cf86b8a8713292be9666d3eca75931a493206317735b1938b0d36e028461f16229e26f38039d54d25b7c2e5ccdbfcfe5a68adbea69ee756
 DIST kaccounts-providers-18.04.3.tar.xz 31868 BLAKE2B 3538782c5eb9c07607d258f00f11384521a47fb719fefa47bd98a4d7a73f287ccd2a5e65f395eca81652da1f83aa2a192939c48e7be465be5757675db26a7d79 SHA512 9e37745392c58992994989e1a9d35a692f5e08170073d9fa95e911d89ddde75a6bb2954283e46f5d6c6f8ffd9d37e31646e574f67e5f782b65fea331fdf0f28e
-EBUILD kaccounts-providers-17.12.3.ebuild 666 BLAKE2B 859261416a66ffe9af1eb12195fb85bf5f63b2171055fd65cb0a2eec94b24071619e58cfec724842fdb3b366576aa46c11fcde9867f06b6c334a8dfc7df3ded0 SHA512 5a2fbf17eb6a9cd3ff593ad6d4507c796198390c0ac552950098ad50991b78ab02e23fa7a722fd96894ce03b0ffd1c2200d9ddfc536e58c3aaee4a98650bdda4
 EBUILD kaccounts-providers-18.04.3.ebuild 666 BLAKE2B 859261416a66ffe9af1eb12195fb85bf5f63b2171055fd65cb0a2eec94b24071619e58cfec724842fdb3b366576aa46c11fcde9867f06b6c334a8dfc7df3ded0 SHA512 5a2fbf17eb6a9cd3ff593ad6d4507c796198390c0ac552950098ad50991b78ab02e23fa7a722fd96894ce03b0ffd1c2200d9ddfc536e58c3aaee4a98650bdda4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-17.12.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-17.12.3.ebuild
deleted file mode 100644
index 8c161f2a41ee..000000000000
--- a/kde-apps/kaccounts-providers/kaccounts-providers-17.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE accounts providers"
-HOMEPAGE="https://community.kde.org/KTp"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_kdeapps_dep kaccounts-integration)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-"
-RDEPEND="${COMMON_DEPEND}
-	net-libs/signon-ui
-	net-libs/signon-oauth2
-"
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 54fdf3691f72..0a8ad05ec4bc 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,3 @@
-DIST kaddressbook-17.12.3.tar.xz 544148 BLAKE2B 9857bfaca4f94e6108066d4a6270e6e959b110f5a6ba9219cc371665d36b00d445cef0723ea118c285bee7971a9fb480d8851e4eb569d474de29161f37b90915 SHA512 0b498c7ebf49a6a4df3c24b185ae9edd2d53a80fdc6d84c6ebc6b9f5531766dff579ca7240f6c4657bc113b872811de941e75f7f4d171d3cbd08a0e9afb2a054
 DIST kaddressbook-18.04.3.tar.xz 547988 BLAKE2B 470fc757fbcf30accada18f62916fb21eb2710eddafacbcb6842562238ca74d04ee6b5e1271a1a15d3cc5482bcb9040930f6c1a1185279d784043ccce3395db9 SHA512 5afdfde4319977b31debfe662e2758080f0749229c087179e887272662eb23d69c06b3b634214b240af77b225c91c5b20dae531ea7cd58befa4d019bd28ebcc3
-EBUILD kaddressbook-17.12.3.ebuild 1706 BLAKE2B c6d7559fb3fac56b6d259836e03f72003d4f89921ae5c4116571ccf80e753fb8c07aa3215ef3e2aeec9eb30d13b7bea139c0ae11a9ef15db77162315587e8b33 SHA512 edecd0701d2519f20045375486ce5f16460cf16879c8c1f76403a4a088cae89a6d68fe03c5ae1183753896d496a6c6056dd93a4651088e929faa9ed897913621
 EBUILD kaddressbook-18.04.3.ebuild 1706 BLAKE2B c6d7559fb3fac56b6d259836e03f72003d4f89921ae5c4116571ccf80e753fb8c07aa3215ef3e2aeec9eb30d13b7bea139c0ae11a9ef15db77162315587e8b33 SHA512 edecd0701d2519f20045375486ce5f16460cf16879c8c1f76403a4a088cae89a6d68fe03c5ae1183753896d496a6c6056dd93a4651088e929faa9ed897913621
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-17.12.3.ebuild b/kde-apps/kaddressbook/kaddressbook-17.12.3.ebuild
deleted file mode 100644
index 92334be68336..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-17.12.3.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_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index 4e039da7ff38..e8ca0a53d79f 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,3 @@
-DIST kajongg-17.12.3.tar.xz 4238944 BLAKE2B 5b953695413d8486468be2e83d7326199415a1cfe3f2fdba834f0ac3be841042efc73fea11d0c2e0177573065b0576f058e8e3527d7186c02e37986c86bdcb5e SHA512 c1d8a0934952cf11d3de3bc081cc7b33b42a7707cc0cdf91a669087f6707108aa6be25a34a065128afcf63602491096f8533bbcebc8ba89a37f310caab9515b5
 DIST kajongg-18.04.3.tar.xz 4241892 BLAKE2B 764d0787917948eb70efca211d3fac59beeec0c1fcd4fb5f4ae7f48ce3235cf490a974b268e56ee4032bb4db0e5e6689ab8067c44cb937f70572d25d9019806b SHA512 ba447ed629b40ec8984d95cd324b06637d5d4131e8868dca36ed10451c6bf95e0126e0548322553b5ea15e8ae82211cb3bccade4cd0bd3f19f6ff4a415eca8f3
-EBUILD kajongg-17.12.3.ebuild 1280 BLAKE2B 1a60ed7e29724456829f6b27689bc3e9f0be2f3433da605a45f55b2e36d9ac1c5436858225d796ba41639d66c71a20f220ea588716942d4644bce613461f10cd SHA512 60c40554e4d71fec23832d1097e568a4727a38b8dd91b4e89210d1c6a7c0b219ca1de171205dd7650b179474e5c277280800d0975d876545a9670b0794b44bf2
 EBUILD kajongg-18.04.3.ebuild 1280 BLAKE2B 1a60ed7e29724456829f6b27689bc3e9f0be2f3433da605a45f55b2e36d9ac1c5436858225d796ba41639d66c71a20f220ea588716942d4644bce613461f10cd SHA512 60c40554e4d71fec23832d1097e568a4727a38b8dd91b4e89210d1c6a7c0b219ca1de171205dd7650b179474e5c277280800d0975d876545a9670b0794b44bf2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-17.12.3.ebuild b/kde-apps/kajongg/kajongg-17.12.3.ebuild
deleted file mode 100644
index 681c2b2c4ad6..000000000000
--- a/kde-apps/kajongg/kajongg-17.12.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{5,6} )
-inherit python-single-r1 kde5
-
-DESCRIPTION="Classical Mah Jongg for four players"
-HOMEPAGE="https://www.kde.org/applications/games/kajongg/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	dev-db/sqlite:3
-	dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep libkmahjongg)
-	!kde-apps/kajongg:4
-	!<kde-apps/kde4-l10n-17.03.90:4
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang src
-	kde5_src_prepare
-	sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
-}
-
-src_install() {
-	kde5_src_install
-	dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
-	dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
-	fperms a+x /usr/share/kajongg/kajongg{,server}.py
-}
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 69f226f5c0b7..fe999f4b31bd 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,3 @@
-DIST kalarm-17.12.3.tar.xz 1797760 BLAKE2B 9ba94eb0dec5b6b9d55fdeac4605ed3ea12668c3d82f530072187b4c5010f8b2d0e4042f7a9b64858a353e7d588afc52186e899479884bf78b2ede7807e61625 SHA512 21f5187fbec15e49b9e51b062b1ee1e424c6dd73cbc9c7871940a8441da5faa15d3344b7adfd1795906907c6ea8b469846f1ad1371d9abfd0e1e4df84daac892
 DIST kalarm-18.04.3.tar.xz 1796128 BLAKE2B e4bf35dad7997c7f01f0a2e06efd4dcebe7d8c4493cfed7fdd1d49fd8ba3908925a4395478ecbfa8deee6e3241db057c03935ed2e4b6555b46307c550ab0d82e SHA512 05a524214c1b58db1d8d43d996771d37a1e17bdb9efa3e4e4f7475f1b48a984a2f8e28398a8d3d7cac9a5f7ef109fc82b35941bcd217fe2b6dc1a1de2e7924d6
-EBUILD kalarm-17.12.3.ebuild 2062 BLAKE2B 51f37557c4d354d47e423338cd0dae03cda913fc90caf123dfce6cade8e1b68e2f806f4153bfcbe9c4f2099665c42fbb00b7dd78b775b046db31fdcb4886b338 SHA512 b0fe838ed717f8c68454f178a6303c135882e5e82c436a8bcd3570aee33f40ecf2b5b4dd6d457da6f02e30ca4bae491f172b4f9f5f8fa9729f957ad2834e1aa1
 EBUILD kalarm-18.04.3.ebuild 2062 BLAKE2B 51f37557c4d354d47e423338cd0dae03cda913fc90caf123dfce6cade8e1b68e2f806f4153bfcbe9c4f2099665c42fbb00b7dd78b775b046db31fdcb4886b338 SHA512 b0fe838ed717f8c68454f178a6303c135882e5e82c436a8bcd3570aee33f40ecf2b5b4dd6d457da6f02e30ca4bae491f172b4f9f5f8fa9729f957ad2834e1aa1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-17.12.3.ebuild b/kde-apps/kalarm/kalarm-17.12.3.ebuild
deleted file mode 100644
index ae2a05492f99..000000000000
--- a/kde-apps/kalarm/kalarm-17.12.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
-HOMEPAGE+=" https://userbase.kde.org/KAlarm"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(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 kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(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_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libxslt
-	media-libs/phonon[qt5(+)]
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index af7dad8f90fa..3e9aedf1e412 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,3 @@
-DIST kalarmcal-17.12.3.tar.xz 494884 BLAKE2B e13c2d013180129eebb497fc26634f53d80cc88b23ea0bba9b5fb775247921e28408ae877651483d803743d531674b4b06ef42c4b33fe87b51978e772714ee80 SHA512 444edd565287441a53da00520bba9b4a22c155048c504a1bd1c0a25f066ae12bea63100589270cd93c26af18cb6e4686c7a753199d10980db638c5a14529239c
 DIST kalarmcal-18.04.3.tar.xz 548228 BLAKE2B 673a8cb71e1355790864295e3762da3f5c567b08b94b32063a293ce7b156f3a8d6ffc1fb8bf8fdee12d5ee4c3f3c30699f48e563b911f786f4fc4d840f859438 SHA512 d3ff9210cb999d83d108a359e996fcbb187aa0b2bf264331c13f744ac9539a64e678e99b4fac47c19c2edb560c041d07f45450cc3ee56e59c86442755df2c204
-EBUILD kalarmcal-17.12.3.ebuild 537 BLAKE2B 2902310cf6e87a09c6271553dd4eacf94dca96c77ebadc7baf34122f8b13b62550ba3209c940805904d0200e06800256e208898c5170b5d6a51fb75bd22b483d SHA512 ffb7a34980e86816df0216a1162323b3e07a0375becbd257ec7484e57aba1ebeb728c9c6ede1035454dad83dc9adf00fb7794674b05c5526066a33198ffd22e9
 EBUILD kalarmcal-18.04.3.ebuild 603 BLAKE2B a92cc38762957696e0a01e9cdc9a71c9318673acb9a86c7e22e03903cc5aa3954d6e086b81f3bcf3a39504dc47a56d99dfe74374ce371244ff8fdac812232019 SHA512 32f5bc44b552413d258db0370ff77ce65df8100a46f7e65e2e7e307447de200c1e77fea0707cad3e1e850254690663a77762c41e0a083a7992ae8bd2fc7322ad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-17.12.3.ebuild b/kde-apps/kalarmcal/kalarmcal-17.12.3.ebuild
deleted file mode 100644
index 1df45b7ee881..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-17.12.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index 3632c5e35603..5e5e269de0a9 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,5 +1,3 @@
-DIST kalgebra-17.12.3.tar.xz 690480 BLAKE2B 996b66e256d3a87181d03d6fdcd35df9322baef6fa4b6c7a28db8e8641dabf7c33378b632b3a676f983cf25f91377ffc9c98b95553e61805bd1d72ccac958702 SHA512 7062ab6c6a2fce17e313ad16535f51b5ce893384499971dd05e9a256b00e7172b1b83dd3fd4cee76406b32e6abc2a16fa671eb5b95cd8062c760968ede44c62b
 DIST kalgebra-18.04.3.tar.xz 708516 BLAKE2B c3977b66bf126a2e1774401ff1fd4161e9ffb6e82d7cc25b1b43cac4604595f8ebaa2e8ac49ceffc65ee5486a88b4d780edf6196d04e1ee257af38e54787bf8f SHA512 8314e8193a29a611b3566eac8b98e2599e2bfde7ff767a7cf513acf51599e9f42b32f24e8f08bca8e824822260c298f97a64c662882eba1d977ce20ddb92a3f6
-EBUILD kalgebra-17.12.3.ebuild 1007 BLAKE2B 9e112544f4654c52f84734458795bcfa4160f0e571d78be02699ec0e85a8839d130f23ca47d312534c1470dc292dd4cc3c7fa32ce6cafc09985b5a41d1a152fa SHA512 c895f264c4ca7472998cc1890e7b446d8ba05008ca97ad3d572bea333ef6a00030e872b78f487c0a21fd80c42f4f0d54770c706cfe8564e9127ef66654c1081a
 EBUILD kalgebra-18.04.3.ebuild 1007 BLAKE2B 9e112544f4654c52f84734458795bcfa4160f0e571d78be02699ec0e85a8839d130f23ca47d312534c1470dc292dd4cc3c7fa32ce6cafc09985b5a41d1a152fa SHA512 c895f264c4ca7472998cc1890e7b446d8ba05008ca97ad3d572bea333ef6a00030e872b78f487c0a21fd80c42f4f0d54770c706cfe8564e9127ef66654c1081a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalgebra/kalgebra-17.12.3.ebuild b/kde-apps/kalgebra/kalgebra-17.12.3.ebuild
deleted file mode 100644
index 8d577bf884a2..000000000000
--- a/kde-apps/kalgebra/kalgebra-17.12.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="MathML-based graph calculator by KDE"
-HOMEPAGE="https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/"
-KEYWORDS="amd64 x86"
-IUSE="readline"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep analitza)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-	$(add_qt_dep qtquickcontrols)
-	!kde-apps/analitza:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package readline Readline)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 063f3f3cf2b8..23c2c38c8157 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,3 @@
-DIST kalzium-17.12.3.tar.xz 24447404 BLAKE2B 48e99e119bf3bdf38603e6fbe942697fdee28c9decc38aecde525b7d0bd4a3b9f8a8084cd13a238b0eb356ebc179f355783d4937e4317bd25dff138d433ee92f SHA512 989e35f617ef019036571103c1fa4df7fb64238fd2cb7c909798b7baaacb1ebc64d6c989c07040a5c46f3db240edf2e415c11ab4a480eb2f532f1ed992af4fb1
 DIST kalzium-18.04.3.tar.xz 24391996 BLAKE2B 54ff86420607eae2cfded6722eb5d12c0305fa5f331b1d8a078eaa62e8c82a4b51e253fcc4138123df33839c02d6e86dbb8fc14fe2ef47f5b6efb65a0576e487 SHA512 1a7a6d6dfc8d210fc29bb77de9b1f59cfe45eb774cec4f1783de367c9d67b4d73c83847ea2c99d2706a47e0d5b2c115decd7d3b9b4b1399bf7ca9d4d69a51cc6
-EBUILD kalzium-17.12.3.ebuild 1563 BLAKE2B 57daa08a596f0f0111aab8f1f7029c78a613c68d2ed81144fb18ac1da44dea82f2272d7c99e793203c1a50cb525604813b662d92a2b29565a0b57339c3cf52c0 SHA512 17c4a6947d2f9ae967c5febe6c29863a877fcc591dfee9e6c39cc0999894ae0c7b5f3ec99cd06312ed7f483b0da14e82e86dc615db77868accb7d82d9e568546
 EBUILD kalzium-18.04.3.ebuild 1588 BLAKE2B 12dde3693005357d77b3702ff117eebaf75151399b8bb130173d037805b83029fad3dbd8d7c7da5a493479f98bdafbfdd22a1e512e3edcdeacc7e9896514f27c SHA512 2f7f82bf2cae3daee18f9b7a4a7beef40baf7600e3a9e532eabac674a061a62f76d742f4f17ac44245e121c9246cbad077edb8ea6f9377a25a57470e49ca5e5a
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/kalzium-17.12.3.ebuild b/kde-apps/kalzium/kalzium-17.12.3.ebuild
deleted file mode 100644
index cbe0425d92d3..000000000000
--- a/kde-apps/kalzium/kalzium-17.12.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5 flag-o-matic
-
-DESCRIPTION="Periodic table of the elements"
-HOMEPAGE="https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/"
-KEYWORDS="amd64 x86"
-IUSE="editor solver"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	editor? (
-		$(add_frameworks_dep knewstuff)
-		dev-cpp/eigen:3
-		sci-chemistry/openbabel
-		sci-libs/avogadrolibs
-	)
-	solver? ( dev-ml/facile[ocamlopt] )
-"
-RDEPEND="${DEPEND}
-	sci-chemistry/chemical-mime-data
-"
-
-src_configure(){
-	# Fix missing finite()
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
-
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package editor Eigen3)
-		$(cmake-utils_use_find_package editor AvogadroLibs)
-		$(cmake-utils_use_find_package editor OpenBabel2)
-		$(cmake-utils_use_find_package solver OCaml)
-		$(cmake-utils_use_find_package solver Libfacile)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index e54c11abdd6c..6627804e5945 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,5 +1,3 @@
-DIST kamera-17.12.3.tar.xz 96720 BLAKE2B 8f0efe658f007a89fb946be9ead52bf3492f4fdf8684899722c9d6a7273d921b64333e576158ad34c4facb477734b355453ae2379b1fae5db1f11cd5390c6393 SHA512 498ebef75fe32e1ea7a4eb048f6942ab1539db870eecf0550f1f04ab85bbe36543ffa864cd658988110540cc3d8a0ace442c71d00bd9a04497c221bfeba24376
 DIST kamera-18.04.3.tar.xz 97376 BLAKE2B 6368a6f736ce5b8e4af30d5b52f8068e3ada90f6914c6922d9d199f3779dac23884d16887ea29eecbf6187689ebd72f9766cb3d844c0478a475b4650cee97b86 SHA512 f0f85eb94377ab04e2ad8bd973ccdfb4ef5aec6fcaf4046dac021cc466168dcb8c79d8a4da0735dad015bd2a69ff561f243401c7f30ef7b41b2f4fdcc6c80032
-EBUILD kamera-17.12.3.ebuild 633 BLAKE2B d95148be451dbeb507d1032e69357812ccf0e7e4af0c127ef7e97deeff878c441dbaf332ad5f07f9ea472c6d829e54c57dc579f3d4c38dee64af53dad982e55d SHA512 ca69f736ddb956d31ee251b254959e37c924f9f4a79b91218bf2177ec6c681a405885b6d15058517d9e07de6e153e776161e6edd75d173c544f73f411a6cbe67
 EBUILD kamera-18.04.3.ebuild 633 BLAKE2B d95148be451dbeb507d1032e69357812ccf0e7e4af0c127ef7e97deeff878c441dbaf332ad5f07f9ea472c6d829e54c57dc579f3d4c38dee64af53dad982e55d SHA512 ca69f736ddb956d31ee251b254959e37c924f9f4a79b91218bf2177ec6c681a405885b6d15058517d9e07de6e153e776161e6edd75d173c544f73f411a6cbe67
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamera/kamera-17.12.3.ebuild b/kde-apps/kamera/kamera-17.12.3.ebuild
deleted file mode 100644
index 80d9e28e0fee..000000000000
--- a/kde-apps/kamera/kamera-17.12.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Plasma integration for gphoto2 cameras"
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/libgphoto2:=
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index bbd3b1eb7ec7..c4c71b6f2acc 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,3 @@
-DIST kanagram-17.12.3.tar.xz 7523656 BLAKE2B 3a3cf6ca8e79be66e48f0d9c9e6a9fe311aba098ab0766b2d07ee6c153a77613167c95a2622fd8c42bb5ca30da7c60470fb824322a9c2a10d97f0afc72a6efa7 SHA512 c75df80c167b155c53cbbad66d90a5b01f8f7ad9a97b303decfa3fe9e02ef5f4fb4f890256f6052ab67d735c0c5a1c587d56ea76738889a0c9dc9f24a6b0eab7
 DIST kanagram-18.04.3.tar.xz 7431284 BLAKE2B 49704820723996c7326c282cacd14991d8a0bb2b7dd6dddba882b7e3398d359e9cb564328e196a657cfbdf057fa09fc90a5199a6c49ca09e8b70cf97a918aa41 SHA512 a1b65cfecb6274d79fba8fe408d5941e4fbf52a7c5359903416801e246e08083b3a9865a21a570920bfd0e02dc403e36c9f7076a5e66ffda814e1ade4becc8c8
-EBUILD kanagram-17.12.3.ebuild 1085 BLAKE2B b55b8f7e63892dc7ee25e80c53d13ab12a7091c260e44c300b0e20de20fa11765c501e83f8af155d4d9469f60ad7578383899a2638cfc538989dfc5dc85faad3 SHA512 de7945997daa902534b2e89c7ee9c2eb089b84329c5aa4c3aa63722d776dce28f8ac8fb26c458dec9c88d0d7d839fc15ad0bff4d62b4675b7f320541b5d4135c
 EBUILD kanagram-18.04.3.ebuild 1085 BLAKE2B b55b8f7e63892dc7ee25e80c53d13ab12a7091c260e44c300b0e20de20fa11765c501e83f8af155d4d9469f60ad7578383899a2638cfc538989dfc5dc85faad3 SHA512 de7945997daa902534b2e89c7ee9c2eb089b84329c5aa4c3aa63722d776dce28f8ac8fb26c458dec9c88d0d7d839fc15ad0bff4d62b4675b7f320541b5d4135c
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-17.12.3.ebuild b/kde-apps/kanagram/kanagram-17.12.3.ebuild
deleted file mode 100644
index 4e07375b62fd..000000000000
--- a/kde-apps/kanagram/kanagram-17.12.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Game based on anagrams of words"
-HOMEPAGE="https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/"
-KEYWORDS="amd64 x86"
-IUSE="speech"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-	speech? ( $(add_qt_dep qtspeech) )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-	$(add_qt_dep qtmultimedia 'qml')
-	$(add_qt_dep qtquickcontrols)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index bc40e7f9fa04..35baec5e8ebe 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,5 +1,3 @@
-DIST kapman-17.12.3.tar.xz 2525252 BLAKE2B 819e84a0c3c887eb5cfdba86935e174f716fb97a93c0cfb7ca30b13606959e5100fc780d199c1955cc585a505b92b2edb8ecd682de3ca0030613268479e498d9 SHA512 68504b49a9cd41e5093096b24fa8ada843656cedbf4274637aac7f8d0f7d78f35ec35c3502bd5781380cf7ae763f773747193747fe8eb8a7e73a91d97c0af379
 DIST kapman-18.04.3.tar.xz 2525652 BLAKE2B 6b96e74bc70cadec5ea75f9f95b651cf19a3083b7562849606783ca9e034238f45e0662beb59a316821ec5724178ee30b5fa38fc03b416fd3c89001a707c514f SHA512 80f6f2dce23244e4da3cbef019a97323ec4dfd146fb2844001339d096c1137a5b4b51b9d19c72c1ac5a404bde66cedd4bdd43b1df06a5deda0ef4adf8ebf0b5d
-EBUILD kapman-17.12.3.ebuild 700 BLAKE2B c1a3f8e5d562345539feb4ecaf04028c9bbd0b2007750f5d3af30872b35257454e2fb07dcc1b72c1d02232837a40a2f3265f1df9202ead97be532918cf34b2d6 SHA512 1bf1c4c78b22de7300801a9acb3b2fc311881664640bdd06272fb5ba1dcabb5c1319509e2d55b3270e8d3d90eae856a63151e1957d0cb9b747c2bc70c124065a
 EBUILD kapman-18.04.3.ebuild 700 BLAKE2B c1a3f8e5d562345539feb4ecaf04028c9bbd0b2007750f5d3af30872b35257454e2fb07dcc1b72c1d02232837a40a2f3265f1df9202ead97be532918cf34b2d6 SHA512 1bf1c4c78b22de7300801a9acb3b2fc311881664640bdd06272fb5ba1dcabb5c1319509e2d55b3270e8d3d90eae856a63151e1957d0cb9b747c2bc70c124065a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapman/kapman-17.12.3.ebuild b/kde-apps/kapman/kapman-17.12.3.ebuild
deleted file mode 100644
index 49bee5fdd8fa..000000000000
--- a/kde-apps/kapman/kapman-17.12.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Pac-Man clone by KDE"
-HOMEPAGE="https://www.kde.org/applications/games/kapman/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index 8e5e928391d7..8f390217d565 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,5 +1,3 @@
-DIST kapptemplate-17.12.3.tar.xz 352488 BLAKE2B 203bfee3e05c42b266f7d7c880149ac31e2f8e37306ae46f2091831b68e80477226c05ace0ba63729e1e258fa504ee91133583e76ffdce0239191f2d4b08c22c SHA512 03eff26877917a38bcae3166a16e6b802cc900513bec9a615c38342f6a1ceeb454fbc195d1e05f3cf3b6f8a9a7a64eeaaa83d07a5058efc42c2140b4a8c9006e
 DIST kapptemplate-18.04.3.tar.xz 316568 BLAKE2B 92bbfeabc7bc3b7d45ab4e805d244404cca8c9a959e27be5e9b5de697bc0f4b8973e12f65198bc675e2977dfa08db07e28304a33b1d786769ac4072a43e2a266 SHA512 35e120bbd5a9dfbfcb9ec9372940ba7420f3e53bf926f2ed77d3facd99343f4edc644bc1ae91a147f73d7a1bcd28730051dc8a1c5990631ceab42113c6c336de
-EBUILD kapptemplate-17.12.3.ebuild 716 BLAKE2B a463eb5207879e6949c7961f872c177e64c85ae7288987ccdc3245cef428f472624f0d1293cfa8f0ff033417ccdb19d1707d797c8ea718526584ef4b5de6e81a SHA512 54f108f307fdd01e40242592d56da88d6b61ace68f5ab44f18b890339016e8f6dae53b392a6d73d6171fea5ac2cbbfe36509de29e405f219883529bca9db6e38
 EBUILD kapptemplate-18.04.3.ebuild 716 BLAKE2B a463eb5207879e6949c7961f872c177e64c85ae7288987ccdc3245cef428f472624f0d1293cfa8f0ff033417ccdb19d1707d797c8ea718526584ef4b5de6e81a SHA512 54f108f307fdd01e40242592d56da88d6b61ace68f5ab44f18b890339016e8f6dae53b392a6d73d6171fea5ac2cbbfe36509de29e405f219883529bca9db6e38
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapptemplate/kapptemplate-17.12.3.ebuild b/kde-apps/kapptemplate/kapptemplate-17.12.3.ebuild
deleted file mode 100644
index f7ed1ab511e5..000000000000
--- a/kde-apps/kapptemplate/kapptemplate-17.12.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="A shell script to create the necessary framework to develop KDE applications"
-HOMEPAGE="https://www.kde.org/applications/development/kapptemplate"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 4ca60783257d..699f92594912 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,7 +1,4 @@
-AUX kate-17.12.1-deps.patch 3101 BLAKE2B 6cb0a6762041c6f6f2b02d921cee39b9f8eba1f3104d05a4e9565f7e9c7287f1e3ad5cb51bf07ff2f93d1c826c646102ae47c4f67d3e34dc82524ad102fba784 SHA512 abdfce9b12de6b254fecfa8d5f9e532e01212711962c88a02ab099f81ab68ef02a95c6afbae22057467562b37fcb1036b4edd2e8d8f1bde3919c4cba171de38b
 AUX kate-18.04.3-root-user.patch 2754 BLAKE2B 98c0edf87332b3cceecc1af326730603adc72088915bd4373799cf8376b22edee536b1d04a97b0f303b2f4563288b48211fed899a363c70d5884d069c41fe122 SHA512 0b4cf0dfddc7060702c19824d4aa9b863a3ff1958e809d8112eec2cc6f3e4f3c594a69ee36390ba20d7067facb87f0c83a2cdee28c643cda7690cc3876aaea2c
-DIST kate-17.12.3.tar.xz 5629840 BLAKE2B 384b15a1273ec02d0d3342e761f5c1135f000d1b8485445d07ff5384ea49f60c6d4a6aaadd8371d931cbfcab190e4e5ff820021708dbc44899a01340b980e3bd SHA512 3435afb4dc643064c9e98c86e02521cec9d53fb7ad30320e686db6260e3468b3745643447172218b033dcd46e7c9f02efbd00af26ee820b928ac74f5cf62b0a6
 DIST kate-18.04.3.tar.xz 5639892 BLAKE2B 76b36061ec758964e3644fc3893069791e060566646eb03ce0bb6ed04c6c2707f5f48240887078e309128f09e3316ee1bb7076063a8d937d1c4ee67e1dedc906 SHA512 7a41ef21e28e275a448fa80f6d6a7890e221669343c30f946a4522e7f9b4812407ff5b168939508568ce17965fa2dea965aa63062f4fe059a2612021f877694e
-EBUILD kate-17.12.3.ebuild 1971 BLAKE2B 3f2152e20b5d66f38cdaef7e201e2a98c4daf6961e788fabf682a2c9e9e6fa27cd57660767d605f14331ed57053bc6980f6912086b7070b8d7293709844bc182 SHA512 67e615780c13a51e507cf2fa51de9a7826d67cdb07cc3acc23f0798c291ec9119300410bfc064fb760d84139602655388ec072f8e24c6e66bd2350c2738140f0
 EBUILD kate-18.04.3.ebuild 2166 BLAKE2B d23223dea86c2a770358ba874466ca50b6a14248beac2a17e3d92869f9b532e925b04cdb5fb1022288fd969c565f81ac4fb15a175e4146f88524eead3bf18bd3 SHA512 0730e7eddf12c896a8739f1c356bbe96ff8deb3a4ef68f61ccd089327309a89018ae3d5b3a646371037382f4e979e5e3afc0a070184335a5cd2a1628614bfa09
 MISC metadata.xml 330 BLAKE2B 2c8081efb3a1a1a6c87988dcdf0ac12e4e3efd85ad5c3965662683891113c9a60caa085a97734ae793bc6d12ac3ae0b8cf5249120b45c98897651ea23c7c3045 SHA512 41ae5a022aca855524ba8c6d4c98e54408853a94398a3ae65afd162200e6e4bb8fb9909ac270a27e99a8dc489a61eb48d732a04a73321113874dfcf605d60e6e
diff --git a/kde-apps/kate/files/kate-17.12.1-deps.patch b/kde-apps/kate/files/kate-17.12.1-deps.patch
deleted file mode 100644
index 05f3d53ff15f..000000000000
--- a/kde-apps/kate/files/kate-17.12.1-deps.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 4a157701ad3fae7fed67a92a9d9359dd36f08341 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?K=C3=A5re=20S=C3=A4rs?= <kare.sars@iki.fi>
-Date: Tue, 12 Dec 2017 07:24:53 +0200
-Subject: Remove obsolete QScript includes from CMake files
-
-Differential Revision: https://phabricator.kde.org/D9291
----
- CMakeLists.txt                 | 2 +-
- addons/katesql/CMakeLists.txt  | 2 +-
- addons/project/CMakeLists.txt  | 2 +-
- addons/search/CMakeLists.txt   | 2 +-
- addons/snippets/CMakeLists.txt | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1fc7d3e..b746376 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,7 +32,7 @@ include (CheckFunctionExists)
- include(KDEInstallDirs)
- include(KDECMakeSettings)
- 
--find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Sql)
-+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Sql)
- 
- if(BUILD_TESTING)
-   find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
-diff --git a/addons/katesql/CMakeLists.txt b/addons/katesql/CMakeLists.txt
-index aba9a38..c4fee13 100644
---- a/addons/katesql/CMakeLists.txt
-+++ b/addons/katesql/CMakeLists.txt
-@@ -32,6 +32,6 @@ kcoreaddons_desktop_to_json (katesqlplugin katesql.desktop)
- target_link_libraries(katesqlplugin
-     KF5::TextEditor
-     KF5::Parts KF5::I18n KF5::Wallet
--    Qt5::Script Qt5::Sql KF5::ItemViews KF5::IconThemes)
-+    Qt5::Sql KF5::ItemViews KF5::IconThemes)
- 
- install(TARGETS katesqlplugin DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor )
-diff --git a/addons/project/CMakeLists.txt b/addons/project/CMakeLists.txt
-index 6787197..12a0ff7 100644
---- a/addons/project/CMakeLists.txt
-+++ b/addons/project/CMakeLists.txt
-@@ -38,7 +38,7 @@ target_link_libraries(kateprojectplugin
-     KF5::TextEditor
-     KF5::Parts KF5::I18n
-     KF5::GuiAddons
--    Qt5::Script KF5::ItemViews KF5::ItemModels KF5::IconThemes KF5::ThreadWeaver
-+    KF5::ItemViews KF5::ItemModels KF5::IconThemes KF5::ThreadWeaver
-     KF5::NewStuff # For KMoreTools
- )
- 
-diff --git a/addons/search/CMakeLists.txt b/addons/search/CMakeLists.txt
-index d86c326..856221f 100644
---- a/addons/search/CMakeLists.txt
-+++ b/addons/search/CMakeLists.txt
-@@ -19,6 +19,6 @@ kcoreaddons_desktop_to_json (katesearchplugin katesearch.desktop)
- target_link_libraries(katesearchplugin
-     KF5::TextEditor
-     KF5::Parts KF5::I18n KF5::IconThemes
--    Qt5::Script KF5::ItemViews)
-+    KF5::ItemViews)
- 
- install(TARGETS katesearchplugin DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor)
-diff --git a/addons/snippets/CMakeLists.txt b/addons/snippets/CMakeLists.txt
-index a19277e..4182866 100644
---- a/addons/snippets/CMakeLists.txt
-+++ b/addons/snippets/CMakeLists.txt
-@@ -29,6 +29,6 @@ kcoreaddons_desktop_to_json (katesnippetsplugin katesnippetsplugin.desktop)
- target_link_libraries(katesnippetsplugin
-     KF5::TextEditor
-     KF5::Parts KF5::I18n
--    KF5::NewStuff Qt5::Script KF5::ItemViews KF5::IconThemes)
-+    KF5::NewStuff KF5::ItemViews KF5::IconThemes)
- 
- install(TARGETS katesnippetsplugin DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor )
--- 
-cgit v0.11.2
-
diff --git a/kde-apps/kate/kate-17.12.3.ebuild b/kde-apps/kate/kate-17.12.3.ebuild
deleted file mode 100644
index e467d9f73cdb..000000000000
--- a/kde-apps/kate/kate-17.12.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Kate is an advanced text editor"
-HOMEPAGE="https://www.kde.org/applications/utilities/kate https://kate-editor.org/"
-KEYWORDS="amd64 x86"
-IUSE="+addons"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(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 kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	addons? (
-		$(add_frameworks_dep kbookmarks)
-		$(add_frameworks_dep knewstuff)
-		$(add_frameworks_dep kwallet)
-		$(add_frameworks_dep plasma)
-		$(add_frameworks_dep threadweaver)
-		$(add_qt_dep qtsql)
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/ktexteditorpreviewplugin
-"
-
-PATCHES=( "${FILESDIR}/${PN}-17.12.1-deps.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-	# test hangs
-	sed -e "/session_manager_test/d" -i kate/autotests/CMakeLists.txt || die
-	# delete colliding kwrite translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "kwrite*" -delete || die
-		rm -rf po/*/docs/kwrite || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_addons=$(usex addons)
-		-DBUILD_kwrite=FALSE
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index e078672aa996..8f41935f19f4 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,5 +1,3 @@
-DIST katomic-17.12.3.tar.xz 1236200 BLAKE2B eb0eb2375fbd272d11e77484029fa66a35915021247e0d30a7312a019b1a59fb092cdddaeea28294b0d84085fe18f24ed06ba140a57c6f70f2b6b7d0dcffbdcb SHA512 7254fec57e9c0fcc2a3bdd3d3fe1a608d09aa80cacb42157b0ceef1af8706a5c0c047b554b0a9cc2a3c098a4d68c07738ea07c23e2516c0e58b405e13df16e1d
 DIST katomic-18.04.3.tar.xz 1237012 BLAKE2B 3880b39d5a2b2a4d87909d7403bb528b5e287ca48250807f937265e03c2a0109e09f5d5881712c70721c7f4751ea0e62dc0ab04c192811fb498d996bc913bf58 SHA512 0aacb62e4c56bdfcb3a861b2ccca8c856d482bc31b89923a20d6a4a0d928bfbe7028553001a897f27742036856b057157b6ae4a226a8adac6ae73baf2a98b1d9
-EBUILD katomic-17.12.3.ebuild 738 BLAKE2B 06d61d0c6e462e9df7f11bd63a69b231948deb734e6d901789f1bd0efdec80496ff5f0f33121342645062e05d75125e8ab402e583d0594fbafaf839805c08b4f SHA512 767d7acf0f646f59ee8f45bb93d85e2f6c78a870747ec2e795663c07edb7595d13effbc343267f9fcae4c096ec19e84c7adad0edde92b0e26e1acb46a1d4e455
 EBUILD katomic-18.04.3.ebuild 738 BLAKE2B 06d61d0c6e462e9df7f11bd63a69b231948deb734e6d901789f1bd0efdec80496ff5f0f33121342645062e05d75125e8ab402e583d0594fbafaf839805c08b4f SHA512 767d7acf0f646f59ee8f45bb93d85e2f6c78a870747ec2e795663c07edb7595d13effbc343267f9fcae4c096ec19e84c7adad0edde92b0e26e1acb46a1d4e455
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/katomic-17.12.3.ebuild b/kde-apps/katomic/katomic-17.12.3.ebuild
deleted file mode 100644
index 31d34fd47d2c..000000000000
--- a/kde-apps/katomic/katomic-17.12.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Atomic Entertainment Game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/katomic/
-	https://games.kde.org/game.php?game=katomic
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index 75a7af96ec72..c2e4ce77ee22 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,5 +1,3 @@
-DIST kblackbox-17.12.3.tar.xz 401756 BLAKE2B 46a6a533271839747e1331f52f6b1b6429b9632bec0473aaf56be90cdb39733257a6ab1f7ddf981c7dc62f4b1e0b3c79aa8a73306c54ead4d4d8f6c303544934 SHA512 e06f251a2b75db0910649e96c0d8ddae449fc23f39d468fc04e56d30b37ce58c3c15483122f40882dcab1ed1791c038caad87131fe2a4c2d140f66e79ed320a9
 DIST kblackbox-18.04.3.tar.xz 404564 BLAKE2B 2cdb7412327ecc8fffde975178d8ce3e16e3bc7829c9dfb5705719a1943d8a259085db159ef9c6f2895979d3fa28cc39a1566742bacda1166f171df0b7b71eb8 SHA512 1d29e375de5671f3c9752291d793a5576ccc6acc89996ad6257f1bf54f1982f84047d65e9da7f3c633284092d0c19a883eb389579925b49ec7a1464370eec8c1
-EBUILD kblackbox-17.12.3.ebuild 734 BLAKE2B 3cd04225e1a8a871bad2c2caa8f52c4b23587ca247f78d17b29d3f5d6f03967cab156ca3940ec606f08a42e9fb966ea1ee890af6da5affacce8abcece4f689fb SHA512 30f4e1bfe5f0751145cdfc2be517c02c062474a3241d89397495699e1192a2818614ccd76a3df171d1e3169def087ba0e8a7ffb12c08275e20045677614b94d8
 EBUILD kblackbox-18.04.3.ebuild 734 BLAKE2B 3cd04225e1a8a871bad2c2caa8f52c4b23587ca247f78d17b29d3f5d6f03967cab156ca3940ec606f08a42e9fb966ea1ee890af6da5affacce8abcece4f689fb SHA512 30f4e1bfe5f0751145cdfc2be517c02c062474a3241d89397495699e1192a2818614ccd76a3df171d1e3169def087ba0e8a7ffb12c08275e20045677614b94d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblackbox/kblackbox-17.12.3.ebuild b/kde-apps/kblackbox/kblackbox-17.12.3.ebuild
deleted file mode 100644
index 2967f9d8cfce..000000000000
--- a/kde-apps/kblackbox/kblackbox-17.12.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index a99a72e3bb3c..dd6fd829a69a 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,5 +1,3 @@
-DIST kblocks-17.12.3.tar.xz 1750472 BLAKE2B 60c4390b9b3625ac6ea8c296fa1ed73b46f255fa5d594b7669a27286a73e296e3d49df0ddb39ec4e244eb465538dfec91f03963911b8e06e8aa46bc85c8367b3 SHA512 72e2d278a5707ca423f1494eec0806a0c267b745f14e0c88b9cb97b4fe5a8ae62c8dd0a78f0c94ad9e285d8090be8b45c91bfd0d88cc2a1956d5e580b090de6c
 DIST kblocks-18.04.3.tar.xz 1750604 BLAKE2B ea372def9f55992980c32b4eda9f938c7ee7e5c6e8416ef99bdd6c752467658afbc2dd065aef2ccef6690a42dccda9bc3360ffa3c33b28feab76b9b1bbb5bcb4 SHA512 6ed96980cfb78ad0ebf62b9742b768e211689acc667120a390be7a0dcc63a4732c9fb4302b594066de4f9e6ecbe3b7b2409a5c4b56dae13bc7a90249de65f48b
-EBUILD kblocks-17.12.3.ebuild 686 BLAKE2B 5af8815669b58db0ff6f0cd3641e833a8f70cb792ca2122ae488c34c630dc4244f98a5d1547a9bb9852be31c7787ce664bf973f7be02648ba544e26c56cee5ca SHA512 5701312c7b1fd2389e341f8068cc4c7566930e7f170a623b886cfde6d32a3b16ac29b52bfdea8d4926d2edb0f32a65c8e2b6b6ab98350acdad484e0a76d65032
 EBUILD kblocks-18.04.3.ebuild 686 BLAKE2B 5af8815669b58db0ff6f0cd3641e833a8f70cb792ca2122ae488c34c630dc4244f98a5d1547a9bb9852be31c7787ce664bf973f7be02648ba544e26c56cee5ca SHA512 5701312c7b1fd2389e341f8068cc4c7566930e7f170a623b886cfde6d32a3b16ac29b52bfdea8d4926d2edb0f32a65c8e2b6b6ab98350acdad484e0a76d65032
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/kblocks-17.12.3.ebuild b/kde-apps/kblocks/kblocks-17.12.3.ebuild
deleted file mode 100644
index 1c20a0c0d4f5..000000000000
--- a/kde-apps/kblocks/kblocks-17.12.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A single-player Tetris-like KDE game"
-HOMEPAGE="https://www.kde.org/applications/games/kblocks/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest
index f0b5395455b3..7a7fac37cbf2 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1,5 +1,3 @@
-DIST kblog-17.12.3.tar.xz 72264 BLAKE2B 36bb90d92b033fcc40f5f899e90b189458b1056c7d3b196d7fe6f0397f98ef5651a1eccbef3294403a27cd37a29ef2d7b45e4be89b752307a3fb2ea011c8db4e SHA512 6e048eed6c247e9af6c96d536fdac371734fc3dfc198094e2cb60218f63347508196ecf9d2d88c190c7e838aa3feb7872001d736be2b7ba01c596f0ca8eea2f9
 DIST kblog-18.04.3.tar.xz 72472 BLAKE2B e4460ad17033afba4be89f29348d5849d98455f4ab479f626cc59b44243932017ed546b0a3851e4615bb892ab33660018d44d8eff38621b62c6ee66fa36fd136 SHA512 c12df99b010a67a3b653a6a0c79209b37b03195b94df27e2bc805ae939f572df99c29e70a182fcce5aee8c792a7b48446e1e6f032493a420896dd39c207cafae
-EBUILD kblog-17.12.3.ebuild 530 BLAKE2B 2a664bdebe9aed7515df9eb4535c850245632b331a23548c82421b96b592f4ece00334320e731e99ad7bb32e1d44f68e85770efe21805f4525f8989ec197a602 SHA512 cf8f8b2331184ddfd495519c39f2091e87c249c4662a1a0ec1d07bd00ec72b213f6e059821d6f9958545489fdd05764731a9d5aadfd12ed830ec1e2e8f7d3bf4
 EBUILD kblog-18.04.3.ebuild 530 BLAKE2B 2a664bdebe9aed7515df9eb4535c850245632b331a23548c82421b96b592f4ece00334320e731e99ad7bb32e1d44f68e85770efe21805f4525f8989ec197a602 SHA512 cf8f8b2331184ddfd495519c39f2091e87c249c4662a1a0ec1d07bd00ec72b213f6e059821d6f9958545489fdd05764731a9d5aadfd12ed830ec1e2e8f7d3bf4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblog/kblog-17.12.3.ebuild b/kde-apps/kblog/kblog-17.12.3.ebuild
deleted file mode 100644
index 582ecc3b742a..000000000000
--- a/kde-apps/kblog/kblog-17.12.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep syndication)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index e1f7e3204db6..b776d0b3f46a 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,5 +1,3 @@
-DIST kbounce-17.12.3.tar.xz 3484252 BLAKE2B 0d802cd70a1618acaaa6609bec8c58628a149aa6bfed08a33041e11e30feca0902eb17f834f02be632e26b5e210a1b636a41bc22034f3d4059ea622228756bcc SHA512 e9a3a4ea3abc0fb46fe4595e494285006e29f0994841f2effe1b9c7efdbaea4eeea48d74268e0db610e8c8b58e322bf4d4261349e9ce00de7681158850c957b3
 DIST kbounce-18.04.3.tar.xz 3485332 BLAKE2B 15b329c20f77f6d5dec1a77e0eed8e294c4917fcad4e9415dfc08fca23bef14883068365fb144026f2c6d19bb4d2feab49c533b7a07c0d3434c84b7a67f59bf4 SHA512 73dfa5736780cf06d88125af12141ca5e76342923fb1ad9808998742ea147d6fc6b0d3e7815bdc8bc897671da29d50a749a9278db4dd931c21804fb683d48fe7
-EBUILD kbounce-17.12.3.ebuild 817 BLAKE2B c1344737ccc3e0884ed0aedde6ea0e70832996761448e02325656d595af247a92983cbb79c68ff6a039fd9c68b139eb997cbef02580b8d5782643a89b23567a7 SHA512 52bc73ca5c7f4e1923c93553e14ddb9e9db8ab8e5d407d2743ae29fc6796bd39c9793f59752ab63c6b42fd1154ac539f1ee4ef675d68bfedf4364983f602fe3b
 EBUILD kbounce-18.04.3.ebuild 817 BLAKE2B c1344737ccc3e0884ed0aedde6ea0e70832996761448e02325656d595af247a92983cbb79c68ff6a039fd9c68b139eb997cbef02580b8d5782643a89b23567a7 SHA512 52bc73ca5c7f4e1923c93553e14ddb9e9db8ab8e5d407d2743ae29fc6796bd39c9793f59752ab63c6b42fd1154ac539f1ee4ef675d68bfedf4364983f602fe3b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbounce/kbounce-17.12.3.ebuild b/kde-apps/kbounce/kbounce-17.12.3.ebuild
deleted file mode 100644
index 5c6330c29e26..000000000000
--- a/kde-apps/kbounce/kbounce-17.12.3.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
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Bounce Ball Game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kbounce/
-	https://games.kde.org/game.php?game=kbounce
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index b1010b182fbf..061e8240e0d3 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,5 +1,3 @@
-DIST kbreakout-17.12.3.tar.xz 2021172 BLAKE2B 839334740acd0c6ac83b2f977044fcfed5c5546250ff96af973a47b7bf323ebb09d2e0feb6e556ec1b6f6bab9f86b81cca97d84f895408dab9652db492bacabd SHA512 8e0927ed28978175dbe9c9e35e2fd2844987b2d556b297a1eb7a31d6ee32508f14f9eb656ebf5ca29ff36dc1007f270e301c41eefb54e34889564e909c122b08
 DIST kbreakout-18.04.3.tar.xz 2023544 BLAKE2B fdab111fbd2364fb135f2e408436f0dbbb25d1ac75e1dd18d199ad72878af047f838b2ec6d267df0c051ed3f239b2b9ea60f4250fdd674f86066efb11d34a424 SHA512 d0296c7a66c7e54c7021bad5624894cd08dc52e6284c102817a43bf6266f5b30165a3c7b1d2f52f23024e6626a83b5e3ac35c4a24b484534f63692a642a1d270
-EBUILD kbreakout-17.12.3.ebuild 766 BLAKE2B d5c1bdfe47144def260c6f124b99ca2c0ac8567067842de0de128f9e7c5df56b26acd049cf9d32cc04201a5b47b50a923829ebd5ef6f88c9685bc78eeb501b72 SHA512 4137190afc45eaef707c4fe2008cef9a06b7f1021fd3051d993ca5a101c989c3f1440feb758d01ecb71a0da068eec3736d53bbc3dd40575bea06091c216b9346
 EBUILD kbreakout-18.04.3.ebuild 766 BLAKE2B d5c1bdfe47144def260c6f124b99ca2c0ac8567067842de0de128f9e7c5df56b26acd049cf9d32cc04201a5b47b50a923829ebd5ef6f88c9685bc78eeb501b72 SHA512 4137190afc45eaef707c4fe2008cef9a06b7f1021fd3051d993ca5a101c989c3f1440feb758d01ecb71a0da068eec3736d53bbc3dd40575bea06091c216b9346
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbreakout/kbreakout-17.12.3.ebuild b/kde-apps/kbreakout/kbreakout-17.12.3.ebuild
deleted file mode 100644
index d78bbc462cbe..000000000000
--- a/kde-apps/kbreakout/kbreakout-17.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Breakout-like game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kbreakout/
-	https://games.kde.org/game.php?game=kbreakout
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index 030c7d756cc2..9e12e9bb4aa3 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,3 @@
-DIST kbruch-17.12.3.tar.xz 5601080 BLAKE2B d6fec580f74cd443f63e3e079060314e29b6b8e706f0ac91209b59c1be948c8cae53b03676d6bbbc7ad22981f43fb62c0975c8c64ff663cbd5dce879a60cee5f SHA512 3b3a4ad6e4abebf803feea0b3145290f9ae4cab048b4711138603cf42a1b856a7175b42bcf30388440c63b6c7025733c2e3f286e821c783f700936eeb890340b
 DIST kbruch-18.04.3.tar.xz 5604504 BLAKE2B d728f78f55abdeb763c30247483ad1df0dba1a7f5293a1fbd50f85ca5f1f75802733309e9ce6b772ca8a888b5ae2f8e39bfcf645317358fdf9bc21e2dae1e147 SHA512 566111d6b097d9b24e98c5911dccf6058b1f7b848a558d004f977fb82d27cbea102f9c84f53ea67a9f006a2537cf76dcd958474474d2cef1480d223552031cc0
-EBUILD kbruch-17.12.3.ebuild 630 BLAKE2B 111e2fbbe4ad95c8351455c57ccd531c3390679a9fa5da642c7f14e4d7f6850f510a1429b7c257cd8e151cf7b05b6df67039fdf63b43407b64027ce3eedb9d6f SHA512 53031739e69852f412c0fc32318f46d5c710e1d8dc9b17810fe0f009fa377bf5c13cdcd72db9132f17d50d901f486b34c76d958ae137c0b60359a2fc533d64b0
 EBUILD kbruch-18.04.3.ebuild 630 BLAKE2B 111e2fbbe4ad95c8351455c57ccd531c3390679a9fa5da642c7f14e4d7f6850f510a1429b7c257cd8e151cf7b05b6df67039fdf63b43407b64027ce3eedb9d6f SHA512 53031739e69852f412c0fc32318f46d5c710e1d8dc9b17810fe0f009fa377bf5c13cdcd72db9132f17d50d901f486b34c76d958ae137c0b60359a2fc533d64b0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbruch/kbruch-17.12.3.ebuild b/kde-apps/kbruch/kbruch-17.12.3.ebuild
deleted file mode 100644
index 3df4deb70143..000000000000
--- a/kde-apps/kbruch/kbruch-17.12.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Educational application to learn calculating with fractions"
-HOMEPAGE="https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index 09a57a97be8b..be59bd409312 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,5 +1,3 @@
-DIST kcachegrind-17.12.3.tar.xz 813108 BLAKE2B a5768fb9cff28f22750d0cca761ee6201ba6e53ec42e86fada92451b2f43a2c81235ef71cf7484a754c39739b8501f1c8fc31a5da9108c7cf0aebe802662346b SHA512 56f4fee2ba8d03760858bd9d0fd6601e5beb9aec4d8ce2d87ba1d811698f3e8673d12ae834b20696ec98689992b6a560ccae049a5b69538432df6abd21dcfcd6
 DIST kcachegrind-18.04.3.tar.xz 812516 BLAKE2B 48811c28f5f4a08727d04d7220e1696eee93be88404d0e3c18781169c17af03b4a66ac8b26e656d4fcf176d631469cad7586a7c90c2e47124f14f6da670414e8 SHA512 c82fc6fc980c08acaea40c9ada4489b8ff7864cacd0705ac9842723f9a0d93c718951617efc0bca17acf187f7400115c04aace9c5b0fd9275193449d083dd3c2
-EBUILD kcachegrind-17.12.3.ebuild 879 BLAKE2B b6a504162dfc611bded522a77895b797dac2d2fdc9dd9cef6ae89746f1a4c9d5157bc589ddcc1d04ac662065b6bb21cab9582aa9da16aa8564029fd7977b98d5 SHA512 cebea211513f766df63d127f369b9a539bf6137f7908e103e862d706c9f64679f791a9808efff89812c690a7da149204f75a9904896706927fdfe12724d44b3c
 EBUILD kcachegrind-18.04.3.ebuild 879 BLAKE2B b6a504162dfc611bded522a77895b797dac2d2fdc9dd9cef6ae89746f1a4c9d5157bc589ddcc1d04ac662065b6bb21cab9582aa9da16aa8564029fd7977b98d5 SHA512 cebea211513f766df63d127f369b9a539bf6137f7908e103e862d706c9f64679f791a9808efff89812c690a7da149204f75a9904896706927fdfe12724d44b3c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcachegrind/kcachegrind-17.12.3.ebuild b/kde-apps/kcachegrind/kcachegrind-17.12.3.ebuild
deleted file mode 100644
index 2fc4bb25de8e..000000000000
--- a/kde-apps/kcachegrind/kcachegrind-17.12.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Frontend for Cachegrind by KDE"
-HOMEPAGE="https://www.kde.org/applications/development/kcachegrind
-https://kcachegrind.github.io/html/Home.html"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-gfx/graphviz
-	!<kde-apps/kde4-l10n-17.03.90:4
-"
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index dcc5816b664f..d100dff6e6d4 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,3 @@
-DIST kcalc-17.12.3.tar.xz 360180 BLAKE2B 5b48e85c8c5bde7a01510d5f9fbf0f4fc98d7afbacf4574e1f8f21ed0c99df0776ac62de7589a1405473ace3c27a01fc54179e8f59463cbe3f5108f95c60f106 SHA512 e8d86165acfa8f6bce5ec0500baedd16ab73330379675b8b92d64093e8f74b8fbaf2758a269ea522682375c3b30c074194f55e1af96cd6ac758cc08ba68e30e5
 DIST kcalc-18.04.3.tar.xz 362048 BLAKE2B 4e07d5236bb807705c4fc7617c7422269812187255277046911011b801310034ef1783e90273732e1bdef241d5b4fd024d58e42f5c57218e9797c9b7c9afd6b4 SHA512 372f0e2660836108c405e9aa48a07f042a86ec8c66f43a7ba4a64c5ac1da561b3ead94f7c9e496ec270826813c77e21144b12b720f6a3872a3c49859bb637c83
-EBUILD kcalc-17.12.3.ebuild 771 BLAKE2B c5c8f2f21e376081aefb2763784572876c9541b1221762eb9c43c36b8145a5f172f363b059c7bfa399fc6310182e8b5177593b1d9b36f59d2bcc010430f797bc SHA512 7991e7adec9c5bb4735a755fdb91cb2ff8ecde7c352ad13e1cc98d58970cdd4439621765ca66f8870f54101265af1021aade8a6a4bfe0c3ef02ab5fbf9686c3a
 EBUILD kcalc-18.04.3.ebuild 771 BLAKE2B c5c8f2f21e376081aefb2763784572876c9541b1221762eb9c43c36b8145a5f172f363b059c7bfa399fc6310182e8b5177593b1d9b36f59d2bcc010430f797bc SHA512 7991e7adec9c5bb4735a755fdb91cb2ff8ecde7c352ad13e1cc98d58970cdd4439621765ca66f8870f54101265af1021aade8a6a4bfe0c3ef02ab5fbf9686c3a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-17.12.3.ebuild b/kde-apps/kcalc/kcalc-17.12.3.ebuild
deleted file mode 100644
index e2e4d0992fe4..000000000000
--- a/kde-apps/kcalc/kcalc-17.12.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE calculator"
-HOMEPAGE="https://www.kde.org/applications/utilities/kcalc
-https://utils.kde.org/projects/kcalc/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/gmp:0=
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
diff --git a/kde-apps/kcalcore/Manifest b/kde-apps/kcalcore/Manifest
index 5c2d0441fdf4..4d611fa9b310 100644
--- a/kde-apps/kcalcore/Manifest
+++ b/kde-apps/kcalcore/Manifest
@@ -1,5 +1,3 @@
-DIST kcalcore-17.12.3.tar.xz 276504 BLAKE2B e2843a3aadbf6abadeabcc135b03ceb8278b19df960bbe9069ea36068844c13a330a8820a7d4cb7bd0bee98d39ea32efa6828eab95f851eee18bb41146ae8194 SHA512 af4d1accecbb220f4d2090553a1b8eb70b6c941ae0304cf67863c70cf25647a668c65f3371c7ce40533955416cf8ad7381da65982c31848087308249c6ff0968
 DIST kcalcore-18.04.3.tar.xz 251228 BLAKE2B d1bef3986badffd3e11b15a52619e653a2e8d1ec05fed6fa4244122493bf9947f542403c0dc167267b0fbca92b7569a08b786c908f8216ce5808aaa16a6fe277 SHA512 2da0993ab1d0c6facbf7f02af186f3554ca38408468dd72f57380817ef1f7f0bf236409a8644d7e84b5019d1eb918f2fd6ff1c1190a89a4e825845659ea84a1b
-EBUILD kcalcore-17.12.3.ebuild 438 BLAKE2B 6d19c4126c628848ba833d0eb807d8221b1e82844646b34fc0e2743b900260d3d647c3f85fb290172e10339efc64e8dad5b3fa6e1a21621e3a06dd29ce214883 SHA512 a8ab920761ef69473ec447e42a108829bd8eb5a9d77e5fa3c814c1c28a8234fae375c33ff25b0597bd41b4b46260464adb47deec7feea401140acf6b7fc23947
 EBUILD kcalcore-18.04.3.ebuild 438 BLAKE2B 6d19c4126c628848ba833d0eb807d8221b1e82844646b34fc0e2743b900260d3d647c3f85fb290172e10339efc64e8dad5b3fa6e1a21621e3a06dd29ce214883 SHA512 a8ab920761ef69473ec447e42a108829bd8eb5a9d77e5fa3c814c1c28a8234fae375c33ff25b0597bd41b4b46260464adb47deec7feea401140acf6b7fc23947
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalcore/kcalcore-17.12.3.ebuild b/kde-apps/kcalcore/kcalcore-17.12.3.ebuild
deleted file mode 100644
index 37d7708da1c2..000000000000
--- a/kde-apps/kcalcore/kcalcore-17.12.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for handling calendar data"
-LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	dev-libs/libical:=
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-"
-
-RESTRICT+=" test" # multiple tests fail or hang indefinitely
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index 50718920fe7e..361fe627db98 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,3 @@
-DIST kcalutils-17.12.3.tar.xz 323512 BLAKE2B 31ee7f6e9608f496fe3aa3ac59f591ccfdedb421397d36dab0e04aa1cfe21a8e57d6716708dc35d06a32c8053822520c4c2b8b527e725a742de8cdf2b7863aa0 SHA512 68a5cded42a3b2d3cd8eb9f0fa3529b34c270fea06a0861c98bf4d1fd8d9bd239c656c25f5f4cd697b7434458c15b3ba974267161f9b4497020d89345475fae7
 DIST kcalutils-18.04.3.tar.xz 326484 BLAKE2B 64787af00f304ef03c8bff17fbcd0b861ae061aa3e11fb235d72bcfb7fe60bb407a7299a402cfbd58d1a43db562f8fb3fecc38319bf7ddd5118031fb30d71743 SHA512 8105755af6ee6ff08f072ac58f66ed688bb9c43a6d1947e68234dcbe6e784346b15410fe136d13df822e3ec3f56cef1d1be59dc3ba70a415c1a860f38a0d962a
-EBUILD kcalutils-17.12.3.ebuild 759 BLAKE2B 546d010e2e92c0d0221700a214af1ae5ed62ba1ce307cafeb505f459a2bec783e519d49f190ca6ac94306647c6e8bdf64fa0ed02675b94aecd08bb8d18e40262 SHA512 502e4fcca0ee7e807df7e72a95e7a3e9390a1eb98fd02017b4784872a941face06149f981ac502f247c179813305b715abecb2d6cc84bf82090b0872af62edc4
 EBUILD kcalutils-18.04.3.ebuild 852 BLAKE2B c66c865ec1692f6a5cae8e1a9da86a0581da30e716b73d29cd4e4dfd651fbdb05f437ea04268c7b2be190af4efb84deaf583aa0d49ffed47b2915414acb43ced SHA512 7af85697ceefc1adf93fc20abd3d2a04c14077dd72e91c7f5751364dfbf2f509ec6165a56431ec8fb062465e89fe6e348ff4e145cae5ce9d8d8290a600b7a9cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-17.12.3.ebuild b/kde-apps/kcalutils/kcalutils-17.12.3.ebuild
deleted file mode 100644
index 7380ea017e29..000000000000
--- a/kde-apps/kcalutils/kcalutils-17.12.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 825df65bff7e..ad4b52a59567 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,5 +1,3 @@
-DIST kcharselect-17.12.3.tar.xz 351308 BLAKE2B fc9e005381eb83f308c1fa10296f8cb54797cc0f53611cdaa737b6755ad35ba3dcf6a4a69dbdd1531d1dee910f000f62d1ee9bbeb1f3a925920969b33727af56 SHA512 75b4044c55ac539b05306f759bc4241da71500086157cb0847318ea7a9cea8a4fb40580c54d747f3e80a51668c435ca7aec80d68dffb7193e3bcded540b31275
 DIST kcharselect-18.04.3.tar.xz 351764 BLAKE2B f3b9d678e89ad1952077e1e42740c0b36356068e5a1740c4b607acd56d8615329691fc43132ad9359d2a3e820d9e833281b462a66c749be798ac2061b254eba6 SHA512 a0ab55769acb4cfbb33f54d5fbdafc48464c306286321ebd2e8f8b932217d5ae42b0b23c3ca3b40156a4770cb6980b832b2f8ae2dd8e7b6ac81d24c141df5140
-EBUILD kcharselect-17.12.3.ebuild 657 BLAKE2B 02d4eb97328d7a29bc35b38d7fbe1d36adec5bf63917e132ef4d3c73af36f466349e0fb69e8e117bac93e81818f24de79ab219a67863741065b9c48146c05a4f SHA512 1b4ad8686d4943234182a53b25579e0f44e8c1a4b5cd6dd1e3b132461906fd70eae7ec3e48603912813212cc8f82d93dc35f331a2c6717a2d393824ddbfde5f2
 EBUILD kcharselect-18.04.3.ebuild 657 BLAKE2B 02d4eb97328d7a29bc35b38d7fbe1d36adec5bf63917e132ef4d3c73af36f466349e0fb69e8e117bac93e81818f24de79ab219a67863741065b9c48146c05a4f SHA512 1b4ad8686d4943234182a53b25579e0f44e8c1a4b5cd6dd1e3b132461906fd70eae7ec3e48603912813212cc8f82d93dc35f331a2c6717a2d393824ddbfde5f2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/kcharselect-17.12.3.ebuild b/kde-apps/kcharselect/kcharselect-17.12.3.ebuild
deleted file mode 100644
index c1c8a166a56a..000000000000
--- a/kde-apps/kcharselect/kcharselect-17.12.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE character selection utility"
-HOMEPAGE="https://www.kde.org/applications/utilities/kcharselect
-https://utils.kde.org/projects/kcharselect"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index 7543e53769ff..2cbc8fdca841 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,5 +1,3 @@
-DIST kcolorchooser-17.12.3.tar.xz 16716 BLAKE2B 2f1f0f7f00104aa3264949b7c14bf304b7f679baee1bf082c4b478742ac18d04989a97b3dd473d2cfa330b86fec7ca913508e4625c64939a12a83be15bfccdbd SHA512 0016433e5f445842e606ae8f258908cd9911b14867695c1aab4d6ba9c2aae2b3255db4442c108a2561cc32b072085a532ebd6ab94a2ac3af70f382e27d4c451c
 DIST kcolorchooser-18.04.3.tar.xz 16888 BLAKE2B f39573acb38aeeb609cbfc42d5f8961436bd8aff62eb5b1d8316227cd68a88f30415ef8920016599e5ede291fd543a4af0c955a3dd594d97ed43a01a43296853 SHA512 3adbc920566089bc12e83507dfa25d7215a1811c8adac530a059bbcc5d35dabd8fc122143dd0a238a1e1d586fae18fdf32a24b4685ec044f1fee1c3060d0b667
-EBUILD kcolorchooser-17.12.3.ebuild 455 BLAKE2B c2b3df4178abef5b4d8d821eb5a598a0d560eb800de0142ef3372189ad9a793d5da46140b669c0f79d4bcba19c9d9ebd78fd597966d12fd80dd3b0eee30529a9 SHA512 6a489f07659676ff90dde300a299efb31711f3eed39bfef10f68a8be4b12c9c2a23a0058dac542b1bbc758bb0161238174f6dd08ef2bd821d0c1b4ed90d09231
 EBUILD kcolorchooser-18.04.3.ebuild 455 BLAKE2B c2b3df4178abef5b4d8d821eb5a598a0d560eb800de0142ef3372189ad9a793d5da46140b669c0f79d4bcba19c9d9ebd78fd597966d12fd80dd3b0eee30529a9 SHA512 6a489f07659676ff90dde300a299efb31711f3eed39bfef10f68a8be4b12c9c2a23a0058dac542b1bbc758bb0161238174f6dd08ef2bd821d0c1b4ed90d09231
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcolorchooser/kcolorchooser-17.12.3.ebuild b/kde-apps/kcolorchooser/kcolorchooser-17.12.3.ebuild
deleted file mode 100644
index 5b16b202b023..000000000000
--- a/kde-apps/kcolorchooser/kcolorchooser-17.12.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE color selector/editor"
-HOMEPAGE="https://www.kde.org/applications/graphics/kcolorchooser/"
-
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcontacts/Manifest b/kde-apps/kcontacts/Manifest
index 4b08ff5fa013..a3305be4558a 100644
--- a/kde-apps/kcontacts/Manifest
+++ b/kde-apps/kcontacts/Manifest
@@ -1,6 +1,4 @@
 AUX kcontacts-18.04.0-unused-dep.patch 1283 BLAKE2B 20a4b624770a7a578d2e0be5a9f8db252d4ddeea5fe8521122023f13d15470b32dd1c0ae7f3e0b8ab65e0848a7f82e568a712e6af2191600bab97995307d881b SHA512 0aa1bffaf62df622975ff092df911a107aca1ec96376aad37339d5a54ed6e34bc7b0aa07b0b2be573382e2e6cd07208ffd463f0e60e13c4f8d5959dc85fe6acb
-DIST kcontacts-17.12.3.tar.xz 206708 BLAKE2B 8c948183fa389be754ee7a8d2928c64f9b854ce06c97fbbca79c784d8e7cd48cade5c2e6a95b3dfe77017f2fcc7bcaebc15c8fb759755b2402a50f4e7dd029e3 SHA512 e6f77cb685d6c163e575862608d127b524815704a4d124234f871aeb36abdbbe6efca26d17c86692094b395e7edf889f53cc70b7c72f33746483c9a04a674e21
 DIST kcontacts-18.04.3.tar.xz 206936 BLAKE2B 00df6e8da4a3d70f7d630b8dd671c6214bca8ed7d938aafc2342dbba97337f077cb77bc9d0bab31a91b7b0b8dd9074f667846120e667a52bcb477ec6b29c20d0 SHA512 bf177c4cf0ecbdb71e75ee32a4e71599f864062524f5663e3c1d4b49a06d58a3abf7b18d2840cf7e70248a426fa6b6367375a2aaea211ba15a697e0dbd27953e
-EBUILD kcontacts-17.12.3.ebuild 853 BLAKE2B 0301f620a23a5135f1222517ba1a30989033f116a598de17b915f17952db5a621bd64eeff73560b69f6ca951dbd11c80a5462c199336ae5e37a993006658a367 SHA512 1c8457c6e45fb5ca445f23a6b5351de168aa081a66858f717954bcd5eeee620571de1290cc7cb3da929b88e29090cbdcf1eaad83dc9f3b49037fd643e9f57f82
 EBUILD kcontacts-18.04.3.ebuild 889 BLAKE2B be58d2731e6ad0605817bbcf6e5786c03c7ffc5b49dd9d0e22967bb46d2f20d0d865737a8c0c0cd127201b50ea1d68414dc4c223c0162f74ea5d18da489b79ae SHA512 1d45d48805a52ee73219d1eb8b61dd66ef4f049fc02b25f4f3d63f79c32a6b1a9ddf037a296c28b86112ea2fe82fc95c1ef9f27f086286767c367e90c375fcdb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcontacts/kcontacts-17.12.3.ebuild b/kde-apps/kcontacts/kcontacts-17.12.3.ebuild
deleted file mode 100644
index 631b7380542f..000000000000
--- a/kde-apps/kcontacts/kcontacts-17.12.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Address book API based on KDE Frameworks"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: Fails test because access to /dev/dri/card0 is denied
-	sed -i \
-		-e "/ecm_add_tests/ s/picturetest\.cpp //" \
-		autotests/CMakeLists.txt || die
-}
-
-src_test() {
-	mkdir -p "${HOME}/.local/share/kf5/kcontacts" || die
-	cp "${S}/src/countrytransl.map" "${HOME}/.local/share/kf5/kcontacts/" || die
-	kde5_src_test
-}
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index 227b523d8616..b9ab3c5d27dc 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,5 +1,3 @@
-DIST kcron-17.12.3.tar.xz 1054784 BLAKE2B e9f37357c1a83f7f9fe162ec5f5e0d1289482ff83b77c0f83ff8a592944fb5c133b99709139c12324be1bb1e0b5b87f92fd306e2a1be9eb0a083240803eba9ae SHA512 edc96b2521d86fd288afb688dc7abc60b575bb5171f2ed0026fcee4f9e12966ead95a15aca55e89b672649d83433cab66b6f569e802ecfb680ace86003a36328
 DIST kcron-18.04.3.tar.xz 1056624 BLAKE2B 2d10df38eccaeac408313480527a40eaabfc1d6ae62122c00add9aa03e644cb1a7c15b8ded9bb7027198550b64e7d840ce274d89805ba123fec1b9f9ac79af07 SHA512 3d0b78135c026b64ac9e08f0e963a6c2e54c00d8039b73fc82c9c305eb1bb766bee4ee06b5cda5756a8e8a816c1d8999304c3295ff941f0ef532843d48699141
-EBUILD kcron-17.12.3.ebuild 559 BLAKE2B 08a9cc3b58768927021f06b978efc556a958dba07975d7c5d3959943ac54421530fbb171b5575dcf7aec3f058b6cbe417c2355ce6002449580a830f6745e219e SHA512 f513f09079aab240c87abb113b6406cfce839f382490e9b81e370b763ab5831e7dcaea5a7ff00071dbb45f95143daeb64274737b26bee279860d0262127fdeeb
 EBUILD kcron-18.04.3.ebuild 546 BLAKE2B de16dc20e75300dbe368a416d5c5af632e83da1e88fa2dccd81bcc7ee00184aac4a3bdb7cdbe992f12665d19b4bf24996a46ac6965252fbdf3e169ced32ca9a4 SHA512 b214603847e53d62d6463d75302485fa2d1107e8a0598272287cd5b0278af3703aa162cc85b19c950bb57808ccba627f8532334422a71efcacb79093050365df
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcron/kcron-17.12.3.ebuild b/kde-apps/kcron/kcron-17.12.3.ebuild
deleted file mode 100644
index 101664e6d647..000000000000
--- a/kde-apps/kcron/kcron-17.12.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!prefix? ( virtual/cron )
-"
diff --git a/kde-apps/kdav/Manifest b/kde-apps/kdav/Manifest
index f4a9ae91b396..c42f85b1a13f 100644
--- a/kde-apps/kdav/Manifest
+++ b/kde-apps/kdav/Manifest
@@ -1,5 +1,3 @@
-DIST kdav-17.12.3.tar.xz 37796 BLAKE2B 3f335f82fd6793d32647d2ab124b349166a7f80aea54d421e57b77f9b68123cde72ed2b8694e4c990303c9e57f73d1fa0a9f367ca2546be267aceec524b4d8e4 SHA512 ae4c28406d9a1cd6e8816ecd693cce1f33c92de8532b29ded33355c417837380bee784608f5784c61d54e77d3bc90e6efcbec9372f64f02131848ee40daba9b6
 DIST kdav-18.04.3.tar.xz 49040 BLAKE2B 2c26e92bc83120f194afa9442322d470302d236730c3d7f3d7ba5e3ba317d3de99cb77e250dd539f1c61d1d2fdf3903da7c6626b9a42eba7d850d648551be0a3 SHA512 5b593fd2345cb0d40dae7732d1e82b8eb84a29a3afe6f3fbddaf4269c2b58cffd5ed34690dae3fe92e59de9979129e567acc1cd41085bac14a42eee81b439363
-EBUILD kdav-17.12.3.ebuild 603 BLAKE2B 291e20fc681eabedad8230ea30a292afc79f15e396aa091b3d513712d1ed33e5c8a46294d8d5e2e5b8b5f72502f417bdab5505301830f57026d9bd8425510b18 SHA512 35fdcbe12541c640d42761ef9f4e13058dd99d1de94e4a52acc2194c87c909c60641b7e21ed7e331360bf86070a4b1cde8de41b9e6b02c7756a971ab0b8579be
 EBUILD kdav-18.04.3.ebuild 682 BLAKE2B 430f8c8f9b66227c832ab9d7fb986d7c43c9a9f48cef6d93c621ce0b5dc99e2bb70ffd815c2be7710575e3a338229e126bdd8567a64870ae9b0bb22ad7233e7c SHA512 9b3d5ec01c7dc376023b492b032025c533f9c9d0b598ef56da26c4830b92f2dc3ccf9aab5bc5bc820356f8b75be96516ca5d935d3d339d4310eca4ca20c29c59
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdav/kdav-17.12.3.ebuild b/kde-apps/kdav/kdav-17.12.3.ebuild
deleted file mode 100644
index 52529eb811a1..000000000000
--- a/kde-apps/kdav/kdav-17.12.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="DAV protocol implemention with KJobs"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# bug 616808 - DavItemFetchJobTest requires D-Bus
-	local myctestargs=(
-		-E "(kdav-davitemfetchjob)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index 27e2539bf0b8..82429ec8907b 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kde-apps-meta-17.12.3.ebuild 712 BLAKE2B eb22f68f34234dac478d2c68faf184e3d15c1628a2375e8f0195f390559d76372e2af8f71e11bc706ba32232444ddbf71f7dff07a5feb4d80a99a143ba0b41a6 SHA512 68230fba9f71b944ae1f6f5751c56b7d86e9be217a7cff4dc0e35d2f7190d6ead515322f0f4643441f6b46cc3ef06e588869bfe61ea93db7e7a6b8d83a2b1c20
 EBUILD kde-apps-meta-18.04.3.ebuild 712 BLAKE2B eb22f68f34234dac478d2c68faf184e3d15c1628a2375e8f0195f390559d76372e2af8f71e11bc706ba32232444ddbf71f7dff07a5feb4d80a99a143ba0b41a6 SHA512 68230fba9f71b944ae1f6f5751c56b7d86e9be217a7cff4dc0e35d2f7190d6ead515322f0f4643441f6b46cc3ef06e588869bfe61ea93db7e7a6b8d83a2b1c20
 MISC metadata.xml 379 BLAKE2B 7144d7c2d05ea49b428bf76314c83a1150296ea19006204241298a707ae28fe67a6feb328f0516cc34859bc1af61df6cda3074d58f96d61be1ef1c21892468b4 SHA512 9dd851fa81ee09c64dff5019b7fe60ff945159b14cf92af707df486969d72a0896b2116c4b203afccf056ff4b2e9704d29022ed0b5d8fb60f65c1cf6d6935ed9
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-17.12.3.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-17.12.3.ebuild
deleted file mode 100644
index 89bd145c9f6d..000000000000
--- a/kde-apps/kde-apps-meta/kde-apps-meta-17.12.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="Meta package for the KDE Applications collection"
-KEYWORDS="amd64 x86"
-IUSE="accessibility pim sdk"
-
-RDEPEND="
-	$(add_kdeapps_dep kate)
-	$(add_kdeapps_dep kdeadmin-meta)
-	$(add_kdeapps_dep kdecore-meta)
-	$(add_kdeapps_dep kdeedu-meta)
-	$(add_kdeapps_dep kdegames-meta)
-	$(add_kdeapps_dep kdegraphics-meta)
-	$(add_kdeapps_dep kdemultimedia-meta)
-	$(add_kdeapps_dep kdenetwork-meta)
-	$(add_kdeapps_dep kdeutils-meta)
-	accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
-	pim? ( $(add_kdeapps_dep kdepim-meta) )
-	sdk? ( $(add_kdeapps_dep kdesdk-meta) )
-"
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 4a3bf0b99338..8823deb3885c 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,5 +1,3 @@
-DIST kde-dev-scripts-17.12.3.tar.xz 375796 BLAKE2B 243211c87fe27f298a49107ef48390d30b80bbf904bbeb1a8eb629453f301069e98ca1401a1bc178fc1df98c0ffacf85d253b86077fdeb1ae2c796f1b972c1b0 SHA512 eb55b5016dd4cd50ba8b062496f4f21a8704e48e277c467ef9f9b2e6056afbb6f71e75c9edff84f6e50b0e25b87bcc97f13646cfd6eec892363362d402ee70cb
 DIST kde-dev-scripts-18.04.3.tar.xz 377672 BLAKE2B 462e59e9782cb82719354fdfe1133a68aee6b9ae27661eb55fca1b36409b313057c8efc64b6dfe73bd2cfb670990b9abd61cf6d327d4883519a4bca0c1c629fa SHA512 270afbe47f0f03f37acf23046ed1d1c09d25a7b12d8704fab27e5f1c181d42e1609dcb257a28fa55813b1f8ad7196afe67523a188a057bc2e98a080f10b5299c
-EBUILD kde-dev-scripts-17.12.3.ebuild 578 BLAKE2B 9449129c76d4f80488dfebf4536e575c1b29770ab5605ad2f271a0798eed4749f3f773754d881ea4c5234a53eb9f0d5c373696d8b30c2d7a92bcef70c6bcefed SHA512 a7caeff730912bb7805c61987203e5f2fae1b7c994a16271d9bcad01ae741b3579d092309c6a25e334c1801a16711cf4b9e0cf24f40d6039e6e2522e6c39d836
 EBUILD kde-dev-scripts-18.04.3.ebuild 578 BLAKE2B 9449129c76d4f80488dfebf4536e575c1b29770ab5605ad2f271a0798eed4749f3f773754d881ea4c5234a53eb9f0d5c373696d8b30c2d7a92bcef70c6bcefed SHA512 a7caeff730912bb7805c61987203e5f2fae1b7c994a16271d9bcad01ae741b3579d092309c6a25e334c1801a16711cf4b9e0cf24f40d6039e6e2522e6c39d836
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-17.12.3.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-17.12.3.ebuild
deleted file mode 100644
index 79fb8d781153..000000000000
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-17.12.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE Development Scripts"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# kdelibs4support - required for kdex.dtd
-# kdoctools - to use ECM instead of kdelibs4
-DEPEND="
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdoctools)
-"
-RDEPEND="
-	!kde-apps/kde4-l10n
-	app-arch/advancecomp
-	media-gfx/optipng
-	dev-perl/XML-DOM
-"
-
-src_prepare() {
-	# bug 275069
-	sed -ie 's:colorsvn::' CMakeLists.txt || die
-
-	kde5_src_prepare
-}
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index a19bae8c2179..3841d7ab6ac3 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,6 +1,4 @@
 AUX kde-dev-utils-18.04.3-ki18n-5.48.patch 826 BLAKE2B 7b1bd3b9c427603070592e795b6df82d9ff015c717909c3b464844a4ac14ed6ef42e7865e9113240a95ff56cc6534a554f71e4ad98bdfaac8e094e81a1893b77 SHA512 d5c3206f47a8b94d3bb11bfca15613c3a2d7681c46bea68bda00529cda5ed16ba4dcb6648726459c18a980832c765e6728481e7e8403e89aca4d84ef7cbcb36b
-DIST kde-dev-utils-17.12.3.tar.xz 61000 BLAKE2B 5bdb7ddfaa792d4a74cc3d55e4c1e110c69af3393421ecbef5871a095097645be566137c2b609ec33c6d13a777e62b388d06f417859af390bfd20e33e406c0c7 SHA512 8f774d33f74eec543772db7a39b18a6a52b4fbade62d5ddad9f632c1719aca58a3a77ceb50bc4f4a96df047c3726c1f37e6e9d21b496cb6a2c082334082ae359
 DIST kde-dev-utils-18.04.3.tar.xz 61300 BLAKE2B 4c5ca2a6e813146390eb65f6a4e78adf9d70873e8b97458a99786aef1892ba86864280f8e9f4db9b68b28ac17f4297362f85f96eae92294b9835094f069e7bc3 SHA512 585c9d4e7bc426fb758bd352eb1e34091bca3051fd7cd2b29f79f05bacee8804d4a794dab1d4e2329dfc3379b01fb449f406589e4010e1f2d1d065c201f81646
-EBUILD kde-dev-utils-17.12.3.ebuild 646 BLAKE2B f04cd447cd1c22b3542dded1e6beae7bdb7f49e60a9fdc27432ebc880cbe35bd69e65a2d9f252bd865597f573c5c24a4217fedf06fcec07b35315ca0184e03b6 SHA512 4e9066a4830a64b89eedce000fc0addc64ff5a832cb0060f5e02218e21d8bfc6e7197f59561c3f28ad9dba8f9fc91b9aec202922cd5821e1c4bd793bbc31d1aa
 EBUILD kde-dev-utils-18.04.3.ebuild 695 BLAKE2B c8f18f9772edfeeb0c431ccf00e5db163d0d28d9918696be1ab798f857f42685f18646a81b262b2ff963d146beb83b3065a449c72f55bbf1366a49dbd9404f8a SHA512 c86372cda9db57d9df3c4fb2ae8f3987b330f781e195d5eefe7f44e528eb031db2783af2e33913258dabaa339185638349d9533e585b9f6d58abfac24a3c9542
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-17.12.3.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-17.12.3.ebuild
deleted file mode 100644
index e7e586f94364..000000000000
--- a/kde-apps/kde-dev-utils/kde-dev-utils-17.12.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Development Utilities"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.03.90:4
-"
diff --git a/kde-apps/kde-meta/Manifest b/kde-apps/kde-meta/Manifest
index 340d2b36c481..0379ffa7f142 100644
--- a/kde-apps/kde-meta/Manifest
+++ b/kde-apps/kde-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kde-meta-17.12.3.ebuild 323 BLAKE2B 50ad12fb1fa077e45f7d87d15d01ab510e6d41ee4d7686830906784c17fc9b742f75d591f37b6e9271b9de3b79b6d463d1837c0ffb059a1b5612997be88e1e55 SHA512 af6bd77fdcabbe77fd664a4da5cde15c790b1b3459dd04aa747b612f12a6953d2030a9c8a0143f3699d1a029b1b463c54be0b61c5b9268a5735dd3a6ce35e885
 EBUILD kde-meta-18.04.3.ebuild 323 BLAKE2B 50ad12fb1fa077e45f7d87d15d01ab510e6d41ee4d7686830906784c17fc9b742f75d591f37b6e9271b9de3b79b6d463d1837c0ffb059a1b5612997be88e1e55 SHA512 af6bd77fdcabbe77fd664a4da5cde15c790b1b3459dd04aa747b612f12a6953d2030a9c8a0143f3699d1a029b1b463c54be0b61c5b9268a5735dd3a6ce35e885
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-meta/kde-meta-17.12.3.ebuild b/kde-apps/kde-meta/kde-meta-17.12.3.ebuild
deleted file mode 100644
index 39ec36b68982..000000000000
--- a/kde-apps/kde-meta/kde-meta-17.12.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="Merge this to pull in all KDE Plasma and Applications packages"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_kdeapps_dep kde-apps-meta)
-	$(add_plasma_dep plasma-meta)
-"
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index fadc0f58a899..d519bb0ddce6 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kdeaccessibility-meta-17.12.3.ebuild 356 BLAKE2B 670b57674d38cd325e3116e6cfb1634827f67526a7a7d43045a4477db227199dff1d21740b19a386a295bdefada351b1320ee969a9ead23bf7431a25f7c6ee9d SHA512 8813797ed8f108a321eddc24c98f2e73834c1aedb4cdfd826b0fc30e66edcb5f55b468b840448be613669777d7223333d22c34d755b44ae31d4a5096099922a4
 EBUILD kdeaccessibility-meta-18.04.3.ebuild 356 BLAKE2B 670b57674d38cd325e3116e6cfb1634827f67526a7a7d43045a4477db227199dff1d21740b19a386a295bdefada351b1320ee969a9ead23bf7431a25f7c6ee9d SHA512 8813797ed8f108a321eddc24c98f2e73834c1aedb4cdfd826b0fc30e66edcb5f55b468b840448be613669777d7223333d22c34d755b44ae31d4a5096099922a4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.12.3.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.12.3.ebuild
deleted file mode 100644
index ef9e5012866f..000000000000
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.12.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_kdeapps_dep kmag)
-	$(add_kdeapps_dep kmousetool)
-	$(add_kdeapps_dep kmouth)
-"
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index 530639901ba3..c1edb8f732bc 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kdeadmin-meta-17.12.3.ebuild 346 BLAKE2B e02288f4f94c2cfcefad4805143e8256ef440d6227a1e77ed4b338fd11c35b194932e416b9539103fe55ac60408d4fc5bfad953a7bbc550f47877a313f6c562d SHA512 89332ce2348e6105ea23a41ad6299cd91eef4d232add22e98e8bbbfc29c7f28be81e90e56fd14a9f10872fd21a72984eb9ecfd273c663a07f2d36f19bda76aeb
 EBUILD kdeadmin-meta-18.04.3.ebuild 346 BLAKE2B e02288f4f94c2cfcefad4805143e8256ef440d6227a1e77ed4b338fd11c35b194932e416b9539103fe55ac60408d4fc5bfad953a7bbc550f47877a313f6c562d SHA512 89332ce2348e6105ea23a41ad6299cd91eef4d232add22e98e8bbbfc29c7f28be81e90e56fd14a9f10872fd21a72984eb9ecfd273c663a07f2d36f19bda76aeb
 MISC metadata.xml 358 BLAKE2B 5830492c2dd2642c5142d8743c6f34006fa8ed9738bb8f3302c32d1a85896b36eac19d5e0464827f0d1b60130bb3249dd5ce30f505ce37e49032a06f9aa969c8 SHA512 32bf1c86b117619bb8dc5629a5d5027bcaf5f6c3de5c3aca895fb2eafcb40079638a10e6e27b3a4f2f22a5c40e365f1fb683148dfe3f0ebf7372eab8191725fa
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-17.12.3.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-17.12.3.ebuild
deleted file mode 100644
index 6ea3535889ad..000000000000
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-17.12.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-KEYWORDS="amd64 x86"
-IUSE="+cron"
-
-RDEPEND="
-	$(add_kdeapps_dep ksystemlog)
-	cron? ( $(add_kdeapps_dep kcron) )
-"
diff --git a/kde-apps/kdebase-meta/Manifest b/kde-apps/kdebase-meta/Manifest
index c09ea2dc30cb..0ac293f5d437 100644
--- a/kde-apps/kdebase-meta/Manifest
+++ b/kde-apps/kdebase-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kdebase-meta-17.12.3.ebuild 327 BLAKE2B 279c2650f074343a4ee5c30c3fb2cf145c4e017c0127f4c7e2ffe7046169b565addbb5fc14e7538b38e96a6871d5846b24ae98d0d3cdf153b649d684fb3a30f7 SHA512 c8fbb53ffa1784e26082357b04e3ac25a0a7a93dc490bcdb4e618181a53d545fb7093877b1086933ca0a9a8e3da40f23d1c7c587e793804ef3f23fdbd1367de1
 EBUILD kdebase-meta-18.04.3.ebuild 327 BLAKE2B 279c2650f074343a4ee5c30c3fb2cf145c4e017c0127f4c7e2ffe7046169b565addbb5fc14e7538b38e96a6871d5846b24ae98d0d3cdf153b649d684fb3a30f7 SHA512 c8fbb53ffa1784e26082357b04e3ac25a0a7a93dc490bcdb4e618181a53d545fb7093877b1086933ca0a9a8e3da40f23d1c7c587e793804ef3f23fdbd1367de1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebase-meta/kdebase-meta-17.12.3.ebuild b/kde-apps/kdebase-meta/kdebase-meta-17.12.3.ebuild
deleted file mode 100644
index 7cb3672400ef..000000000000
--- a/kde-apps/kdebase-meta/kdebase-meta-17.12.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_kdeapps_dep kdecore-meta)
-	$(add_plasma_dep plasma-meta)
-"
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index a9e021e728db..8437dfe8842a 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,5 +1,3 @@
-DIST kdebugsettings-17.12.3.tar.xz 48668 BLAKE2B 1bba5a7860b47c6cc74e249dbc5b8885ea1721ba5614dbe4246f701c0f759a13efca834298453c17e75bebb1ad9ac155a51d95742b5b428f279bf3090c9a4e89 SHA512 e0f73e18ab1d7bccdb1d4a76a546dfb638f4b0a9ef331a45478fad8e15057a9424bb47d24aee5d870181c00a917ff42ef0e99697ebd3da4319ee8c24aba9264b
 DIST kdebugsettings-18.04.3.tar.xz 51832 BLAKE2B 58254c1a12262674e5d2ead5deb414a8060fe19c68dc004d704d72ec57de5f48e91bd878ce7fa827e251eeb768767c615f5b956454a6a98bf7ddf6dceda2fe18 SHA512 582dde5bff461355ba5a2d2173e5a94b129cfa9fd3db6bd70471f1b8f92a0d03df45231c9b69c8c9eec78865b2e45283a3ffb00f2dfd41c88e57003730430023
-EBUILD kdebugsettings-17.12.3.ebuild 595 BLAKE2B 23e604f648131c3c51d620b8133a1494c1466ff0883ce2037b10fdf402f819e2a7f0b0ee236fb2cd0fdfafb47fe9e6f6bc6eb4d96004d4e7eb63a7fad3ef7d04 SHA512 7facddf48cd39adc8910819bac603a5f2ff784a110364affef27c3c0b8944c36ca2ebea2b89de6a96e7736dd494eaf6a3bea9bba43aa0de063d04547ae8e39f0
 EBUILD kdebugsettings-18.04.3.ebuild 595 BLAKE2B 23e604f648131c3c51d620b8133a1494c1466ff0883ce2037b10fdf402f819e2a7f0b0ee236fb2cd0fdfafb47fe9e6f6bc6eb4d96004d4e7eb63a7fad3ef7d04 SHA512 7facddf48cd39adc8910819bac603a5f2ff784a110364affef27c3c0b8944c36ca2ebea2b89de6a96e7736dd494eaf6a3bea9bba43aa0de063d04547ae8e39f0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebugsettings/kdebugsettings-17.12.3.ebuild b/kde-apps/kdebugsettings/kdebugsettings-17.12.3.ebuild
deleted file mode 100644
index 74b2fa4674a0..000000000000
--- a/kde-apps/kdebugsettings/kdebugsettings-17.12.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Application to enable/disable qCDebug"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index 53a2e6e92f1e..7be4aff0717b 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kdecore-meta-17.12.3.ebuild 564 BLAKE2B ab892f36312833261e1e698df5d0b79a04f340189169b59d93fcbe9c00f8fe6a50c80af09260675600080669a8c2c444307a946ae934914f8140fd429ad242d5 SHA512 e0a096c7a226d6ebec34759d4cba1b06531be6fdc553bf90fdeacda8f30dd2570fcc0bc112a7acd6c877a7e3a3c44406d1050cb985948ca5ceaaf96af8acdba3
 EBUILD kdecore-meta-18.04.3.ebuild 564 BLAKE2B ab892f36312833261e1e698df5d0b79a04f340189169b59d93fcbe9c00f8fe6a50c80af09260675600080669a8c2c444307a946ae934914f8140fd429ad242d5 SHA512 e0a096c7a226d6ebec34759d4cba1b06531be6fdc553bf90fdeacda8f30dd2570fcc0bc112a7acd6c877a7e3a3c44406d1050cb985948ca5ceaaf96af8acdba3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdecore-meta/kdecore-meta-17.12.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-17.12.3.ebuild
deleted file mode 100644
index 71c701acb64f..000000000000
--- a/kde-apps/kdecore-meta/kdecore-meta-17.12.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdecore - merge this to pull in the most basic applications"
-KEYWORDS="amd64 x86"
-IUSE="+handbook"
-
-RDEPEND="
-	$(add_kdeapps_dep dolphin)
-	$(add_kdeapps_dep kdialog)
-	$(add_kdeapps_dep keditbookmarks)
-	$(add_kdeapps_dep kfind)
-	|| (
-		www-client/falkon
-		www-client/qupzilla
-		$(add_kdeapps_dep konqueror)
-	)
-	$(add_kdeapps_dep konsole)
-	$(add_kdeapps_dep kwrite)
-	handbook? ( $(add_kdeapps_dep khelpcenter) )
-"
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 7dbf8e8fdd37..162351a4179e 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,5 +1,3 @@
-DIST kdeedu-data-17.12.3.tar.xz 327652 BLAKE2B 554de77a50fd6ac954dcdb6081f3ab9631c819150994389977142095defc3f7c802d8a94d8fcf0a2e07df60663d49ae27b75a4420d3ea35013a8c6ddf62ab6e4 SHA512 4f6dc1ed4407bc1447d5a4c66e0ee6e1b2eff69545a46ff365f69ac1e93add84e6415e3e397210112f9850556b52d82ac826dacba501713c4495f1b3669b15de
 DIST kdeedu-data-18.04.3.tar.xz 327812 BLAKE2B 7bec203b7f40c6909291a3c31f72b768e46b32a9678106cadfb24c7872670d886c46a85a21c6dc071c009e688012235872c01db9a46d9cfff9c299cbb2763648 SHA512 aec7224798e47c257fd4411a6432689a9a583262a32f875895c6205a276c8af3aa2ee5d57ffcb0b725334a3cef3982d85ad2c61d4b62e6b2f211a7cdfffeda26
-EBUILD kdeedu-data-17.12.3.ebuild 410 BLAKE2B eaa18f5506043dd8df271fed9fbb0745270caf4ab9ca37dddaea6bfd86febe3145e9eda889a1869c0dbb25c276262c81bf4f2f4a7da457a14cc78af7bbda98e7 SHA512 8f1472dc7549a96e75b1d2de05bc4c72c9b908c41c8a7a7fb5decf85b62366914551db39eac1414c2e18c69f134f8067ff086e2d00f47138c2b19877e3656f09
 EBUILD kdeedu-data-18.04.3.ebuild 410 BLAKE2B eaa18f5506043dd8df271fed9fbb0745270caf4ab9ca37dddaea6bfd86febe3145e9eda889a1869c0dbb25c276262c81bf4f2f4a7da457a14cc78af7bbda98e7 SHA512 8f1472dc7549a96e75b1d2de05bc4c72c9b908c41c8a7a7fb5decf85b62366914551db39eac1414c2e18c69f134f8067ff086e2d00f47138c2b19877e3656f09
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-data/kdeedu-data-17.12.3.ebuild b/kde-apps/kdeedu-data/kdeedu-data-17.12.3.ebuild
deleted file mode 100644
index 26f0de9b64df..000000000000
--- a/kde-apps/kdeedu-data/kdeedu-data-17.12.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Shared icons, artwork and data files for educational applications"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="
-	!kde-apps/libkdeedu:4
-	!kde-apps/kde-l10n
-"
diff --git a/kde-apps/kdeedu-meta/Manifest b/kde-apps/kdeedu-meta/Manifest
index e0f93a755e15..e494c6b14201 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kdeedu-meta-17.12.3.ebuild 1015 BLAKE2B 95de6c64a19be1476baf5ed5b1d1aecbb352eadb71cad7403c624d41c7567d322f2c57da37c9ef69f62746078c147b40911e811524b9b189c350ce18e7711e7f SHA512 112f1316947e28da8c52a36a031e2774ca24896b475e39d06bd200047b697521ab6f4a032ee8cdba07687916474c96b843dcaa3146e41303f3b98f20bb8c6155
 EBUILD kdeedu-meta-18.04.3.ebuild 1044 BLAKE2B 1d20c11f4dbb093f4822dc84c36baba673e4f215dc770d8414654c6298f90d18f8082f4f51865cadc129a3d1d472ba70e64ade7985a28c256984944bdff564c1 SHA512 bc2217d651699fe4306cd9a30eaaaab0cf59a60cfd2da06e4e0494910b54fe520fca5e7141b0a5d325f770a6699cf8b7a3331ce29a967ebce43f17d1ca1926f1
 MISC metadata.xml 403 BLAKE2B 0cd42ab85cbd256e6080ce92fd939e8138a9639832c2f0a87ce4fec0364ead3a180d344c16672a2631dd294cbb7f50f9d748a6a3d0585c6a834bffb05469792c SHA512 50f9c120fc6e8705b2b40f21a3e119a1a52fdb1bafcaed645f41bd13311cac342f4ccff3090a9fa3ba031904871954f81ef3301c73a58e0688d071ddba5d0152
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-17.12.3.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-17.12.3.ebuild
deleted file mode 100644
index c72bcaac0e0d..000000000000
--- a/kde-apps/kdeedu-meta/kdeedu-meta-17.12.3.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
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
-HOMEPAGE="https://edu.kde.org"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_kdeapps_dep analitza)
-	$(add_kdeapps_dep artikulate)
-	$(add_kdeapps_dep blinken)
-	$(add_kdeapps_dep cantor)
-	$(add_kdeapps_dep kalgebra)
-	$(add_kdeapps_dep kalzium)
-	$(add_kdeapps_dep kanagram)
-	$(add_kdeapps_dep kbruch)
-	$(add_kdeapps_dep kdeedu-data)
-	$(add_kdeapps_dep kgeography)
-	$(add_kdeapps_dep khangman)
-	$(add_kdeapps_dep kig)
-	$(add_kdeapps_dep kiten)
-	$(add_kdeapps_dep klettres)
-	$(add_kdeapps_dep kmplot)
-	$(add_kdeapps_dep kqtquickcharts)
-	$(add_kdeapps_dep ktouch)
-	$(add_kdeapps_dep kturtle)
-	$(add_kdeapps_dep kwordquiz)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_kdeapps_dep marble)
-	$(add_kdeapps_dep minuet)
-	$(add_kdeapps_dep parley)
-	$(add_kdeapps_dep rocs)
-	$(add_kdeapps_dep step)
-"
diff --git a/kde-apps/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index eefa6dba6dba..116810134869 100644
--- a/kde-apps/kdegames-meta/Manifest
+++ b/kde-apps/kdegames-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kdegames-meta-17.12.3.ebuild 1512 BLAKE2B 3a5f0d6dfb9135330701276aee09b4e5400ffadc4cb6879f1df0934a6c0553ebb52b86850825bf055b212a08de4b66640dfb9970cbfebefbf497c0962d754fde SHA512 dc97ada20d5b222a9bb252ad15e1c6c771a5bd20655b4a7874ca92d7e263db7eced138eedac778992c7bee28f2000dafbbbd3d8cf8b5facaee35b4d61b36d81d
 EBUILD kdegames-meta-18.04.3.ebuild 1512 BLAKE2B 3a5f0d6dfb9135330701276aee09b4e5400ffadc4cb6879f1df0934a6c0553ebb52b86850825bf055b212a08de4b66640dfb9970cbfebefbf497c0962d754fde SHA512 dc97ada20d5b222a9bb252ad15e1c6c771a5bd20655b4a7874ca92d7e263db7eced138eedac778992c7bee28f2000dafbbbd3d8cf8b5facaee35b4d61b36d81d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegames-meta/kdegames-meta-17.12.3.ebuild b/kde-apps/kdegames-meta/kdegames-meta-17.12.3.ebuild
deleted file mode 100644
index 4a126824e683..000000000000
--- a/kde-apps/kdegames-meta/kdegames-meta-17.12.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
-HOMEPAGE="https://games.kde.org/"
-KEYWORDS="amd64 x86"
-IUSE="opengl python"
-
-RDEPEND="
-	$(add_kdeapps_dep bomber)
-	$(add_kdeapps_dep bovo)
-	$(add_kdeapps_dep granatier)
-	$(add_kdeapps_dep kapman)
-	$(add_kdeapps_dep katomic)
-	$(add_kdeapps_dep kblackbox)
-	$(add_kdeapps_dep kblocks)
-	$(add_kdeapps_dep kbounce)
-	$(add_kdeapps_dep kbreakout)
-	$(add_kdeapps_dep kdiamond)
-	$(add_kdeapps_dep kfourinline)
-	$(add_kdeapps_dep kgoldrunner)
-	$(add_kdeapps_dep kigo)
-	$(add_kdeapps_dep killbots)
-	$(add_kdeapps_dep kiriki)
-	$(add_kdeapps_dep kjumpingcube)
-	$(add_kdeapps_dep klickety)
-	$(add_kdeapps_dep klines)
-	$(add_kdeapps_dep kmahjongg)
-	$(add_kdeapps_dep kmines)
-	$(add_kdeapps_dep knavalbattle)
-	$(add_kdeapps_dep knetwalk)
-	$(add_kdeapps_dep kolf)
-	$(add_kdeapps_dep kollision)
-	$(add_kdeapps_dep konquest)
-	$(add_kdeapps_dep kpat)
-	$(add_kdeapps_dep kreversi)
-	$(add_kdeapps_dep kshisen)
-	$(add_kdeapps_dep ksirk)
-	$(add_kdeapps_dep ksnakeduel)
-	$(add_kdeapps_dep kspaceduel)
-	$(add_kdeapps_dep ksquares)
-	$(add_kdeapps_dep ktuberling)
-	$(add_kdeapps_dep libkdegames)
-	$(add_kdeapps_dep libkmahjongg)
-	$(add_kdeapps_dep lskat)
-	$(add_kdeapps_dep palapeli)
-	$(add_kdeapps_dep picmi)
-	opengl? (
-		$(add_kdeapps_dep ksudoku)
-		$(add_kdeapps_dep kubrick)
-	)
-	python? ( $(add_kdeapps_dep kajongg) )
-"
diff --git a/kde-apps/kdegraphics-meta/Manifest b/kde-apps/kdegraphics-meta/Manifest
index 24af02ab07be..43541b08a7a2 100644
--- a/kde-apps/kdegraphics-meta/Manifest
+++ b/kde-apps/kdegraphics-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kdegraphics-meta-17.12.3.ebuild 765 BLAKE2B a5a9d2bd8dec75e23280998d581e2359a827ab2b387ab6f2958e1839e62d7c2cf49763099824748b69cc27a894ff349892abcbf492be0d9d4629992bce3b0c9c SHA512 76ff544e418bf64e34d1ecf2034d13ff6ef37c0f107bd92d24d52b85208bef19bfff1c83f90aab64da143845a7438e0223ba52d8eebd1422e55286476f19a2d2
 EBUILD kdegraphics-meta-18.04.3.ebuild 765 BLAKE2B a5a9d2bd8dec75e23280998d581e2359a827ab2b387ab6f2958e1839e62d7c2cf49763099824748b69cc27a894ff349892abcbf492be0d9d4629992bce3b0c9c SHA512 76ff544e418bf64e34d1ecf2034d13ff6ef37c0f107bd92d24d52b85208bef19bfff1c83f90aab64da143845a7438e0223ba52d8eebd1422e55286476f19a2d2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-17.12.3.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-17.12.3.ebuild
deleted file mode 100644
index a8e049568e98..000000000000
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-17.12.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
-HOMEPAGE="https://www.kde.org/applications/graphics/"
-KEYWORDS="amd64 x86"
-IUSE="scanner"
-
-RDEPEND="
-	$(add_kdeapps_dep gwenview)
-	$(add_kdeapps_dep kamera)
-	$(add_kdeapps_dep kcolorchooser)
-	$(add_kdeapps_dep kdegraphics-mobipocket)
-	$(add_kdeapps_dep kolourpaint)
-	$(add_kdeapps_dep kruler)
-	$(add_kdeapps_dep libkdcraw)
-	$(add_kdeapps_dep libkexiv2)
-	$(add_kdeapps_dep libkipi)
-	$(add_kdeapps_dep okular)
-	$(add_kdeapps_dep spectacle)
-	$(add_kdeapps_dep svgpart)
-	$(add_kdeapps_dep thumbnailers)
-	scanner? ( $(add_kdeapps_dep libksane) )
-"
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index d004aebc2eaa..e1edba8617d3 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,5 +1,3 @@
-DIST kdegraphics-mobipocket-17.12.3.tar.xz 13436 BLAKE2B ba45e959dd1f2c807210ac215cad3bfb0270d7bdf4162e2d80560fb4c6d8f6524a2a7da9ff519a6f93a4a937d69b1d1bc8b5fc47d97c3ff900cbf63a73e22adb SHA512 89558644d89bd3c68ab1436adb49698f264c2f59c85646cfbc8dbb2c2364933e74d91d9a24bf266b8ecf2e8852786d21615be1a83d7807e3abf6cd9cef213243
 DIST kdegraphics-mobipocket-18.04.3.tar.xz 13476 BLAKE2B 33b49885314b1e531c690a3d9873272b5f73e8cc23fa23524da07a48917f6e08a32f8fb840270941419b7d8ebc36cef28004b8ffc9e034abbaed8d60df1da98f SHA512 e475c7425bd9be50e5e28409ab0661eec7f33945ebb0a1b5fe9ade06c5b14d02b74a7afd572145049d1412a22a5cda12686039bebeecb25ade4eaa54fa307cf2
-EBUILD kdegraphics-mobipocket-17.12.3.ebuild 422 BLAKE2B 6815ff8abcd82d201ccaebe992d7df276ac95c4c2474fb04478bf73092158c0b532157f85275842fd9b5400fd9f10bcbcc32e1c9b9fed2e37613dc453d31bde0 SHA512 b0653f84cf4b6e9a5b5c517268e728f84610939dcd17f5d6ed52f33140aea2e3030394b6584b4437cea46b27019e10f1792a6c35c6eec0641959fb5e4fa1d4c5
 EBUILD kdegraphics-mobipocket-18.04.3.ebuild 422 BLAKE2B 6815ff8abcd82d201ccaebe992d7df276ac95c4c2474fb04478bf73092158c0b532157f85275842fd9b5400fd9f10bcbcc32e1c9b9fed2e37613dc453d31bde0 SHA512 b0653f84cf4b6e9a5b5c517268e728f84610939dcd17f5d6ed52f33140aea2e3030394b6584b4437cea46b27019e10f1792a6c35c6eec0641959fb5e4fa1d4c5
 MISC metadata.xml 325 BLAKE2B 8ec301d2e0047b619373cd33b250090cb4c5c20a62d38dfc9a66187f8aa21fd598733c75d293f226d6bae43c84c56b8fe2d5c72aa2489d84dbfbab6823cd66ba SHA512 9418f0328963c23416a3d0dda0fd491a75e26c2a95b3ae1bce180413297038cd33129d1ea86c9e707280ac6bb00c9584e1fe75abe6b1b84b4dc556d429740d95
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.12.3.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.12.3.ebuild
deleted file mode 100644
index 5fb1d11f17ad..000000000000
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.12.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Library to support mobipocket ebooks"
-KEYWORDS="amd64 x86"
-IUSE="+thumbnail"
-
-DEPEND="
-	$(add_qt_dep qtgui)
-	thumbnail? ( $(add_frameworks_dep kio) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_thumbnailers=$(usex thumbnail)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kdemultimedia-meta/Manifest b/kde-apps/kdemultimedia-meta/Manifest
index a04ca8689a1c..3084920bdd59 100644
--- a/kde-apps/kdemultimedia-meta/Manifest
+++ b/kde-apps/kdemultimedia-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kdemultimedia-meta-17.12.3.ebuild 683 BLAKE2B 9f2c1c82f6cf5ccaf7f02462d5298468d42aac913133b6b4893c6e0a3c0fdb9e84c89a711405f9605816f66c346ff1ca758e06987f4ef27cadfd512ef5f1eec8 SHA512 cc179782601d05ec6d00cac899a2d290989eccc10e4181dc277e52afc7877cae2bf37dd8cb96579921b5a6138a98b97a76f69c84c6ca1daba2a683537d5722a4
 EBUILD kdemultimedia-meta-18.04.3.ebuild 735 BLAKE2B 68ffe03a692837927bb3ad434eb1feddb4d68a0b7b6594777a9c423467995411a6d9f5bf6d5ab020cda3472743a49e07a64b39cc683c0fdf187cd1ccdc8d3fd2 SHA512 df3c03c90679791c85a5c5f05222f1081b4b6245eaea41f7047efc54f08be655fdf9e105295de36a6c5a2d8491422c29fb8708c61b888bbd3636aec5aa77bb5a
 MISC metadata.xml 327 BLAKE2B 37deeb7aa86563880751c2d17d4ffc48246f0edfbd4d528a718ba0b2baaae58c3a5e479e379d20dec90e7d0e145fc6b548a5037008907a80c82f2cc6bb83ad4b SHA512 a9070d6747bb3ecf1541038b48dc4e71770ac294fbf0a8e3d2268926fd0238b804fd8dfb014e0c1a293192c997a91291657a69b3a8eba679a92726e20c0f3d11
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.12.3.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.12.3.ebuild
deleted file mode 100644
index 570d97a847a2..000000000000
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.12.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-HOMEPAGE="
-	https://www.kde.org/applications/multimedia/
-	https://multimedia.kde.org/
-"
-KEYWORDS="amd64 x86"
-IUSE="+cdrom +ffmpeg"
-
-RDEPEND="
-	$(add_kdeapps_dep dragon)
-	$(add_kdeapps_dep juk)
-	$(add_kdeapps_dep kdenlive)
-	$(add_kdeapps_dep kmix)
-	$(add_kdeapps_dep kwave)
-	$(add_kdeapps_dep libkcddb)
-	cdrom? (
-		$(add_kdeapps_dep audiocd-kio)
-		$(add_kdeapps_dep k3b)
-		$(add_kdeapps_dep libkcompactdisc)
-	)
-	ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
-"
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index de3d299fd9dd..ab9341f9b4f0 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,3 @@
-DIST kdenetwork-filesharing-17.12.3.tar.xz 323564 BLAKE2B 5d1e6b96507e983bb0d30aafc57c59517e6095546de71892e2686d13c96a980af390343a629e5f41426bfaeb010bd52739fb377356fb9854cdf783ece5f01316 SHA512 3152b7ba7eea4a8dd5f4dacfc87cdfb4236d678cf305bebeb915e3f13575d1924ef6418df1d7095ddcea83d17d614370b61738f62631e9696e41a313fcca7457
 DIST kdenetwork-filesharing-18.04.3.tar.xz 324004 BLAKE2B 41470dca8d8a0e9eb092445a5d32c2ef655b9f64e14fcea46b96c848efdcb69471cd184edb321860ae52ad7e222ca81aa8218e5e05d81c523f22834d4910ca9a SHA512 f9672ac750a9b6ae05f0c3b9c3e340966bcacbf906c130ddabae6e7d62f5b67838e5183cc772b676c9a314b866c563d82e079c4e59cdd1339d550a1583a0df5e
-EBUILD kdenetwork-filesharing-17.12.3.ebuild 572 BLAKE2B 38ae6cdaeaafa1047dddc6b3c303098db6343279be551b0f72f51b2cc324afb789e6db3ce575572f7b1b793d1e432654dd44f1b9eb337064c4d569e7389459d8 SHA512 755e810f11580ce3c59b3ee8a215521ff5eb7d97bb9d69ca8f0d6a52ac9d73c7ed7c5f6d1e8f1c2ce30cb07cd8cff0f86f219b00075e58f420a1324220f5b3d2
 EBUILD kdenetwork-filesharing-18.04.3.ebuild 572 BLAKE2B 38ae6cdaeaafa1047dddc6b3c303098db6343279be551b0f72f51b2cc324afb789e6db3ce575572f7b1b793d1e432654dd44f1b9eb337064c4d569e7389459d8 SHA512 755e810f11580ce3c59b3ee8a215521ff5eb7d97bb9d69ca8f0d6a52ac9d73c7ed7c5f6d1e8f1c2ce30cb07cd8cff0f86f219b00075e58f420a1324220f5b3d2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.12.3.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.12.3.ebuild
deleted file mode 100644
index 82b38a189d00..000000000000
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.12.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="kcontrol filesharing config module for SMB"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index 24475386b9fe..a0d98e93c063 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kdenetwork-meta-17.12.3.ebuild 459 BLAKE2B 3392228fa2e577ad43cf8533792ca73de59d71e6838d72b023e2ceb7cff4ef2f673d258c886ebca4eb6d1ba023e63ba2c9fbca6ea0093dadebbda9e603f04868 SHA512 5dcf7efc7c7574854ba439c20a8af85cbd15818d807605e933c914aa89a5632b06f4ea950df32dbe830c2d865726a10235d803eaa93a7d94806b1c3bcc98dda8
 EBUILD kdenetwork-meta-18.04.3.ebuild 511 BLAKE2B 0627b330695a6747c664dd26304985af3675be0cece5e42c9780ec34ca4be767f2d1854eb25f75042b59e2f4ce8f4266e8800f534be3b80b0bd795252ad65b55 SHA512 5b5f2f98f9bc8fc2b47a6b18356c169e3ad631e3aace2f9014b4641664d362d16b3d338cc3c1b27dd58bb7ee256e6966dfa691c3102b7502ac048e107d3a8df9
 MISC metadata.xml 410 BLAKE2B 8d98bd833e50db75f604cdb99878a614b28ad320b4a377b75897b7bcb6d0b95f5b2fa102661fc26474533eeda09e7cd5f8fe2131d0162f85b87c45a8aee9649f SHA512 049780b067ed1159cac1db34a6408997d614c74445b74c01d0fb3bca4beb46185b8bed2e2280f590501b44177fe13a5bf3fa090c21cfb5455b4e7a3a44ef1436
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-17.12.3.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-17.12.3.ebuild
deleted file mode 100644
index 7a24640ef8e0..000000000000
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-17.12.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_kdeapps_dep kdenetwork-filesharing)
-	$(add_kdeapps_dep kget)
-	$(add_kdeapps_dep krdc)
-	$(add_kdeapps_dep krfb)
-	$(add_kdeapps_dep plasma-telepathy-meta)
-	$(add_kdeapps_dep zeroconf-ioslave)
-"
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index bb47ca52ec86..09aeb27880be 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,5 +1,3 @@
-DIST kdenlive-17.12.3.tar.xz 9383532 BLAKE2B a348cfc3622735af5c37d60f43645062a0bb077e1b10fd780d91ede4d1c6298fe1cad3ce8d6964b33e4b60ad7074ca656199209c827deb2e67da5a71cd341593 SHA512 8142229d01c4c5108bd1482f6479dd7ef7ccb56e19152a74021a47939aedd5841f9161483994f2e8078099b4e3c65a501736938b1ea3233779498f0d8cf5272d
 DIST kdenlive-18.04.3.tar.xz 9399136 BLAKE2B 0cb0a172ea301695e5e8f1e11aa25cfe8a6a597c61ef2913691fd834f6c9f021a3f63ede54c3a2d13753e06cd0932681246db84831d979a1355faa94418bf37f SHA512 c4f903a2de7a44b743a87068bd54379f12af1ba56f19aa7a5820db58514bd2c973cdfddc05f89232304ba06da9a8e4437138485eff0d611138e21f4f8af4ed77
-EBUILD kdenlive-17.12.3.ebuild 2087 BLAKE2B c8ac625eb0726f290615cf273c6b55fa64e4ddd253531be75b0fbaf8e36e8807c17588a95ca005bf7d7f289b56caa834408fcc5ea459e2de0ecc9daace50517d SHA512 23b0d0a856ded3048f40ee67ddb581c5bd385b5d2aa671b3c6cc649d7377a9c234e98c1a3cf6491e9c42d55ef9126ccd9570fffd1733a14de348132c724cf7a0
 EBUILD kdenlive-18.04.3-r1.ebuild 2126 BLAKE2B ac074cf0d3c79c1882784256cfe72e8762fb3f39c8a1dcd4b5c953ecdd1ba171ac44a406df7dc1959f4277da5f859a05262e1bd39e0969f1cb05d37a2c8a62a3 SHA512 e17e9a58e359e9d88b85f4f570c4ff13ac511fc36924b76b8607a649e6002c1243490f4d48b352cb4f5026dab5dc1e4c26d5968350146478dcdf2a221b26f41a
 MISC metadata.xml 531 BLAKE2B 2418fe9902d1e4253198b8ccb70ce23cee258143c0da3d99198328e02d2a1ce3ca1e327afd5beaa4ec3a41c04a5c5cd6c2b8d0943fa4b33599ddc3e9eaf59737 SHA512 f3658592c4023a1c101a2faff25018061f7514d5110794e137f72b31106021d581a5b9fbf85b460e55b541a2d11af77a074d702896cb6ab07c4e46740832fea6
diff --git a/kde-apps/kdenlive/kdenlive-17.12.3.ebuild b/kde-apps/kdenlive/kdenlive-17.12.3.ebuild
deleted file mode 100644
index 334ff2b7043a..000000000000
--- a/kde-apps/kdenlive/kdenlive-17.12.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Non-linear video editing suite by KDE"
-HOMEPAGE="https://www.kdenlive.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="freesound gles2 jogshuttle semantic-desktop v4l"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(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 kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml]
-	virtual/ffmpeg[encode,sdl,X]
-	virtual/opengl
-	freesound? ( $(add_qt_dep qtwebkit) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
-		-DWITH_JogShuttle=$(usex jogshuttle)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package v4l LibV4L2)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	# Gentoo bug 603168
-	if ! has_version "media-libs/mlt[fftw]" ; then
-		elog "For 'Crop and Transform/Rotate and Shear' effect, please build media-libs/mlt with USE=fftw enabled."
-	fi
-}
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index b935194e406b..9c2af81c7712 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,3 @@
-DIST kdepim-addons-17.12.3.tar.xz 2038588 BLAKE2B 76636629c40b81afa4cd6bdf273ea250e196247e2673365dbfb768c76449b01a72ad80af277bb03e31302b4ba8643f5d783b9c05aa62dea8b8eba1effce8a68f SHA512 15e15f5a7a00db274f1ac643d03b41cb71949ad7c36d35c19a011d2704b887dd1f23e78dd6f8ef04852a7934e5e5361fe0a60c93e17b2c891d55baeee75352f2
 DIST kdepim-addons-18.04.3.tar.xz 2509988 BLAKE2B e52e24cda18808e177b9192c1c69cb4c8c6b8815ab738b3b1e2127c61fa7cbf6007704a1a243824a0bb66e93336bcaa2590a6a83edca594029fb2087cbb5c20b SHA512 af1659a41a128cd6c822c8de089aa447131817c60636803bb809fe637780e312230633156347cadb11546b7b8bcbcfffd730d6176109dd80ee20e7dcc9a7707b
-EBUILD kdepim-addons-17.12.3.ebuild 2254 BLAKE2B feb95b32a64c8d8ac8e0f7664cff63fbbafabe83263fb9920dce532d3736c49b7db26506799b267ea74c1b8de94a3600768ebdccd62e0843cbd5c2df0f05e1de SHA512 8d0bb5991fefb409d17e1575cc9ab1aee3784693e15df062c77ab3d07c0df403d905db5eb30728353b48c0287eb5d4b33d7d70f64d7186d2e2a991b12225be17
 EBUILD kdepim-addons-18.04.3.ebuild 2254 BLAKE2B feb95b32a64c8d8ac8e0f7664cff63fbbafabe83263fb9920dce532d3736c49b7db26506799b267ea74c1b8de94a3600768ebdccd62e0843cbd5c2df0f05e1de SHA512 8d0bb5991fefb409d17e1575cc9ab1aee3784693e15df062c77ab3d07c0df403d905db5eb30728353b48c0287eb5d4b33d7d70f64d7186d2e2a991b12225be17
 MISC metadata.xml 378 BLAKE2B 9ff4bb4cba46c784e2664d026e71aa42bd2bc3336e5107d9476fb13aa57646b06a21890047e2ce763223d1c359c161f701148d58df6c2afc32c18112a6e5942f SHA512 6a36925cdc8648716b5b3c6574f544b5dbe2bcd656a2594930a8d5d9b2600bc3a9c98801221191a2c308c5d05716d48859b381dc6c0343ab6894b8c704280701
diff --git a/kde-apps/kdepim-addons/kdepim-addons-17.12.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-17.12.3.ebuild
deleted file mode 100644
index 47985780bc1c..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-17.12.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_EXAMPLES="true"
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://www.kde.org/applications/office/kontact/"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-
-IUSE="importwizard"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(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_frameworks_dep prison)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	importwizard? ( $(add_kdeapps_dep akonadi-import-wizard) )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
-		$(cmake-utils_use_find_package importwizard KPimImportWizard)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if [[ ${KDE_BUILD_TYPE} = live ]] && ! has_version "kde-misc/kregexpeditor" ; then
-		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
-	fi
-}
diff --git a/kde-apps/kdepim-apps-libs/Manifest b/kde-apps/kdepim-apps-libs/Manifest
index 485c2ecc17e4..1d15879f4659 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1,5 +1,3 @@
-DIST kdepim-apps-libs-17.12.3.tar.xz 72912 BLAKE2B c7988237e127e6b5c79f1488dbab6b2594c16c93570ba5f2dd3f61f477f9a0eff4061417c913eaae20f359037a045c349b960b8252091c180e1aac1cc69725d9 SHA512 ffa2f59f95245ae5f6de56c8bd70a7f7b08cb063917d37aa225ffb7f580460ee951b442b1678151a1cf9ab8fa2fe04a36fcce8fef9773256dd74091337014e50
 DIST kdepim-apps-libs-18.04.3.tar.xz 73056 BLAKE2B abc67a5d354ffc4ff45b82d4bfb66f5b7b1327c95ed754768b9944c4f87987feca8c7478db1808251ef5939da5c3a3776f0ef6850b9a7f5e7cf873379b91ffb2 SHA512 1531c1f37540de4d0d8910a7f75eb85d5907495e2d65dfecb1dc83577e58f9587b2b3c37c451d4fe7b968c6f930f96e8cafa3c66fc6931c66e6aa5e41a4a8ab4
-EBUILD kdepim-apps-libs-17.12.3.ebuild 920 BLAKE2B 7f5d44fbc2462713efaac8d6626c0b9a93443b6ab5fc61d2430ffad2bfae7d28df323eb83cd25db915e32df9de55c39e92c0e1003f4a2ffa537775afea24d6ad SHA512 4b0f06a6d396335e9f7d87b6e2d22a4356ae9d4095f4c9a41c865f2fdd50d0e7129b11100c3acaad4e552ee4caaab3fc38461c38bf3f7be2baf03713b3a45a32
 EBUILD kdepim-apps-libs-18.04.3.ebuild 920 BLAKE2B 7f5d44fbc2462713efaac8d6626c0b9a93443b6ab5fc61d2430ffad2bfae7d28df323eb83cd25db915e32df9de55c39e92c0e1003f4a2ffa537775afea24d6ad SHA512 4b0f06a6d396335e9f7d87b6e2d22a4356ae9d4095f4c9a41c865f2fdd50d0e7129b11100c3acaad4e552ee4caaab3fc38461c38bf3f7be2baf03713b3a45a32
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.12.3.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.12.3.ebuild
deleted file mode 100644
index 2c3d2c7bd5b1..000000000000
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.12.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries for KDE PIM applications"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep prison)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/grantlee-5.1.0:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index f4486f52b7e1..de32bda55303 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kdepim-meta-17.12.3.ebuild 2087 BLAKE2B afc09acdaa85df96cf067382914d3b79286d4d72abce61bdef73bd6c922850109803026dda15b62f294b0d68c7af3b2638bbce24fad69693427d05bde5527073 SHA512 a754585116fa52a7c67f85a12928364e3143c0af6610d2e4a7fc11326dabf66c43cdaccfdc9a825553d61f45a509c870ababdb8dad0b0adb12ef3ce67d86d227
 EBUILD kdepim-meta-18.04.3.ebuild 2054 BLAKE2B 0859f98049ab023b4b7d9ff3c74c05b3823738572bf9f86444bb5a154894c98a31f4a787bf626bdf771c026922f6297d4b5a3c2f1efc0c093b50227b02b6e19d SHA512 7a810fef22bc3a2f0a1e98ec958676b2aa873b5409f597a95f660d1c31601f7ab6863bdea1513507ef7ba725ca3bc26e46d775198d0c1ecb393b1014f5b32cde
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-meta/kdepim-meta-17.12.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-17.12.3.ebuild
deleted file mode 100644
index 3eb7af9f08e6..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-17.12.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://www.kde.org/applications/development"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kholidays)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadiconsole)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-import-wizard)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep akregator)
-	$(add_kdeapps_dep calendarjanitor)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep grantlee-editor)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kaddressbook)
-	$(add_kdeapps_dep kalarm)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-addons)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kdepim-runtime)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kleopatra)
-	$(add_kdeapps_dep kmail)
-	$(add_kdeapps_dep kmail-account-wizard)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep knotes)
-	$(add_kdeapps_dep konsolekalendar)
-	$(add_kdeapps_dep kontact)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep korganizer)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep ksmtp)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkgapi)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep mbox-importer)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pim-data-exporter)
-	$(add_kdeapps_dep pim-sieve-editor)
-	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep syndication)
-"
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index cb3020343c16..870661ad564c 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,3 @@
-DIST kdepim-runtime-17.12.3.tar.xz 1796892 BLAKE2B 8e74409e6a5eee9201340f971f14324eee68d1510c23f2684686a3e8b8463031cfd6658de2073f1205f8c6f7207d1f1dabbddcfad05c87fa7c8665dd30566bfa SHA512 9ddb7c717a94ca75f561e54f7842c18c2def83c129f004e345a32ab4de4a5b4b15ec50f2044000d785572636a0d78adc4d90f9b3550ed853cf1982c6ef749aa7
 DIST kdepim-runtime-18.04.3.tar.xz 1750516 BLAKE2B 09bbca0580ca2a835d61ab48a004fde691b70d04b03a9da3ccf52abfad16d341e6007ef890d0fda364f679650c6d07e78c2bddd5a4b0dcfb296f24bd0e2c046a SHA512 94770f46d9a100117adf05b03ad75aa3201ae4fc2a6b300bdc3ffc42003e1a54cf8b1275d28c78f32ac764f56e58909dfbc1448b3ab8a9625485d64e8366e68e
-EBUILD kdepim-runtime-17.12.3.ebuild 2099 BLAKE2B 89590057bee63523527965deaa1c1b2b75640d6e3a9a1e4204dfd4122c273ceb20e65e4da8cb6fb456b135fd0d6638e173e80957eddddf1c929a4ba66ce9805f SHA512 cd966833607fa7e46b7d39ccccd557c09698aff2c0b883e7b9f71cd83e147db3d0e2da1e792eaa4c874bc626e05529ac1a5562965120d3b3ac51816fd28fca5f
 EBUILD kdepim-runtime-18.04.3.ebuild 2132 BLAKE2B b61017828ea6ef25170f71647111a56828e7a6fe147ed7bbe7a1ba118df8fdaa7c442ef4a2896460294d262959d2e80333ddbe7c6c0e112e086b9fef7a4c65ee SHA512 a7bdf693083cb9a845abd1d8125aad886bd625168d59f46b5df378cc682b51f9067fa19356b244052a592425aa31595b3e4197dcebaf2e5c369a1bc75ff4c519
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-17.12.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-17.12.3.ebuild
deleted file mode 100644
index 0bc47e6cce6a..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-17.12.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 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="Runtime plugin collection to extend the functionality of KDE PIM"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE="speech"
-
-# TODO kolab
-CDEPEND="
-	$(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 kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(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_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdav)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkgapi)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/cyrus-sasl:2
-	dev-libs/libical:=
-	speech? ( $(add_qt_dep qtspeech) )
-"
-DEPEND="${CDEPEND}
-	$(add_qt_dep qtxmlpatterns)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep kimap 'test') )
-"
-RDEPEND="${CDEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-misc/akonadi-ews
-	$(add_frameworks_dep oxygen-icons)
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index 20855a124b63..1d7dab949b2f 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,5 +1,3 @@
-DIST kdesdk-kioslaves-17.12.3.tar.xz 37376 BLAKE2B 6d3e5f63ba3aa306df92740cb7e0b3adf46475fbdae8d3994e0682f5c6ce51e16e9c1288d85c9b9f5cb20ffe21af39d3fd99602cc6877b7bea0a2a2efaf72d33 SHA512 c82efe950bb23a8a78e941136a544fd61eaa96421c547b1d68a8b21c265ed69d746fdb14078dde007b96d800aa8b53c629549de01b64733ab830990a65161750
 DIST kdesdk-kioslaves-18.04.3.tar.xz 37460 BLAKE2B 32e1aa9ab46b0eb5697b630488a0bebe0f8ae41e4b52f22960bc60ec140151cd72ba79624bc9c7dd12da5aab5261cc9693818873e8778b9e903b6ce2569de318 SHA512 bce7c3638cc57bd5d0300050d13dad8a3c5508569eea6589023cd9c9fd744f2d24ad0ce52a8fdad59e876a7ab8c9c4856ce61b7d80514175ecf42a7533706038
-EBUILD kdesdk-kioslaves-17.12.3.ebuild 375 BLAKE2B 8df34029202846d40886767b498ad131fbfe88c9a002f50c7b7bee550aa2f9d527ccf52d4d3c4ff4772457ebcd6cdae914030cc4428e9740639da9cd2e8d3c94 SHA512 99cd80231159521eff93142152fe52833f8f36d0678f4ccaa9e85522a34dd77f1ae5b1070d527915ee34e99219d55eb61e811e4608dc40a27fe8c77177152488
 EBUILD kdesdk-kioslaves-18.04.3.ebuild 375 BLAKE2B 8df34029202846d40886767b498ad131fbfe88c9a002f50c7b7bee550aa2f9d527ccf52d4d3c4ff4772457ebcd6cdae914030cc4428e9740639da9cd2e8d3c94 SHA512 99cd80231159521eff93142152fe52833f8f36d0678f4ccaa9e85522a34dd77f1ae5b1070d527915ee34e99219d55eb61e811e4608dc40a27fe8c77177152488
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.12.3.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.12.3.ebuild
deleted file mode 100644
index 2b720541e5a0..000000000000
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.12.3.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
-
-inherit kde5
-
-DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	dev-lang/perl
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.03.90:4
-"
diff --git a/kde-apps/kdesdk-meta/Manifest b/kde-apps/kdesdk-meta/Manifest
index bc7d0281520b..3bde5a614c86 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kdesdk-meta-17.12.3.ebuild 787 BLAKE2B ef971af318c8bbf0bc0831ec896eff1c866e1dfe4366f0b3a046a13930f5ebb6d8bc7091ddaa93516044610ea47d3ba24bb826d485ce84254d1e525ae4868028 SHA512 69534d2fe222ff9a01b50c616d878643c4b8305332b7a78a5494006d2c2bba4d491ead1141627deb8923330ca951d786dfe6bddfe3c5de28d6ed3ae1fd27daf7
 EBUILD kdesdk-meta-18.04.3.ebuild 787 BLAKE2B ef971af318c8bbf0bc0831ec896eff1c866e1dfe4366f0b3a046a13930f5ebb6d8bc7091ddaa93516044610ea47d3ba24bb826d485ce84254d1e525ae4868028 SHA512 69534d2fe222ff9a01b50c616d878643c4b8305332b7a78a5494006d2c2bba4d491ead1141627deb8923330ca951d786dfe6bddfe3c5de28d6ed3ae1fd27daf7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-17.12.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-17.12.3.ebuild
deleted file mode 100644
index ac85038b84e3..000000000000
--- a/kde-apps/kdesdk-meta/kdesdk-meta-17.12.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
-HOMEPAGE="https://www.kde.org/applications/development"
-KEYWORDS="amd64 x86"
-IUSE="cvs"
-
-RDEPEND="
-	$(add_kdeapps_dep dolphin-plugins)
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kcachegrind)
-	$(add_kdeapps_dep kde-dev-scripts)
-	$(add_kdeapps_dep kde-dev-utils)
-	$(add_kdeapps_dep kdesdk-kioslaves)
-	$(add_kdeapps_dep kdesdk-thumbnailers)
-	$(add_kdeapps_dep kompare)
-	$(add_kdeapps_dep kross-interpreters)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_kdeapps_dep lokalize)
-	$(add_kdeapps_dep poxml)
-	$(add_kdeapps_dep umbrello)
-	cvs? ( $(add_kdeapps_dep cervisia) )
-"
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index e2196a6dcc39..e919ae1f9dc6 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,5 +1,3 @@
-DIST kdesdk-thumbnailers-17.12.3.tar.xz 17164 BLAKE2B 5189bcfd5b39d3d91af18b3e0c2be39c9cd889eea6402b8ba98f6d9bbe2ac1b28d30d68ae476e3b26d2a75f29e8f73cc304dbc67cfaaee381afab2ada1564a35 SHA512 4a1aaee48d72601730a5eaffccfcd8f3fc10c848af4c5b72d0a81a41c3012521e43c259fa1fecc83268261290d86cb188c541d06827bb7cb990148257b699c45
 DIST kdesdk-thumbnailers-18.04.3.tar.xz 17140 BLAKE2B 0d25308ec6db0722d971f888fd412677411d223998ba810830e6b20194c055d71f12bbfd48987c1eec677cc00fcdae40db944ec096902250eb087055195d895c SHA512 18e3518fc66fc9d23d49658cfa916ad9080547e0e57899ca66eb4f87874d9e957b0620965464a683912784d6966d8b950f17ea2ac80ec0024e7d7a2c98f509ec
-EBUILD kdesdk-thumbnailers-17.12.3.ebuild 428 BLAKE2B b1487995dfe76b2153c1ce5a8cb91165f9c26b4d92026b662e07c99a792b98dfee71fb2a449cff6170efd6b28eafc35f10e1b66f4fdfe9217fc48c924a96a104 SHA512 0b08e749f42ced5d342bba47dc64a59f5627bd23313b1ddc0ed38f30c6e2804b5827234c6f9335a6f9ae6af61d9e94ea4da5f144719f62addbdaeca2958a3ab8
 EBUILD kdesdk-thumbnailers-18.04.3.ebuild 428 BLAKE2B b1487995dfe76b2153c1ce5a8cb91165f9c26b4d92026b662e07c99a792b98dfee71fb2a449cff6170efd6b28eafc35f10e1b66f4fdfe9217fc48c924a96a104 SHA512 0b08e749f42ced5d342bba47dc64a59f5627bd23313b1ddc0ed38f30c6e2804b5827234c6f9335a6f9ae6af61d9e94ea4da5f144719f62addbdaeca2958a3ab8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.12.3.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.12.3.ebuild
deleted file mode 100644
index b20e20f0bbba..000000000000
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.12.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Thumbnail generator for PO files"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdeutils-meta/Manifest b/kde-apps/kdeutils-meta/Manifest
index 8ce84bd19ce1..80e29d3b02f7 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kdeutils-meta-17.12.3.ebuild 780 BLAKE2B 9c88d6fa4afe2aac44e6346be781b1d01df5b6ece0db29b776d87b22558318b8ecbf51876d6505d626c78a0b5e43a0eca58f66e221d942a4bf8a0856e4196d51 SHA512 9183685acacf514d5e0efaa07af67d15a61b71ba0c5bf02b19c572bca03d39b32cc4be2db42289bbe81f79adb752f537827e26bc9efd8ec1aa9c7ff30c960ee4
 EBUILD kdeutils-meta-18.04.3.ebuild 808 BLAKE2B db0af0cdceff2e6d3012637829d2cafbb9c931fde649b74d996deb9eb0bdb732a979782b41bec1009b360dde2f5dfb6d480588e347b9b3c920ebad43c09abbf8 SHA512 661a80f10cbc6b4cb249bd077640bcab21419278a11a0ea3f7eb46b6e0b114d0947d542d6d93c4300de31d20a3721b8e8d5e4601d8c43b19f17a9e711c5715ba
 MISC metadata.xml 389 BLAKE2B 7f665fc6407ec0455464d44f43b98afba7702a6b7a2e65841d2bd54dc7c229cc5c227cdd47fd81eb7cb97e45b69957c2d4085a61e2e2eecd2e2f8186d896971a SHA512 f991910e5080fab1810b9762700b528556370472cb796e02c5f03fe63058f4e5d665ad39b6de597d49c04c233b09a4b703c80408205a3df175025c14767cf564
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-17.12.3.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-17.12.3.ebuild
deleted file mode 100644
index 97ce454f03e5..000000000000
--- a/kde-apps/kdeutils-meta/kdeutils-meta-17.12.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
-HOMEPAGE="https://www.kde.org/applications/utilities https://utils.kde.org"
-KEYWORDS="amd64 x86"
-IUSE="cups floppy"
-
-RDEPEND="
-	$(add_kdeapps_dep ark)
-	$(add_kdeapps_dep filelight)
-	$(add_kdeapps_dep kcalc)
-	$(add_kdeapps_dep kcharselect)
-	$(add_kdeapps_dep kdebugsettings)
-	$(add_kdeapps_dep kdf)
-	$(add_kdeapps_dep kgpg)
-	$(add_kdeapps_dep kimagemapeditor)
-	$(add_kdeapps_dep kteatime)
-	$(add_kdeapps_dep ktimer)
-	$(add_kdeapps_dep kwalletmanager)
-	$(add_kdeapps_dep sweeper)
-	cups? ( $(add_kdeapps_dep print-manager) )
-	floppy? ( $(add_kdeapps_dep kfloppy) )
-"
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 5577872fa837..481560ccbb8f 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,5 +1,3 @@
-DIST kdf-17.12.3.tar.xz 531168 BLAKE2B 34999ff9c3dabd8f83b3b4e1f197d6587926782ee68cf7df1897316ced417a8a5d6fe83821f9d74f3a2eda95e65c87bedd06822e71c6776c9dbde4705405ea5e SHA512 4a39e1f1d25d73171ba5b299227b9e4e51778d27a544b0198d77217904a5479c9e7107b15514f1ed1b9e2c8418ee3afd134f23c929b796a940a851b104563167
 DIST kdf-18.04.3.tar.xz 531604 BLAKE2B 2fb097444f1bc5eb7e7f1a31e3fc33f68f96b4a37d095640719fe734a6cf7e768e66f609395b3aa3c4d1120506da268d60aa6e56fdd4d0ae6bbfa3b95d4d428a SHA512 60d79b85ea9432561dc2cbd9a5f1ccd986fe8bf6fa8d8d0d722ab3e1316013d4044731ed98756441bdf5e56f91bce46d5496bc53863e74c0b5e456b0412cb3fe
-EBUILD kdf-17.12.3.ebuild 723 BLAKE2B 2cd42edaa2ee679b03d8557f41d0751eb21363e51383ba705ad10269628fcf602425cecc819004cc22e0635a3f1e0ff71c9807db6109afff199def42e8458be3 SHA512 c3d2ccc31530c8902ec386e9c7e0f91906cde6cce2b9702e44cbb5dd71c3a9b40b13eb679f11da1c90436f5eccb13a7bcde0ba5f14f869858e0979bcb8a38885
 EBUILD kdf-18.04.3.ebuild 723 BLAKE2B 2cd42edaa2ee679b03d8557f41d0751eb21363e51383ba705ad10269628fcf602425cecc819004cc22e0635a3f1e0ff71c9807db6109afff199def42e8458be3 SHA512 c3d2ccc31530c8902ec386e9c7e0f91906cde6cce2b9702e44cbb5dd71c3a9b40b13eb679f11da1c90436f5eccb13a7bcde0ba5f14f869858e0979bcb8a38885
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdf/kdf-17.12.3.ebuild b/kde-apps/kdf/kdf-17.12.3.ebuild
deleted file mode 100644
index f6d3e402d3bf..000000000000
--- a/kde-apps/kdf/kdf-17.12.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE free disk space utility"
-HOMEPAGE="https://utils.kde.org/projects/kdf"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(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 kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index b93130c01e8b..bde7b9026e15 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,5 +1,3 @@
-DIST kdialog-17.12.3.tar.xz 95956 BLAKE2B 5a7aee1b13e3163e29f85a98f17fb94e0d4503ad43f4c9a6be82df8bbd64e9ad12de80ebc33248c79c63f27240d192d184e5c9f7d85e458dca22731b5678a599 SHA512 412cff325ff8bc77f91077d5a364f4e900d7344f27a0b13d9319c16c903bf9d7ae79e3687f53167e0157600988ca8c77ef005e37e3fe8d1a0c45c8f776de1e4c
 DIST kdialog-18.04.3.tar.xz 96444 BLAKE2B be1a2603dbfe870245ab97f5fcb2c4e59529830a33be9d3fac38bf6e1c1f3c9fc0a6869210a055e89564ba5e8dff46c0ca2c464d6951ac94b4e1bd65bc3b74ce SHA512 a6dc04a0faa75642b919eafc78a67c36a976d98981bb624e39ee6f41e193ca8dd32867e56579caa7f28ae4ce40c32a3191ce357d139df83f13ba2efea74140e6
-EBUILD kdialog-17.12.3.ebuild 835 BLAKE2B d1530d890374d6a94b326c053cb83f3bd834e9a1447aae26877096cc997bf4ff4dcca7fa80d2122b32e5a0006e73e8e02c2ae1821af62e7f89aad286e20b2bca SHA512 801f9facb90bcbb670e3c253e4e308b1c46f17435fdc5306170d3a54d744393e8552b9428e313310fdd85ca5b122c99c92b87ec83ad95adca7929b8b0f87a96d
 EBUILD kdialog-18.04.3.ebuild 835 BLAKE2B d1530d890374d6a94b326c053cb83f3bd834e9a1447aae26877096cc997bf4ff4dcca7fa80d2122b32e5a0006e73e8e02c2ae1821af62e7f89aad286e20b2bca SHA512 801f9facb90bcbb670e3c253e4e308b1c46f17435fdc5306170d3a54d744393e8552b9428e313310fdd85ca5b122c99c92b87ec83ad95adca7929b8b0f87a96d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdialog/kdialog-17.12.3.ebuild b/kde-apps/kdialog/kdialog-17.12.3.ebuild
deleted file mode 100644
index 98be1678a251..000000000000
--- a/kde-apps/kdialog/kdialog-17.12.3.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="Can be used to show nice dialog boxes from shell scripts"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index 2d7264b9693f..f43975921437 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,5 +1,3 @@
-DIST kdiamond-17.12.3.tar.xz 4606848 BLAKE2B ddb65e22deeaf41cdb125ea7dbac51c82a7f7e2528f77e49738261da79d4507f3b61a4261014d16ec5e1507b2317e483bc2e01d2815587ba6629feaa55a16521 SHA512 bcf362489e0e1ace69de17fb33bcf2fe8237565a620f6cb4f6a0ac5563c93c1e7ecdf76e5411463daa7a71225b91c2dd4131b1726566e9ac6b80d49babfd2b4c
 DIST kdiamond-18.04.3.tar.xz 4607668 BLAKE2B 5f0a344297310e7d376730c87750d1d29fbee6d56fa8e2aa3098d14424f66b4a99268ac5a375dbe89e66dc6bd48992eb5d6f373e96673fe51578e2e3b02847e3 SHA512 05798ded8fd034fe4f8829fa1a57ac60b579d8215318ad4707527536cc56d5a0a5634eb7b5634abfab9c070774278efe26ead9a1708f4958690d58c061a4e3bd
-EBUILD kdiamond-17.12.3.ebuild 789 BLAKE2B d3c9f7a689285fa19ca4a69867de48ec75c3159cf478ea9f6a65fd6fb2f1c411422f6c34548cf3217a3ffdf1b66221f6ea1861527696bf8f0848cc68d15a7793 SHA512 2ac9033bedf4e831528a6998b77f6f02bcbc453648a9dfa2a4d564cc4c6d0bbc9ad108d171d79b722245daeeeb89395bd16860676d74d0561544e24e48cdc47b
 EBUILD kdiamond-18.04.3.ebuild 789 BLAKE2B d3c9f7a689285fa19ca4a69867de48ec75c3159cf478ea9f6a65fd6fb2f1c411422f6c34548cf3217a3ffdf1b66221f6ea1861527696bf8f0848cc68d15a7793 SHA512 2ac9033bedf4e831528a6998b77f6f02bcbc453648a9dfa2a4d564cc4c6d0bbc9ad108d171d79b722245daeeeb89395bd16860676d74d0561544e24e48cdc47b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/kdiamond-17.12.3.ebuild b/kde-apps/kdiamond/kdiamond-17.12.3.ebuild
deleted file mode 100644
index 9c5edd274d08..000000000000
--- a/kde-apps/kdiamond/kdiamond-17.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A KDE three-in-a-row game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kdiamond/
-	https://games.kde.org/game.php?game=kdiamond
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index ffaadcfef472..6da26765b444 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,3 @@
-DIST keditbookmarks-17.12.3.tar.xz 183248 BLAKE2B 89c2c23d1d0c9387d38dd84843b9da21cf9fc2d93d58f3b28c1f88bfdcf5c3e35862b7db9e13832cdc72b81a38421ba813bb4b00c21ce6ab2e21421d3a3abdf2 SHA512 9febc64485af7ecc4e2d80d3412a4c6ee8cc6cc38ef4606f31c10bf822389da9318f5e5ac97386bb68f6d4640f4ee5212871bc7c7a2b1a4ffe229936a00c0848
 DIST keditbookmarks-18.04.3.tar.xz 183956 BLAKE2B 5baa0c62b32710ccc4047ffe40fddd587c8c2be86e19029410be7d5ea0b6510d929fac32a2e2764527650c2ed3a741ae7a2cf634568da58b7c42994ba3f2d42b SHA512 e9f6b54efbae782ee18ae428cc2c4a797cf95fd92a88c4a8aa610449d6b71864fd226d8e50cb4e3c81309e5048210ace13f55b4a592aa455379aa2f215a7eb55
-EBUILD keditbookmarks-17.12.3.ebuild 1011 BLAKE2B c7e602a87e3a8c4b2d24670c70fac2603e67ea23dcb7face912e902d968f0fdd8f6fa35b364a20e8736cbe13918a2f3b82685cab68dd5c2a783d8c97ab9914a2 SHA512 62ab8d13685bef04dfaf60adcda07034f10212bfbafc11d27b2161d275e69ef00cc338d4f25eade629da6e7fc3564965e597111d8bdcab2c849675f1b2f14fa6
 EBUILD keditbookmarks-18.04.3.ebuild 1011 BLAKE2B c7e602a87e3a8c4b2d24670c70fac2603e67ea23dcb7face912e902d968f0fdd8f6fa35b364a20e8736cbe13918a2f3b82685cab68dd5c2a783d8c97ab9914a2 SHA512 62ab8d13685bef04dfaf60adcda07034f10212bfbafc11d27b2161d275e69ef00cc338d4f25eade629da6e7fc3564965e597111d8bdcab2c849675f1b2f14fa6
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-apps/keditbookmarks/keditbookmarks-17.12.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-17.12.3.ebuild
deleted file mode 100644
index 3d8ffd21aa07..000000000000
--- a/kde-apps/keditbookmarks/keditbookmarks-17.12.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Bookmarks editor based on KDE Frameworks"
-KEYWORDS="amd64 x86"
-IUSE="+man"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(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 kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!<=kde-apps/konqueror-16.08.3:4
-"
-
-src_prepare(){
-	kde5_src_prepare
-
-	if ! use man ; then
-		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
-	fi
-}
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index 5d3b0f01988f..51e961c13b8b 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,5 +1,3 @@
-DIST kfind-17.12.3.tar.xz 208948 BLAKE2B ac1830df924a8e81fb0756a331e1bec1ed267cc8cf27ac38d2c1c36be8e9293b92505f6446ce0b291871bd0c09e9a3a3399dd63b2d372da7f242d6bb7dc3bbcb SHA512 bc6edb248208f7ef6f609bd3b49cea6c621276dc2e43fec9b4dc28c86f162eb01af6656adc6bd9d90f3b47c92c35470985468c0b166e41a12fac608d77214121
 DIST kfind-18.04.3.tar.xz 210064 BLAKE2B 1d158d79ebb985ce2ac0e0182c01495a0d94cd7c1964aed86330cf8a992a9a000305021b15509a5bf04fb1de67875aa89dfae12de52656df26106c4328d243b1 SHA512 04e055c67256ad3f25b60ce2aec12f11ab5201e92a5d091d9faed6ef395ac129108cf8108c3cb413ffe45104aa4a1f59fd3e89ad6b32f6f8b4107b52aafefb4b
-EBUILD kfind-17.12.3.ebuild 787 BLAKE2B 0eb3991ac4ee3a81e94971f0dd5ee1747b6baa4967e32ecbbb34f07725adeec4212dc9a04d88839f3b0ab69bfc2a3065debf2979ce9e40d35c8800e9914a80b2 SHA512 d6588b758e9318d5b33c6f85affb13307bbf6931f70a12fb359e80e35cfcaf23792a9993437353d19912bc88c93e281d23ca14b26528877d99ea415e2907f5c4
 EBUILD kfind-18.04.3.ebuild 815 BLAKE2B f29da02864449f73f5813b4725ec8bfd45b44c9a53cc43158414fece8a32de6c676d5fd417a10b25b16d022a9f9635eddd1cef953084076c4a32bb71c3fa4b8f SHA512 cd0320f7875dcd3f0dcb3ebd90145954a3100bfb7de3247e74c18a8df63717696413bddaab1363214e29a43e477e3702543125b58bd98c3f3f455140be8990d7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfind/kfind-17.12.3.ebuild b/kde-apps/kfind/kfind-17.12.3.ebuild
deleted file mode 100644
index 9761333413d3..000000000000
--- a/kde-apps/kfind/kfind-17.12.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="File finder utility based on KDE Frameworks"
-HOMEPAGE="https://www.kde.org/applications/utilities/kfind/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(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)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 1874f994cf4e..142f33b96d62 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,3 @@
-DIST kfloppy-17.12.3.tar.xz 199060 BLAKE2B add58331fd220c61c7b764e2bc970181b515dc08ddb7b867f41a23d1a70ffc2d8b457ed7a97ef4f49040f048b508e8431478c96db6eb18af990056c934055710 SHA512 1197b15ad8953e037f4fd8463b49da903b56dd5108472b24c9d9e9af22a7c247737650e80c70310d4d906baffb2783e4b911a3645afcd3c69a9acb124a782a16
 DIST kfloppy-18.04.3.tar.xz 199896 BLAKE2B b71413634da0e4a03d0236573bd973c55edbc10322aa57807c1148138d73f8a121bd481e0e2bb265f871aba9636a6a2b7bb9a249a8e0cde12fdd0c4869fc469b SHA512 4bdc3541bdf3e817840e81b11ab1878d71e96bc7eff2e3fe53d2877b0956588e0ec6cafc41b2661064a676e4e08c0de4c744d97146fee7ae0d3379f6850eb674
-EBUILD kfloppy-17.12.3.ebuild 751 BLAKE2B 8b20fa977aa4e17b58157a3b469c54c047705a992ddc884f45b3b9954cc678562df906bb7eaafd14d0f3e129988bf586918b2886076adc93180e0f04b134a9c5 SHA512 a4215b6c1d1ef610c17327f070e8a1ef4823855a0cd817e88b9d2974ec9f0acd8b7aa6f83f7bd5b6fdaa1d4d5f9da1495cbfa076410898d192e6e5fa0297c1ab
 EBUILD kfloppy-18.04.3.ebuild 751 BLAKE2B 8b20fa977aa4e17b58157a3b469c54c047705a992ddc884f45b3b9954cc678562df906bb7eaafd14d0f3e129988bf586918b2886076adc93180e0f04b134a9c5 SHA512 a4215b6c1d1ef610c17327f070e8a1ef4823855a0cd817e88b9d2974ec9f0acd8b7aa6f83f7bd5b6fdaa1d4d5f9da1495cbfa076410898d192e6e5fa0297c1ab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-17.12.3.ebuild b/kde-apps/kfloppy/kfloppy-17.12.3.ebuild
deleted file mode 100644
index 1b882c18fcfc..000000000000
--- a/kde-apps/kfloppy/kfloppy-17.12.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
-HOMEPAGE="
-	https://www.kde.org/applications/utilities/kfloppy/
-	https://utils.kde.org/projects/kfloppy/
-"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index fc332dde1748..5be2938c5431 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,5 +1,3 @@
-DIST kfourinline-17.12.3.tar.xz 573076 BLAKE2B b7fa506a3e602286b6e5329fd5b091e8165f80104ddf9c6c859e75caaa29257f124c05da82a04e7e8f5ff90ffe5654287a1e10b2f1bbaebde90042b240ce08a3 SHA512 77f9046d477e65aa99a7dd9b4c88b1bf8727e25127b1afdf9872f01d8154bb01e3dd3d8dfe294698dcbc8acdb666f0cfa80bace9893448a5a696485316997005
 DIST kfourinline-18.04.3.tar.xz 573708 BLAKE2B a6a147ba51b2c788e7dd0009f665909310c0ac9e9b296e6485e80c01cbadba98bc9d86a50057473b75ed54216ac1ec7755a53dd626336996973029ef60984284 SHA512 e7333413bb85ce817ea71dd5b12c3af5eb36147d48f2df9bd87fc83f8b975def60a4dfa17fee8836cd3388d5ac6de189f22cd2d35029764569df9773216f0129
-EBUILD kfourinline-17.12.3.ebuild 733 BLAKE2B d663c190f21719280e58c0fc51f1f5e28977c9f9ee7804980023dfb57407cd51c1ef548645413ef568197106226d75c88d45deae4e6210f947ad4d56df379be9 SHA512 b158cefe8e92b3561ad8e6cd19f490c6f1397769b6a1cbeccc216667548aa3c4fb38d7add1af2491eafb598ac7a63a562b97c9047879f7bc51ba1e541425113f
 EBUILD kfourinline-18.04.3.ebuild 733 BLAKE2B d663c190f21719280e58c0fc51f1f5e28977c9f9ee7804980023dfb57407cd51c1ef548645413ef568197106226d75c88d45deae4e6210f947ad4d56df379be9 SHA512 b158cefe8e92b3561ad8e6cd19f490c6f1397769b6a1cbeccc216667548aa3c4fb38d7add1af2491eafb598ac7a63a562b97c9047879f7bc51ba1e541425113f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-17.12.3.ebuild b/kde-apps/kfourinline/kfourinline-17.12.3.ebuild
deleted file mode 100644
index 203bd507893b..000000000000
--- a/kde-apps/kfourinline/kfourinline-17.12.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE four-in-a-row game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kfourinline/
-	https://games.kde.org/game.php?game=kfourinline
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index 9efbf1ad1bd1..5e88f9f78241 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,3 @@
-DIST kgeography-17.12.3.tar.xz 10922256 BLAKE2B fd19344317ced08cebce16caf2f927b6cc8e4059ea6807a0a176ce390d4ce40a9072d06c53454650d77b26f824afe4d1adc89b6c69380258cb9e6208bca57e8e SHA512 de54afe24786535fc90433322cd6bccbbd130e9a1fc162e32dbc2ca2c6ff4a0277be851bce5e6dc722e32f5bea709186a1c6f30eddf0f6a9d403bf5e86b1c1d8
 DIST kgeography-18.04.3.tar.xz 10932484 BLAKE2B 1511abc7ade5f212faec31e1ea0afbd134edc9c0757727534a33a51bc29b21328c6bb0973010ac4f1302970e589e87d453cf3dd0c187660eb9919bd27ef1e2cb SHA512 c462a2e3a20fb12bb5583539fbe75d884a4b8f25f018bb3baa15d44054af1c6814d534bb873b66b418927a2009bc3915733828abce8e650c5f3ee752ca3d78d6
-EBUILD kgeography-17.12.3.ebuild 743 BLAKE2B eb402c1e0d48c0741540dc47f4490c42b072893c2a916f642714e63f89fd98767ae0e3ce37c88689ebaeb96881a0522f6fa1d5d7159ff0a3c8e6449886662452 SHA512 9b1bab3a408adc8835c0b25fe01358af0ccf897656cacb2be0e39257948eb9259d29477bc50da5e96038ea836e3ba0b49237080ae4331c6488e090a1499b0b55
 EBUILD kgeography-18.04.3.ebuild 743 BLAKE2B eb402c1e0d48c0741540dc47f4490c42b072893c2a916f642714e63f89fd98767ae0e3ce37c88689ebaeb96881a0522f6fa1d5d7159ff0a3c8e6449886662452 SHA512 9b1bab3a408adc8835c0b25fe01358af0ccf897656cacb2be0e39257948eb9259d29477bc50da5e96038ea836e3ba0b49237080ae4331c6488e090a1499b0b55
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-17.12.3.ebuild b/kde-apps/kgeography/kgeography-17.12.3.ebuild
deleted file mode 100644
index 9ff150f5dad8..000000000000
--- a/kde-apps/kgeography/kgeography-17.12.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Geography learning tool"
-HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography
-https://edu.kde.org/applications/all/kgeography"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index 194a4fb68e24..8dc6fbc55524 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,5 +1,3 @@
-DIST kget-17.12.3.tar.xz 5388864 BLAKE2B def36699a85dcf35166b2466884966acff152a5db16501ecdfd99540c42658f2b63e15024b6f0a891d24fbbb856c19aa8538b42f28fb084e0ce004a4c4f68ef9 SHA512 7f4f12090ed94fa16c71bbfb1e00702fc71b145cf9fed3b3d49197360f2533cdd8f9e442caf3d41e9d1749f94156f48b935e03a9027826def6a3b334af5bdd18
 DIST kget-18.04.3.tar.xz 5213500 BLAKE2B dc9ef5cd626744cfe2aa505887a6046c7da40f4864e3485945fec3cd36b0ffeac974ad1d55a8986f824ea7a512053e82bcab94e5d5af4e35e221cc78a971d320 SHA512 cefc16a3ecd919a6c288e3adf6b63fff55b8dcbb1517b70ebafebea1045044b28ca490bef91a50dcdcd96091523a0a0b79bb5f3c926f719138de29bb29f50489
-EBUILD kget-17.12.3.ebuild 1713 BLAKE2B d94cad35694aec4cec379d31b90615bbc941a16b4ee5ee8a50a605b30c552839c043d5f3f2b2271d2052e9c581eef6109396475e8eebfc3537c92656f29ab97a SHA512 042f1e1fd81492bdd01e6ccba914a9213bbb5f8706367b1a2f17797adb62bb9a9a19584d965454cc6396a8c5c11d5f6f2e4251e50da67241f2a404b895894bca
 EBUILD kget-18.04.3.ebuild 1814 BLAKE2B b72ae45a75d125696f743c0d75e0c539fe6255ac7923c73399e43199179f862fcc6157bea09f8fd88399fb392920d8fc7a819d33eb698fb78a7a0f441accdb14 SHA512 4f986ab160023a00c64afae57b1fdc4a546a07533d9458fecb64f8b4bf08955c2b993afde37b18b8288ebdcd52c3c7c47200284a37fb337044c9f3114c4c0c85
 MISC metadata.xml 575 BLAKE2B bb45bf1f9dda42b69d9934b45343f36ad73c907eb7a408b41108237269467b9d77f0f65abfdf88cd9087c6f7d444814c76b0d5a4f65a333cc29908abcf7da50f SHA512 854827c48f8b6120747f6428d3ba98de77217c810664272d7e7732358eb5aef3fdeb6829f5be4cf9a2bf40fcffdcc7cb2aad2a7fedb5850c01237339b77ad000
diff --git a/kde-apps/kget/kget-17.12.3.ebuild b/kde-apps/kget/kget-17.12.3.ebuild
deleted file mode 100644
index 5266402b695c..000000000000
--- a/kde-apps/kget/kget-17.12.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Advanced download manager by KDE"
-HOMEPAGE="https://www.kde.org/applications/internet/kget/"
-KEYWORDS="amd64 x86"
-IUSE="bittorrent gpg mms sqlite"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(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_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	bittorrent? ( net-libs/libktorrent:5 )
-	gpg? ( app-crypt/gpgme[qt5] )
-	mms? ( media-libs/libmms )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kde4-l10n
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package bittorrent KF5Torrent)
-		$(cmake-utils_use_find_package gpg Gpgmepp)
-		$(cmake-utils_use_find_package mms LibMms)
-		$(cmake-utils_use_find_package sqlite Sqlite)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index e50bde018391..539bc685fa37 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,5 +1,3 @@
-DIST kgoldrunner-17.12.3.tar.xz 4403404 BLAKE2B e075034c51de901f78c53d1156488ef4f81bf5822217e69ea957c26a83060365f037dd565a83e4eace9a271449ccf06c7da0d8b592162fa1117957cb20422af6 SHA512 b8b0e596270f9f231e79a83eb0597932bfac675e33574320bbee60290973f907f753316e336c111b370a15989fb945fa5ab762d55bc8db64c782a695a8e4eb1f
 DIST kgoldrunner-18.04.3.tar.xz 4406988 BLAKE2B 9354a0f2abe37b4921b9bbd8c4a496a22a4c8700dcc7acc9927c3660161e1a2eb81dc637aed4ea88bc6ef6205573965069b7ac2a468a1907cb93a1cbca3f1272 SHA512 f920c917322e20fadedfd2b00a93294238f2ea11f7bfcd14110b3feb586958551febc80a729ba5319c77cde08b4e9a68c82df0cf02ee2937472c64c9dc08f482
-EBUILD kgoldrunner-17.12.3.ebuild 863 BLAKE2B 8ad0721fbcae4c372e89fcc4c69c78a22c9fb603d2f2d8779ebb2ba043bb5e98967c24740228440d28f54ba77ddf66d3bb9a466c35f757f208c67109e89d8c5c SHA512 0194780fdc4fa17261a8db7853cb2149f09fd25d6a8a5ca28e97a19eade16e1e41628d93da452c442e351c5bd9d882ba4c18e0947a8e358e30707b30ee8c3dd1
 EBUILD kgoldrunner-18.04.3.ebuild 863 BLAKE2B 8ad0721fbcae4c372e89fcc4c69c78a22c9fb603d2f2d8779ebb2ba043bb5e98967c24740228440d28f54ba77ddf66d3bb9a466c35f757f208c67109e89d8c5c SHA512 0194780fdc4fa17261a8db7853cb2149f09fd25d6a8a5ca28e97a19eade16e1e41628d93da452c442e351c5bd9d882ba4c18e0947a8e358e30707b30ee8c3dd1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgoldrunner/kgoldrunner-17.12.3.ebuild b/kde-apps/kgoldrunner/kgoldrunner-17.12.3.ebuild
deleted file mode 100644
index a730e1731345..000000000000
--- a/kde-apps/kgoldrunner/kgoldrunner-17.12.3.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
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Game of action and puzzle solving by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kgoldrunner/
-	https://games.kde.org/game.php?game=kgoldrunner
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 04f529e0d1b8..3e54c0a59356 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,5 +1,3 @@
-DIST kgpg-17.12.3.tar.xz 2817380 BLAKE2B 0ea960f82cbd25a8b0d5bafaaa4ee08f8a70a187c438dc89a113e6f6192e9bc1f70778815257cb2009c117fff698c8d5de87a23feab3c15b798a9a1786cd49b2 SHA512 ff013f675a8a28cd6771683060cbafc12ce2f11fa0bbe400c75483c3eea78311aed6a35c11e799372b79ae6f33d8bfe38410c4faebba6f3c5db693a359cc0cde
 DIST kgpg-18.04.3.tar.xz 2822520 BLAKE2B 8ee556bd1ece83cae3b53e8dd2769a3805b7634dc4db9fbe02a51021938c1ff294daeed6d494f40d40c82ff43ea5f2c3d679b2fbbd980b60ebf9daf83f60e50b SHA512 e799244dd28b26cd5738cdc03a07c563eef94a92304d4e045441f9c3104cd37addb240ed2ab1a42b576746b9c02e694111e4a4de8f01da61f95ea940ac69e74c
-EBUILD kgpg-17.12.3.ebuild 1275 BLAKE2B 77b4aa15a4b469e0510d1a30bfd3cb7c5b618ba1085b35f6f1b00c23f03e79a868a32db2191443552eb7f3cb37c56358a0232cbc1eea9601528147d0cd7169ff SHA512 7ba158f0997cd7f36f9944928f3946f5526d0c9b356667e19a263d374e8f9eabc024b1c82eb591cae49c189dd4654339bf85a3c7cc2dd25d1858fcbe263930b7
 EBUILD kgpg-18.04.3.ebuild 1275 BLAKE2B 77b4aa15a4b469e0510d1a30bfd3cb7c5b618ba1085b35f6f1b00c23f03e79a868a32db2191443552eb7f3cb37c56358a0232cbc1eea9601528147d0cd7169ff SHA512 7ba158f0997cd7f36f9944928f3946f5526d0c9b356667e19a263d374e8f9eabc024b1c82eb591cae49c189dd4654339bf85a3c7cc2dd25d1858fcbe263930b7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-17.12.3.ebuild b/kde-apps/kgpg/kgpg-17.12.3.ebuild
deleted file mode 100644
index d32d13d7827d..000000000000
--- a/kde-apps/kgpg/kgpg-17.12.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="gpg"
-inherit kde5
-
-DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
-HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
-https://utils.kde.org/projects/kgpg"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(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_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	app-crypt/gpgme
-"
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/gnupg
-"
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index 1cf717e979f7..a0e2c573e57c 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,3 @@
-DIST khangman-17.12.3.tar.xz 6456648 BLAKE2B 48bd56b9bebbc2f91715c5b1d33b9f3c32908a8fced9f609c37a0f91cd431d9bb6dd5afd5cf452074662c3fe0f7b1017809918b4f2f00fbab94a447edf6f8016 SHA512 9b2759a272089422e1929854cfa584c356e3b69a6f58a26d3f610961cf36d581f06b41e173e19783c80cca4d9adb0f239a98316dcf36f82ecc17fc829d0aa5dd
 DIST khangman-18.04.3.tar.xz 7271792 BLAKE2B 1681d7ed248be16ef903814c0d5c1a9c6bd83aaa2ebcd82e2c03b5a98e4f5148b880453c622c76db49d3240891d78e2e1c2512ac191af446e40e68d5db8742fa SHA512 6df84c260f72f925e272f1977bd8b6552ce23b27402e88ac7640cdd4e6a89ef79cae928b11c26c17775c70e424d1934dd7961f2a7f41bb894d9aebd5d950edca
-EBUILD khangman-17.12.3.ebuild 1039 BLAKE2B 562fb8187fc5281462879c78a3ea6840a9328cd242557b470d5b099acc8d692f43288068b6e55aefa02d62f75bee5cee1d6819d2b11a39ba706f86973650afeb SHA512 695ea6506d595c25d3cc7b8f3db3a3cbb6e6bf6c7a43938eb0f5d11fd862090efd374b0ccd9c1163527a18fefb38446f1df254bb1594f0950fd2721ae2a278a6
 EBUILD khangman-18.04.3.ebuild 1039 BLAKE2B 562fb8187fc5281462879c78a3ea6840a9328cd242557b470d5b099acc8d692f43288068b6e55aefa02d62f75bee5cee1d6819d2b11a39ba706f86973650afeb SHA512 695ea6506d595c25d3cc7b8f3db3a3cbb6e6bf6c7a43938eb0f5d11fd862090efd374b0ccd9c1163527a18fefb38446f1df254bb1594f0950fd2721ae2a278a6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-17.12.3.ebuild b/kde-apps/khangman/khangman-17.12.3.ebuild
deleted file mode 100644
index 7497ea52c9c5..000000000000
--- a/kde-apps/khangman/khangman-17.12.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Classical hangman game by KDE"
-HOMEPAGE="https://www.kde.org/applications/education/khangman
-https://edu.kde.org/khangman"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtquickcontrols)
-"
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index 010346a17b04..e34e5bb50a66 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,3 @@
-DIST khelpcenter-17.12.3.tar.xz 3024356 BLAKE2B 97f0ada4b68485204d0a239932a581c3e89312d5e0f5d991d35983e17ddb65331660e8a4d134594880989c17d36ad3a2b21a9ff327fc171aec7fbfe57e0489f2 SHA512 32febc1984c44112c22877e05742c6e7bbf0933ada1708305687fb6147e9bf3e06141cb2e88d8d3a4fe6442d983a56d4dd0e813f05e8ddb8b7083826575bf40d
 DIST khelpcenter-18.04.3.tar.xz 3831256 BLAKE2B fb770d49fa3c98270a41413160a2122caa68a4db796bf722827989973cad5b7779d0a2b008fe1e72dcdd96f6dad2585f5e16602b48799acb3b833aba29c0bdda SHA512 4727de8223af52a9c269d47e59b4de3f7f30a1d06b85cdc71300a6c83eb49ddcc2f32c33db8a9ea7d8d961da6d20550dcf49400df6431fa91c7ec5a2b676dd63
-EBUILD khelpcenter-17.12.3.ebuild 1074 BLAKE2B b8398202280e0f2022e1344b8dad8bd08d265751f6ee1cdae608b0629a636064b1191e2e9c66e034f5639c6b85d5bfbe4f5155c77679227bd3a045b0bad1f58b SHA512 95f51a67a22432bfc25d0885d511405d50573443211e73a4504f3e9c82a9f544493aec6598334371df026ac67f2d5458d5f6224b6d1779c0c4db5dcb9886b4ae
 EBUILD khelpcenter-18.04.3.ebuild 1074 BLAKE2B b8398202280e0f2022e1344b8dad8bd08d265751f6ee1cdae608b0629a636064b1191e2e9c66e034f5639c6b85d5bfbe4f5155c77679227bd3a045b0bad1f58b SHA512 95f51a67a22432bfc25d0885d511405d50573443211e73a4504f3e9c82a9f544493aec6598334371df026ac67f2d5458d5f6224b6d1779c0c4db5dcb9886b4ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-17.12.3.ebuild b/kde-apps/khelpcenter/khelpcenter-17.12.3.ebuild
deleted file mode 100644
index 2363bf5485ef..000000000000
--- a/kde-apps/khelpcenter/khelpcenter-17.12.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="The KDE Help Center"
-HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 kdoctools)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	dev-libs/libxml2
-	dev-libs/xapian:=
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index 9d8932144049..648f82a7b223 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,3 @@
-DIST kidentitymanagement-17.12.3.tar.xz 147912 BLAKE2B 84c2252caaa7b30145910fc6012018e325ea5013dbe5f780504a181d067ff3279520a0e64385861130e6eaa350bf44edf14890e01bd17621026393eeb7ad98c3 SHA512 3ab1f0ebe6f993a5c1d8bc6b4952f7ab99150ec9938d4599c3b15451880089f385fe4775a950bcd948ca0926082038c47ddd3dd1f3ca5e9dfcd625f4934a66ea
 DIST kidentitymanagement-18.04.3.tar.xz 148148 BLAKE2B 17cf0a0e449c99cfce153f29f5dd5cb8db5769250f4a5cb70fc2c84e6d644fdd7f18721bc55256c357221e54460361f1e1ebf19890ac38f01392d56ced7a8663 SHA512 4e6ad309d18e2bb88a86a1b236bb29782aede0ca18cc5e4ac76926e17030ec6367d80fda50dab4c29fcf5a4475560e027edbb7cc9cdedf2c3d6f9dba7ff6697b
-EBUILD kidentitymanagement-17.12.3.ebuild 768 BLAKE2B c958331ed3a4f7db3328327f9f42f9e1d52b8b220062f74d787cef3a93a9019f1ea98e0c5f3205a0e9d7f053cced1bbc665d09e1ebbccf93169e45f995121914 SHA512 684a847d7e536f9c19785d0a1cb3bbd473ee3c75bc370b6a492bca0eb4b27769b310f87e3033fd73dad99f292dfd54a891f7145e2ed5af3be6899ca23f5f1b9f
 EBUILD kidentitymanagement-18.04.3.ebuild 768 BLAKE2B c958331ed3a4f7db3328327f9f42f9e1d52b8b220062f74d787cef3a93a9019f1ea98e0c5f3205a0e9d7f053cced1bbc665d09e1ebbccf93169e45f995121914 SHA512 684a847d7e536f9c19785d0a1cb3bbd473ee3c75bc370b6a492bca0eb4b27769b310f87e3033fd73dad99f292dfd54a891f7145e2ed5af3be6899ca23f5f1b9f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-17.12.3.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-17.12.3.ebuild
deleted file mode 100644
index dc6f819f6569..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-17.12.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for managing identitites"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 1fa98686aedd..7db25985d917 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,6 +1,4 @@
 AUX kig-4.12.0-boostpython.patch 1012 BLAKE2B d2dc90dfbdc0e361faef3506f32b37afae4a35a8c1ed0c16f0e52b9b56b33cb4b355ae313b2699125764508008bd75cb357ea6a9b020773e0faf88f208dea9db SHA512 0e490efcda1d61b9053fd4eec45e872db62b2f1f543378fb397bde65cb79e575a9268a2e2dd18e2b5590f60ba6f72954612191d0cfa1b57a697b627367a7c18f
-DIST kig-17.12.3.tar.xz 3589648 BLAKE2B ebe02b35f3244d3e9f262dace700f194b8083f0f3f996c12b466ae1f722085205bc39e8a743ed201f5e41c5b201cc512c2b5700f6c2a11d3c596479c718f9b2a SHA512 bf6201c74627e3892a584c455875f6aeabf466aa092ff35255423e152ca59b9b4d364281c740ba5f65ec3b6a208628ed229368c223193c28ae0c7fa6a21aee36
 DIST kig-18.04.3.tar.xz 3591984 BLAKE2B 6ac5285f4e9a0fe97a19886a44874f352e96688d0fd2c81bc9ea8119570939654b5eb26f1c874eaa05894d7518b5b199f42093939d20baad898af2d802f55665 SHA512 cb015a7d675cf0854c8f911fe0f9868c3a55c844af9f4337a0ebb67ce14f75146fe86a03248cdb0c7f361dba61d58276d0893fa06b355f26a85faf48423ce377
-EBUILD kig-17.12.3.ebuild 1499 BLAKE2B 2b4a6e92492c904751cee9d89337a09e6eadcba375167a2c47e8e391b647a7cfda57b9fa9c03673fdc601f7fd636f486d9a752875cf18834d33079ab933ea3c2 SHA512 3f95555910729514ab7534c5017c33396bf1df644ce89961e339997874e859237ff3808846f5b963831f5023e7e86a1248ede3da3af4c9790e1812f94683f432
 EBUILD kig-18.04.3.ebuild 1499 BLAKE2B 2b4a6e92492c904751cee9d89337a09e6eadcba375167a2c47e8e391b647a7cfda57b9fa9c03673fdc601f7fd636f486d9a752875cf18834d33079ab933ea3c2 SHA512 3f95555910729514ab7534c5017c33396bf1df644ce89961e339997874e859237ff3808846f5b963831f5023e7e86a1248ede3da3af4c9790e1812f94683f432
 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
diff --git a/kde-apps/kig/kig-17.12.3.ebuild b/kde-apps/kig/kig-17.12.3.ebuild
deleted file mode 100644
index a7f051aef49b..000000000000
--- a/kde-apps/kig/kig-17.12.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 kde5
-
-DESCRIPTION="KDE Interactive Geometry tool"
-HOMEPAGE="https://www.kde.org/applications/education/kig https://edu.kde.org/kig"
-KEYWORDS="amd64 x86"
-IUSE="geogebra scripting"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	geogebra? ( $(add_qt_dep qtxmlpatterns) )
-	scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep ktexteditor)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_prepare() {
-	kde5_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake-utils_use_find_package scripting BoostPython)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index 4f533f7814be..70fb2c78c08c 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,5 +1,3 @@
-DIST kigo-17.12.3.tar.xz 5222512 BLAKE2B 24fa500c8b5b973fdaf266f710c120a824e7e7832c1d973f915c745cfa5a6528dbfa4c3fb0b62fd80520b6ce8b8da1149c1b24438c11c679bb08718ba34ef9a9 SHA512 23e998bf600b7cd97b92ad5d327448b5190885c1470286e0c1c76755b5cd4d278806010854ea98b7ac71ba6776b6748895f62f4c9c309adae44a97c5c9295112
 DIST kigo-18.04.3.tar.xz 5224404 BLAKE2B 32285e811a899cad93ab05ef08b00336d13d04fa1371cdf994ca9ddfbe1a87d2328b9544f5090afcb9d1a720637281b362d722496cf6388cc48a44573edc78d8 SHA512 3e42114294c633985ba527390bf24404086fd5fa0a03f714201af1a93c2e16a6b325b10eaa5459aa11d4f11fb69a88f3fa40c8bf3a0535ae44ad6ce408591c7a
-EBUILD kigo-17.12.3.ebuild 853 BLAKE2B 317ccf14cb550b706e68ddbcd4ae5f155bb53afcad1421b8455173e7847586a8f192929e41a186c73d5a2b01fe46ee2b273491847b10d36e4f186806850e4089 SHA512 da2004f56ef18d098ca8008a12a320229021fc1809b96f237c61a3b1a88311fabdb927c4c609aaea5a6911f47315caf96578f6995ab3555b8dbe78c70d6ad7f0
 EBUILD kigo-18.04.3.ebuild 853 BLAKE2B 317ccf14cb550b706e68ddbcd4ae5f155bb53afcad1421b8455173e7847586a8f192929e41a186c73d5a2b01fe46ee2b273491847b10d36e4f186806850e4089 SHA512 da2004f56ef18d098ca8008a12a320229021fc1809b96f237c61a3b1a88311fabdb927c4c609aaea5a6911f47315caf96578f6995ab3555b8dbe78c70d6ad7f0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/kigo-17.12.3.ebuild b/kde-apps/kigo/kigo-17.12.3.ebuild
deleted file mode 100644
index 72b0c7c9e7f6..000000000000
--- a/kde-apps/kigo/kigo-17.12.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Go game by KDE"
-HOMEPAGE="https://www.kde.org/applications/games/kigo/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-	games-board/gnugo
-"
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 5adb7905036d..a64fd8077234 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,5 +1,3 @@
-DIST killbots-17.12.3.tar.xz 1166204 BLAKE2B 418c9e86420e9d8b7014e949f2afd910503e9cd90bca71034af1f99c26f5a2bbc339e36c1c46df091a088a71c23a1294dd04cd31c600ebbc9c1fc31050148686 SHA512 327229cdc3f2dfffbc3cafa152b899081d66e0fd7560251c948cbca0bf961bfb4df16e3cf7eacef281278441a4eaa58985197942d653980d6f3ed82e754b7cc7
 DIST killbots-18.04.3.tar.xz 1165284 BLAKE2B 5d8e7aff2fc2cf670693c1985217277d33d88bc7c9550dcc08fbc9503da218d4551c665da7cf4c914885155f6f1285aac7b9180b5fb677f27d7dad3739a1d705 SHA512 b14103edecedc5b3b8602c56b0291d4a2cb73805098f2380c48dd010b1363901a36adaea3b655d474cb379679932060696cd7dcb3a0cf5d91531778980f9fad3
-EBUILD killbots-17.12.3.ebuild 715 BLAKE2B e8df4101325f24ec3ee979166690ef2b70ba9c0fc409149f5cf9c4b5d02d3fc68c70c6d896956fe334c1d6870371b46a2de36455e157c82c95b4c7623cc9ab0b SHA512 70888187c4e26ea0e12baedfffb483cf0b2b15c372f8e4241344f2cdeed0448ea1b930867d7928060944fd03132fd29d3aaa1b50b8fefaf8a5dda55ced792e94
 EBUILD killbots-18.04.3.ebuild 715 BLAKE2B e8df4101325f24ec3ee979166690ef2b70ba9c0fc409149f5cf9c4b5d02d3fc68c70c6d896956fe334c1d6870371b46a2de36455e157c82c95b4c7623cc9ab0b SHA512 70888187c4e26ea0e12baedfffb483cf0b2b15c372f8e4241344f2cdeed0448ea1b930867d7928060944fd03132fd29d3aaa1b50b8fefaf8a5dda55ced792e94
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/killbots/killbots-17.12.3.ebuild b/kde-apps/killbots/killbots-17.12.3.ebuild
deleted file mode 100644
index 9f4d9eae4de0..000000000000
--- a/kde-apps/killbots/killbots-17.12.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Kill the bots or they kill you!"
-HOMEPAGE="https://www.kde.org/applications/games/killbots/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=()
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index 7699821c68d9..ef305fedfec2 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,5 +1,3 @@
-DIST kimagemapeditor-17.12.3.tar.xz 1053900 BLAKE2B 07606cc923bf586027111797822f61c4a9bb04bb26216e52e7970ace5a6729f2b2493b2c89cc1a8945ef3955273b7684ce085cb2268f917873a682343b1ac9e0 SHA512 5a8922131f5847bca4100ced10d8b02e4d0b641f14afa0df7162ac71682bc19bed499515df57e40ce61f1c30bb3593e8c68ee5c650d60e9e62d390a10dd12bbf
 DIST kimagemapeditor-18.04.3.tar.xz 1056724 BLAKE2B 8391d25f9621b91e17fe7cc251a5f1b3a43b56102acc9b9b1e34dc709e589d7b43b111563bf5d864f33490f3f64e903c3d8e8673a41e33cfc7136e1c04d5b9cc SHA512 ac9e491a8557be0e28fcd2f01fe3a7621043ad343acaf6ab68524fe1cdc1733d55c8e63ab44145b7aaf8feb39d77cf9fdd68549e39f512965342418bde7be872
-EBUILD kimagemapeditor-17.12.3.ebuild 803 BLAKE2B 67094a945e9991e016c3b2be781596040669dfa639ed51e4325be9b413bbec359fb128f069a5e2230f78705f7fc23509545c1f04e66109f85adee60a63ec6b43 SHA512 4377f373dce195b367de3ad344da3c9600f1ab840378eb5c98530b0c3e31763e45dd70d5fad6936f2e4c3034d9a97a342d0147ead10a6267bef1eba87fe081b5
 EBUILD kimagemapeditor-18.04.3.ebuild 803 BLAKE2B 67094a945e9991e016c3b2be781596040669dfa639ed51e4325be9b413bbec359fb128f069a5e2230f78705f7fc23509545c1f04e66109f85adee60a63ec6b43 SHA512 4377f373dce195b367de3ad344da3c9600f1ab840378eb5c98530b0c3e31763e45dd70d5fad6936f2e4c3034d9a97a342d0147ead10a6267bef1eba87fe081b5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-17.12.3.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-17.12.3.ebuild
deleted file mode 100644
index 3aba32bc7ddb..000000000000
--- a/kde-apps/kimagemapeditor/kimagemapeditor-17.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Generator of HTML image maps"
-HOMEPAGE="https://www.kde.org/applications/development/kimagemapeditor/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index b92fba19e03c..0e4e71e89b56 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,3 @@
-DIST kimap-17.12.3.tar.xz 119720 BLAKE2B 49bc60c94804735468f491f6d50308f580cff8a7f19f95cbb0e2168a6c357783ecc1efbef3eab6a8dc5f841bb5166116690e2542fab51dbfb86f4e8b94569a03 SHA512 588a681bca53d4a0b961ba6670007c1d507c6622db1e3c058ec20b1bdaefb603fb6d071931ac988916b0686d3a020a86aaf96ddb29f1e75355f53090b79aabc5
 DIST kimap-18.04.3.tar.xz 119332 BLAKE2B f235a3ffc973bdf3ca27eba494b279c4ae2cc9b5eec8bc2b8597667fdc3e2d2fc4f9c97a0437001a13c770f498480e0945f85aedd0f9c00b20aa4b027650dd02 SHA512 a17e4132a3c0d698eda715fa7ebcc5d7d4e16b9ad8aefab25bc3d91a64200504fdfcf034d42929f56c0b26ee90ad8b068e58b7bac1d2a3934ae5757de4c3b966
-EBUILD kimap-17.12.3.ebuild 721 BLAKE2B 6cf62bd63ba1cfffc493e50b6ab7310ccfb8559e537315f17fac45891cfddcc67d3b831e4a8e8bacc686cde7898598c873ab70bbe080434e70426e2e4f31b3b5 SHA512 2ff2f8668fdc35bf1771a88c1be2816ecf5bc352d2c93b3d751037ba4f486552f223a1776ba0ecd93da94a2115edbf9ed2af6f5160b3cb35e31248dc0d25127c
 EBUILD kimap-18.04.3.ebuild 721 BLAKE2B 6cf62bd63ba1cfffc493e50b6ab7310ccfb8559e537315f17fac45891cfddcc67d3b831e4a8e8bacc686cde7898598c873ab70bbe080434e70426e2e4f31b3b5 SHA512 2ff2f8668fdc35bf1771a88c1be2816ecf5bc352d2c93b3d751037ba4f486552f223a1776ba0ecd93da94a2115edbf9ed2af6f5160b3cb35e31248dc0d25127c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-17.12.3.ebuild b/kde-apps/kimap/kimap-17.12.3.ebuild
deleted file mode 100644
index 32b8081ab45e..000000000000
--- a/kde-apps/kimap/kimap-17.12.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for interacting with IMAP servers"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# TODO: Convince upstream not to install stuff with tests
-CDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtgui)
-	dev-libs/cyrus-sasl
-"
-DEPEND="${CDEPEND}
-	test? ( $(add_qt_dep qttest) )
-"
-RDEPEND="${CDEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# tests cannot be run in parallel #605586
-	local myctestargs=(
-		-j1
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 74f6737092af..ee6df6858972 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,5 +1,3 @@
-DIST kio-extras-17.12.3.tar.xz 555544 BLAKE2B f8821e0ce5c3f6a7a28ae6a5d672227697efec49b9841b272bc9574aca897bbf104644ea303f11749161c68543206407c26174141ae31c43ca6b403c7d39c179 SHA512 a7d13516646954a00b03d1284c6d93ae71ec9598d03e3f500a6449160c228be9e41aa2351b71522423960e5321cc3a30a46ac6d2ba9e8dbad043def2804b57d5
 DIST kio-extras-18.04.3.tar.xz 549840 BLAKE2B 7bb03f01fff6930d5b7bc4cdd01e960239d55ede4feb4eeb131db75515763cf924b288811cd99a5d89a79059f2cd5241e872b990799c758431f13f1440eef424 SHA512 49ab5ad8d74831a9ef1636e46abc76d66d3ef7d9e8f1ce793eb8d5c37f9e7ee4205c9643339f5c46657d4f537572e3f8a180ebace8599a1dfcbf8d27470b2f0b
-EBUILD kio-extras-17.12.3.ebuild 2296 BLAKE2B 765a560c155d84d38e9b2112ffc9bbb8c24b25fbf77e45a82b263c4a84ef0931b3d42f75f37416b685ce630e0988bcde065c513ba70e16cfb76dc380b34781b6 SHA512 6d7d7f1f347b11b038d6d0c224f26762068b495b90447d82f2ca4b9e54f45529ffd37250d60a1c273e5e8e95fc3e97e819d7381e0ebcf3ce003a238276d42bae
 EBUILD kio-extras-18.04.3.ebuild 2223 BLAKE2B 0745386e8a162a0b99e88a17e2831f169b2553fce7a2042b5e429b26fe6c4352dc6d39b0c1fe6429f0a1da273153029b8be5313602432bd9d1c08563f4f78c58 SHA512 de06b453a62678f330d13ffa8c2578cb6f6952999d83973d54c86bde7b52b23f511fa67f5e56434483512079d56655886f95f5fa811479ad1c9779a5712821d5
 MISC metadata.xml 765 BLAKE2B dc7954f6adcbf433e73a70b1e352c0522d61a9dbcd09894584407d5bad621788b36eb8e9f5f79c83b923baf11b14dea8372244d06f005220c282549a7d8f3dd6 SHA512 63acedc06b541f4150c89fc289ce05b86fab57de253e33626fbe9b02ca0511e9d34cdc1169c1559945ee1621f46aad09fd526c7fa647ffd1cc04e09509516378
diff --git a/kde-apps/kio-extras/kio-extras-17.12.3.ebuild b/kde-apps/kio-extras/kio-extras-17.12.3.ebuild
deleted file mode 100644
index 714cc12bbf22..000000000000
--- a/kde-apps/kio-extras/kio-extras-17.12.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
-HOMEPAGE="https://cgit.kde.org/kio-extras.git"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="activities htmlthumbs +man mtp openexr phonon samba +sftp slp taglib"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive 'bzip2,lzma')
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	activities? (
-		$(add_frameworks_dep kactivities)
-		$(add_qt_dep qtsql)
-	)
-	htmlthumbs? ( $(add_qt_dep qtwebengine 'widgets') )
-	man? ( $(add_frameworks_dep khtml) )
-	mtp? ( media-libs/libmtp:= )
-	openexr? ( media-libs/openexr )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	samba? ( net-fs/samba[client] )
-	sftp? ( net-libs/libssh:=[sftp] )
-	slp? ( net-libs/openslp )
-	taglib? ( >=media-libs/taglib-1.11.1 )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-"
-DEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-	man? ( dev-util/gperf )
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package htmlthumbs Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package man Gperf)
-		$(cmake-utils_use_find_package mtp Mtp)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package samba Samba)
-		$(cmake-utils_use_find_package sftp LibSSH)
-		$(cmake-utils_use_find_package slp SLP)
-		$(cmake-utils_use_find_package taglib Taglib)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index 6b1d137d28dc..73280dd1c175 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,5 +1,3 @@
-DIST kiriki-17.12.3.tar.xz 325916 BLAKE2B a84aa79acde6f9ed16e9f92a7e64b3b479e161e8f394321fa929c6da9083215c60bae64fce92d4a3f59acb59c6eedc95365e58475788eb852aa0ea0981bf0877 SHA512 68ef87ee08d3ece79a90eff2e231851bf0cba0c8dda335be68716188646c6b2c85bfe45b0d159d063ef80e51b096e5a8872037f82a79250dce7cb64139cef1a0
 DIST kiriki-18.04.3.tar.xz 327092 BLAKE2B f5b2af57eb2a81550f1957e14681c2336ac640783bdc1ab0a1a82193a0b8ae109d43155a596a7ebcf189523c4a7fec52aa5b82916449ba74952d1e2361c40265 SHA512 2d00d7d04768dea1000f5d96d69e069087085f5450cbd60425f686ae7dc177cef67575b45a107ef203c2a7b04e7aa2f9168b683d7c624c04ca8e85465d8b750b
-EBUILD kiriki-17.12.3.ebuild 780 BLAKE2B 3ccd5c6a3d359aaea020421a3a9fb70cd37bdbd012fee6e8de431c47b96881e118a826c4b4f481890e705690177116c1cd97265994b56455bc0a42362dd703c9 SHA512 54c9b931af8bc19c85b70736a8d459b8df1d798db8732f7f55fd26e26e8ec30e31e8f4d83dbc02b48a05a635ba9af00f95a9b6be6174392457491f6aa1a7ac46
 EBUILD kiriki-18.04.3.ebuild 780 BLAKE2B 3ccd5c6a3d359aaea020421a3a9fb70cd37bdbd012fee6e8de431c47b96881e118a826c4b4f481890e705690177116c1cd97265994b56455bc0a42362dd703c9 SHA512 54c9b931af8bc19c85b70736a8d459b8df1d798db8732f7f55fd26e26e8ec30e31e8f4d83dbc02b48a05a635ba9af00f95a9b6be6174392457491f6aa1a7ac46
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiriki/kiriki-17.12.3.ebuild b/kde-apps/kiriki/kiriki-17.12.3.ebuild
deleted file mode 100644
index 83ed17393f75..000000000000
--- a/kde-apps/kiriki/kiriki-17.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="An addictive and fun dice game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kiriki/
-	https://games.kde.org/game.php?game=kiriki
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index a9c6ef7deb54..1867e70c2f91 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,3 @@
-DIST kiten-17.12.3.tar.xz 11556408 BLAKE2B 4e6604d0fe67cb6a10aa43f8339bc161ff66c7699b26c88b4b973de84fdcbce2bcd448f82e670f6c7e5f5f940ab4707aca513c671cffc5d840b5265d30dc21d3 SHA512 aa84ca7fddf98eceb2215f4040b4494f529d7270f9b0157b916e3e9e97efbc9de0c6c7483d31f99eb17ac9a7c78e6765be2853090da9e86b379678678b8f2fa3
 DIST kiten-18.04.3.tar.xz 11554812 BLAKE2B 00f1d12ee3e39e83cae4fdc66ca78c99e7db389ae0aa91eb5f43a85a1ca3db3471e2f1f6b911fa94a0f58cf4ff021536c43508e68d2adc76d9663b201a64fa4d SHA512 b377ce0b7f3644c23301d6c3cd3a947e311a8b62e786ab9c1e66a3c2b0675eaee5d90db2023fe15e6c612cdf82d616e9afc13b90a69f3199c442249dbea63541
-EBUILD kiten-17.12.3.ebuild 811 BLAKE2B 4e2610272301095da9b26ef32278393ac8db2affd5bf3b79baac0e335d5907a721a8c74717a02b52b232cabf41f206f54ebd155ae41abcbf4bd5650cc9dd04ce SHA512 c77cf3e29c5437897a144100518da7012531ee7cc3d5cd628481be988b446feab3f193ebc877aa96e7a2263acc1ddc1ef089e1e0286aadd30972f374faf5ca22
 EBUILD kiten-18.04.3.ebuild 811 BLAKE2B 4e2610272301095da9b26ef32278393ac8db2affd5bf3b79baac0e335d5907a721a8c74717a02b52b232cabf41f206f54ebd155ae41abcbf4bd5650cc9dd04ce SHA512 c77cf3e29c5437897a144100518da7012531ee7cc3d5cd628481be988b446feab3f193ebc877aa96e7a2263acc1ddc1ef089e1e0286aadd30972f374faf5ca22
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-17.12.3.ebuild b/kde-apps/kiten/kiten-17.12.3.ebuild
deleted file mode 100644
index f975da1e9011..000000000000
--- a/kde-apps/kiten/kiten-17.12.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Japanese dictionary and reference"
-HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index 82add3c12d66..0958c690bee4 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,5 +1,3 @@
-DIST kjumpingcube-17.12.3.tar.xz 293288 BLAKE2B 4efcec26285087b8eedfb406c9f702972e93e609a6f2a34ff98e1cd7f097fc7c27d51ecba4bda582adf36c07affd2c7825a6300feb4c0790f711931c00d5b090 SHA512 880ac463dead49d103947b228f80153e38c43c0c75d7b1f9a60445f61fd19999403d8d04848250b29a1a3424c2d5815312e99ea1a3b520eb511369b26462e3cd
 DIST kjumpingcube-18.04.3.tar.xz 293940 BLAKE2B fb7610e9f3352954e1df4eeeff2ddd80fc4aac454f19bd1f7406c4131a34126990de633d79bac1569e1e96d1743d8f55efd35a857f63d877600b6333c6b0c5de SHA512 c10548aa970fec60f9306ee351f5129c4892dfd74746d782ef72696d41a6362fd92f6bbcc49abf816b455f1e6d8992b4f66cf9ddf19c6109596ea053dd04d8bf
-EBUILD kjumpingcube-17.12.3.ebuild 767 BLAKE2B 68f9ca993109e2efda935509a8b4f5f93f6a283a43048b6d5d27fe0deee39961fd5a3210eaa307c0a51fa07a00d5976f4de8d016584aa586f85f1d48a2848803 SHA512 d0940a208cdbf9ab81d93511e2616ccefe4acabe2163b33d6835c732a45a0952f3122081ef6e32686e368384d71d3a3accee538cff583695035b9e12f2607b4b
 EBUILD kjumpingcube-18.04.3.ebuild 767 BLAKE2B 68f9ca993109e2efda935509a8b4f5f93f6a283a43048b6d5d27fe0deee39961fd5a3210eaa307c0a51fa07a00d5976f4de8d016584aa586f85f1d48a2848803 SHA512 d0940a208cdbf9ab81d93511e2616ccefe4acabe2163b33d6835c732a45a0952f3122081ef6e32686e368384d71d3a3accee538cff583695035b9e12f2607b4b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjumpingcube/kjumpingcube-17.12.3.ebuild b/kde-apps/kjumpingcube/kjumpingcube-17.12.3.ebuild
deleted file mode 100644
index 14930e6a1626..000000000000
--- a/kde-apps/kjumpingcube/kjumpingcube-17.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Tactical one or two player game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kjumpingcube/
-	https://games.kde.org/game.php?game=kjumpingcube
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 1a88b6a05299..b3393b7181ad 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,3 @@
-DIST kldap-17.12.3.tar.xz 155112 BLAKE2B f4d124243e39f5ef94a9a8d5c9c0eefba9881c243867f8d873256cedb96a03f3e2791a390f2e14dadec84cf4255ff4627ec2cf435b3eead21963efa516bd1d3a SHA512 d7cf0fa6b7a0f6fdcc712fb91f3214a4696ceefdc5bbdebb67f5f03c59901e0eebc6a7010c51f17791ffef490f2e39aa82d81dd581f2e2075e9f3bb4a3e8d3af
 DIST kldap-18.04.3.tar.xz 154232 BLAKE2B 782e2a727d7fb14c9d844e227f52f700bf13a19d6ded85ec14bf7c6ac6bad9209e14e53743704dbce8d79d09ec9a6b43b4686abf9c1397f06c7f0ece0dbb0dd2 SHA512 7159d5dd37641ef68c37d00e03b47febdcb2967460b51dce318344426077ced9d17095b8449ec82b8f8cd736ddf12f5c71f0737cab9a21811c576f14d63ac9df
-EBUILD kldap-17.12.3.ebuild 760 BLAKE2B f1950ca416e0f20b9dd05e0b3b94a683b3012219e2da5f06d395b1060d26c05ad3df42f9f96432f6f4c6d1de295c16e4bc53c0ccabf8e9c9989ff3bed90e0cb3 SHA512 97040219bf3b380924624e7e7f34b13597ad2d664a0c784ee5ee18367dabd79d4d6f95a3630812fbf0684943da9f99990bd67a454be9190f1e2655315859237c
 EBUILD kldap-18.04.3.ebuild 760 BLAKE2B f1950ca416e0f20b9dd05e0b3b94a683b3012219e2da5f06d395b1060d26c05ad3df42f9f96432f6f4c6d1de295c16e4bc53c0ccabf8e9c9989ff3bed90e0cb3 SHA512 97040219bf3b380924624e7e7f34b13597ad2d664a0c784ee5ee18367dabd79d4d6f95a3630812fbf0684943da9f99990bd67a454be9190f1e2655315859237c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-17.12.3.ebuild b/kde-apps/kldap/kldap-17.12.3.ebuild
deleted file mode 100644
index c1cbca392b51..000000000000
--- a/kde-apps/kldap/kldap-17.12.3.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
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for interacting with LDAP servers"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/cyrus-sasl
-	net-nds/openldap
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use_if_iuse handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index b8ecf8c4fd34..7dbb5cab578a 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,3 @@
-DIST kleopatra-17.12.3.tar.xz 1895848 BLAKE2B ed9c6b72edd555b1707ce95804c32ca7fb682016135f290677a7964af344fe6a2c1529f7b621626fcf5cf7fd1d7a72bff7d4d7e5e8f7c379a82326ee1fc9c343 SHA512 36cb2e8abe68d11e8d1919e1d87f80d0f926e3934432f0ffc0988574e5d82adf67fb9891fb3bb81d0c68b63d80f7165462dc78572bf29d5cd905284fc255cdbf
 DIST kleopatra-18.04.3.tar.xz 1902264 BLAKE2B 1571128442689e709ffae97092643195150a870bb90ceb0d18f7f8c6fbd1ad9c1f8e4f3b1424ba13d4181085bb18bf6a3ea8bc02a585858d1a0cac2b3e3fc618 SHA512 6f74ad1d5da2c1e2c22b42212010768af2dbcf108b337dbca9f21e2cb2a88e4899fec692667cc1515a46dbe8e942eef5cb86551a3f605b9d048345fc31277061
-EBUILD kleopatra-17.12.3.ebuild 1323 BLAKE2B 1aa3bd4a95a6dd7eccbc6ac669c78250343d3c7b99369b443aca92a489019aaebec2408a693b7269350a1b230c6caf399f328b0b7d966cad70d87ffd35aea06d SHA512 b247b69325a3119fa09d7d9e1bcefb121aaa09933578fad290b3ba8c17ccdecc0de7b40a99fbe13f0640c0506670dbe9076e6439f83380824fd7a2ef8f9c3cff
 EBUILD kleopatra-18.04.3.ebuild 1323 BLAKE2B 1aa3bd4a95a6dd7eccbc6ac669c78250343d3c7b99369b443aca92a489019aaebec2408a693b7269350a1b230c6caf399f328b0b7d966cad70d87ffd35aea06d SHA512 b247b69325a3119fa09d7d9e1bcefb121aaa09933578fad290b3ba8c17ccdecc0de7b40a99fbe13f0640c0506670dbe9076e6439f83380824fd7a2ef8f9c3cff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-17.12.3.ebuild b/kde-apps/kleopatra/kleopatra-17.12.3.ebuild
deleted file mode 100644
index 88558a7d9f2f..000000000000
--- a/kde-apps/kleopatra/kleopatra-17.12.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
-HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(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 kitemmodels)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-	dev-libs/boost:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	>=app-crypt/gnupg-2.1
-	app-crypt/paperkey
-"
-
-# tests completely broken, bug #641720
-RESTRICT+=" test"
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index 01eada7059a1..a1b042b043fa 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,3 @@
-DIST klettres-17.12.3.tar.xz 21712168 BLAKE2B 79e8e2798fc50fdf0b78eac94f3d346fadf90e4ca70ea8e51cfbf298e08c9143b4ad68cfcdd7e7970ed02f4c4b16189403ebbcd9aea0c1f8ae6cb6a9c015efbf SHA512 a251699633712938393c81f314f9ef8069ea8ab792201ede097cfa2e46ddce6e2184add5a8959dcf6925a87b329b2b3b1acf134c9da1c25e3d39850a42276158
 DIST klettres-18.04.3.tar.xz 21713228 BLAKE2B 09f915c3ae3074544a2cf0e8c67c8b85be63a0aa73abab25df1f02d288fe9b780dd8569896c5848a22c45a19505b9111660396766454a56a7f3a9093abf45c48 SHA512 c579a1421694a1681d68716695210ad88bf0510647a4d0957ffdd4f86ce137ffb0693bb7a0fa7ef5d0a15845ce8ed85a909fb1711597b6dc8302ae43e0435b0a
-EBUILD klettres-17.12.3.ebuild 771 BLAKE2B 2def2ad609ebfb87f7352dde75c0b6cf0b5b1939897ed4dbc8badbab50fb711aa106cfb7269a87861c40a56d1af2a41770ffe5b44df5eabff6d3682fc40a8b0f SHA512 ac4b1f7434ff79717f691a88825da9160b47c2e7a173a766b12dc9d8f1c2f95ffa275ea6c3231467d39c4112618d2ddcd268f9b948b0887ad991b6c37098b5df
 EBUILD klettres-18.04.3.ebuild 771 BLAKE2B 2def2ad609ebfb87f7352dde75c0b6cf0b5b1939897ed4dbc8badbab50fb711aa106cfb7269a87861c40a56d1af2a41770ffe5b44df5eabff6d3682fc40a8b0f SHA512 ac4b1f7434ff79717f691a88825da9160b47c2e7a173a766b12dc9d8f1c2f95ffa275ea6c3231467d39c4112618d2ddcd268f9b948b0887ad991b6c37098b5df
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-17.12.3.ebuild b/kde-apps/klettres/klettres-17.12.3.ebuild
deleted file mode 100644
index 9e60e5f3183f..000000000000
--- a/kde-apps/klettres/klettres-17.12.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Alphabet learning application"
-HOMEPAGE="https://www.kde.org/applications/education/klettres
-https://edu.kde.org/klettres"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index 7cf9242e8f7d..fa8ff199063e 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,5 +1,3 @@
-DIST klickety-17.12.3.tar.xz 1410128 BLAKE2B 224d7df32d37039e289e436c60a432c94cfe4fbd1e467b846272b710e86a089f946e0dd9dfd421f04a1d890311bf293335ba0af1f78e1e40cfe6437dd9dd4aac SHA512 3236c3f294d7270a6da40526436ab789b722e61f17774cc337287f482602967ebb5428bdc843e45fb375d0ce227a0d20e4dbe285477df846ce46e52b215e5b18
 DIST klickety-18.04.3.tar.xz 1411288 BLAKE2B 318985d5c6c2766ecab4a8118043dd4f9ee4ced035a08c03ce9527f5b0a68db0f6447f950f0482a144d9d171ebe733d90963e13c9ba9cd49591999b6cef99797 SHA512 d7cfefc611ad711c2e2990995e1faf208dcc61f685ed792934ffa001c83958c319c3245a652135f2e460b8d7d160b8ccb357b4fc5283d68978d1449fca6fc8df
-EBUILD klickety-17.12.3.ebuild 777 BLAKE2B 9d0562efe8ed345c19c2038b1d8790c73c08531624a981acafec198470974f6adfd41c079f52dad4ed05e94f9496caf314d7b5d310f2eaafc6500c5d30a1ab6b SHA512 2f5dc2324fc5538e5a58416f58af57edc34ddcf6d3608c24b22d97b1c099c93652f8c89b403302846c30c2edf6f2df047dd286c7dc34d9b1514b920667fae3b8
 EBUILD klickety-18.04.3.ebuild 777 BLAKE2B 9d0562efe8ed345c19c2038b1d8790c73c08531624a981acafec198470974f6adfd41c079f52dad4ed05e94f9496caf314d7b5d310f2eaafc6500c5d30a1ab6b SHA512 2f5dc2324fc5538e5a58416f58af57edc34ddcf6d3608c24b22d97b1c099c93652f8c89b403302846c30c2edf6f2df047dd286c7dc34d9b1514b920667fae3b8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-17.12.3.ebuild b/kde-apps/klickety/klickety-17.12.3.ebuild
deleted file mode 100644
index 964480355198..000000000000
--- a/kde-apps/klickety/klickety-17.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=()
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index fa89c3c8c47f..6bd4067626f1 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,5 +1,3 @@
-DIST klines-17.12.3.tar.xz 1667652 BLAKE2B 1159f2867e124b95475efe73a4bc2588eaaaca5172f4932e8aa9fcf5b06e6d895252e019550a4aef05f4d7c6cfdb17bd50b17a75f2ef59a4c7130e34c2496dbd SHA512 14a3fff0dd010d94b7e76308a8032c4bce428950b5024cb81676a18c264f0c1de7d87540d8a36060588beaad5da7f22a4140551b8c46be08cac7a50c314ff3e6
 DIST klines-18.04.3.tar.xz 1670864 BLAKE2B 88e1a21189d76eb7658b2c89d64a8a6b062ff8efdac07c681e78108110b21f0f7c47f0cf6708a7072e22ab28717175b8830b523d6d8b076c62074d24f9774b25 SHA512 15885ee5afaf863e2cc95aeb8d7877741b12cd2d7e16fa0ddd2fc88b50231e4fee0e29e246017e6507e0e59fbf70616a4251d60ba235539870b6c50f141699a0
-EBUILD klines-17.12.3.ebuild 786 BLAKE2B 77bc18df1dc422f77976c3c9d1a0c6d5a9dfe3a3261c18766a1e68ca755c5db1831848b74c6b927e3f1bd7b005ba1998bf2ee1f4025a82f9e4d5659fc8091741 SHA512 87a9781483b04be005d26690868278dced7c776a105b274d38381781f46e25a64c23fc640b3d8cb899282d03518330394cf5cb0d69c1c5226a247a7145f9e216
 EBUILD klines-18.04.3.ebuild 786 BLAKE2B 77bc18df1dc422f77976c3c9d1a0c6d5a9dfe3a3261c18766a1e68ca755c5db1831848b74c6b927e3f1bd7b005ba1998bf2ee1f4025a82f9e4d5659fc8091741 SHA512 87a9781483b04be005d26690868278dced7c776a105b274d38381781f46e25a64c23fc640b3d8cb899282d03518330394cf5cb0d69c1c5226a247a7145f9e216
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/klines-17.12.3.ebuild b/kde-apps/klines/klines-17.12.3.ebuild
deleted file mode 100644
index 00b2e3a600ad..000000000000
--- a/kde-apps/klines/klines-17.12.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A little KDE game about balls and how to get rid of them"
-HOMEPAGE="
-	https://www.kde.org/applications/games/klines/
-	https://games.kde.org/game.php?game=klines
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index 74524bdfdc4b..399096204b47 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,3 @@
-DIST kmag-17.12.3.tar.xz 588224 BLAKE2B 7e5a9c5eba52fe751b1bdf8f5e5afea400a82cb3b48bc8e5a31c7219b44f5fa69b9bd047c8e0b508c5229c367b2ddd706e0b2c7b26e18ffef8105310f2fefaad SHA512 d9815d9e59a25765a74b3a33253de718b333f53c32df9afefdf4cb6551f10faeedaed189e625f20593d8d3528b835a01a47891dfaed341f0e943a317d6c6aab0
 DIST kmag-18.04.3.tar.xz 589340 BLAKE2B f195d8e3c7e4178aa123ee198a673dd4881826ec6c8c9fd488bdac60dc39d4fa2bf0adc1eb42028803e8cf5dcc498f68ddb7c99ecf0d0129669ba2138c4846af SHA512 f3a9890906143824f36e2bd5ea191ddf68aedd7afeabff50c884f00d160c9ad670e96b5563afb1d5b2c9c2ec7842a49c0ee62781ea9337086f40875607b4e09e
-EBUILD kmag-17.12.3.ebuild 857 BLAKE2B e51060f466ca3fb7845575a3fb80fbe46933deb5e19141eb4a4c2024c82a9dbd3b3fb5101e831ee907fef31b49d9c5e1bdcbd8050cb6e10e33af603eb70664cd SHA512 741d51b88c16628b1eedeca0641ab3ca71f8e3c8bb6ddf36cdaec2d35eabd435f60ccd47d021caa5dab16146c9a7d3f3d7cbc6286785a012402ad13d61d491b8
 EBUILD kmag-18.04.3.ebuild 857 BLAKE2B e51060f466ca3fb7845575a3fb80fbe46933deb5e19141eb4a4c2024c82a9dbd3b3fb5101e831ee907fef31b49d9c5e1bdcbd8050cb6e10e33af603eb70664cd SHA512 741d51b88c16628b1eedeca0641ab3ca71f8e3c8bb6ddf36cdaec2d35eabd435f60ccd47d021caa5dab16146c9a7d3f3d7cbc6286785a012402ad13d61d491b8
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-17.12.3.ebuild b/kde-apps/kmag/kmag-17.12.3.ebuild
deleted file mode 100644
index f65edd9033fa..000000000000
--- a/kde-apps/kmag/kmag-17.12.3.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
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE screen magnifier"
-HOMEPAGE="https://www.kde.org/applications/utilities/kmag/"
-KEYWORDS="amd64 x86"
-IUSE="keyboardfocus"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	keyboardfocus? ( media-libs/libqaccessibilityclient:5 )
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package keyboardfocus QAccessibilityClient)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index 48a4872ebaa3..eb8f3acd8ca9 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,5 +1,3 @@
-DIST kmahjongg-17.12.3.tar.xz 4084868 BLAKE2B 761d68c0d027110a6898d3697898ed6824681fed98bc0a87b042406432a6796dd771a2012866d82c2b41eaf447a3cc89c6baab72d3fb09002aa1d9f3f0c3ebe3 SHA512 c6835b0900e7969f65f5cf74cccdd0271aac1e4d0f161fea13812e91415db77b7b5937b75adbadd027a3b424e520de8cb7c9ce277dd29285ba6a8e439888e8fe
 DIST kmahjongg-18.04.3.tar.xz 4086376 BLAKE2B 2dc6c87c90eb6448ae26526c52fee81012457d56188e77fffe542bca3a2908627f538c37d84c2b2744c2105d2c09b13b938a9860a6f94d58dc00cdca77155ff7 SHA512 ce986e043a1620fc982ad0b6406214a53d4c3d912a36c5468fc9c4c986565fbca83e1f2d42179295fa7ba694ca1190fdd7c740d035c05fe378161c268ff8c0dd
-EBUILD kmahjongg-17.12.3.ebuild 919 BLAKE2B 6f6c7d03718a1c1884cd05e759c43cbe6931bef488ef1086032d5e503c9ff63636b0d6e54fa3e38fad15552060bbd50827b9a5a7dcede35c4888046d1d478c4d SHA512 f0f8629356ae75045ea083099e0deec449046034a97a28119708565fae484aa88e1d41b53d519de7d21186dd2a4e730c0b3e93bbbab1f88e584bb36d2e62da31
 EBUILD kmahjongg-18.04.3.ebuild 919 BLAKE2B 6f6c7d03718a1c1884cd05e759c43cbe6931bef488ef1086032d5e503c9ff63636b0d6e54fa3e38fad15552060bbd50827b9a5a7dcede35c4888046d1d478c4d SHA512 f0f8629356ae75045ea083099e0deec449046034a97a28119708565fae484aa88e1d41b53d519de7d21186dd2a4e730c0b3e93bbbab1f88e584bb36d2e62da31
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-17.12.3.ebuild b/kde-apps/kmahjongg/kmahjongg-17.12.3.ebuild
deleted file mode 100644
index b6d62c354d25..000000000000
--- a/kde-apps/kmahjongg/kmahjongg-17.12.3.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
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A tile matching game for one or two players"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kmahjongg/
-	https://games.kde.org/game.php?game=kmahjongg
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_kdeapps_dep libkmahjongg)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index ca89bbedbafd..08913f2b48a3 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,3 @@
-DIST kmail-account-wizard-17.12.3.tar.xz 153456 BLAKE2B 84dcb3249dc82d22e29597ce9396d788fa6447f0e5ab4ccb783904e54eb86f65e8cf7b7e583567bf7d61a45f4eda485b46e5abb9767f91fbb71ba95aee0c981a SHA512 c19d89cfaecb4072b1dbf4fbd059e522e60b148edb78eb94e46ec73d56f3794e29b4af198d453d6b837431fdb738ab22dc6ba3c98766c2848c0e3a24135bbd02
 DIST kmail-account-wizard-18.04.3.tar.xz 154896 BLAKE2B a35c47a78da31a280d3f2bb668cd777b1c30d0633ebcbd846381b4927c2a5433dc9bf7b3a5b36402d89b8ceafbbc1888b5dc7ffec11b6325f9713881aec76a70 SHA512 93e05feb39d8e31635ec7bb367ed8bda5fd5ac6ef2912763a080884e4a6dd03183f90e3768f80d97dd03cb25e3f98a2db567efc8b516b8597d52070b4e404745
-EBUILD kmail-account-wizard-17.12.3.ebuild 1443 BLAKE2B 6007a7862e8aef132649f83be8b139a1202b3c8ecf62b32e63fbce7e8be706ee36e358a03fcbd555cced21d43a5d9ecb57e18eba0c7ea0c0d7d6a885e72bfc6f SHA512 4cdba7be5e9e59617a5f37ec4282e66dca61a13570acaffdc39738ecd5eab0b60ddd1d77e3ee1708832df59985e6d9a15e890ebfe1d02eae53e1e4911354eaa5
 EBUILD kmail-account-wizard-18.04.3.ebuild 1443 BLAKE2B 6007a7862e8aef132649f83be8b139a1202b3c8ecf62b32e63fbce7e8be706ee36e358a03fcbd555cced21d43a5d9ecb57e18eba0c7ea0c0d7d6a885e72bfc6f SHA512 4cdba7be5e9e59617a5f37ec4282e66dca61a13570acaffdc39738ecd5eab0b60ddd1d77e3ee1708832df59985e6d9a15e890ebfe1d02eae53e1e4911354eaa5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-17.12.3.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-17.12.3.ebuild
deleted file mode 100644
index aac8da52342e..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-17.12.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Assistant for KMail accounts configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepim-runtime:4
-"
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index d080794f36d5..7ef962ea5b0a 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,3 @@
-DIST kmail-17.12.3.tar.xz 4746820 BLAKE2B a8ffca362a5cb7433917cc361a786039e9792714910ccd46b305d97826111d21502a9598bd044988949cf4b1ed74c3eb49a4cb70f5d7af22a118a876d3d17b52 SHA512 903e6accd92cf70134a162fcbe2bb78c5058453c4272ed2fae02cc75aaaf185da7fa87b64926c0ad6d40a3f42ffb60ba7873106076c034840cd75dd965e406a0
 DIST kmail-18.04.3.tar.xz 4757552 BLAKE2B 281c4e131518dd6efb9172d5db83e6945570943f7942ace28a9d5542130ea9636191894a72043410c641b9d3d8731efdf5b72d0e25ee5058948e6f1bfdd2f3f8 SHA512 216f57078ea32ba4d9cae70e7c2aaa28957c677e9c0eef9f4ed32fd405f63e02881f87b6a44530d9ca65839535c775de4913aad83bec8e253ff6fd01a45f61b1
-EBUILD kmail-17.12.3.ebuild 3201 BLAKE2B 542857f6faef4b8d94c223f6caf64c47cb96d38df8f44ae86d58dd6b6473b9ec75c1fcd7b6fb1dfb8f0b633b2e99aa979fabe9fddaafb7b596300d9abb479f58 SHA512 852462e0a5ec668dceae6ef15495ca9c193469f308cadb3d51c8ff5a8ad4c812d4f457e1f38c6e1abc646fd2e9eb54696fd46e856c158066cc910f8387348a24
 EBUILD kmail-18.04.3.ebuild 3180 BLAKE2B da8d524844c0f15733102a4ed5a9dc899a016bf301ab686ec0b159a8c0b0d983a53233a00de82438c4b756e4cf9775c17faf1e9350ca003d75ecd292bb3f8e3c SHA512 84a8c96c3e6af5fbdc6258e63af1f218c7991d5e84ac772d2031241cb6de1c2beb93657f948c960854a8f58532b7da3983a5d895036fe29281cdab077b71ae4e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-17.12.3.ebuild b/kde-apps/kmail/kmail-17.12.3.ebuild
deleted file mode 100644
index 90efed2f4acc..000000000000
--- a/kde-apps/kmail/kmail-17.12.3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 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="Email client, supporting POP3 and IMAP mailboxes."
-HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(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 kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kldap)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/ktnef
-	$(add_kdeapps_dep kdepim-runtime)
-	$(add_kdeapps_dep kmail-account-wizard)
-"
-
-RESTRICT+=" test" # bug 616878
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use handbook; then
-		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
-	fi
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	pkg_is_installed() {
-		echo "${1} ($(has_version ${1} || echo "not ")installed)"
-	}
-
-	elog "KMail supports the following runtime dependencies:"
-	elog "  Virus detection:"
-	elog "    $(pkg_is_installed app-antivirus/clamav)"
-	elog "  Spam filtering:"
-	elog "    $(pkg_is_installed mail-filter/bogofilter)"
-	elog "    $(pkg_is_installed mail-filter/spamassassin)"
-	elog "  Fancy e-mail headers and various useful plugins:"
-	elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
-	elog "  Crypto config and certificate details GUI:"
-	elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
-}
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 42ef67358031..00027ba3e319 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,6 +1,3 @@
-AUX kmailtransport-17.11.80-deps.patch 1450 BLAKE2B dfb1e3c3d0e232986bd187e0bd1b623a0f1895750af69b9aa03876dce49c0baf09c2d2dbb83c40241da280d40045f9898ff218f4e8cafc4df09daee8f3fd27f8 SHA512 037a7efb891883cfa388d252a8e4fc12994a851eea56770c0f6c7acc368fe507d66937392ff6a401cf2781c30cff748e2521f014024ca2f61c690664b63b5af9
-DIST kmailtransport-17.12.3.tar.xz 164804 BLAKE2B 79b2e5d28429c777f1b6f205a950109bf8f16310eb8e6700079a9e28c4876398e813406376aefbecef5565caf0d75262bef700f1a69ee59dff393ce93d10d18f SHA512 a90d305a0ca9e938c0629ac602862307f1561280cd8f90159e0d9eab48bc8e3ad67208a04db724bae5e8b5edb08ff7901843c86f3d6ab3b5a2d7092de127d513
 DIST kmailtransport-18.04.3.tar.xz 165156 BLAKE2B b303d8435e5df867b9c911f1c580f4a994b45fab9ac763fa58c6072629811f22d978faa10c8c1e6c7eca788187e27368a166210babe0b282084b424076e0acf8 SHA512 c371016a6d660b12feac9d1d705116537797206ff6b01d2fa488247929241f9b179a541dfb1d0da4d0b14e050f4e586b055a8228bc3339ac403f8e72c683626e
-EBUILD kmailtransport-17.12.3.ebuild 973 BLAKE2B b1eaef0dadbf94bbfb1db48bfec8d330d2797afd3f346f17c8e70198c252010f92428762c4203ecdca63dc67da850b4b4c47d1e4a007fbb8026dc81fb131d634 SHA512 b6dae6990a2ec2754b147851e5d027e1b436000ac79cd06021b2fe1f8d146ec6e54d8ea5562619c44aa6736bfa821dc36aa02558999afa0b04be3d3cb4295819
 EBUILD kmailtransport-18.04.3.ebuild 920 BLAKE2B 9b8a7edebb1b54d882fa1857103cf10e0422959f25c720958a16d636a14f181977876d85a30f0fd3de7ae763c21f7d3232d849b4da9bbfa202affd7a74698957 SHA512 3c5681b817d17ce9731b49d6da1194015dc4ac05d383dfc9c7c59fb7f1b36f1dd90c101e1c507a9efa6b6d67085390dc4cf9c3fa0021ed1e61fd239dca280f6c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/files/kmailtransport-17.11.80-deps.patch b/kde-apps/kmailtransport/files/kmailtransport-17.11.80-deps.patch
deleted file mode 100644
index f245f77a965f..000000000000
--- a/kde-apps/kmailtransport/files/kmailtransport-17.11.80-deps.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1e6ac475c2f591b93d3b1a10c75514d172bbbdf7 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 16 Nov 2017 16:11:11 +0100
-Subject: [PATCH] Drop obsolete dependencies
-
----
- CMakeLists.txt | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 53761c3..1df4b65 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -38,7 +38,6 @@ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailTransport")
- find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5ConfigWidgets ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
--find_package(KF5DocTools ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
-@@ -50,12 +49,6 @@ add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
- add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
- add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
- add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
--find_package(Sasl2)
--set_package_properties(Sasl2 PROPERTIES
--                             DESCRIPTION "The Cyrus-sasl library"
--                             URL "http://www.cyrussasl.org"
--                             TYPE OPTIONAL
--)
- 
- if(BUILD_TESTING)
-    add_definitions(-DBUILD_TESTING)
--- 
-2.13.6
-
diff --git a/kde-apps/kmailtransport/kmailtransport-17.12.3.ebuild b/kde-apps/kmailtransport/kmailtransport-17.12.3.ebuild
deleted file mode 100644
index 7dfbc2df8d42..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-17.12.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Mail transport service"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep ksmtp)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepimlibs:4
-"
-
-PATCHES=( "${FILESDIR}/${PN}-17.11.80-deps.patch" )
-
-RESTRICT+=" test"
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index 5d5100e9d1ab..73823bf25d3b 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,3 @@
-DIST kmbox-17.12.3.tar.xz 24356 BLAKE2B 7780c408317bbc7aaf1d0d8cb128550afcdf0a8a5a5d035c51fe25a9b9870ef825f74351b4bad33f0d8524582771ff91f15297bd1e3c1d8c119c3d4e399af335 SHA512 785dfc65b7b3ef7b5bc9a1dde9d67d04d06110995fbc0b4112670c27350fdee4cfffdae7867dd73f07a431f4116b784faef716de902cf4da0767f396e7d3624e
 DIST kmbox-18.04.3.tar.xz 24552 BLAKE2B 26ef3f094ba959fa96a186332306d824367c66ebf2163a2f2f00398f57115540ced120c6a8087c73fba27e3e8f500f2573f9e42cf0aef597a3430c19c5198046 SHA512 72c82f74723f661d486e3c502e028072fd9c7556d73a364384898187e124e596b0eb0f62f4edbd8dc2aafc3ae2fb397545b4c1d04016d30a6232dfac9b16f99f
-EBUILD kmbox-17.12.3.ebuild 309 BLAKE2B 455819bdc1f3f68251a13c8449aeb6be5e2b7e54dc73f78a852b6ec3e8c2b2a893adc1ab9f2dcccc016a1e80bfc46b6c1d936d35784ac7da7d2398dc4b623c02 SHA512 20f579addae7175ce34af42be9092340339b17b36562ba819228658a50b5d72f1187c6cb7267e0d7d513237ebe84f152e902807bc1b0392ffa0fe59675db634b
 EBUILD kmbox-18.04.3.ebuild 309 BLAKE2B 455819bdc1f3f68251a13c8449aeb6be5e2b7e54dc73f78a852b6ec3e8c2b2a893adc1ab9f2dcccc016a1e80bfc46b6c1d936d35784ac7da7d2398dc4b623c02 SHA512 20f579addae7175ce34af42be9092340339b17b36562ba819228658a50b5d72f1187c6cb7267e0d7d513237ebe84f152e902807bc1b0392ffa0fe59675db634b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-17.12.3.ebuild b/kde-apps/kmbox/kmbox-17.12.3.ebuild
deleted file mode 100644
index 3e28fef4ac42..000000000000
--- a/kde-apps/kmbox/kmbox-17.12.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for accessing MBox format mail storages"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="$(add_kdeapps_dep kmime)"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 9b48144dc507..f3f64d9080ce 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,3 @@
-DIST kmime-17.12.3.tar.xz 146456 BLAKE2B 106a985528ae9ecebdf3f9363ed2d84eb1067e53cdec59dae09896575bb49cb350527ee72c2d44ff5a7f48c8208360c2a919f8b1362bb5397796fe32d6c7a922 SHA512 f1d9ce2468da62836f9db461c2da71293ca38666576acece3c7e60c6f1bad10380f5db650c4bc5c4ebdb5bb12969c6a11f88e0e9205d265a8b0af825c34afab8
 DIST kmime-18.04.3.tar.xz 146276 BLAKE2B 41d9ec8feeafac110008de3816b4fe4e921368668ef7fc4813ee76b270106dae2d30dec79ddefcf144b4533574ee7d07e3ec25da0a8a8db1f3a6f19b80970df8 SHA512 274a0835fe429b6d442f287bbfc5953639bb4cae3c24f29bdb11092aa85ccb60d5b555161d778077460014fa5e5362f617bbefd630700696c2160d6013c220cc
-EBUILD kmime-17.12.3.ebuild 379 BLAKE2B 216ed6d21e1450630791516fc558d407840f4839a29251580707da273b38ee58e7a5ca0f7277e1d76df18be46e4f48582691e7d29b8a08d7fcf66d3fc4cdbab8 SHA512 9a3fd01d1dad25cbb1614bf1beec04bd3f6b2afdd93c9eb78b24992eb0920d2a5dd10259441adc92efd41c3b46307578e7fc8e8bfb78b8bff917abb8c4bcd709
 EBUILD kmime-18.04.3.ebuild 379 BLAKE2B 216ed6d21e1450630791516fc558d407840f4839a29251580707da273b38ee58e7a5ca0f7277e1d76df18be46e4f48582691e7d29b8a08d7fcf66d3fc4cdbab8 SHA512 9a3fd01d1dad25cbb1614bf1beec04bd3f6b2afdd93c9eb78b24992eb0920d2a5dd10259441adc92efd41c3b46307578e7fc8e8bfb78b8bff917abb8c4bcd709
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-17.12.3.ebuild b/kde-apps/kmime/kmime-17.12.3.ebuild
deleted file mode 100644
index 3a8402553cd4..000000000000
--- a/kde-apps/kmime/kmime-17.12.3.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
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Libary for handling mail messages and newsgroup articles"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep ki18n)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index ce5dc68bd0ce..df6023a76883 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,5 +1,3 @@
-DIST kmines-17.12.3.tar.xz 882616 BLAKE2B 80d87205c646c6f4fba54bbbc92361678e6247cf34859649dcff73eeddf62fb6830b47520ac6778aab43cb0378c7469f0f82e14636e57abf1305c7ad6fa4986d SHA512 09f17fc4ebb8babd9c2a1470269e55c9f10f94680577812aa65ef84191668226e4aefe206cdab4997a05ef9db1eb45a568563da7061de8be6d1629c1bbbc8a33
 DIST kmines-18.04.3.tar.xz 882592 BLAKE2B d8f942a971d4c0944f22f871b7a0861e3ae8329ae51d5745488d9e9715801ec5daa5efa3cc5722cbaa06cdc88585393571ebe29aaf6bd3831043c88e91cc49a8 SHA512 580730e896b70cb7923c34f223026f74c9451096d7cae53ef775c100957e774687e6e9902dee90c49b05f96d25480cc858269e0af462f7873516d9d91ea29374
-EBUILD kmines-17.12.3.ebuild 773 BLAKE2B 10d7004524f7f641407361453077250c3069ce28f6dcf2281ed5bfb66bb155c8eb0bffcc4c857914acb960c3c13056dc7fd5c949cde406ffd6468ff6f81473ce SHA512 6fdd7890ce470b3596249de91c0194453fba15b32c7f1bd3fd4dea40ee375e636b80a3f718308daea3d99f1ff6d4b505114423deda6d8037cc04c18ee39aa642
 EBUILD kmines-18.04.3.ebuild 773 BLAKE2B 10d7004524f7f641407361453077250c3069ce28f6dcf2281ed5bfb66bb155c8eb0bffcc4c857914acb960c3c13056dc7fd5c949cde406ffd6468ff6f81473ce SHA512 6fdd7890ce470b3596249de91c0194453fba15b32c7f1bd3fd4dea40ee375e636b80a3f718308daea3d99f1ff6d4b505114423deda6d8037cc04c18ee39aa642
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmines/kmines-17.12.3.ebuild b/kde-apps/kmines/kmines-17.12.3.ebuild
deleted file mode 100644
index cb01f30961d2..000000000000
--- a/kde-apps/kmines/kmines-17.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Classic mine sweeper game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kmines/
-	https://games.kde.org/game.php?game=kmines
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index a8b7a305c131..1e5512806bd8 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,3 @@
-DIST kmix-17.12.3.tar.xz 1281524 BLAKE2B 7eb86417515b33a1ee0d50f87d20e2ade27df4be6792e9b2991065eb99bf123b0d5aefe4477c952a129aef08052dbc96960e32b58cafaad124e4072254e4d6b8 SHA512 e238331586a9c77792c10b1011f789ba739ff0811cf457e73812b31ffea7bc8bd4d3db66d5d50395676d1b8eebaf1894e01ae10166bddf7818c2833c6f346688
 DIST kmix-18.04.3.tar.xz 1284556 BLAKE2B 7c09365ef0629c55ae8bd88335e2fa2eeba7fd934f18dbae96025b992e94e51083b8293f6ab9dcab2efef099bb4f81a367319d5050253b628409ee5979545594 SHA512 768b787a939e10e045f7af4d8d6a47d216da17dd73c0d8d3d73a93855998bc3f345bc38d6b9298d63e8149523a6d9280ff89467edc01b2c085be8b138b29dad6
-EBUILD kmix-17.12.3.ebuild 1257 BLAKE2B b6e380cfc5ad9dacfad944abdf8938eedeef0b2fb645ed3b8e9326991468a08d674327cb5bb883084867c13023e20b33ccb98b3b1aee513f005bf3ceaf0fd980 SHA512 a5f8527e8a10eab94ff93b1694a8656c460ae1b6c5bb91f4f6741a2a140bf6e0c98720b2041c69ec9a85ea86b82366075443bdc3c82c6676c418df42b28dddf0
 EBUILD kmix-18.04.3.ebuild 1257 BLAKE2B b6e380cfc5ad9dacfad944abdf8938eedeef0b2fb645ed3b8e9326991468a08d674327cb5bb883084867c13023e20b33ccb98b3b1aee513f005bf3ceaf0fd980 SHA512 a5f8527e8a10eab94ff93b1694a8656c460ae1b6c5bb91f4f6741a2a140bf6e0c98720b2041c69ec9a85ea86b82366075443bdc3c82c6676c418df42b28dddf0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-17.12.3.ebuild b/kde-apps/kmix/kmix-17.12.3.ebuild
deleted file mode 100644
index ffffc8a80760..000000000000
--- a/kde-apps/kmix/kmix-17.12.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Plasma mixer gui"
-HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/"
-KEYWORDS="amd64 x86"
-IUSE="alsa pulseaudio"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	alsa? ( >=media-libs/alsa-lib-1.0.14a )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		>=media-sound/pulseaudio-0.9.12
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-apps/kde4-l10n
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
-		$(cmake-utils_use_find_package pulseaudio Canberra)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index 95f9195caf56..0a7ef3418323 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,5 +1,3 @@
-DIST kmousetool-17.12.3.tar.xz 110788 BLAKE2B b0212a774095735d69048430b0181a88d6c375ab74d850d8fd0a2e1978ed85a201d860fbf957b151f8f513dd785c15f4b3a8ec0616bfdcad43b456cd4a1ce010 SHA512 5e67d82d8034568c27e367f77e591688a3f9cb2fb0a84e06323994fa36f486004dc1bb9bf8c7d2cbbc42c234bbbcac95605e05eca6590ec53499f391b36eac83
 DIST kmousetool-18.04.3.tar.xz 112816 BLAKE2B fe69bf4c4b5060732e2ec04b4ced3bedcf042a1779285602cdf8c92da6c1c9f21616d91c803fa750006d9eb74b3cad9709dd7a6daf9181c2f7315bfc344e7842 SHA512 46821eaecc616288892226d5f7c9a2eea97b8e2e822d2c98871ad028dd0b9b71404f2b74a6032299266623239d7a57e8ed09dbfeb6b8b54f50e8c747e98564b2
-EBUILD kmousetool-17.12.3.ebuild 819 BLAKE2B 6a2ea6ff7754da477d8ad6811a29fc343cda6f2db8d170c6bbbcf9e84f93a65b475f6b4a069d4e048bd658b1cd6445f5203f07b489253d5fc93280053d22006e SHA512 2dd8c2c3ec5e7851267027ab2c9b3f07e2748ccccd92e839abcd5bc9a776cd8171ba129ef3feeed9347aea1ab5b1953288d752f967c16b472234ad3d21992906
 EBUILD kmousetool-18.04.3.ebuild 819 BLAKE2B 6a2ea6ff7754da477d8ad6811a29fc343cda6f2db8d170c6bbbcf9e84f93a65b475f6b4a069d4e048bd658b1cd6445f5203f07b489253d5fc93280053d22006e SHA512 2dd8c2c3ec5e7851267027ab2c9b3f07e2748ccccd92e839abcd5bc9a776cd8171ba129ef3feeed9347aea1ab5b1953288d752f967c16b472234ad3d21992906
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmousetool/kmousetool-17.12.3.ebuild b/kde-apps/kmousetool/kmousetool-17.12.3.ebuild
deleted file mode 100644
index e73bd5f9364f..000000000000
--- a/kde-apps/kmousetool/kmousetool-17.12.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE program that clicks the mouse for you"
-HOMEPAGE="https://www.kde.org/applications/utilities/kmousetool/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXext
-	x11-libs/libXt
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index 98db217f3cb3..1cb8352f7802 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,5 +1,3 @@
-DIST kmouth-17.12.3.tar.xz 1823724 BLAKE2B 782ebccaeab0fcbeba98fd6b3deebd3a19b445032e5b0b921d0130b88dad60b96cc4d7b46a5b5cc94b9a70620f4aee12704ad0c581bba7ca75d4218f5e17b10e SHA512 3f1af3952d8ed591b7e492f7db0ed3a80097b111e9b5f37039f71145ebb4bb6c907fad4748b6fb804e0f404ac1b30a7aa70e00946bce5ceaf3b54f3ad0f51576
 DIST kmouth-18.04.3.tar.xz 1766968 BLAKE2B f8145cb2f744228d684355d10ee05edc67030f558c62434dfaa38b82dd916fdddf4d68bdf67caf5b51b4dacf4088c2659ee617aea39dda9a5b2519f3189e407a SHA512 f181bdaed15040feded37576aa8539e42acf61bf06a1406ffc7fe6890ba355f45ecb96b8657629105606c555f1d7b798814987c1060e83855de1a9fc34708cbc
-EBUILD kmouth-17.12.3.ebuild 770 BLAKE2B 28a86a37b22b5dba01003bf8444da389068e8daf9b7f903a4c4a19a219987afdf9faaad273d765f440d272e219b999b9de3562a148f2729382080cd15b83a1d5 SHA512 db09f5401d25b9e38e440ec9b705b2327f7329f3be9423e22183836654223646de3c63e5f93a4c945abe80a9c9a5c81bfbd4b253f8b984c9de624399b2d2f7a8
 EBUILD kmouth-18.04.3.ebuild 770 BLAKE2B 28a86a37b22b5dba01003bf8444da389068e8daf9b7f903a4c4a19a219987afdf9faaad273d765f440d272e219b999b9de3562a148f2729382080cd15b83a1d5 SHA512 db09f5401d25b9e38e440ec9b705b2327f7329f3be9423e22183836654223646de3c63e5f93a4c945abe80a9c9a5c81bfbd4b253f8b984c9de624399b2d2f7a8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmouth/kmouth-17.12.3.ebuild b/kde-apps/kmouth/kmouth-17.12.3.ebuild
deleted file mode 100644
index 694e7a4dc0b4..000000000000
--- a/kde-apps/kmouth/kmouth-17.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Text-to-speech synthesizer front end"
-HOMEPAGE="https://www.kde.org/applications/utilities/kmouth/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtspeech)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 04e774f57ead..54cc9e72b4ba 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,5 +1,3 @@
-DIST kmplot-17.12.3.tar.xz 3024624 BLAKE2B bb733da35bc751b853e0e7f0b22f215552417bfefaa12d0591fd4a5d18e9c693b891a1521bece8e4bce68b653758001621078b082db2513a3814fe23f366894f SHA512 c82c6560e41aa24b7eed69fb24b1f96825b36ea8c6bc82a3d73d95aef74ceaf534bb4e7da64b68fd3a7e291e96790cee123d1c6fbef06b578996ba3df6180af9
 DIST kmplot-18.04.3.tar.xz 3028664 BLAKE2B baf384a0104b44d3ddda7657e0a5135c78728dafcaee2c14a7e36a9251dc3e78ed627923b98bddca793b6aeb173c43eba6694cfad72215e8a38342510b620cda SHA512 798ac10e281efc393f111e222641f92a9a5cca94513f740468aa17626cabdc80fd9628a96972748a7297665957d7c5164f43036e51bef35269899e04d779708a
-EBUILD kmplot-17.12.3.ebuild 930 BLAKE2B efb2b3bd9ea45ca378ecb970201fc6e8b407d27a182b394e0b7c574e81306353977d0b6c0afd61a5a257157e5d5930319b75eba768514cb65818f2a1af0c3a9d SHA512 7f7d9085b96b736c20b7a2281000a0550e9041176b2ed543ef78240f44f649e8994a6f4aa29073313ec1af57422ffbc9df2f1f0b93add0b1ac8f8b27075219da
 EBUILD kmplot-18.04.3.ebuild 930 BLAKE2B efb2b3bd9ea45ca378ecb970201fc6e8b407d27a182b394e0b7c574e81306353977d0b6c0afd61a5a257157e5d5930319b75eba768514cb65818f2a1af0c3a9d SHA512 7f7d9085b96b736c20b7a2281000a0550e9041176b2ed543ef78240f44f649e8994a6f4aa29073313ec1af57422ffbc9df2f1f0b93add0b1ac8f8b27075219da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmplot/kmplot-17.12.3.ebuild b/kde-apps/kmplot/kmplot-17.12.3.ebuild
deleted file mode 100644
index 1230c05f6424..000000000000
--- a/kde-apps/kmplot/kmplot-17.12.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Mathematical function plotter"
-HOMEPAGE="https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index cd0f9728ceec..e4480132263a 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,5 +1,3 @@
-DIST knavalbattle-17.12.3.tar.xz 1220100 BLAKE2B ed09e00653164e254fbf1fa259861d26507ce61df5d126343691b804067c0facebf0aeb88d32d7d4d8f0440e66bb886f5ab469a904fe66d9980c83a7ce6920ae SHA512 3f15e67cff9ea4a055fe20896787568e1171cd3de58b57334be1bc3a50c0922b87a8f81c0fbd7acbe793c5882aa06581e73756f91bf15cfce3047dfa057e26e2
 DIST knavalbattle-18.04.3.tar.xz 1221332 BLAKE2B 5e074e09f71628032237a5bc19dd5acd19d3758b9b740511ba7bf2947577f23f0f3ce7fdf8e3083bc864af4c28cf06f423f1a1134dbc5434337c10249ab64aaa SHA512 67b9049d55e975dd5f1dc9f9cb08bd3102d633046c75bf172abf33e12506774f3e6606f63c3af6e1b23e0d42494a1b4945f019b9f2bbed7d7d64df8609cb2931
-EBUILD knavalbattle-17.12.3.ebuild 872 BLAKE2B 6f45834f266fa08a99416868578f894d12c04cb13fd023b56f5c32c82c19b02af5ed50a38a3fe667a3eff4e49431b2699c426b463c7543c1bad19ba669b31aa4 SHA512 ac29b5cee1b9d45e47167cefaac334fadf27f3d47e493415bb571557fd6a44aff1ce8f8fac623eb25e5899326782363b97cfb68c42756d22d87b26281c67deba
 EBUILD knavalbattle-18.04.3.ebuild 872 BLAKE2B 6f45834f266fa08a99416868578f894d12c04cb13fd023b56f5c32c82c19b02af5ed50a38a3fe667a3eff4e49431b2699c426b463c7543c1bad19ba669b31aa4 SHA512 ac29b5cee1b9d45e47167cefaac334fadf27f3d47e493415bb571557fd6a44aff1ce8f8fac623eb25e5899326782363b97cfb68c42756d22d87b26281c67deba
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-17.12.3.ebuild b/kde-apps/knavalbattle/knavalbattle-17.12.3.ebuild
deleted file mode 100644
index 880bb832c19d..000000000000
--- a/kde-apps/knavalbattle/knavalbattle-17.12.3.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
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Battleship clone by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/navalbattle/
-	https://games.kde.org/game.php?game=kbattleship
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index 6b8a4f21bd90..dee5844ecd33 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,5 +1,3 @@
-DIST knetwalk-17.12.3.tar.xz 981588 BLAKE2B 9ab231ff78d0ded0fc44a1f3d719f512edfc831f2eaad7a1622259c399eee6272441532ae24ed40f324cb8ec65e8484954c1f0087ea8c6021e640b7a499fb462 SHA512 c7fc0cd8622eadc3036a1a286736162a9c6240546741591b48b74d4b5fa84aec25b5764ffd05ef7ec2ab85ad97bee7c0ec63d3f009e07410444f09b99f26ea9a
 DIST knetwalk-18.04.3.tar.xz 981328 BLAKE2B bab9922b39d0a8ae7fcbd62812fa2bdc14482e71213335049cfa45ed7af7111ce894d03bc5508751a24e6dc54baed50503a0e529ca45b4999dfba7b5afcf4266 SHA512 1d2d778f170d0ffba2ac9052c53a256ef6682ca82573fbe09b75cf5b00ab6cb4ce0948a3f40ec8bb75b39563c7ef383bde23fb2fca794ce6927e996acfd25e9b
-EBUILD knetwalk-17.12.3.ebuild 864 BLAKE2B 0c06b84f708811b29b156ce4adaab1026eaa439538d5f7a599f9d9d0d6da5cddbc30ee13c1f245a6ac489ad23df5cf8f45d35edb8680ccc3842ce3144a7a748f SHA512 adf4cb12f6d2628806e9702f67dd45648fcc78105e0bbb652a6e8c02752740d1e54ad1c63ef953b613d0ed52d950913bc031561341d8608b674ad8e76743eccb
 EBUILD knetwalk-18.04.3.ebuild 864 BLAKE2B 0c06b84f708811b29b156ce4adaab1026eaa439538d5f7a599f9d9d0d6da5cddbc30ee13c1f245a6ac489ad23df5cf8f45d35edb8680ccc3842ce3144a7a748f SHA512 adf4cb12f6d2628806e9702f67dd45648fcc78105e0bbb652a6e8c02752740d1e54ad1c63ef953b613d0ed52d950913bc031561341d8608b674ad8e76743eccb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knetwalk/knetwalk-17.12.3.ebuild b/kde-apps/knetwalk/knetwalk-17.12.3.ebuild
deleted file mode 100644
index 1db083c44c77..000000000000
--- a/kde-apps/knetwalk/knetwalk-17.12.3.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
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE version of the popular NetWalk game for system administrators"
-HOMEPAGE="
-	https://www.kde.org/applications/games/knetwalk/
-	https://games.kde.org/game.php?game=knetwalk
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index 415052001ab5..d53a3a1da4ab 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,3 @@
-DIST knotes-17.12.3.tar.xz 335744 BLAKE2B cb49c9542939bafe89846470d3a799128ff8f7397cdff3185e281fa8c00df40966560403f60639c3afe688bf863c4566073f561601be188eaa88804847a0c1f4 SHA512 b3c24cecdbfb72280d2fdd83b1cab481691980a9a29cd93a33af2a62421186b06d4df98bbde484d50140d8db3d17b0ea6186208bedcab7094a314fa08e5fe085
 DIST knotes-18.04.3.tar.xz 336096 BLAKE2B dcedf008475796e561e411e7739e58d68dfe0557c8d64a30390299ee46e40c1d5e8e5a8cb34946090ed8d6c8da323a5852a201bb24e34e0ebaede21b9fd0aa6f SHA512 899ea5a22b4e0885acb41ca1d4dfd04a399186c452d29ab9672bd0099acafb1b089e1b82e81bf6af8f803fcd89f504adf9a74ceed7c52ba53e3852235999f0ec
-EBUILD knotes-17.12.3.ebuild 1849 BLAKE2B b3c436a1c3c07292e46de05368258fcd55a914388f01ce7ad8e0dbfacd1ef0276be14fec8934ce0e887a95d677b00bcb736424b4b728b65d7a58725dc91ffaf4 SHA512 cdc0a287ad739d2db30ecef025af186a5fa16c92658f9e66928bfff76fe405f5be44f67b3df494b54e2e31b293086c6bebfdac8a1e071cf95acfa9c0014a5a68
 EBUILD knotes-18.04.3.ebuild 1849 BLAKE2B b3c436a1c3c07292e46de05368258fcd55a914388f01ce7ad8e0dbfacd1ef0276be14fec8934ce0e887a95d677b00bcb736424b4b728b65d7a58725dc91ffaf4 SHA512 cdc0a287ad739d2db30ecef025af186a5fa16c92658f9e66928bfff76fe405f5be44f67b3df494b54e2e31b293086c6bebfdac8a1e071cf95acfa9c0014a5a68
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-17.12.3.ebuild b/kde-apps/knotes/knotes-17.12.3.ebuild
deleted file mode 100644
index cd3f3c3c929e..000000000000
--- a/kde-apps/knotes/knotes-17.12.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 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="Note taking application"
-HOMEPAGE="https://www.kde.org/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-src_configure() {
-# 	local mycmakeargs=(
-# 	# FIXME: Does not build (last checked 2016-02-17)
-# 		$(cmake-utils_use_find_package X Qt5X11Extras)
-# 		$(cmake-utils_use_find_package X X11)
-# 	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index 856a728be9c3..d2fdeb219bbe 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,5 +1,3 @@
-DIST kolf-17.12.3.tar.xz 923672 BLAKE2B 2329786f8dfbbee92cbcd84219b091bd30872b44179bf1f688997df0b4fb05ba4a2dc45c634873708b4a2dc365dec325b21af8540114814c81648015e1a7242b SHA512 8040362317639222c4b4046b65de77888d66daa3e7d99dec9661e8b868b253408f3f45b5636b4b5771e0bc07700d506810e95e7339141901947b8bec78b5e92e
 DIST kolf-18.04.3.tar.xz 925060 BLAKE2B 6c04a8e60f0d0a12375f782b722f3f9172210f230725c70d26ed9d0b2bf2740d466380b0278c1ef832029ce48017bb0ac1ef889f03e56c16dc401c353c1ad81f SHA512 e14b94419504f531b615c7dcd7918c2ced7b7512d7219b60680533a16e365eeb3bfcf9f7db3d4838672a4fc70494dd7758a9ea409c87544f36018f590e7160a6
-EBUILD kolf-17.12.3.ebuild 815 BLAKE2B 00ef1d34aa586ff26f65db6fa933b43b20a5b9d483d9f43e1d370b7be06dedef78e7a49dd7d5dff2e244e506f3dce10d9754c714864d1369074d43e2ab1dc7ba SHA512 b3b84088137f392ce0996c59fc630083f1dfa7aac5978d4525adc747da630dfc5c69810aded6f23b4651b9f24ae54cecf42809e0cd517eac8170f7aa0041529c
 EBUILD kolf-18.04.3.ebuild 815 BLAKE2B 00ef1d34aa586ff26f65db6fa933b43b20a5b9d483d9f43e1d370b7be06dedef78e7a49dd7d5dff2e244e506f3dce10d9754c714864d1369074d43e2ab1dc7ba SHA512 b3b84088137f392ce0996c59fc630083f1dfa7aac5978d4525adc747da630dfc5c69810aded6f23b4651b9f24ae54cecf42809e0cd517eac8170f7aa0041529c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-17.12.3.ebuild b/kde-apps/kolf/kolf-17.12.3.ebuild
deleted file mode 100644
index 8866609989a5..000000000000
--- a/kde-apps/kolf/kolf-17.12.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Minigolf game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kolf/
-	https://games.kde.org/game.php?game=kolf
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index acaadb8148af..5bf3d690adb9 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,5 +1,3 @@
-DIST kollision-17.12.3.tar.xz 272044 BLAKE2B 86178a9a39c79accfd21e8797feddff506cf260e81c407c32ab465894f37df9877619aecbc66619f04f10b887ca27ade0c47bc1a96d1e24ce34d81a04a51993f SHA512 e28d33f6fa0e52b08c674a68116586561bc0a786fc089922c313107d1d3b39ee89768192a203fc7473cdfe40fb67675e421f1058443703df859f1003371f1393
 DIST kollision-18.04.3.tar.xz 272564 BLAKE2B 27ef55f7dc587267b10af8d1db7de418575a8f9cf29bcd651cd093b3a8bd49e1698d79d1099ad7a91ee5a35ccb83f4f4a96b6d9eb634c808aa645796608e9b4b SHA512 c4db5f6a96364e86eed8f344bb378752c9c05e147302d029aedc9a6926a761ae71acaa5b37ae39abe14e6ab7b0e9061ac26e495b5917d6b3cf862516898db58e
-EBUILD kollision-17.12.3.ebuild 677 BLAKE2B 4aa766c5a0d006410dfe46eaaddde0c53297a4f138d6441383a1331169f3bb4a553f3ff3b35a68f12d85c4c1c3462f71bcc1c6d64bc0ac0d63b580b3a80fc118 SHA512 ba86505711ba8223554c71eb569c50319f71653cb92b9e329b82708d543a8c5056a00af6172e91efc1d0d739b7038b098b53844889c9c28f04e6580a2c2f8402
 EBUILD kollision-18.04.3.ebuild 677 BLAKE2B 4aa766c5a0d006410dfe46eaaddde0c53297a4f138d6441383a1331169f3bb4a553f3ff3b35a68f12d85c4c1c3462f71bcc1c6d64bc0ac0d63b580b3a80fc118 SHA512 ba86505711ba8223554c71eb569c50319f71653cb92b9e329b82708d543a8c5056a00af6172e91efc1d0d739b7038b098b53844889c9c28f04e6580a2c2f8402
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/kollision-17.12.3.ebuild b/kde-apps/kollision/kollision-17.12.3.ebuild
deleted file mode 100644
index 9ca5e1b201f3..000000000000
--- a/kde-apps/kollision/kollision-17.12.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Simple ball dodging game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kollision/
-	https://games.kde.org/game.php?game=kollision
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index 7483aec3ad99..4d7de3c74a18 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,3 @@
-DIST kolourpaint-17.12.3.tar.xz 5546236 BLAKE2B 9cf7aa982fc92fcead172a43bcd0a73b9fe88b05a893d51251600bf3a22eee8973f112874f5253bc127c8b287837a144d0f2a2e21b997affb73979af50b34797 SHA512 abe94f8bb56e975914302429f9d38fdd7ee5cd7b7942f0684fd993c2db0c3b7ab83b7562eed2c1e5d8330939df7705ba99dfe15249a5f6f1abb6c5b1e837d2fd
 DIST kolourpaint-18.04.3.tar.xz 5548984 BLAKE2B 15017e7bfe7b7a8c82f0340f3cd4e222f3871f476f2530df358ca65e0f1971ec85199f2ed67e1a86a998331b4a5bec1e3ba1ec0b4ad5ef8d3d1c949ea074c216 SHA512 e9e90e16ac93f019327f9987f546ea55999a707e5ac93218a6850669bd729506d80c52e2e1cdc78d5c2d12a3abc696412c7eee07343a2bf726d7c5fadb5ff4e0
-EBUILD kolourpaint-17.12.3.ebuild 1034 BLAKE2B 6e9776b8a4bc28871147943f6a1be6c0e6abb7f6b94fba18d2fa4d8a98abb00ac20a495c8ffae4315d70f53adf3c57d96f9186def14d067ac15cbd7f14c24f0a SHA512 2a91e2766f47103d893779861492223455289982fc509eba3919aee657f240b984d1daece66659275f5aacdf2543aa833f254c54ed505db591a1d4df5385a921
 EBUILD kolourpaint-18.04.3.ebuild 1034 BLAKE2B 6e9776b8a4bc28871147943f6a1be6c0e6abb7f6b94fba18d2fa4d8a98abb00ac20a495c8ffae4315d70f53adf3c57d96f9186def14d067ac15cbd7f14c24f0a SHA512 2a91e2766f47103d893779861492223455289982fc509eba3919aee657f240b984d1daece66659275f5aacdf2543aa833f254c54ed505db591a1d4df5385a921
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-17.12.3.ebuild b/kde-apps/kolourpaint/kolourpaint-17.12.3.ebuild
deleted file mode 100644
index b2ef4bbe8518..000000000000
--- a/kde-apps/kolourpaint/kolourpaint-17.12.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Paint Program by KDE"
-HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
-KEYWORDS="amd64 x86"
-LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
-IUSE="scanner"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	scanner? ( $(add_kdeapps_dep libksane) )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package scanner KF5Sane)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index 7722621259b9..c581deab8a35 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,5 +1,3 @@
-DIST kompare-17.12.3.tar.xz 710940 BLAKE2B 421d6c9a348f7f50272fba87c3c92f078604c1f4d641514ed30b92a1f8582291b69f85bdeb027a390c6c71df783db54217ed7ba3b12d60aae398696c0589ac44 SHA512 19cf624d6e3362d3b0b6d384b08aea25b74aebbeaf7c8f6c4849eb233f07016189a393551c2a0a60b4b31094b4f5de1d0c1bd747c0829ee2f2276e570a22e483
 DIST kompare-18.04.3.tar.xz 712096 BLAKE2B f2aba3342dd778abf88daed69967191dbb34cbce9afd006ad9d73341667d4f3c7270b942ea0d89844fb03b663901b04868ee043d3797a03ef9d0b1ec9447034f SHA512 16cbea4ec5202f073fe7251db2682031915509b888eb5ecd098d72f20438ea23576750976a4811f922bba1863f08e280a5f7045248e97e3060c3d37b81ae1b65
-EBUILD kompare-17.12.3.ebuild 957 BLAKE2B 7b5ebca036dbca4a2306a6c090b758850cb904f34a845b5c74339b3b203b5c9df205a21189707be0d39097603340785456bcf7531986dfc2369bb8ac807449d5 SHA512 3dc0f9aa5b85f173d7150f074130d5b2a25262113c63a735bc14d2998cc2eab5da4a71ae61fbb340d6a8aa0fa6e89cc66c2622d1864d83b0022fe41b93573c4a
 EBUILD kompare-18.04.3.ebuild 957 BLAKE2B 7b5ebca036dbca4a2306a6c090b758850cb904f34a845b5c74339b3b203b5c9df205a21189707be0d39097603340785456bcf7531986dfc2369bb8ac807449d5 SHA512 3dc0f9aa5b85f173d7150f074130d5b2a25262113c63a735bc14d2998cc2eab5da4a71ae61fbb340d6a8aa0fa6e89cc66c2622d1864d83b0022fe41b93573c4a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-17.12.3.ebuild b/kde-apps/kompare/kompare-17.12.3.ebuild
deleted file mode 100644
index 92e04bccf6fe..000000000000
--- a/kde-apps/kompare/kompare-17.12.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A program to view the differences between files"
-HOMEPAGE="https://www.kde.org/applications/development/kompare
-http://www.caffeinated.me.uk/kompare"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index caca5a8e31cc..dcd562f7a245 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,3 @@
-DIST konqueror-17.12.3.tar.xz 7720068 BLAKE2B 803f1ea753764be169339e48f490f4e379eaeeec1ab048fca8fc75c82a0b952b9f1e1a3b0cd1f40f35f7412d51f1b8c909526c03676b8e946acebcfeb060296e SHA512 12d3b33b8d437e8f20bd329281c3b03600bc15d2ebbb85016b79d9f5da002f88f2906cc982bc3e5c94d8a9511880ee0155e6ac800e7186ad8368620b3ab5ff92
 DIST konqueror-18.04.3.tar.xz 7694900 BLAKE2B fa20f95abee369084796785b622056b759c3acf11f6feee597a0ac788c9d64740283f6bb4e45150b2eb52f4de8689f1e66d3c4f3cf1e8f6d50ead6eae8900e16 SHA512 c55c0bf0f97c5ecaa73c7c56e2fd236642620b9256ef6f7dc3bd922b8d590e33c2524ea154d8308fc9dac9196e5cac3bf08d109565afa756ee6d54264ee4ab3b
-EBUILD konqueror-17.12.3.ebuild 2782 BLAKE2B 356f538e8b789972345c451b56226ba2c8f14bf998f6e4e314a54047a9b1af2aea560b9abc39e43bb7471fbe5e4e53cce56c520a3dc521cb2b9c25022dd8854b SHA512 7c918eb59c79a1aa283ad7b9fa0d237c0fe68af5a4397002934db635cbcf2e4abbcb99a2c0f2c7ca6d7efcd52840605213be9730f2b96a779ca9d46ee0d591df
-EBUILD konqueror-18.04.3.ebuild 2999 BLAKE2B 3bda63da5a2be533765bfc786cc2a93db051495d0be1b9113348f27714def34d206f0fb65f727eae9c908dba3f24f6f942b1ff005ab2bfca3729502321ed6b4a SHA512 ac8b1f55dbbef8684a002500013c037b5615cde9e7c6f30ba5d925910d1fa8e7b13a9e9669f9da67ce5de8f28e574cb4b51ede413bd8a7dd4a4ec24182862177
+EBUILD konqueror-18.04.3-r1.ebuild 2995 BLAKE2B 4c5f270217b06f782ef1930aa9c14f6bc52b189d860207e7ef0acf86a2edaceca9a581519e1892aba73e438f703e17d629ee7f556fee0a965de77858efe4ed5c SHA512 8b7016e5b2f365b18269c6df9195768f30250a2111072a05791ff9f74b845f7a6e82ebc5cfceb199d55664d119182e6c2e160c815cabf60d2b22a0cf151d9f0b
 MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
diff --git a/kde-apps/konqueror/konqueror-17.12.3.ebuild b/kde-apps/konqueror/konqueror-17.12.3.ebuild
deleted file mode 100644
index 676cbcd92950..000000000000
--- a/kde-apps/konqueror/konqueror-17.12.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic kde5
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="
-	https://www.kde.org/applications/internet/konqueror/
-	https://konqueror.org/
-"
-KEYWORDS="amd64 x86"
-IUSE="activities speech tidy X"
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(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 kdelibs4support)
-	$(add_frameworks_dep kdesu)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(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 kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-libs/zlib
-	speech? ( $(add_qt_dep qtspeech) )
-	tidy? ( app-text/htmltidy )
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${COMMON_DEPEND}
-	activities? ( $(add_frameworks_dep kactivities) )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kfind)
-	$(add_plasma_dep kde-cli-tools)
-	!kde-apps/kfmclient:4
-	!kde-apps/konq-plugins
-	!kde-apps/libkonq:5
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tidy LibTidy)
-		$(cmake-utils_use_find_package X X11)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-		elog "For bookmarks support, install keditbookmarks:"
-		elog "kde-apps/keditbookmarks:${SLOT}"
-	fi
-
-	if ! has_version kde-apps/dolphin:${SLOT} ; then
-		elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
-		elog "kde-apps/dolphin:${SLOT}"
-	fi
-
-	if ! has_version kde-apps/svg:${SLOT} ; then
-		elog "For konqueror to view SVGs, install the svg kpart:"
-		elog "kde-apps/svgpart:${SLOT}"
-	fi
-
-	if ! has_version virtual/jre ; then
-		elog "To use Java on webpages install virtual/jre."
-	fi
-}
diff --git a/kde-apps/konqueror/konqueror-18.04.3-r1.ebuild b/kde-apps/konqueror/konqueror-18.04.3-r1.ebuild
new file mode 100644
index 000000000000..fa56ec002dee
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-18.04.3-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit flag-o-matic kde5
+
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
+HOMEPAGE="
+	https://www.kde.org/applications/internet/konqueror/
+	https://konqueror.org/
+"
+KEYWORDS="amd64 x86"
+IUSE="activities speech tidy +webengine X"
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(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 kdelibs4support)
+	$(add_frameworks_dep kdesu)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(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 kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	sys-libs/zlib
+	speech? ( $(add_qt_dep qtspeech) )
+	tidy? ( app-text/htmltidy )
+	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+	activities? ( $(add_frameworks_dep kactivities) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kfmclient:4
+	!kde-apps/konq-plugins
+	!kde-apps/libkonq:5
+	$(add_kdeapps_dep kfind)
+	$(add_plasma_dep kde-cli-tools)
+	!webengine? ( kde-misc/kwebkitpart:5 )
+"
+
+src_prepare() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+	if ! use webengine; then
+		punt_bogus_dep Qt5 WebEngineWidgets
+		cmake_comment_add_subdirectory webenginepart
+	fi
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package tidy LibTidy)
+		$(cmake-utils_use_find_package X X11)
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
+		elog "For bookmarks support, install keditbookmarks:"
+		elog "kde-apps/keditbookmarks:${SLOT}"
+	fi
+
+	if ! has_version kde-apps/dolphin:${SLOT} ; then
+		elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
+		elog "kde-apps/dolphin:${SLOT}"
+	fi
+
+	if ! has_version kde-apps/svg:${SLOT} ; then
+		elog "For konqueror to view SVGs, install the svg kpart:"
+		elog "kde-apps/svgpart:${SLOT}"
+	fi
+
+	if ! has_version virtual/jre ; then
+		elog "To use Java on webpages install virtual/jre."
+	fi
+}
diff --git a/kde-apps/konqueror/konqueror-18.04.3.ebuild b/kde-apps/konqueror/konqueror-18.04.3.ebuild
deleted file mode 100644
index 377dba24af65..000000000000
--- a/kde-apps/konqueror/konqueror-18.04.3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic kde5
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="
-	https://www.kde.org/applications/internet/konqueror/
-	https://konqueror.org/
-"
-KEYWORDS="amd64 x86"
-IUSE="activities speech tidy +webengine X"
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(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 kdelibs4support)
-	$(add_frameworks_dep kdesu)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(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 kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-libs/zlib
-	speech? ( $(add_qt_dep qtspeech) )
-	tidy? ( app-text/htmltidy )
-	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${COMMON_DEPEND}
-	activities? ( $(add_frameworks_dep kactivities) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kfmclient:4
-	!kde-apps/konq-plugins
-	!kde-apps/libkonq:5
-	$(add_kdeapps_dep kfind)
-	$(add_plasma_dep kde-cli-tools)
-	!webengine? ( kde-misc/kwebkitpart:5 )
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	if ! use webengine; then
-		punt_bogus_dep Qt5 WebEngineWidgets
-		cmake_comment_add_subdirectory webenginepartexit
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tidy LibTidy)
-		$(cmake-utils_use_find_package X X11)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-		elog "For bookmarks support, install keditbookmarks:"
-		elog "kde-apps/keditbookmarks:${SLOT}"
-	fi
-
-	if ! has_version kde-apps/dolphin:${SLOT} ; then
-		elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
-		elog "kde-apps/dolphin:${SLOT}"
-	fi
-
-	if ! has_version kde-apps/svg:${SLOT} ; then
-		elog "For konqueror to view SVGs, install the svg kpart:"
-		elog "kde-apps/svgpart:${SLOT}"
-	fi
-
-	if ! has_version virtual/jre ; then
-		elog "To use Java on webpages install virtual/jre."
-	fi
-}
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index 12c9f8bf25a0..569ea81a2815 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,5 +1,3 @@
-DIST konquest-17.12.3.tar.xz 658364 BLAKE2B 45ab884319512ffd4e8264b5cff389906c53552148825eb1028ae5bda9f324f00df19bb11a45573aa42f5c07aab0f451436fff1028bcedb0c73df4024993a4af SHA512 24c7dea266b3acbd7d006592c15a0ed28e55143a04ed107806bf9476eeb0ac8d30af18abde283e89433bb86f151d5e0363c8db672aee49368a53a963ad3bc7e2
 DIST konquest-18.04.3.tar.xz 658784 BLAKE2B 89d675c2bf2bbb8a24c1bc337782dd489c4bcc9cee4539fac34f2b92eec5036067138d888a0af48119e25fbdb8b9c00c14a6f916da636df1102193106a7f5c79 SHA512 211830edd3a3bd24f48dafff7a0e60229f3f24296ba91314f93c00d5494400df7f34a54b792dbfffb5d57f5a169135563485839637055f6234590f95cf38e216
-EBUILD konquest-17.12.3.ebuild 791 BLAKE2B 3f0d7085c9c1c666655799412dc59a7a42eeba0bcae00a63eec0e6b633a7e5108088e30098c0fc962441f3d9e1a666ecfb3c6fcb5986d50e0d8685511d01a921 SHA512 5954afd4c9bed7e21e9b1ed5ab809e0e777e57a06242fbcf6cd87219a2d85d82c496e52186a730d88d8460262700a4ad247878e4f9db2525266007addbb34c2c
 EBUILD konquest-18.04.3.ebuild 791 BLAKE2B 3f0d7085c9c1c666655799412dc59a7a42eeba0bcae00a63eec0e6b633a7e5108088e30098c0fc962441f3d9e1a666ecfb3c6fcb5986d50e0d8685511d01a921 SHA512 5954afd4c9bed7e21e9b1ed5ab809e0e777e57a06242fbcf6cd87219a2d85d82c496e52186a730d88d8460262700a4ad247878e4f9db2525266007addbb34c2c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-17.12.3.ebuild b/kde-apps/konquest/konquest-17.12.3.ebuild
deleted file mode 100644
index 303802389244..000000000000
--- a/kde-apps/konquest/konquest-17.12.3.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
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Galactic Strategy KDE Game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/konquest/
-	https://games.kde.org/game.php?game=konquest
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index f7f34418c9bd..b2ad734ae3c0 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,6 +1,3 @@
-AUX konsole-17.12.1-libinput-pixeldelta.patch 1914 BLAKE2B 27fdeb10eb73f0e935ade90c3c453256e5e8bde94ef4ae3920b6e6caeb109c8fba226698745c6d7116116e3c0e6c8aaf935e77c503bba52549874b861d26809d SHA512 0d9cda130728f6b5e618b73fbc9c07431b924d6190df8f91f7801b798822ce001e7b077fde2992dd8f570bac9e7af857576e149fbffbfe37ae4e9a7b3873cb5b
-DIST konsole-17.12.3.tar.xz 1026672 BLAKE2B 98f2f545aae26965009a79d196640811702e9444a21c665db1f4da277a1059943f192a31ea1020c52867523ad40bfe21bc09503ec2643b289da1ed69c7eda30e SHA512 973c47341ebe729442ba8f8a7523eccaf5da28afbfe236fd4ec2897f710c3967f22ed5cd8f2f997f631a5369625c830f7a4540cdf6953874c2f556f547c413a0
 DIST konsole-18.04.3.tar.xz 1043452 BLAKE2B 341d589ea00536913d008548affecf301f9c455661eb5630e345481d75c3feb0138e5dff23d25421d0f375381586c4dc72b511042cb4803dc75873a943c20658 SHA512 0809cf4db6e10e672a4a976609045fb88879fe615b48e452f140da0a6c44971f31a7b4606124ed3b7642ee3f3556ace45b31e0b5c466df611fea98a9cf702066
-EBUILD konsole-17.12.3.ebuild 1454 BLAKE2B eaa62cd6b0b0a5467bd2f66f48588a1c961d07e42441b1a64caa1533faa15df7a5549b3eb2ae4e59b6fd65f45f3ad0e53373509e61f514ff97a641c684131f64 SHA512 1ab838c8422d38cee71f1ec09613bd0b7077d844d037345144a2e905d63d90ba4c0f4a165ef7702dfd798a571cc03670b6fbb0ecba0d58704115f102bf8d5d87
 EBUILD konsole-18.04.3.ebuild 1420 BLAKE2B f940eacd6525caabc7f69e5e89a8cf1b470d255a3334f98ade87b950b5c91ed45bdeec7769cfd274c32d39abf99e0ba9475d4284c5ea042ba546949d78e7f1b8 SHA512 8da1c3cc6e9ae895ba7fc992bad527de09e8355dc6d49fc74d5a925fa18b0b64b79233aaf5fad2617d7ac93ebe56594669a07487ddb1de0c8c825c5ce223fcc2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/files/konsole-17.12.1-libinput-pixeldelta.patch b/kde-apps/konsole/files/konsole-17.12.1-libinput-pixeldelta.patch
deleted file mode 100644
index 37049b9b2f2a..000000000000
--- a/kde-apps/konsole/files/konsole-17.12.1-libinput-pixeldelta.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From d25e5ac7089f2c81cc5ffe8e155ba8b3dfb11b97 Mon Sep 17 00:00:00 2001
-From: Kurt Hindenburg <kurt.hindenburg@gmail.com>
-Date: Wed, 7 Feb 2018 10:38:09 -0500
-Subject: Fix mouse wheel scrolling with libinput
-
-If the Libinput X server input driver is used we get a value for
-pixelDelta for a physical mouse wheel scroll, so we check that the
-source of the wheel event is actually a mouse, this was fixed in
-Qt 5.9.5*
-https://bugreports.qt.io/browse/QTBUG-59261
-
-Patch by ahmadsamir
-
-* fixed in Gentoo: Qt 5.9.4
-
-BUG: 386762
-Differential Revision: https://phabricator.kde.org/D9008
----
- src/ScrollState.cpp | 19 +++++++++++++++----
- 1 file changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/src/ScrollState.cpp b/src/ScrollState.cpp
-index e5b486d..f71b142 100644
---- a/src/ScrollState.cpp
-+++ b/src/ScrollState.cpp
-@@ -25,10 +25,21 @@ using namespace Konsole;
- 
- void ScrollState::addWheelEvent(const QWheelEvent *wheel)
- {
--    if ((wheel->angleDelta().y() != 0) && (wheel->pixelDelta().y() == 0)) {
--        _remainingScrollPixel = 0;
--    } else {
--        _remainingScrollPixel += wheel->pixelDelta().y();
-+    // If the Libinput X server input driver is used we get a value for
-+    // pixelDelta for a physical mouse wheel scroll, so we check that
-+    // the source of the wheel event is actually a mouse, this has been
-+    // fixed upstream in Qt 5.9.5: https://bugreports.qt.io/browse/QTBUG-59261
-+    // Fixes Konsole BUG: https://bugs.kde.org/show_bug.cgi?id=386762
-+#if (QT_VERSION < QT_VERSION_CHECK(5, 9, 4))
-+    if (wheel->source() != Qt::MouseEventNotSynthesized) {
-+#else
-+    if (true) {
-+#endif
-+        if ((wheel->angleDelta().y() != 0) && (wheel->pixelDelta().y() == 0)) {
-+            _remainingScrollPixel = 0;
-+        } else {
-+            _remainingScrollPixel += wheel->pixelDelta().y();
-+        }
-     }
-     _remainingScrollAngle += wheel->angleDelta().y();
- }
--- 
-cgit v0.11.2
-
diff --git a/kde-apps/konsole/konsole-17.12.3.ebuild b/kde-apps/konsole/konsole-17.12.3.ebuild
deleted file mode 100644
index 546e7f2cc269..000000000000
--- a/kde-apps/konsole/konsole-17.12.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
-
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(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 kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-17.12.1-libinput-pixeldelta.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 1976196b5b52..1fdcbd0b7010 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-calendar-tools-17.12.3.tar.xz 223424 BLAKE2B 57622ccc637d9a41634d90e764f1c9dfdbe60e7a77d13632397e41222dc1cc5b544f268451132a11f8a3118a9042c701e993eef512ef5ac1df05aeea6bc1d35e SHA512 18c8bc3deb273022543c209410403f7bf7a9b13bcbcf9be601ef011dc9ae6c0335d866d1e696b410fcc4751830cb824a1fe530299ae76fe92e2f785f6886bd11
 DIST akonadi-calendar-tools-18.04.3.tar.xz 221048 BLAKE2B 66dda4fb9e796f12a06a314197d95f33117dfa5c0d962c46edc6cceef225407f4b9ed4acc334ad9927c151f7e4709dcb4deac78d0252b5e62ec78cecc2ae2079 SHA512 25183856d3bc5ee2b1bcff27055479c9694df37db169419d0ef3525adcdebd06dae07134ab7ebadc42afd9d79d7598574b8c5036e6c295b0986af048153b1b9b
-EBUILD konsolekalendar-17.12.3.ebuild 942 BLAKE2B 9488a6d4c482fd997d83dbba4d8a461af2c7594832bc30ca9ccb1de4a804021db5121a659bf1c2da3a23dac63f58d7ce2af33ff63b8906fc66e3915529cdc245 SHA512 944719833fbfcfa708a2f77b840782cd42b5abeb9d06339c07ea98e8f97f30bcf868a6e6c98d9d7230b76ed33e85691ed5f6e48dd0ffdba6c2e8d0acaa0d9a85
 EBUILD konsolekalendar-18.04.3.ebuild 942 BLAKE2B 9488a6d4c482fd997d83dbba4d8a461af2c7594832bc30ca9ccb1de4a804021db5121a659bf1c2da3a23dac63f58d7ce2af33ff63b8906fc66e3915529cdc245 SHA512 944719833fbfcfa708a2f77b840782cd42b5abeb9d06339c07ea98e8f97f30bcf868a6e6c98d9d7230b76ed33e85691ed5f6e48dd0ffdba6c2e8d0acaa0d9a85
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-17.12.3.ebuild b/kde-apps/konsolekalendar/konsolekalendar-17.12.3.ebuild
deleted file mode 100644
index 8f286d827a78..000000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-17.12.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KMNAME="akonadi-calendar-tools"
-inherit kde5
-
-DESCRIPTION="Command line interface to KDE calendars"
-HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	# delete colliding calendarjanitor translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/calendarjanitor.po || die
-	fi
-
-	cmake_comment_add_subdirectory calendarjanitor
-}
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index ff49cb9d0b3c..16f6fe422d88 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,3 @@
-DIST kontact-17.12.3.tar.xz 862984 BLAKE2B 3428fea3f4b207fabf3e0a486044f79487baa1c3d5012835f4d502c884212dd9973d90c8ad2dc2eb53ee17d47bc1d6dd40f75dcb2202b696406f9f054956aa8d SHA512 f6ec9c2e4631246aca06d6af1cd0681d7cd1477d6932ce24d444f3d74e9805dc91da62afb40093e088390778a2ca08c92ae186d30de99bb488406cbdda7a0c86
 DIST kontact-18.04.3.tar.xz 862824 BLAKE2B f9bdd0833aa84e971af18894677bb43ea3f7c857fdebd1e2352403599927a90cd80c878a318cad992c6bef15b1da178b836db0eb73d913ddc2bcdeb94147e0c6 SHA512 e902e9089f26d831fd85d91415d13a259cc91866e1df4fc4bc3a25bafbf67d180a44cfe2f18f0f49f94a11efe0e5f43737ab49ba8a761b24948725221f2218c0
-EBUILD kontact-17.12.3.ebuild 1201 BLAKE2B 25a39047a7b805c48b0e125a9abdd90fd399f4adc01857261370205157d3dd8d92e7858d6be58434770ae0cc29eeed686894c7c8d377ff3bb9a114fb7bc93331 SHA512 8fb6256b7a1e35ab92642cf673ff334281deb9c6e8afde36dea0357d39e942aec77cd602186cc69e1f4e49f758c7fb6b4d995c938b8a230f465de270b4d252a3
 EBUILD kontact-18.04.3.ebuild 1201 BLAKE2B 25a39047a7b805c48b0e125a9abdd90fd399f4adc01857261370205157d3dd8d92e7858d6be58434770ae0cc29eeed686894c7c8d377ff3bb9a114fb7bc93331 SHA512 8fb6256b7a1e35ab92642cf673ff334281deb9c6e8afde36dea0357d39e942aec77cd602186cc69e1f4e49f758c7fb6b4d995c938b8a230f465de270b4d252a3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-17.12.3.ebuild b/kde-apps/kontact/kontact-17.12.3.ebuild
deleted file mode 100644
index 42005ff8bdeb..000000000000
--- a/kde-apps/kontact/kontact-17.12.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Container application to unify several major PIM applications within one"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index 4a53d8168a31..d4716a125694 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,3 @@
-DIST kontactinterface-17.12.3.tar.xz 32768 BLAKE2B 3bdfcb9910bd733a937a90cf24b9af15b6dfeb5c41a996f86229a0cbdebaae3103e04fbb21f957f6e246891345deb7167d99cc492d84832e5ebba28910c2fde6 SHA512 e65bbfb7e717f60aafd47d4a0f8f37da3058a1c1f7b6ada3e806b1c292502a91bd2f7cb46a4e9f2512e8b4f33aa93fd91cbc891b68d89ddb14a33acfc1b0aa57
 DIST kontactinterface-18.04.3.tar.xz 32892 BLAKE2B 984b35cca9863cf21cdf7c19c891a0ad7bfb1b3874fb2657d69f766adf16b8d385a4d1d0837938ef7b1e00ce70f0a12ecf9c1bc153fe039ad48283293c543fb6 SHA512 2c1a0ac71c5222189aa37ab606205cfc7f7fb6506cbae97058c73584b5195547c2d7813b12f05542173853081b6ce54cc9792d4c9d6114e424ba5fe24b3bcfcf
-EBUILD kontactinterface-17.12.3.ebuild 592 BLAKE2B 459a8ab4dc042f07180f7571e3a23d1e99051835e77ba7f60b79b188fa592f0ccab18991ffefa550235d1fe54fbbafa8ca7a2829ea54898051404f28b27fbe52 SHA512 7e8dd97122cb8ad60418dc70f39c153b8cf0f4be05724be1ed4890c87cecea3daede34b6f7df5dd36706699a4adc5da78f5ca34d3a4c96590f6c56681dba94c8
 EBUILD kontactinterface-18.04.3.ebuild 592 BLAKE2B 459a8ab4dc042f07180f7571e3a23d1e99051835e77ba7f60b79b188fa592f0ccab18991ffefa550235d1fe54fbbafa8ca7a2829ea54898051404f28b27fbe52 SHA512 7e8dd97122cb8ad60418dc70f39c153b8cf0f4be05724be1ed4890c87cecea3daede34b6f7df5dd36706699a4adc5da78f5ca34d3a4c96590f6c56681dba94c8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-17.12.3.ebuild b/kde-apps/kontactinterface/kontactinterface-17.12.3.ebuild
deleted file mode 100644
index b54cbbc19570..000000000000
--- a/kde-apps/kontactinterface/kontactinterface-17.12.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Library for embedding KParts in a Kontact component"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index bf2499eab8d9..8698e9149013 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,3 @@
-DIST korganizer-17.12.3.tar.xz 2257368 BLAKE2B 3ecd3ea0711df1d7d45f8b2e8efa0942e0f1e189b08c1fab73c18aa8358ad2175c2b4f69101d29fe062894f9e614e35a72d7bae39872221b63edecf3ff70d8e0 SHA512 c6127e3d0c8a1892b1da4435885076172f6026f83fd412a0069ce0cd75156e7211356b07032ec2f673d5d38787bec352f03aff561143e50f61909ae7445bb686
 DIST korganizer-18.04.3.tar.xz 2267176 BLAKE2B 2731a2660d2eea48e61cacdce4d8f73772bfa8cd6817ff50059ac8a92c31b7aa3b56064f38c88c915dcd3a0a1f96a5a9ba85e9b251aca48edc0d3ed441041aff SHA512 52a777001ab986fd1f1bfc573519b2a19d0b0308f654a4ecfc2a273d88c0feaccdde86a044d1da1617fae4442811d3e9c35628e6199aa776cc8fab61c13bf5aa
-EBUILD korganizer-17.12.3.ebuild 2394 BLAKE2B 130a1d34ab261ad3cb0f5fba0a9f06db3bdc8d180ee4b18b25ec029986bac66afabc8b893c1db7af3d3dca941d3659d5f4dcb207c9d8b0cfddaad1cdefd6d71e SHA512 b3bbe707942c826c71056e40cd38597650a9ba786d60adbfc9e6ca7a8b826af96a6bb4591efc8ad41c1ce1e1023700a1d246e41851c68043cb6ded615e74478a
 EBUILD korganizer-18.04.3.ebuild 2394 BLAKE2B 130a1d34ab261ad3cb0f5fba0a9f06db3bdc8d180ee4b18b25ec029986bac66afabc8b893c1db7af3d3dca941d3659d5f4dcb207c9d8b0cfddaad1cdefd6d71e SHA512 b3bbe707942c826c71056e40cd38597650a9ba786d60adbfc9e6ca7a8b826af96a6bb4591efc8ad41c1ce1e1023700a1d246e41851c68043cb6ded615e74478a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-17.12.3.ebuild b/kde-apps/korganizer/korganizer-17.12.3.ebuild
deleted file mode 100644
index 79b37be4a7d4..000000000000
--- a/kde-apps/korganizer/korganizer-17.12.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 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="Organizational assistant, providing calendars and other similar functionality"
-HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(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 kdelibs4support)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kldap)
-	$(add_qt_dep designer)
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index 8d1d1965baa8..b8f75f095d97 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,5 +1,3 @@
-DIST kpat-17.12.3.tar.xz 3566240 BLAKE2B 0fc1339871589216ca0ed037e89c12fe9a0e66279a51c71da9913ad035b528dd0ae9ed59b07f656142bed1a27b8f1214f9f4ea4a1231dfdee3ee69ed819a5b41 SHA512 e30ac4a80c81285513d730cc331e2c93c208bc2d6a1521914675bf46307f9b90b612e2ed247224cd9495b443cd67efb6b01a009c62727abc127e112d94f0d25e
 DIST kpat-18.04.3.tar.xz 3565116 BLAKE2B 3b61d26df58e6c502f45acdf3ece92d400301c6e8087fe00034d56f4acbbf047cb5ffe391345cde20b5ed69317cd703ecf1871c891e192e53d91eba73d6e4c8e SHA512 bd325d52faad7200d5aa1738cc539d8f285c4b9cb67e2f63837379fc89b4adb8873433df01392447e69546db04698b2f108613fe0a3001bf7c77dbda0bd73acf
-EBUILD kpat-17.12.3.ebuild 853 BLAKE2B 8724d194b60c10f9a0386989e414b1d9d0fade5392c76f21c348c4b3d9fb14db11a0ee6d76a46a93f0abcff7067791a72db01709e14229eef7977728521955e9 SHA512 9a0cbbb1783a646df6fded9fa68a2a192b30bf861f0cba51778b353e0f82cc8375b7ba30987c225e3dd80076382469dec16b58fda35f3cf560a02b6be90cf2a2
 EBUILD kpat-18.04.3.ebuild 853 BLAKE2B 8724d194b60c10f9a0386989e414b1d9d0fade5392c76f21c348c4b3d9fb14db11a0ee6d76a46a93f0abcff7067791a72db01709e14229eef7977728521955e9 SHA512 9a0cbbb1783a646df6fded9fa68a2a192b30bf861f0cba51778b353e0f82cc8375b7ba30987c225e3dd80076382469dec16b58fda35f3cf560a02b6be90cf2a2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/kpat-17.12.3.ebuild b/kde-apps/kpat/kpat-17.12.3.ebuild
deleted file mode 100644
index 163e9aafd78e..000000000000
--- a/kde-apps/kpat/kpat-17.12.3.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
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE patience game"
-HOMEPAGE="https://games.kde.org/game.php?game=kpat"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 1654d36428ae..291a59b00584 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,3 @@
-DIST kpimtextedit-17.12.3.tar.xz 141572 BLAKE2B 04c091748c8f4c5cfd9e57de3a1888d755aae2b9e6550f19738213cea21a487f65bcfcb5ff7e71dcce7a64a7c4a43b073442ef238541f090a108ac49f5760306 SHA512 0dd7891de260c2497ff0b44340a6a79994c512ad906db4bffe0217cff0fda11f27c86fcb89bd43a40668bcc8068b76b9287ad43de6a277909585b6b2737953cc
 DIST kpimtextedit-18.04.3.tar.xz 142880 BLAKE2B a8ff9679cf54f0445c4fea83ace27774dd801aea2ea11a29031fea906e35f22867cbcffec3e1541d45ec4dbfdc34dde0f508f2bc85d7439707a8b2be0dc0dece SHA512 e8cf0563a2c60bef0b82b0d60a025191c8660c783f262648bc0c9c9c17eb24b5c3c2a0d21159df60009256e920e8a649f06b22815ab051099ba4d6ef145d848e
-EBUILD kpimtextedit-17.12.3.ebuild 1129 BLAKE2B a2e761276a599082c12b2a2567ec078a53bc09f946cd06d57e5d61eb40aa35380202b7f4369a6cf0f6e5e6468cecbd2f674791c9d6002a91293d13c18a44e11f SHA512 1c09e0d93b126047052e1655df2877b5538ab13964eb42a918e1ed08c5c345e6674819f3ff6a578ecd5f386cd98dc7449f7eda6cf1f0f5643af3824919400e52
 EBUILD kpimtextedit-18.04.3.ebuild 1129 BLAKE2B a2e761276a599082c12b2a2567ec078a53bc09f946cd06d57e5d61eb40aa35380202b7f4369a6cf0f6e5e6468cecbd2f674791c9d6002a91293d13c18a44e11f SHA512 1c09e0d93b126047052e1655df2877b5538ab13964eb42a918e1ed08c5c345e6674819f3ff6a578ecd5f386cd98dc7449f7eda6cf1f0f5643af3824919400e52
 MISC metadata.xml 399 BLAKE2B ec34ba2aa27c902fbadcc80e20cb0454169efacc5560ce722010c720d036c96ae381f8b07d2565fb1f4a74e56bf684123e5ebaba64621c3a0d21c37e8d2ac394 SHA512 8a6dca910cce7710df6cfea5320dd39d6037b2718bb46276d5a2f141f85b8ba7b56b0c73de2f8c93f4bed110192d1c3f2bc9f76c2f489c002e388673fce16893
diff --git a/kde-apps/kpimtextedit/kpimtextedit-17.12.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-17.12.3.ebuild
deleted file mode 100644
index da42300dfe80..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-17.12.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="A textedit with PIM-specific features"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE="speech"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-	speech? ( $(add_qt_dep qtspeech) )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index 2656e9bb164b..57bdf5784623 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,5 +1,3 @@
-DIST kqtquickcharts-17.12.3.tar.xz 25516 BLAKE2B 3f9e906bfbb6de0e70855e721b08b52f78be415b4b862a8aed8210c5c5f51648d01092151646231b3f6ef49c1d884c978fe2d9b74924d22f8f6198f8612031bc SHA512 496502071f079798ef61c7ff2542ad77f5cce505efc6492d18c998e017ab6eb2b0b4c6f7565511ba951ec21af45e6f0e45b58586d69ade3867ddf07e5e5de913
 DIST kqtquickcharts-18.04.3.tar.xz 25688 BLAKE2B 617a448edc1f24ea0819f047cb4162f21cd4ce1ccefee9b57787df1879b010b06929b48117298f30c4d7208e278ab55253e028b48413248f9462ccec2d8888a8 SHA512 1569a64fdfa1ba95368976b25793c24b19a796b2a62e50942b0588368e5fab17df3dd6b0aadb774f32b64c1f71705264057781a2ce3b151fa3bf3f6444e2e8df
-EBUILD kqtquickcharts-17.12.3.ebuild 308 BLAKE2B d7cf5e9111fa6601dacc8c513226c6633e1a9c267522b2ccff1781f5642e845aabe57be692c6ede94aa76496df5907867636d6125eef33e242f7cdc6912c7698 SHA512 d7245eefebe52badffb56eaf5c63e54009ddd6843dbcc130d8eb62d4618d4d418b2e592b5d050c940d70acd139ee688907906edce8fd051b11ea9ee793a73c7f
 EBUILD kqtquickcharts-18.04.3.ebuild 308 BLAKE2B d7cf5e9111fa6601dacc8c513226c6633e1a9c267522b2ccff1781f5642e845aabe57be692c6ede94aa76496df5907867636d6125eef33e242f7cdc6912c7698 SHA512 d7245eefebe52badffb56eaf5c63e54009ddd6843dbcc130d8eb62d4618d4d418b2e592b5d050c940d70acd139ee688907906edce8fd051b11ea9ee793a73c7f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-17.12.3.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-17.12.3.ebuild
deleted file mode 100644
index e623f1f207d2..000000000000
--- a/kde-apps/kqtquickcharts/kqtquickcharts-17.12.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index 394ee1b9c6af..976f0a63d15e 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,5 +1,3 @@
-DIST krdc-17.12.3.tar.xz 1554384 BLAKE2B 800a1365d3bf73573e0b36510531d215f7297b666805bb8a27a1a311e8125307e18d6d0b8d860c92e20bd4c81747a8aebb8ae8fd36a1034b15e32c10728d90a9 SHA512 aefd7f2ae3120482d9b85550eaa5ad5e771e4bd2663c0646d0256f95413ce27d45ee843a6dcc7ce5c6b33513e72983d528ac3e4e41e6a2eef61e094aaff2b82a
 DIST krdc-18.04.3.tar.xz 1553844 BLAKE2B 712f94ece355d7f5f16c2b94f058a93cc7461b1992d04ac54729e6b8ee8774dba86bc84f96563e18867a88c4ca76c57936ecf9b4dad92522000660555b0ebb4e SHA512 ee987c449b76abeaca909a3053ad41eace8a1890eff8cf05f6a2a83faa7707ad60e2c1c18cbd06268d4d9f0452a033574b26c2b38c29f463179c6a9fcde82e30
-EBUILD krdc-17.12.3.ebuild 1175 BLAKE2B 6206722e0bc1d69af854ae2a41512651cb216e6c4e1db5041785fbd0439c1fda773158f3f3983483cfd7efa1f4264460a50580467ba9512ff0a811f31075e41b SHA512 65e5f03c34946e9c14a7637a075e6bf2a3af3433ccb6197f94a9676b89bdd14bc185109c419e15c085162836c9108ed8fe19ab4b39bc8891c172eae3450c71ed
 EBUILD krdc-18.04.3.ebuild 1175 BLAKE2B 6206722e0bc1d69af854ae2a41512651cb216e6c4e1db5041785fbd0439c1fda773158f3f3983483cfd7efa1f4264460a50580467ba9512ff0a811f31075e41b SHA512 65e5f03c34946e9c14a7637a075e6bf2a3af3433ccb6197f94a9676b89bdd14bc185109c419e15c085162836c9108ed8fe19ab4b39bc8891c172eae3450c71ed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/krdc-17.12.3.ebuild b/kde-apps/krdc/krdc-17.12.3.ebuild
deleted file mode 100644
index 1775fbbad641..000000000000
--- a/kde-apps/krdc/krdc-17.12.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Remote desktop connection (RDP and VNC) client"
-HOMEPAGE="https://www.kde.org/applications/internet/krdc/"
-KEYWORDS="amd64 x86"
-IUSE="+rdp vnc"
-
-#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	vnc? ( >=net-libs/libvncserver-0.9 )
-"
-RDEPEND="${DEPEND}
-	rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_LibVNCServer=$(usex vnc)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index f442b9e83a0a..3ccc55c1ea14 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,5 +1,3 @@
-DIST kreversi-17.12.3.tar.xz 913036 BLAKE2B c76b01192e3ca636306007e5b3014d4af20f38f98403f337af2cc72ffa076b76ff6bf5f9ffb4c1e4b7145a6f48528076848572d93837e1f9496968bdc90156da SHA512 dfc0cc5d4b49375754a1928cd45d87bfe4b6d18e62766828bd3ada8bdec017df12f51d18e432980449879f4fd321c38c75fa5a2c3919397f1363860d5d52559e
 DIST kreversi-18.04.3.tar.xz 913708 BLAKE2B c489932a6edb2e7dca4b249109a830d57f54d32e264315410599300c5d7cf6b2b5dcc8519050fc2673934cceafb28455204cc96f3acd28aa5844701ae3c43714 SHA512 b5c104e23b1dc26d3e074b3b1f5863f8a937e5a4c6be3344defbbf5f43226b61a666a1cc7b967dfea36b44386a56e58f8953185477972698c37667d2c583bd21
-EBUILD kreversi-17.12.3.ebuild 929 BLAKE2B be265893561a6148a0bbb33c1d2664af84aa002a40f6539a7dc07d3dbb6be2c889094d3ac76a2fc91bdf3fc5b7c54454c9d4f7eaf2e2ea824e8d3a373ad2d491 SHA512 0272785202f8ede0810cef15e8724aff7183e366e00c7cfa63387922d67a2e13a7bc43c3dde9eb638593b19cbea4b2f5978f44b4d16b3ad7db7dc7501594d7c7
 EBUILD kreversi-18.04.3.ebuild 929 BLAKE2B be265893561a6148a0bbb33c1d2664af84aa002a40f6539a7dc07d3dbb6be2c889094d3ac76a2fc91bdf3fc5b7c54454c9d4f7eaf2e2ea824e8d3a373ad2d491 SHA512 0272785202f8ede0810cef15e8724aff7183e366e00c7cfa63387922d67a2e13a7bc43c3dde9eb638593b19cbea4b2f5978f44b4d16b3ad7db7dc7501594d7c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kreversi/kreversi-17.12.3.ebuild b/kde-apps/kreversi/kreversi-17.12.3.ebuild
deleted file mode 100644
index 436086f29d35..000000000000
--- a/kde-apps/kreversi/kreversi-17.12.3.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
-
-KDE_HANDBOOK="optional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Board game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kreversi/
-	https://games.kde.org/game.php?game=kreversi
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 05541e663d67..647c35954b5b 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,5 +1,3 @@
-DIST krfb-17.12.3.tar.xz 995712 BLAKE2B afe6fa51e0b44b96a2bb7f1da1cb5b35c901219d6f8d0a086ec5d73915aaee47dd039d2346649d0aa5aaee280239dec9a2be1c52a436c4caf2a7bb17fd5d4898 SHA512 934bbd9e6b92bf6e6a2b46ac7df03fae9bf2d604a0fe9e5420d16332576251e621caee1057b0e743a32cc38bb38b54ed95a6ef99bfc613754a5fe23e8f697a53
 DIST krfb-18.04.3.tar.xz 996132 BLAKE2B 00b13411d52ca0f7b96dddfaf0b0563aa8a89a92c38d0136fc687f6d79bb63e819a610aedeb58ff5c652eacf57effdbe2c538d116474f71b9d2e26e3f2c49198 SHA512 25ddd2a9a71266961a1f55f0e2442e67e6c4ebb45205903981857b3d24f82b1ba5edd34e7386b56b301a7c925a4498cb85213c543d74d5fca522619dcc107e8f
-EBUILD krfb-17.12.3.ebuild 967 BLAKE2B 31a7a97ddf448e04a6647a706fd05e9be0a3cf1abe6b1f95ae0d3560203318f2faec4f0b4d719b2dc995b03acb9de7f2ea9888a2fc5a85755a6331ae5778a9c1 SHA512 9b65eae19b6ba77d51add635b0b7d5f6d987b22a0200e46f1deecdb75059ed69339433c801be23f974a707c5c85526d5b066ac0e326570e632931ba8fec8a9f3
 EBUILD krfb-18.04.3.ebuild 967 BLAKE2B 31a7a97ddf448e04a6647a706fd05e9be0a3cf1abe6b1f95ae0d3560203318f2faec4f0b4d719b2dc995b03acb9de7f2ea9888a2fc5a85755a6331ae5778a9c1 SHA512 9b65eae19b6ba77d51add635b0b7d5f6d987b22a0200e46f1deecdb75059ed69339433c801be23f974a707c5c85526d5b066ac0e326570e632931ba8fec8a9f3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/krfb-17.12.3.ebuild b/kde-apps/krfb/krfb-17.12.3.ebuild
deleted file mode 100644
index 462cbfbd15e1..000000000000
--- a/kde-apps/krfb/krfb-17.12.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="VNC-compatible server to share Plasma desktops"
-HOMEPAGE="https://www.kde.org/applications/system/krfb/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=net-libs/libvncserver-0.9.9
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index 03af46814357..ba49d97d3205 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,5 +1,3 @@
-DIST kross-interpreters-17.12.3.tar.xz 144424 BLAKE2B 0eec653e071c026e3485c33325d9656c271e59ec187c166f2440cac8095f6ada195ffdd07622d05a9a1be100b4c6b06265771b2245a3ea79b00a2b1c5ea21fc4 SHA512 2eb261cbf57c505766dbc1d7086350f8e93b0c4da804464488701444a650119350b6ffded93beaf9956ee5974701ddaa3354838341ade3d080877918c91c6c63
 DIST kross-interpreters-18.04.3.tar.xz 144832 BLAKE2B e1d32ae2dec8c4ada9c69576cd0feaca79c641c8d50e6772a966c4e766fac1054ac226a6fa3cdd4fa30aa11a0f2b04dba424ed2e4617eead3e49f9e2f11b7104 SHA512 d5ff06870ef0fc7906dfde9e413ceb0321dfe40296ad08f0a7f74ef63b368b91179bb140d12c650e0bbceed0601c5d141d76497eb87c95ac4f1f523b523d1a4d
-EBUILD kross-interpreters-17.12.3.ebuild 852 BLAKE2B a41c05e9e3a4463898168dcf2256903b44cb4710bbe7eef54e38720bd598176158c3e528ed0c11cca9e170f0a55c551103bbcf57f1aceaccf4f334f21b49a403 SHA512 4aa4a2f5a807e6b33317d6033cdaa525702d98341f78962bbbe1487d0557214ba8fb6e919cc78950d08ca11e2677b7b6b11ce153e46a939ae19e730e1c56dd48
 EBUILD kross-interpreters-18.04.3.ebuild 852 BLAKE2B a41c05e9e3a4463898168dcf2256903b44cb4710bbe7eef54e38720bd598176158c3e528ed0c11cca9e170f0a55c551103bbcf57f1aceaccf4f334f21b49a403 SHA512 4aa4a2f5a807e6b33317d6033cdaa525702d98341f78962bbbe1487d0557214ba8fb6e919cc78950d08ca11e2677b7b6b11ce153e46a939ae19e730e1c56dd48
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-17.12.3.ebuild b/kde-apps/kross-interpreters/kross-interpreters-17.12.3.ebuild
deleted file mode 100644
index 6ed78bde1b69..000000000000
--- a/kde-apps/kross-interpreters/kross-interpreters-17.12.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23"
-inherit kde5 python-single-r1 ruby-single
-
-DESCRIPTION="Kross interpreter plugins for programming languages"
-KEYWORDS="amd64 x86"
-IUSE="+python ruby"
-
-REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	$(add_frameworks_dep kross)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e "/find_package(PythonLibs/s/REQUIRED//" CMakeLists.txt || die
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_python=$(usex python)
-		-DBUILD_ruby=$(usex ruby)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index e268e3e7dfa7..d59472b84acf 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,5 +1,3 @@
-DIST kruler-17.12.3.tar.xz 259608 BLAKE2B b79ef372469b76d5734aa758b18e570c9aaba410d24f76f80a97e64bf35e61d0ac578a37dba088eb2c2ad10a8a46d4a5b24376a36a5e5f770011d51cd7230990 SHA512 e505604e01916226401ce0bbaabe8660910ca6a3e4f0e7213312b1f889ea86023d394e7ef7f821f29251ea1b16d44e3f270298304aff2f65bb1b5a937eadf23f
 DIST kruler-18.04.3.tar.xz 296084 BLAKE2B 20281feecca79c90970b1452883a3603467fc6cfe3a69203194cf145e94a4adfd1523953d6b71a1122dbbdbe96b42b5a0c1a63c90bcbdcae31021a3b7b466b70 SHA512 0d1ff9656530e4496e18b4382bd73c5750b4b2ecfd677140a57c3e159687e56254790198f406898c140654f01288580fbe48d84531d24c53b629a7d2a87557c0
-EBUILD kruler-17.12.3.ebuild 844 BLAKE2B 2dca8d115cb3241c82e077a2ba890874fd5ea94a09f8a47c99f5b4ae2dd195e5f9770e90a4ffc7e8704423b84358f87c64d00da40bba4a844c188f9fe206ff59 SHA512 6bc2032c25a9c2c903aa305544488269822b689acf312585ead9017318494c0c8bff8ebd87e9298bf5eff5ea9567a5778fd839bb6c89ed6dc19ed2aae429de39
 EBUILD kruler-18.04.3.ebuild 844 BLAKE2B 2dca8d115cb3241c82e077a2ba890874fd5ea94a09f8a47c99f5b4ae2dd195e5f9770e90a4ffc7e8704423b84358f87c64d00da40bba4a844c188f9fe206ff59 SHA512 6bc2032c25a9c2c903aa305544488269822b689acf312585ead9017318494c0c8bff8ebd87e9298bf5eff5ea9567a5778fd839bb6c89ed6dc19ed2aae429de39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/kruler-17.12.3.ebuild b/kde-apps/kruler/kruler-17.12.3.ebuild
deleted file mode 100644
index 9d45e63ab264..000000000000
--- a/kde-apps/kruler/kruler-17.12.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Screen ruler for Plasma"
-HOMEPAGE="https://www.kde.org/applications/graphics/kruler/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index 6871afd25c09..dfdf93087bfe 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,5 +1,3 @@
-DIST kshisen-17.12.3.tar.xz 708896 BLAKE2B 736271af515dad98556f6003b7fef81be7a7d56ed4a76219b479370cfb064e53a19fc829ae3049bba8ac902d5a29ea77aad2ee70457ca540e38f41f7d9e2dacb SHA512 50599330d51f4a08de050b2f4af764f084c505a5de09e3044cba00b687d9daa81618c8d9526bc76e4ab3fb53fa84e28a2f1508b992a05e284240649cfc1a0b96
 DIST kshisen-18.04.3.tar.xz 710776 BLAKE2B e9fc3a3ed41d68c85f1f4b0b0eb1f94521d6aff12158589ff1146642f854d4cf6b64f3944f443bf98843528639e3763a237b1e0da78511d412c6a91b9baf66b6 SHA512 87d7e86ac41fe179735afd20ca5186c659a8eeefa8b4973553f295ee712649a7bf05fa25b051583c4904d2b875816cb0175206b48febc48520f4ec548149081f
-EBUILD kshisen-17.12.3.ebuild 778 BLAKE2B 287c583e113f4b8dd114318ab6d66bf34171193851d65c02c9cc92a8ea5940823b90fa543ab15deb6030e987e371b9cf26ef6199896ef4d5c68e1b178dbe2824 SHA512 ddcdf43eebd4d156e7df00bbf8eeee016d7c16f72f84d3813996aae88b63e938d94f23f88594dd0d20e6139e06be3c880004d7fde01a1889946c36725aa99c60
 EBUILD kshisen-18.04.3.ebuild 778 BLAKE2B 287c583e113f4b8dd114318ab6d66bf34171193851d65c02c9cc92a8ea5940823b90fa543ab15deb6030e987e371b9cf26ef6199896ef4d5c68e1b178dbe2824 SHA512 ddcdf43eebd4d156e7df00bbf8eeee016d7c16f72f84d3813996aae88b63e938d94f23f88594dd0d20e6139e06be3c880004d7fde01a1889946c36725aa99c60
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kshisen/kshisen-17.12.3.ebuild b/kde-apps/kshisen/kshisen-17.12.3.ebuild
deleted file mode 100644
index 03898b82af9d..000000000000
--- a/kde-apps/kshisen/kshisen-17.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A KDE game similiar to Mahjongg"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kshisen/
-	https://games.kde.org/game.php?game=kshisen
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_kdeapps_dep libkmahjongg)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index 78491c79e262..f5e325821f7f 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,5 +1,3 @@
-DIST ksirk-17.12.3.tar.xz 6987416 BLAKE2B 280cfdbe3254d6ca6a63be411f1b96f2d892323fcc72b8800982461712d9e16b1a76f824c355e227db0d862fc8ebecdc73210275dd394b76aa1669cc2fe9e1b0 SHA512 dc18e40bd3db456dd5313365bc531c597ac4724b887465585ce4ac496c2086c078e059aaebc2e7f3e554fb3c51dd4b103e55017474020d5663209ffaf16aadce
 DIST ksirk-18.04.3.tar.xz 6985888 BLAKE2B 965337f838aed03844fa43fb0b3740fb84f65615d9646757124516974a32248ea77861428dcecba8090c09f16ada6d58e7f401e504e03477d650698da675d268 SHA512 568b5d1abc51ee9b46fc35dfdac0a1e0bdf7e64f4640da751459bf81bb5f2ffabe5efb62462dee36630ef6b6e967bd2f1be822b2af739ba2bfa87b7d6d6013cd
-EBUILD ksirk-17.12.3.ebuild 992 BLAKE2B c23517b1e85f4b12db1417bbd326834aaf1af327883e98a61d3eec720f1e1a18aeb43f5c2aa94a33b14cfaf266996c2e0ee2cce99c428e04cde9b1aaed2f9b44 SHA512 9a40f9bf1d56099ba864c113e828dad9d5543381016970c51a1cd66456cb25b37d02aeba727d524aba1a0e887b2538e51e4f0e4a4b64f1353edd0b956671e1c8
 EBUILD ksirk-18.04.3.ebuild 992 BLAKE2B c23517b1e85f4b12db1417bbd326834aaf1af327883e98a61d3eec720f1e1a18aeb43f5c2aa94a33b14cfaf266996c2e0ee2cce99c428e04cde9b1aaed2f9b44 SHA512 9a40f9bf1d56099ba864c113e828dad9d5543381016970c51a1cd66456cb25b37d02aeba727d524aba1a0e887b2538e51e4f0e4a4b64f1353edd0b956671e1c8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-17.12.3.ebuild b/kde-apps/ksirk/ksirk-17.12.3.ebuild
deleted file mode 100644
index 0e3b32157b31..000000000000
--- a/kde-apps/ksirk/ksirk-17.12.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Port of the board game risk"
-HOMEPAGE="
-	https://www.kde.org/applications/games/ksirk/
-	https://games.kde.org/game.php?game=ksirk
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 5f3dc850b507..1ab40405b094 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,3 @@
-DIST ksmtp-17.12.3.tar.xz 38496 BLAKE2B 448a00e29c8bbd8143b5a18848aa6a1bf9bbc2f0b9270ff90c695e3b44c7fe6c055442cee685cb32259bd5fb9bc913ca0d302e68a3d600d0fadebb303fa7ff89 SHA512 9f11e39cfc7fc56a2e84b7a33ea832c3817069d8e91980bef936d3cffacbce320af1d31ead13b3d7db56953d6aa4bb0a91ffb28cbc6d2cd1d435bc9e077ea197
 DIST ksmtp-18.04.3.tar.xz 38044 BLAKE2B fb35f06e63e05c82e958b0113356ef80cefdb2af19dda511ac4d8a5803dba12d31655080fb3f4ccfb357dd81ec5c88e3a486978c13e9bca705222361d737ea8f SHA512 b4149d8e6805e75f6de1e3e491859ae43aa596fd6ff59909f99d7deeefebe051ad34e1300f9879ea552f78d789e58e70f31f71e83f1aedb2e352ada4be302831
-EBUILD ksmtp-17.12.3.ebuild 491 BLAKE2B 0d8c11d06da656a119826b39db7a9134334fb0efad3e7c731e4b9b4d435460b2dda02f8340e5864b89c236bf9e669aab0f401f5fdf4e32daeecf425d8605cfcb SHA512 88050509a6d5ab2286bcf680d77be6f781c9eb9936813b5c839bf887b8459d923fe17983504bd461cda3bc251cd8b0608a3c20bfcf50ad5d8511718f4ecdb7f0
 EBUILD ksmtp-18.04.3.ebuild 491 BLAKE2B 0d8c11d06da656a119826b39db7a9134334fb0efad3e7c731e4b9b4d435460b2dda02f8340e5864b89c236bf9e669aab0f401f5fdf4e32daeecf425d8605cfcb SHA512 88050509a6d5ab2286bcf680d77be6f781c9eb9936813b5c839bf887b8459d923fe17983504bd461cda3bc251cd8b0608a3c20bfcf50ad5d8511718f4ecdb7f0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/ksmtp-17.12.3.ebuild b/kde-apps/ksmtp/ksmtp-17.12.3.ebuild
deleted file mode 100644
index 19ff10a3d840..000000000000
--- a/kde-apps/ksmtp/ksmtp-17.12.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Job-based library to send email through an SMTP server"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtnetwork)
-	dev-libs/cyrus-sasl
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 642410
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index 12028866cd41..374e20a0ba16 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,5 +1,3 @@
-DIST ksnakeduel-17.12.3.tar.xz 606008 BLAKE2B 5f0860f9b5c2848e7a4ce1b1b01c49df05280d5e7369b09fc7cc458aaab6f40c6f9414c19c44f9445bf8ec8a1be73191d8f9ec8a8981631d66f519d4919fcc4b SHA512 aed3e2f9744dc8b3a85aa3119a68f9a5081703a69c7f75394e23c9a5bb8308b4a2a2feabb6f404ecbabbc6e48fbbc7c38f592fd66a840a0628f416f0d724b4c8
 DIST ksnakeduel-18.04.3.tar.xz 605444 BLAKE2B 4977fc37e1bb324ffb26c6d78cf537dad14c653b77b23b8ba7caffd613bd1db84392b7fbf648456dde25321b13533b42b925bc940c0c42efc9d9f890e025fe66 SHA512 04ccbba57d99aecbba962d45456f59b35195991653491550115e1f4d9909ca67ad55e2c5d603475334e795d8ee449fd5deb3f3aa60b319602d159af475b5a465
-EBUILD ksnakeduel-17.12.3.ebuild 799 BLAKE2B 49dec31ff6c24dcfcfc3810913d57aca0ffe7b897c65c78336ea245e0bd979dfe8650a0cd6a3f156e9be5f4a209b09d1e28a1bcca7d932f5e35b1ce139de1f39 SHA512 1dbfac43ba40f312124b25bb6b3170f5e85ce5ed7da0b083ecaa023558fc434f40e74fdb7e23290df763178a52c3f15e442b20740a3bb4ba0b194fc40c1c73b3
 EBUILD ksnakeduel-18.04.3.ebuild 799 BLAKE2B 49dec31ff6c24dcfcfc3810913d57aca0ffe7b897c65c78336ea245e0bd979dfe8650a0cd6a3f156e9be5f4a209b09d1e28a1bcca7d932f5e35b1ce139de1f39 SHA512 1dbfac43ba40f312124b25bb6b3170f5e85ce5ed7da0b083ecaa023558fc434f40e74fdb7e23290df763178a52c3f15e442b20740a3bb4ba0b194fc40c1c73b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-17.12.3.ebuild b/kde-apps/ksnakeduel/ksnakeduel-17.12.3.ebuild
deleted file mode 100644
index 24f56ca12baa..000000000000
--- a/kde-apps/ksnakeduel/ksnakeduel-17.12.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Tron game"
-HOMEPAGE="https://www.kde.org/applications/games/ksnakeduel/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index 9db0f9de95d9..2ddd5d2081b9 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,5 +1,3 @@
-DIST kspaceduel-17.12.3.tar.xz 609992 BLAKE2B f50359fd07ca4580e4532e1797c8d7e0e083b16429aa1a8202a38c74c0a7dcbfd41104003497449572fa299b748c28598749d2e8dc4b50e997bdeabc272fccb0 SHA512 c4a9851ef9af9d9db4248800548a844e5ec64c0f368c5aac18efa2172155e2b7d10daa1c7f0e7bee3161faae20acd3b4a3a10dfdc75f197d07dc981a633752c3
 DIST kspaceduel-18.04.3.tar.xz 611180 BLAKE2B b09aedb33f5d5fd56302459e31bc9d6c44e9c50e846665f0209e08eedfa37e80e653293d8235222d591b5c6c7aebd938d9f2c4902c4a87b466ea039616f3eb63 SHA512 aabed6df0c78ff7cecc2f2d3c8cf7803a4bb2c51cbc9482a964ec537808b016bb4d517d8af628d58a6bad60dac56312ff49c19b5bf1c8149486651c56174ab5f
-EBUILD kspaceduel-17.12.3.ebuild 752 BLAKE2B c4b0dab1f8fe500bd162eda61631e9b155962a7a6c31f292e39c5b21434a86d0bdbc58afb31b94fd06c6f229863bdf16b32f5100fea08fd5db7152d6fbb1ac0c SHA512 4d7187ab554af0e9e8a8bc7b8a9ff64f3f120c10bcdda8f39c6674aa47b07fa48be65357f73e397f218ab93ad8334461eb06bafc3c017dbb6765425b8d9b326a
 EBUILD kspaceduel-18.04.3.ebuild 752 BLAKE2B c4b0dab1f8fe500bd162eda61631e9b155962a7a6c31f292e39c5b21434a86d0bdbc58afb31b94fd06c6f229863bdf16b32f5100fea08fd5db7152d6fbb1ac0c SHA512 4d7187ab554af0e9e8a8bc7b8a9ff64f3f120c10bcdda8f39c6674aa47b07fa48be65357f73e397f218ab93ad8334461eb06bafc3c017dbb6765425b8d9b326a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kspaceduel/kspaceduel-17.12.3.ebuild b/kde-apps/kspaceduel/kspaceduel-17.12.3.ebuild
deleted file mode 100644
index 1d3abe18a497..000000000000
--- a/kde-apps/kspaceduel/kspaceduel-17.12.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Space Game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kspaceduel/
-	https://games.kde.org/game.php?game=kspaceduel
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index 0075a3989561..17f5a146d514 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,5 +1,3 @@
-DIST ksquares-17.12.3.tar.xz 215668 BLAKE2B 779f1b9dd804b008fa14353fedabdde12ddccb003314b7d326d8606537fe71e3827f2cc4179140ed0dee067eb6445e6f90b532509542011d754ebf44f2a272bd SHA512 d22db7bf1563005c7ae1bb64bac77211be7c0ab0fba47832f91759a88814d5b4ed97f121156599f9203025657167f4f6ed542ecec7c64da3dcb7503216b9345f
 DIST ksquares-18.04.3.tar.xz 216800 BLAKE2B 97d0f6c594bff6046a8faa9369c58466a92ee529f38c39a9732d0af6620b912c31e4b59d2a3c9f726e9dbe03876324dd1f3193692f550759bcf7614bdca545b1 SHA512 58b28c87321ad2380b95d58ca5969f5def22642bf3d073a4774acd036cc9d50489594feb0492d9e53c33744c0c7ffd3fc1243e475e00ac9ec6f96b9bf2c9f646
-EBUILD ksquares-17.12.3.ebuild 753 BLAKE2B 527ea5200d86e94fe946f3ee106694729f0d7517807907d7a5acd3b4403b3b8e36245ac2327b29be254ccd664dfe277c31c2fd9031cea2d65172036ee3dd30e8 SHA512 37bafc3b3251cc6bb4651e13bf4db0c9de0a1fd8fe0f019c33e592e318eb4b8a7f6bb6b1e88f47f839d9c49044b22c5e6b67728287dc3b0aebf9579aa8c69514
 EBUILD ksquares-18.04.3.ebuild 753 BLAKE2B 527ea5200d86e94fe946f3ee106694729f0d7517807907d7a5acd3b4403b3b8e36245ac2327b29be254ccd664dfe277c31c2fd9031cea2d65172036ee3dd30e8 SHA512 37bafc3b3251cc6bb4651e13bf4db0c9de0a1fd8fe0f019c33e592e318eb4b8a7f6bb6b1e88f47f839d9c49044b22c5e6b67728287dc3b0aebf9579aa8c69514
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksquares/ksquares-17.12.3.ebuild b/kde-apps/ksquares/ksquares-17.12.3.ebuild
deleted file mode 100644
index 8c8b16b046a2..000000000000
--- a/kde-apps/ksquares/ksquares-17.12.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE clone of the game squares"
-HOMEPAGE="
-	https://www.kde.org/applications/games/ksquares/
-	https://games.kde.org/game.php?game=ksquares
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index 6c04ff8e81af..f5536afdf771 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,5 +1,3 @@
-DIST ksudoku-17.12.3.tar.xz 1635656 BLAKE2B 19dc7c25d38db5b86b83abfe4a68b45ce0499e3ff8850649d9c9b4b77623662e57146011d8ba1dbdc2f8b06a19e3fa08a47873d51b677466aa1364dfae52be72 SHA512 4c35e01d793dd8358350378766b85f7567a91c18d9637aae7cfd752255fdf84cdc028c70ba32e7b0e71c6bbd4a2a1b06d04257524fca3ddb7dcc411ff983d841
 DIST ksudoku-18.04.3.tar.xz 1639068 BLAKE2B 2627851afe3c1ad271f5c835c198cc449a5ec13f532043e9e0b9ee0f7ef3681506783e5ad85bd943730e7990c691f71ee3dcee8fa0d413cfb209031f276ea4bc SHA512 b205523e365c87badaa9c0b47f3228df2c678e89346329215c2a11cc652f92399d0a31edb09db992164e20addf44ba18c31b989b1d5b66b090138c656d4b32c4
-EBUILD ksudoku-17.12.3.ebuild 1134 BLAKE2B a3974c852ae75b254b7b6788daad23ddd899df4d163be21c6f4209b779eeba49a7d7fac7274ea323a814231179b6cfb09d016448fd9e0cd787cb9d3c07e59c50 SHA512 bfdd9f816c958358db157ee94f1f22c9bb77d2eb404e505ff2da78481472111fdc255d9b04092d761da064cc479994c024e3fb323e748beb5284f7a25309ccdb
 EBUILD ksudoku-18.04.3.ebuild 1134 BLAKE2B a3974c852ae75b254b7b6788daad23ddd899df4d163be21c6f4209b779eeba49a7d7fac7274ea323a814231179b6cfb09d016448fd9e0cd787cb9d3c07e59c50 SHA512 bfdd9f816c958358db157ee94f1f22c9bb77d2eb404e505ff2da78481472111fdc255d9b04092d761da064cc479994c024e3fb323e748beb5284f7a25309ccdb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/ksudoku-17.12.3.ebuild b/kde-apps/ksudoku/ksudoku-17.12.3.ebuild
deleted file mode 100644
index 8e7b1284a73b..000000000000
--- a/kde-apps/ksudoku/ksudoku-17.12.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Logic-based symbol placement puzzle by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/ksudoku/
-	https://games.kde.org/game.php?game=ksudoku
-"
-KEYWORDS="amd64 x86"
-IUSE="opengl"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	opengl? (
-		$(add_qt_dep qtopengl)
-		virtual/glu
-	)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package opengl OpenGL)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 0b0331f2191b..110e03c844bf 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,3 @@
-DIST ksystemlog-17.12.3.tar.xz 1782044 BLAKE2B 0679e1f79edf65dc99958932d1e60cf4e5979d02786a97b0f5181a819b289ceb3dd219b4678dd84537df4fabec0560a6cf112fd55adb1155da2060b826acdd39 SHA512 b9f1a56a4ec0c26cae5556f3454d69fb7f186762affe95008ee4403071a42d1c76cc2b8451fdd19b3d0302fb0f2b1e7c8e04f84b0efae6fda3ceac90d83d9b61
 DIST ksystemlog-18.04.3.tar.xz 1784680 BLAKE2B 27f71ffb37ab30311cb638f1ed03a1ff0a78c92117c0452f1797c0b01cc1c816763b6ecb7295f22118747ad85856b64399d04a02447ca4766cde598385ad3ff0 SHA512 f42d7fdabd93f98180077388ff4fc93921db562795edaa1892dd4526a8f8637a2f5ed5c063c0b97f96603a0f0f2f0425336c61b956c9ba933cec565fb2cad827
-EBUILD ksystemlog-17.12.3.ebuild 1564 BLAKE2B 3c90337a6c5caca3d546aeb611e8545be0cb9fc2d840bcb5bb1b41f837b7faaf1dfc8537ce60e3de21bec325173a5e968b3d55612b1d2173f2af69aa65f0fedd SHA512 ef1ae57fd6276bcc9bb529b2a142b3f83774f58fe93f727320c5ec8ca696d1b6d5ff8a2a8f7a7ff4268408516050f989c6467ed623075a84d6db26dbad12a77b
 EBUILD ksystemlog-18.04.3.ebuild 1564 BLAKE2B 3c90337a6c5caca3d546aeb611e8545be0cb9fc2d840bcb5bb1b41f837b7faaf1dfc8537ce60e3de21bec325173a5e968b3d55612b1d2173f2af69aa65f0fedd SHA512 ef1ae57fd6276bcc9bb529b2a142b3f83774f58fe93f727320c5ec8ca696d1b6d5ff8a2a8f7a7ff4268408516050f989c6467ed623075a84d6db26dbad12a77b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksystemlog/ksystemlog-17.12.3.ebuild b/kde-apps/ksystemlog/ksystemlog-17.12.3.ebuild
deleted file mode 100644
index a76e19a8614c..000000000000
--- a/kde-apps/ksystemlog/ksystemlog-17.12.3.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_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="System log viewer by KDE"
-HOMEPAGE="https://www.kde.org/applications/system/ksystemlog/"
-KEYWORDS="amd64 x86"
-IUSE="systemd"
-
-# bug 378101
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if use test; then
-		# beat this stupid test into shape: the test files contain no year, so
-		# comparison succeeds only in 2007 !!!
-		local theyear=$(date +%Y)
-		einfo Setting the current year as ${theyear} in the test files
-		sed -e "s:2007:${theyear}:g" -i tests/systemAnalyzerTest.cpp
-
-		# one test consistently fails, so comment it out for the moment
-		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" -i ksystemlog/tests/CMakeLists.txt
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package systemd Journald)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index 30b9c9c9e5f0..ad7841db59c8 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,5 +1,3 @@
-DIST kteatime-17.12.3.tar.xz 297228 BLAKE2B 48bd8240ba9b8c5d31522ac5a5fa84483709f18c690b88af003c0534b70390a92c11c90c280b1021bb0e3ebc9e6b2191dbbd0ebe5f188e30b9d248d6222ce187 SHA512 658f08d6d11705d4bae1c458a44d1910ebd1297b6d245e3b866fc6355dad517081ca2feb6a33cd7e0629eaafcbf0d6007d94c54f1aea6bc4a45bd423c10f4f49
 DIST kteatime-18.04.3.tar.xz 297864 BLAKE2B ca37f60362e8b4554bfe12c12e110fca5f1277a86fc2e43371e29cdf884ab3c76ff809ff325fc8ad6d7a2328d11a95370055ba6b8b4bbb80ff5389a881bb870b SHA512 5d6e19eac3687b1ecd0abeec1f6e0e28f69b78fe599e9d2cadca33a5f38b4565fe6a7abefc3877ff5a3b174a12d85c057c020d92318f311b7917466195e72961
-EBUILD kteatime-17.12.3.ebuild 718 BLAKE2B 06cbb4252bcdc2d843e2f162fff7e915db999203d1e0ce37d3e355587350bc311e838aae0b4069250cc10207d81b8b68e0bf1789cc709960879680686aac268a SHA512 80ee20c830c03c3b364fb562d08e09fe50b33186336a7409b476b5e1d786b8a36c56658954b33a413006ca5bbc5743f11144a67d82693740633d3001e4a80d61
 EBUILD kteatime-18.04.3.ebuild 718 BLAKE2B 06cbb4252bcdc2d843e2f162fff7e915db999203d1e0ce37d3e355587350bc311e838aae0b4069250cc10207d81b8b68e0bf1789cc709960879680686aac268a SHA512 80ee20c830c03c3b364fb562d08e09fe50b33186336a7409b476b5e1d786b8a36c56658954b33a413006ca5bbc5743f11144a67d82693740633d3001e4a80d61
 MISC metadata.xml 389 BLAKE2B ad9fbc771cd4608e96f4687330f7e6d42c003b24bf99ca55c8547903f6ffb2a8b08b7e0419c9431d8805f1f738c40e35fe67e9b68383ea1dff25f93c0cefd2ca SHA512 c898b3887333e169839d1d96ccd69a45e85a8fcc3a68c609df27d244dba1a7e9b7d7f66c273dddf8d92440c557c10137d722f62661612fa797375ab88daec071
diff --git a/kde-apps/kteatime/kteatime-17.12.3.ebuild b/kde-apps/kteatime/kteatime-17.12.3.ebuild
deleted file mode 100644
index a362c5484d57..000000000000
--- a/kde-apps/kteatime/kteatime-17.12.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE timer for making a fine cup of tea"
-HOMEPAGE="https://www.kde.org/applications/games/kteatime"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index cafcdd7b48dd..d14709f89231 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,5 +1,3 @@
-DIST ktimer-17.12.3.tar.xz 452056 BLAKE2B 2b1916d8b26232824296893d4ed0c9e3db510b8e6dda93a8b547fe83e490e2d646b7d6abddbf781730bc831c7aeaf05ae478658b85fe1395069fdce090f3b437 SHA512 89445386f152ce0960f0de9c84d50701d30811a526933c3bcc4441a29b5ee71cbf7e3f674b49ab8554f5e58e884f46a6727c66c60f273d52dec5d597e053df5f
 DIST ktimer-18.04.3.tar.xz 456116 BLAKE2B 3a37fc65efe73991e30873fdc60a396966ae6e4f94d277b01b5119933d875648ce02121d3f81323c68fabfc8ff16eb7803c71898777030e85d15ba51ace6e2ec SHA512 d964f1751782ee112d91d59c66e8f5836751e41cb607d04d61eff4450c75dee44989a73cd484b651ec31b233e7242ab8ab8a39c29d175d20259a35dc54d02e56
-EBUILD ktimer-17.12.3.ebuild 660 BLAKE2B 37955088d78d5daba9a62a36db829157900185ef1b934d99d2567782185c2397c1826b13c9a7b4ab5c3212ea9c5ed04c2eba48226c3acdbf7d40278545a8961e SHA512 e7b802fc6f09b0bb488546c02891708c4c8a5ff442c68537e8b2ed64c2559bfb749b2c390bd8699adaff7a37dba3e3be270be631dc61ba27ab46584217fcb2cb
 EBUILD ktimer-18.04.3.ebuild 660 BLAKE2B 37955088d78d5daba9a62a36db829157900185ef1b934d99d2567782185c2397c1826b13c9a7b4ab5c3212ea9c5ed04c2eba48226c3acdbf7d40278545a8961e SHA512 e7b802fc6f09b0bb488546c02891708c4c8a5ff442c68537e8b2ed64c2559bfb749b2c390bd8699adaff7a37dba3e3be270be631dc61ba27ab46584217fcb2cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktimer/ktimer-17.12.3.ebuild b/kde-apps/ktimer/ktimer-17.12.3.ebuild
deleted file mode 100644
index 27e5fad06d44..000000000000
--- a/kde-apps/ktimer/ktimer-17.12.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Timer"
-HOMEPAGE="https://www.kde.org/applications/utilities/ktimer
-https://utils.kde.org/projects/ktimer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index 8197aab5702d..177f154bc15c 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,3 @@
-DIST ktouch-17.12.3.tar.xz 5105460 BLAKE2B 1878e633bd2aebe9f3da34a53d3ca868f1b1585c55bb0bfe6a05ac18788480caa3385ffc6f0249c0687aa0a44e65f4db4a69e75880550aa0f29b42b1bcc6d2f5 SHA512 6fb3f1ee7062331047aca2d44159bc47717cd0fdbf72e97a19e6bdf0fdd86df35f05405b724cdb0401c42b6a390eae7e9aaf26caddaa9f15e44c9ee7388b6c9e
 DIST ktouch-18.04.3.tar.xz 5111132 BLAKE2B 36ded77fc81acc624f4c79aa8d9bce9e7df0718c8ef326ec2d03f8b70730a7629d715a681d96a8614f767649e794dee26a9ab378157cb6ef6dae84beca4a60d8 SHA512 eb27ecb18b9b06b839d56e150248e0ca89e12b89d80c1ba7237f46462e28056cdc423c1e3f3e9282b746f94c265d944dbc2cd4143dff1b145d6bdaf83d2e563d
-EBUILD ktouch-17.12.3.ebuild 1111 BLAKE2B 3595076fec0dc3b9e18b41285dd9ec7cc8c2bfd155555a25537d612c2e946b038be06fdfb3b7b86296238a12a58f6dd4e28a0d3697bea836fa2e672575d9d660 SHA512 ba126e96bff53bedb5210766322cee11ae7f5e828aab493a58b42389131e098f65c879b32ca0f3f1f5876d32faa006754ab8d146639302840460e4bc29d8f5db
 EBUILD ktouch-18.04.3.ebuild 1111 BLAKE2B 3595076fec0dc3b9e18b41285dd9ec7cc8c2bfd155555a25537d612c2e946b038be06fdfb3b7b86296238a12a58f6dd4e28a0d3697bea836fa2e672575d9d660 SHA512 ba126e96bff53bedb5210766322cee11ae7f5e828aab493a58b42389131e098f65c879b32ca0f3f1f5876d32faa006754ab8d146639302840460e4bc29d8f5db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-17.12.3.ebuild b/kde-apps/ktouch/ktouch-17.12.3.ebuild
deleted file mode 100644
index f13700391c9b..000000000000
--- a/kde-apps/ktouch/ktouch-17.12.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Program that helps to learn and practice touch typing"
-HOMEPAGE="https://www.kde.org/applications/education/ktouch/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(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 qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwindowsystem)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kqtquickcharts)
-"
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index b504efbb3d8f..1a38216fd000 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,5 +1,3 @@
-DIST ktp-accounts-kcm-17.12.3.tar.xz 262800 BLAKE2B 63db8496c2a21114ade346ae060b1ecea49faf8df101cc6ecb465ef0c5b856d54f6240dd7900f0917fb9729182b32c376634e6fdf29cd94c5e2d66e4d768fce5 SHA512 5cb33357fa974e383a288f7af4785b9d18e35445130a01a3062e127be4f01039a4f65e894cfc5fe2f0002cd8bd837b066be03e5e19f4fed89a8a0bef5436f43c
 DIST ktp-accounts-kcm-18.04.3.tar.xz 264164 BLAKE2B 39f51d40b275b72e4ed3e38bb317fd9e3ede37c8fa1991c30b412938fb835dade8ff33c51256e3fd5cde4d325f780909f3d11d93420c21b3e20a4d1579c4dcb6 SHA512 410b9cc74abdb11287d633a7188970e7e12c21797da19e2a5595057c00e3311d916e3321475309cdad6492ae2bc6404439bc78b0e83d53702fa39dbdd7c39de7
-EBUILD ktp-accounts-kcm-17.12.3.ebuild 1515 BLAKE2B 39bd4bb71f741d222d7d468d71f34f00d442fef3eb8c605943238f4681d3464cab0fad1fbd1a06078d9b3ad64db33d54a62762fc51193bec9934ee253ea42d79 SHA512 fa5225abb028f052b8f1a4b0e28512e6675588382b50a0fcd4c0395024c510f7e0b1673d3aaba341baca65eadc2154f8969cd0165c65a49270100b3b17a32d9a
 EBUILD ktp-accounts-kcm-18.04.3.ebuild 1534 BLAKE2B ec8fb22eabefaaa23f458dd6138f553f2273b30b0c2badcd42ffc424785b526cd91a902d2577814b8c47af93be762e763ae3d22398f4ba90b919f22ea05f844d SHA512 db5a5d131242c33a778fb2884247fb48e82af0a1cc0afbd10e08d8ca5a1011e290c3a655d87f84eec1d9f1b69142ac51f49cdf175377a0512f3a73d222a268b2
 MISC metadata.xml 358 BLAKE2B bed2948111adbc5773b15f13c4173b128243fa31e206c711d5b703d477999011f5508ec9fe95a4e0917145194cd66229e83bba5e96cebfcd0c5441246a8f2d27 SHA512 c3dfdd12ba493b5e382136755f3c3f4504f388af4a0620c764fb469031f5b2de1f20817e0080927ead546f78e533a3750daa18eb12516eca341495f4329e7229
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-17.12.3.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-17.12.3.ebuild
deleted file mode 100644
index b8bdb2af7e2d..000000000000
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-17.12.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy account management kcm"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
-IUSE="experimental"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kaccounts-integration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	net-libs/accounts-qt
-	net-libs/signond
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kio)
-	net-libs/libaccounts-glib
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kaccounts-providers)
-	net-im/telepathy-connection-managers
-"
-
-src_prepare() {
-	if use experimental; then
-		mv "${S}"/data/kaccounts/disabled/*.in "${S}"/data/kaccounts/ || die "couldn't enable experimental services"
-	fi
-	kde5_src_prepare
-}
-
-pkg_postinst() {
-	if use experimental; then
-		ewarn "Experimental providers are enabled."
-		ewarn "Most of them aren't integrated nicely and may require additional steps for account creation."
-		ewarn "Use at your own risk!"
-	fi
-}
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index 8fb2b841cb3d..b235fbadae30 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,5 +1,3 @@
-DIST ktp-approver-17.12.3.tar.xz 37044 BLAKE2B 7c9f25572a3a1bd9d38adbfff60a161900d2a02fa1a02f95be2412f4ecc3682097f63dbe4b0b29a8f6e5cbe6a63be63f405e74012816dec21a8fdcea0625eb96 SHA512 30668c4ee3b03b11a4781b57f4c8ba9c596c4e965016522ed9d6bd579cf42f9cc394c36ae1c4035288a1821276a392094a6c6b9bbf4e0bd6f94c3e46546ca4e4
 DIST ktp-approver-18.04.3.tar.xz 37088 BLAKE2B d3120dee367a2b9f3528a62ceece05d7aeceb824f0b6a9cbd66a255485e5227e424064d1dfdf83595f93f260e57dd8f0954fa086ccf74cf4764488e6f8cca42f SHA512 acc974de146cd6d5f803c34039d9db10c28c9e34775ef8194a65a2ace1da22108fb58756a630bf825e05a48ce43f477f9320ac93a710e69cb52e53f9bed855f2
-EBUILD ktp-approver-17.12.3.ebuild 676 BLAKE2B 27dece05da5da88d16f3d81d4824a7eebc02cd9bbfb3cd5a16ff13fda8f1b0528e2ada5f1255c977743a1317eebcb23f081a186b85cb1a103cf477083886b7d7 SHA512 be36ec7dfa033aaf1618172cc4ce9a7a1ffd81fc5bae4e606489b063766a896c0743aba06ef359409f7fe6005fc0a0740e2ad4ced0bf00c0e6e3b40f193ff87c
 EBUILD ktp-approver-18.04.3.ebuild 676 BLAKE2B 27dece05da5da88d16f3d81d4824a7eebc02cd9bbfb3cd5a16ff13fda8f1b0528e2ada5f1255c977743a1317eebcb23f081a186b85cb1a103cf477083886b7d7 SHA512 be36ec7dfa033aaf1618172cc4ce9a7a1ffd81fc5bae4e606489b063766a896c0743aba06ef359409f7fe6005fc0a0740e2ad4ced0bf00c0e6e3b40f193ff87c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-approver/ktp-approver-17.12.3.ebuild b/kde-apps/ktp-approver/ktp-approver-17.12.3.ebuild
deleted file mode 100644
index 6b422c75e3c3..000000000000
--- a/kde-apps/ktp-approver/ktp-approver-17.12.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy notification handler"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep ktp-contact-list)
-"
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index 9b07b8db9151..02460e9b1907 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,5 +1,3 @@
-DIST ktp-auth-handler-17.12.3.tar.xz 46260 BLAKE2B 22d2089a51776a0adc363422fe93b7a179f8c7fc143c42197ba8ed43e74c35b91558444f116d9527cd009235a670563ae73aac4a135c393da84a6083069584c6 SHA512 08b6a5e0b1a4ade40dd93ac8c515f4120e84e5251a7117c824194c47e35e30992e6afbd371c46ca8f29684caecb3f0e0ae26ab8d9c090019ca9c78336f24478a
 DIST ktp-auth-handler-18.04.3.tar.xz 46356 BLAKE2B ccd7155b4ca8b42f26338d95cd4e8bac926bc1265857f9e7e748fb4ac1e327f1aa75db983bd656b45464a9e269c09f80b2649c74ee9c53660a11459cd91a7320 SHA512 1e674f484e445e244d7c70e43063ef6deccf50b4e75058bd290ca55d3ee792f9ac596ce570c16407a61fb97b87ae58077c5f9352a510541bd95231ed2cdddf52
-EBUILD ktp-auth-handler-17.12.3.ebuild 827 BLAKE2B 237e604a61a6c5ac61a2541a0daa73d1afb77db4ad747305f14a8ea31cad8c443fde4249e3729f77071c95e754750e5875d5d58a5609e9af8796e31a892ca1e4 SHA512 47e2ff24b54a5a88fd2ca27dcb5e7f8f0bc76bbf78e111263a3fbca089b29c72e38c7c42fc0d0a74acbfa0564ddf39ae9ff319804879e7e8c9b8cb24cbd88345
 EBUILD ktp-auth-handler-18.04.3.ebuild 827 BLAKE2B 237e604a61a6c5ac61a2541a0daa73d1afb77db4ad747305f14a8ea31cad8c443fde4249e3729f77071c95e754750e5875d5d58a5609e9af8796e31a892ca1e4 SHA512 47e2ff24b54a5a88fd2ca27dcb5e7f8f0bc76bbf78e111263a3fbca089b29c72e38c7c42fc0d0a74acbfa0564ddf39ae9ff319804879e7e8c9b8cb24cbd88345
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-17.12.3.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-17.12.3.ebuild
deleted file mode 100644
index ac65e27313b3..000000000000
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-17.12.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy authentication handler"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kaccounts-integration)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	app-crypt/qca:2[qt5(+)]
-	net-libs/accounts-qt
-	net-libs/signond
-	net-libs/telepathy-qt[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	app-crypt/qca:2[ssl]
-"
diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
index 34cd057dc626..d25496499c7d 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,5 +1,3 @@
-DIST ktp-call-ui-17.12.3.tar.xz 96532 BLAKE2B ed43fa92c5ccb10b831c3577a1a58f91195d50c3207b56e11911f0a153fea4705a5a2b99de950e40647730473dd53815333819cdc933bdb71d2fa7087a1bb5c7 SHA512 9fc96b1e83b95a2e6d2793631c94ff1092e72fdd78b700ed7d44bd1dfe7dd2c010ac86ab7baea1ddaad02c99cbf75b27f8d42da43867fe84d2d7dc245aef0ea4
 DIST ktp-call-ui-18.04.3.tar.xz 97288 BLAKE2B e4b33af35f505bd03d4c0ae6509cba9f6c0ca63052b556bbe6dde46c637b8c81b1e2ba84a0337c81de84270b6031ab20754a667d454d6ee81eba04c4c6d308f8 SHA512 837252b0a788064b186423630178aff76e446a1c192b83dd06a70a4e6c22b39894763f524f9489c91767cddd05b61a2f46bc0d2ec48fb6f216cc9c4e6472588f
-EBUILD ktp-call-ui-17.12.3.ebuild 986 BLAKE2B d96de4faed6b79fc39132c4b39f7f747d3295e6a8e8d6246e7470717b8f1632f35a52e9265857f260c6f3776209b281af8dba8fedef29bb8a3733dbf7fa67fe0 SHA512 d9d93eea87d6b24e113835482a9a48af0e0bb24ce6d6e4ae5aca97bb5506ae932624931df319240a586586eef89bd07c79d0b01b053b1b8d48ef3d4c577ee385
 EBUILD ktp-call-ui-18.04.3.ebuild 986 BLAKE2B d96de4faed6b79fc39132c4b39f7f747d3295e6a8e8d6246e7470717b8f1632f35a52e9265857f260c6f3776209b281af8dba8fedef29bb8a3733dbf7fa67fe0 SHA512 d9d93eea87d6b24e113835482a9a48af0e0bb24ce6d6e4ae5aca97bb5506ae932624931df319240a586586eef89bd07c79d0b01b053b1b8d48ef3d4c577ee385
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-17.12.3.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-17.12.3.ebuild
deleted file mode 100644
index c5f03b2540c4..000000000000
--- a/kde-apps/ktp-call-ui/ktp-call-ui-17.12.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy audio/video conferencing ui"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/boost
-	dev-libs/glib:2
-	media-libs/phonon[qt5(+)]
-	media-libs/qt-gstreamer[qt5(+)]
-	net-libs/farstream:0.2
-	net-libs/telepathy-farstream
-	net-libs/telepathy-qt[farstream,qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 5e0382c1f598..e97207977d60 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,5 +1,3 @@
-DIST ktp-common-internals-17.12.3.tar.xz 441184 BLAKE2B 65b3e4e830e5d90f9318d160ddb3ec239772a840973464b95c0b6dba1e753a5a12120896a31aa9d6663adfc235591181adb4b0f938a3a56f7f18d63ff4e1146c SHA512 7662017f3186ed0b70dc02a6af33b0f0f5547c2a3da5f76855cbdaa7ce8bdc31cc43929033b040cd1d7bea0b9606dfb440ee93a8ce5d0f9835363775b95c9cf1
 DIST ktp-common-internals-18.04.3.tar.xz 443664 BLAKE2B 2c66f2a401981675b8b393a2de2928cacaa6f1929b3f5aef5cff681a9b6abc30de8234447c35cf4a33fa51981785241848a4d161a153a98b9db2e300c849f15a SHA512 b405fa103fab1a366497ab19d5fc60bb8d939bde2119e50e43e240fa7066b5cee5647396b1b4ba246c9c82bf5bc876481c8ca586400613a410fae08735b120f9
-EBUILD ktp-common-internals-17.12.3.ebuild 1575 BLAKE2B 40d89f97145068b5b6e27077941ba229f258698a3b05bedde6c966d22ae5ed39801ed4310d6dfbd736578d9f5dc8853b671b73d7dc8d50f65462c88c8e483844 SHA512 11ec9de3d9940f861e4eae9d3dcf1cbe4291d108f414c7a0bac0c1362cfc3d7831cd0ce7cd1ce5ecef8d7f58b01e5245da6e10cbebbde3b3ef568a83d99e3d60
 EBUILD ktp-common-internals-18.04.3.ebuild 1575 BLAKE2B 40d89f97145068b5b6e27077941ba229f258698a3b05bedde6c966d22ae5ed39801ed4310d6dfbd736578d9f5dc8853b671b73d7dc8d50f65462c88c8e483844 SHA512 11ec9de3d9940f861e4eae9d3dcf1cbe4291d108f414c7a0bac0c1362cfc3d7831cd0ce7cd1ce5ecef8d7f58b01e5245da6e10cbebbde3b3ef568a83d99e3d60
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-17.12.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-17.12.3.ebuild
deleted file mode 100644
index 8debec6aa8bd..000000000000
--- a/kde-apps/ktp-common-internals/ktp-common-internals-17.12.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Telepathy common library"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
-IUSE="otr +sso"
-
-RDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=net-libs/telepathy-logger-qt-17.08.0:5
-	>=net-libs/telepathy-qt-0.9.5[qt5(+)]
-	otr? (
-		dev-libs/libgcrypt:0=
-		>=net-libs/libotr-4.0.0
-	)
-	sso? (
-		$(add_kdeapps_dep kaccounts-integration)
-		net-libs/accounts-qt
-		net-libs/telepathy-accounts-signon
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtnetwork)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package sso KAccounts)
-		$(cmake-utils_use_find_package sso AccountsQt5)
-		$(cmake-utils_use_find_package otr Libgcrypt)
-		$(cmake-utils_use_find_package otr LibOTR)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index c5181f0bc1e8..a7fe6064b4e2 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,5 +1,3 @@
-DIST ktp-contact-list-17.12.3.tar.xz 131508 BLAKE2B 55f46331693029939137067e98d252cf6b8efc816b96e597042c2adbaec3bbefdfe5bf027ffda47d9ece869285107425da27661f2b5d0bc63c438843bffdabfc SHA512 4ceaad321e180a121ed8dc10001932c070042544fbab6df1716d882ff429a51615fa3d97615c443141f0e709eb78aee6a013a2e36159d500494bd406761c8983
 DIST ktp-contact-list-18.04.3.tar.xz 146956 BLAKE2B a0eef7d446ec629d3b5c409dce828eae70e248e43013abe22981036698e2695884074fc916366a6fbf23854abf02721be2cca094067eecd0c87e1d19e3de4b5c SHA512 17fb11cea4f20e529f6d9b27c1d79a5d4a876d6fe2a5c240b7aff36793637aec227e23caf3b37ff247017b20244266be2d7a7f67fb4b5bd0dd1e1672ab2276cd
-EBUILD ktp-contact-list-17.12.3.ebuild 1032 BLAKE2B 81c466f9879a9d4cc03c073c74ecc85ee7787a4ec026dc9ada56d75102cee2d026b8c3235d905927fce3c3e62edfb075c46b5053b9482ac064bd45449e22bacf SHA512 914e0ff38721394f9b828072c806a7884c32f9ca93e32196566b0b85025db90d97e4be207b4a805fe7afb0db9ff411fed4aca561a99bbb35ed68191f54751239
 EBUILD ktp-contact-list-18.04.3.ebuild 1032 BLAKE2B 81c466f9879a9d4cc03c073c74ecc85ee7787a4ec026dc9ada56d75102cee2d026b8c3235d905927fce3c3e62edfb075c46b5053b9482ac064bd45449e22bacf SHA512 914e0ff38721394f9b828072c806a7884c32f9ca93e32196566b0b85025db90d97e4be207b4a805fe7afb0db9ff411fed4aca561a99bbb35ed68191f54751239
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-17.12.3.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-17.12.3.ebuild
deleted file mode 100644
index 676060d49efe..000000000000
--- a/kde-apps/ktp-contact-list/ktp-contact-list-17.12.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy contact list"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(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 knotifications)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_qt_dep qtxml)
-"
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index 2b547ecd3bbd..6e6ac775bac4 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,5 +1,3 @@
-DIST ktp-contact-runner-17.12.3.tar.xz 40100 BLAKE2B a328c6f8af07e2d7a3d1bacad077fe83e39d412ad1517feda7a1f0f17aed45fd503e22fa3064cf57e3687c572b1dde4a99df48e36405ba1662edbab33614f5c5 SHA512 b2ebd74bc9dfd893867fca624a1e4ccb2b999b27b87c2f460735fd0c1e7d9627765d012cd901a9db1d5d6df79a587da3d2457d7a2afd504eae8b41cc9917cf9f
 DIST ktp-contact-runner-18.04.3.tar.xz 42700 BLAKE2B bedc758583266aea0a4ab31b532eb835c0b13cf7eea8b369dfbd7b24b9f76d9bad98e5ba936759d5f3f9e0f653b35e84335d10aa47a82613f1b02e89dd43105f SHA512 7b775570a4179b4a97c162e0e2b3b76f932394d527809ccdbf6bc2a0f1e4d700c2281a768145ed3a90ff7ce25430a267ad1bf4f9d7857a8b1de3d7a94bcea93e
-EBUILD ktp-contact-runner-17.12.3.ebuild 602 BLAKE2B e61fc57cf35cb8129dcb9c034316c2ac66fad4b4e91d7055cfc3a9cff345b5a22706678ff35487d660c78f1f861768abe94a079e3ef0cca103be7e1c2ee2b10c SHA512 28eefe0bd03dcffbe5f6707ffc9b54616f795434fe9d6a932c666f203c004973c41bf8e71b0fa57aa2ff1f346027bddf75e61c6246f22af36970c1584ad91288
 EBUILD ktp-contact-runner-18.04.3.ebuild 602 BLAKE2B e61fc57cf35cb8129dcb9c034316c2ac66fad4b4e91d7055cfc3a9cff345b5a22706678ff35487d660c78f1f861768abe94a079e3ef0cca103be7e1c2ee2b10c SHA512 28eefe0bd03dcffbe5f6707ffc9b54616f795434fe9d6a932c666f203c004973c41bf8e71b0fa57aa2ff1f346027bddf75e61c6246f22af36970c1584ad91288
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-17.12.3.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-17.12.3.ebuild
deleted file mode 100644
index 849a4ab66492..000000000000
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-17.12.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy krunner plugin"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kservice)
-"
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index dff63cc53dad..5318342734bc 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,5 +1,3 @@
-DIST ktp-desktop-applets-17.12.3.tar.xz 43220 BLAKE2B c1d783c2c10481e4eda0e18cabe6598d8ee5fb0342f3d3b23f75916c66b2bebe6e43ac330fb224b1380d8fdfa746ed458e447b1525b3b23ad15a6ed2d4f8d1d5 SHA512 e6f1edace6b543c56b85b79f421c0023d28495c5dbf6d821f729970161a8d097faa03433051f385117d4b0968c4d877ecc5b0134b94feddb73a577763de63a3a
 DIST ktp-desktop-applets-18.04.3.tar.xz 43124 BLAKE2B 53af20f4e3a1a51aa09b3dd8061b16ad964ddf6efec4bb7982212e7312bd2cc07cdf5265e29e900e7e2aaeb77ba8132031ff331a0b5090f6f20819655a7a8f14 SHA512 865f8f983f7434f32fa8d598c815454ff7cebce935fe9a72e35173b5e560aeb91f380e6cf60441f57eca7251b5fdecf8b5e7d0fceef289136fb91dc01750eeb6
-EBUILD ktp-desktop-applets-17.12.3.ebuild 572 BLAKE2B e2dd4ee48db45d71f005e75677cde0fb38304368dddfb448870ee5aeca7a68ef017d45fe215a8f6a264390a48747d2c62b93f45527b1e976b2ad0461343c7f68 SHA512 2da8ae5261b2abec7f5286e308e31a048a2d794b6fd40071bc192401dc320ed1d87e78ba865cb7496b8c614063e8f557c7c097abf416a6ca4bfab962636d2eb5
 EBUILD ktp-desktop-applets-18.04.3.ebuild 572 BLAKE2B e2dd4ee48db45d71f005e75677cde0fb38304368dddfb448870ee5aeca7a68ef017d45fe215a8f6a264390a48747d2c62b93f45527b1e976b2ad0461343c7f68 SHA512 2da8ae5261b2abec7f5286e308e31a048a2d794b6fd40071bc192401dc320ed1d87e78ba865cb7496b8c614063e8f557c7c097abf416a6ca4bfab962636d2eb5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-17.12.3.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-17.12.3.ebuild
deleted file mode 100644
index a87326bbd06f..000000000000
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-17.12.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy contact, presence and chat Plasma applets"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep ki18n)
-"
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index 5c34ba6f641c..4c701541f92b 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,5 +1,3 @@
-DIST ktp-filetransfer-handler-17.12.3.tar.xz 45968 BLAKE2B d982a94ec787124d5d6df5284a1effdeb58c4f1dd15e7a9bfd6e017f8acc172becbfe83162b9769ee12a3617d1dc7348efde4e563f95e771976cbb58d3d1cfc8 SHA512 145b3616523c224b479107b94de6b267151a9e6b12a412a86abf8da7a1f0b18fdb88783167149e84641532fe4ebf5105d64976155561f3ce7d23139ef58825c3
 DIST ktp-filetransfer-handler-18.04.3.tar.xz 46224 BLAKE2B e3882799897df59030f3fdc841c5495735c1531cf09ec4e98629e450d77721296c2cd28a4357411b0e13ce2faf2631fcb75c93c2ca2a0bb71899ed68adbbc6b2 SHA512 61410a03d2da650f2d92dc734e35546d47c39818273be6a49057570f2ecfbd06d58b67d05a88f5e8df7ad0b34e608d8dab64d1aec716d7db8d699d68de190204
-EBUILD ktp-filetransfer-handler-17.12.3.ebuild 618 BLAKE2B cf226ea7a2f1f229bc6d48fb99dfb341fc1fc8f3f5fd8fbaac9c21ecf0ce7a39fc1abe20a65e799517036ce2bf158daecd52428b6905d31583ab422cbf46e89a SHA512 f441d634b4b082e5456777422ad0c423d5f5931dd2b7f3af04fccd1fc766989244e4427241bdd1e76841def3a1f32437a6833897d8dfa20de1aaf4343b3266c1
 EBUILD ktp-filetransfer-handler-18.04.3.ebuild 618 BLAKE2B cf226ea7a2f1f229bc6d48fb99dfb341fc1fc8f3f5fd8fbaac9c21ecf0ce7a39fc1abe20a65e799517036ce2bf158daecd52428b6905d31583ab422cbf46e89a SHA512 f441d634b4b082e5456777422ad0c423d5f5931dd2b7f3af04fccd1fc766989244e4427241bdd1e76841def3a1f32437a6833897d8dfa20de1aaf4343b3266c1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-17.12.3.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-17.12.3.ebuild
deleted file mode 100644
index 455f5d3bc4e5..000000000000
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-17.12.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy file transfer handler"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index 3042c5a9f467..fdceb01b7316 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,3 @@
-DIST ktp-kded-module-17.12.3.tar.xz 81256 BLAKE2B 690a858e80614ecb1f3fa465361010d846acb73c4a92d9355735cc6cde97648894182a11065aae28954f093a09e4e950ff5e104f0b6675caadae79126ddcf913 SHA512 0d804705662ed87fe56217e603ade5b0ad28b3dc852a7f6fb005c42b033464ae92f866ef00e52e80cdb67c2e107d94f104f3e0b7ce7bb7660cc4555f4e414d57
 DIST ktp-kded-module-18.04.3.tar.xz 94540 BLAKE2B 7c6119a638ae191407ff6ce8250365e177a7fe3c48edc1a8a20facdc7c8c79f7d10d68d1fe0bd587b433f76ba4a617ada28bbf59d90351553a12267f6cd552e2 SHA512 8fa78a3af4a17e345ec6e4c096ba86646cde8e4b67be847cb61ca3d470fadbfdbabdc24d3c4c61fb4a9f98817ab02c5d963b382b9747c79748110f1e24022fe9
-EBUILD ktp-kded-module-17.12.3.ebuild 977 BLAKE2B ff58345e59fac7e503b76fc1a3a290c1447d4c3791a9227296749d90b0e0d23c6ba689e32ff2623298df2f0ea3eae7d83562c6ffdb693b8e19ce94465f660807 SHA512 1a911854ecc01b8955542d1a0c0e416a23cb7455b06d0840371d79a27f3fa29418f82f52b86656a037832b2b09b05797eb8c40a23c5b5e4c7bcde0c2e35e519f
 EBUILD ktp-kded-module-18.04.3.ebuild 977 BLAKE2B ff58345e59fac7e503b76fc1a3a290c1447d4c3791a9227296749d90b0e0d23c6ba689e32ff2623298df2f0ea3eae7d83562c6ffdb693b8e19ce94465f660807 SHA512 1a911854ecc01b8955542d1a0c0e416a23cb7455b06d0840371d79a27f3fa29418f82f52b86656a037832b2b09b05797eb8c40a23c5b5e4c7bcde0c2e35e519f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-17.12.3.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-17.12.3.ebuild
deleted file mode 100644
index d7f970e100f5..000000000000
--- a/kde-apps/ktp-kded-module/ktp-kded-module-17.12.3.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
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy workspace integration"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kwidgetsaddons)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep signon-kwallet-extension)
-"
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index b7c7281d333a..6dd1acb74e84 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,5 +1,3 @@
-DIST ktp-send-file-17.12.3.tar.xz 28820 BLAKE2B 267abc501fa4d2890e5c530ed7df132cad2a56800d3008f72dd3599779e1ba34c14f82635991bd43035af25087ec2c36dd14c79384819a01c2f9e4d3a7050f95 SHA512 887a7d4008f77fbc48355c32e4716f164df77c901ba4bf7eb0b0305e83b03e3e8fd38e7b5381532e3037f42b60055e65c4b49e1510799000c3951c67ee2a0ef5
 DIST ktp-send-file-18.04.3.tar.xz 28800 BLAKE2B 8bc11189a37537c073338c84792374919242e64738440f63cd47ffde61a1b8764c3b8487054e307b810199b62c406ac559717e39661d5a125d88265eb64f94c0 SHA512 a0644f8d0e8bd71ff29a60895f2e28fbf9dd80f82f208930fc816b358c953009bdfb8052359900476446129f1bae4be71b125cd50f335b432c8857b396686fc4
-EBUILD ktp-send-file-17.12.3.ebuild 825 BLAKE2B a70d898988364281be37568053a6177286bb6156b18031a317e0d17514a40f527e3dd3f104ec3fcfea6a3057f300f9942b8ce8e2619cd05d250dcabb103294ca SHA512 93249abba02c9fe9d9b9e9d990b4497d4cea760dc8c41f0eda35ee701c5a64818bfa5ce67f5e0d2ce082309f26cc53556cc79508c84ca9ea6313a8d0700172df
 EBUILD ktp-send-file-18.04.3.ebuild 825 BLAKE2B a70d898988364281be37568053a6177286bb6156b18031a317e0d17514a40f527e3dd3f104ec3fcfea6a3057f300f9942b8ce8e2619cd05d250dcabb103294ca SHA512 93249abba02c9fe9d9b9e9d990b4497d4cea760dc8c41f0eda35ee701c5a64818bfa5ce67f5e0d2ce082309f26cc53556cc79508c84ca9ea6313a8d0700172df
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-send-file/ktp-send-file-17.12.3.ebuild b/kde-apps/ktp-send-file/ktp-send-file-17.12.3.ebuild
deleted file mode 100644
index bc535441e01a..000000000000
--- a/kde-apps/ktp-send-file/ktp-send-file-17.12.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep ktp-contact-list)
-	$(add_kdeapps_dep ktp-filetransfer-handler)
-"
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index 5c7e6e432580..bab67806b261 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,3 @@
-DIST ktp-text-ui-17.12.3.tar.xz 468592 BLAKE2B d4a4aadce200e67f40ec16382902f386ff06bc14bcbc0b91fd7ad0193eaf31e9bf7b1e8fefdf80dbf1cbd6e3e100a61fefcfcf1a67d4dd578f2191760877519b SHA512 2ae0dbfac8f23e478cf208be610cb2d5b73648b1bda43af75f4fa33dcbdb00a5342a19c4b2b6cd8c5a59a07ec6ca3a8d3d8d95cbc42d24c4b74ff40ee22b427f
 DIST ktp-text-ui-18.04.3.tar.xz 469688 BLAKE2B c1e43957d1ae541eb3371bbcef1da2d876e00f6db932861ca8154d448c134f05a9a4b2de1fc2efe791bddb7bdb0aab4dcf5409ba7f502fc07540bc4ec05d6d51 SHA512 b4b620d3a25307c027cca61fc3b814bb6f511feb10ae3baab176a9c0f86a4bb7101dc278b278dbaeb0d6556bd6fd7c42db3ac96c64178ee5c6db3ce47740c519
-EBUILD ktp-text-ui-17.12.3.ebuild 1487 BLAKE2B cde9527f6ec6e11917ac0e4c0f747658f3f680b313cc969ab4e839682849cd0d93f4419e96067838901bf127b8c114ae2956bf344c872c5e8796d3fdd5b8b4d8 SHA512 562849c9bac6ed0c34bbace3ddeccaa36cfed9c48ec957640d2fdeba30e6ee64ee46a67c9e689ab9100a20dd7a1e00a60ca88c73b3d37550ac1901e19dd32884
 EBUILD ktp-text-ui-18.04.3.ebuild 1487 BLAKE2B cde9527f6ec6e11917ac0e4c0f747658f3f680b313cc969ab4e839682849cd0d93f4419e96067838901bf127b8c114ae2956bf344c872c5e8796d3fdd5b8b4d8 SHA512 562849c9bac6ed0c34bbace3ddeccaa36cfed9c48ec957640d2fdeba30e6ee64ee46a67c9e689ab9100a20dd7a1e00a60ca88c73b3d37550ac1901e19dd32884
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-17.12.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-17.12.3.ebuild
deleted file mode 100644
index 7573ce56a650..000000000000
--- a/kde-apps/ktp-text-ui/ktp-text-ui-17.12.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy text chat window"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
-KEYWORDS="amd64 x86"
-IUSE="speech"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdewebkit)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep ktp-common-internals otr)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	net-libs/telepathy-qt[qt5(+)]
-	speech? ( $(add_qt_dep qtspeech) )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep ktp-contact-list)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index b16032b915ff..c58681e55408 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,5 +1,3 @@
-DIST ktuberling-17.12.3.tar.xz 32802036 BLAKE2B b80c4fcf37315889270de1e9cbef3ce70817b6823a5f20305d05e4213be0714d3a6fb575c388d77fc264b32acf9458e1317bd29ca4021cdb9524b13bde0a76da SHA512 f92d1f97c725bbe45e2590b3873978a321fc5fc78930e21f98274ec34eb665d71542a3451e7970c964e5f3cd7a615f472f6e4f5656562f6c349d45807ed2bda1
 DIST ktuberling-18.04.3.tar.xz 32797016 BLAKE2B 92d52365bf712d45fd2a6195eb5e9072de5427952ae7b268de352acc85b5cc25509891835c5ded1bbb8d81b743ffcdf589a2dc16956ef68a6854f7c14d0ffac4 SHA512 7f8e26b681389d50194d85c08a88abce6d96acecf8b668e966eb4a61bb9129f9d9ebd667e3021eb83f681bdf5476a0c60fdd4716f083456be5b5d0e24c9a57d6
-EBUILD ktuberling-17.12.3.ebuild 975 BLAKE2B ec8f1d47106ecaee3fb5fb1d87a30a65e0015031bd4c0721b7038e9a7546b230e3e68374f856bc6d9e19820290c66cfdc401a4e3187952ab92e05664a9453f49 SHA512 4a8c6fd5a2492d094eaf7dbd351630b8224ba8529d16a026e9f99883f3f0aa4492372c2f14e2d8cf12cf47fefa4a36075c74b49c4ecb5de51e437a490a68dba4
 EBUILD ktuberling-18.04.3.ebuild 975 BLAKE2B ec8f1d47106ecaee3fb5fb1d87a30a65e0015031bd4c0721b7038e9a7546b230e3e68374f856bc6d9e19820290c66cfdc401a4e3187952ab92e05664a9453f49 SHA512 4a8c6fd5a2492d094eaf7dbd351630b8224ba8529d16a026e9f99883f3f0aa4492372c2f14e2d8cf12cf47fefa4a36075c74b49c4ecb5de51e437a490a68dba4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktuberling/ktuberling-17.12.3.ebuild b/kde-apps/ktuberling/ktuberling-17.12.3.ebuild
deleted file mode 100644
index 34792267dcde..000000000000
--- a/kde-apps/ktuberling/ktuberling-17.12.3.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
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Potato game for kids by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/ktuberling/
-	https://games.kde.org/game.php?game=ktuberling
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index ad0efe509e5f..6cf410686034 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,3 @@
-DIST kturtle-17.12.3.tar.xz 1608852 BLAKE2B 1f8fa96742f08bb3e9ff4be1c6b2f1cc9bae22acf9e54f69a19a74f621fae9cf55bad26f4baee1313e03ea3a575b21f5d45d66541f712c128b823718fcc7936f SHA512 5510621296a824cdedd2454cbda21e5eb906bb72a79addae5ccb19d011af813c29c7702166bd2e4b728a3cd1d62589842b44983af01af10d3f6a13536afcff2e
 DIST kturtle-18.04.3.tar.xz 1608732 BLAKE2B dbf1c0ccf1b4c0efeae57d0c538b9bc43e2ce82b689fa862e7beece84a504276eb3ef7c41c8d8ee46d156dfde537d13cc804438903590490099860e80e5c5b82 SHA512 c4d3a20b7a399f4ffd2e8ed6975df6732fe33fe945694a8eb94410c2d80923f3156d7cae1658edbfb48692ebf86fd19c17040d8fbda877c86d12e939eba98ec6
-EBUILD kturtle-17.12.3.ebuild 843 BLAKE2B 0efee60c3bf185f01be78b64a97e73d630ac9d194c4211b9baba35551de7994e120832f6b4615490c678029b5be3a715378c76d2de1b913ea8c82279a1c496bf SHA512 e61ee8e395c453417cfbfb1cc7f6f1b6fea53b02f3ae2046700f42e3e5129e9cf081cba65526f358c7a43a3133bd3997362a2be5911ffadf1256d59958f0b684
 EBUILD kturtle-18.04.3.ebuild 843 BLAKE2B 0efee60c3bf185f01be78b64a97e73d630ac9d194c4211b9baba35551de7994e120832f6b4615490c678029b5be3a715378c76d2de1b913ea8c82279a1c496bf SHA512 e61ee8e395c453417cfbfb1cc7f6f1b6fea53b02f3ae2046700f42e3e5129e9cf081cba65526f358c7a43a3133bd3997362a2be5911ffadf1256d59958f0b684
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-17.12.3.ebuild b/kde-apps/kturtle/kturtle-17.12.3.ebuild
deleted file mode 100644
index 106310e9186c..000000000000
--- a/kde-apps/kturtle/kturtle-17.12.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Educational programming environment using the Logo programming language"
-HOMEPAGE="https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index 9801e1c2407e..4b2cb13604d5 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,5 +1,3 @@
-DIST kubrick-17.12.3.tar.xz 307056 BLAKE2B 737e97392692bc9aa7e1ba67d1cc04e370824932248586ab1a6a04afe4f4a3f4feea6e8dc86a4f39e56714bb01781c637d466d6eea6c950d22146d61b7fedc1d SHA512 4aaa118514674458513ffc8b4ce0d5cad479d33103302979e2a9ee6f9ed7955147dd42d8f31ba73a6ad39e1050ffbd48f85d8eab6954bad834fbf1e6b92f39d6
 DIST kubrick-18.04.3.tar.xz 308328 BLAKE2B 544061d358993a7f924440b1aa1b33fc53fbcbb331c66072fc44c5a5d8ce7f29c8737cf1f613e43692271b1984a72b236ab53d3f6e942e7f3d991f83cd024e46 SHA512 a2bc2bb76150a60b7e85173899eb112eeddc91748c412bd2f2281d72ca83a6b418edfb693d4468de125ddffff280a9bebd3412bda0a331b17ce494c0b5610d57
-EBUILD kubrick-17.12.3.ebuild 749 BLAKE2B da0554f2e3eab3029a90b6d791de0f008d9f16f2d241da6943c3cb526ac3bc620e0ecfb9b96e760d35805ff3e09c121fe0bd71fbb291bb1b79a326da4a5f95a8 SHA512 d0a1c727665ec7b34e12d3970f109d31187a0e54ace76dd7214cc9f1172b9581a61af9791a4f12830c6a5b9714e40aa65611da6032d826771dc18253b5e2b89b
 EBUILD kubrick-18.04.3.ebuild 749 BLAKE2B da0554f2e3eab3029a90b6d791de0f008d9f16f2d241da6943c3cb526ac3bc620e0ecfb9b96e760d35805ff3e09c121fe0bd71fbb291bb1b79a326da4a5f95a8 SHA512 d0a1c727665ec7b34e12d3970f109d31187a0e54ace76dd7214cc9f1172b9581a61af9791a4f12830c6a5b9714e40aa65611da6032d826771dc18253b5e2b89b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-17.12.3.ebuild b/kde-apps/kubrick/kubrick-17.12.3.ebuild
deleted file mode 100644
index 905e2a86308f..000000000000
--- a/kde-apps/kubrick/kubrick-17.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
-HOMEPAGE="https://www.kde.org/applications/games/kubrick/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	virtual/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index 89d6e7a4501b..627b82b4d45e 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,5 +1,3 @@
-DIST kwalletmanager-17.12.3.tar.xz 778500 BLAKE2B 106e4cae3ec45f1782f838dc7fdf6722ebf766120ca922c6ff49a469afe09c48ff2dd81607094864a56f69355408b292e5dfa68138375bf1b2e48415f9227766 SHA512 b06bd097c580dc70d51388a12f30bd0ff0460d6dec5789333e460037ee3d132886e004c1fb1cdb13add6e588bce554d72b5cfb33bffa205b0edfebcf074610ac
 DIST kwalletmanager-18.04.3.tar.xz 779004 BLAKE2B 7220e472946cd61e1b7ef882e3e8cc92e285d5fa5696a5d4e9703e5077ff9ee70fc68f78b662a952a1d733ea2ca3a7f7c1d482ed728b6e3ff6d772124bd25917 SHA512 54cc68ad34419703092cc53fdfe19e48ab758377b47feae405d2a094950501195cb8a39ce863d37204b0d2a0019100411ad73164c00bbf1e96bc2662a9a79b44
-EBUILD kwalletmanager-17.12.3.ebuild 1246 BLAKE2B aac270c42cbeb8fb891dd9d65a8de55d51993e296ad3e56ae59015746f6d19bf3b6fe70e857ca2a575c94b21ae69dba5c1d2b6151457a8027faacfc177e54450 SHA512 18f35758834e8b4d9dc2f32d87d998ce4b36f278c6f24a76dfb9c38501382bd986abbf0181ad68c632b303855c9d882d6b8a09a89535965e9dc7e2779673766c
 EBUILD kwalletmanager-18.04.3.ebuild 1246 BLAKE2B aac270c42cbeb8fb891dd9d65a8de55d51993e296ad3e56ae59015746f6d19bf3b6fe70e857ca2a575c94b21ae69dba5c1d2b6151457a8027faacfc177e54450 SHA512 18f35758834e8b4d9dc2f32d87d998ce4b36f278c6f24a76dfb9c38501382bd986abbf0181ad68c632b303855c9d882d6b8a09a89535965e9dc7e2779673766c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwalletmanager/kwalletmanager-17.12.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-17.12.3.ebuild
deleted file mode 100644
index 2aedae9329f5..000000000000
--- a/kde-apps/kwalletmanager/kwalletmanager-17.12.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Wallet management tool"
-HOMEAGE="https://www.kde.org/applications/system/kwalletmanager
-https://utils.kde.org/projects/kwalletmanager"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(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 kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kcrash)
-	$(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_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kwalletmanager-15.04.3-r1:4
-	!kde-base/legacy-icons
-"
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index 3b8f5d6911c8..e0150b5c0ed9 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,3 @@
-DIST kwave-17.12.3.tar.xz 4757724 BLAKE2B 1479b75aada209ec45fc69a735f789512f8c81177a469e7f87f55e8063f8bf2421b7c901aae0886f6aff238ff6ed9acec2b872fa61d596d30251745ca5553619 SHA512 008df107d05c5e9d07a9b8f64ad261a03bfdca64c8ffc098be6838a4672bce2d0c00f9fe4afe07cd7418390e0973720c0bcc1703ac4ab8fb5e0bbd5fee9fb503
 DIST kwave-18.04.3.tar.xz 6186388 BLAKE2B 4c6d4c9d2beeacee09535930e5660cde084105a9bed21ef4df400fbe8f5b0ccbdc5eb0152f08a92bbe60b7eb164b268964f6b386af0740677d99c2f1abe2dc9f SHA512 30fdfdf681bdf2f339a0b8ca91899e4b3e447075a7454f352f897745af2b671a5412c37ff372563a5f80cb3545295a5c4849b3243386ab86831e325867f7ef23
-EBUILD kwave-17.12.3.ebuild 1987 BLAKE2B 9b5d443154717b131c0f807a64f76e16dfc38b993c268003f778ae80d285a4fb63b124b54b0762b81dfa84c8dd69e722df52aebbd218c2f4761363f2890ef612 SHA512 c80dcbd90fa9b0aba14d7d007c940646c477a8be7d3d7f97449bd267628676da6f72d44c0af285220b5d3d64ee6fd958a6239f52e6600e345cee4ef77ad2d7d7
 EBUILD kwave-18.04.3.ebuild 1987 BLAKE2B 9b5d443154717b131c0f807a64f76e16dfc38b993c268003f778ae80d285a4fb63b124b54b0762b81dfa84c8dd69e722df52aebbd218c2f4761363f2890ef612 SHA512 c80dcbd90fa9b0aba14d7d007c940646c477a8be7d3d7f97449bd267628676da6f72d44c0af285220b5d3d64ee6fd958a6239f52e6600e345cee4ef77ad2d7d7
 MISC metadata.xml 749 BLAKE2B 860265ca3ab192b9f0eb386b4f8c32d400ffe0d79d9ae52fd1b03e10b6c1955406219641cab9c38cfa3c45de2a7bc2d37525ddb264599922e3359d764add4318 SHA512 ea33dd37159d916ce727354e5183f77e4435553fad594e6f0494419e41137bc29d9f1d7b1035ab88ac982ca4c56a68065783a9336f29a511f681074bf2d772a5
diff --git a/kde-apps/kwave/kwave-17.12.3.ebuild b/kde-apps/kwave/kwave-17.12.3.ebuild
deleted file mode 100644
index a2dc825eb15a..000000000000
--- a/kde-apps/kwave/kwave-17.12.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Sound editor built on KDE Frameworks 5 that can edit many types of audio files"
-HOMEPAGE="http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/"
-LICENSE="
-	CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+
-	handbook? ( FDL-1.2 )
-	opus? ( BSD-2 )
-"
-KEYWORDS="amd64 x86"
-IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
-
-RDEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/audiofile:=
-	>=sci-libs/fftw-3
-	media-libs/libsamplerate
-	alsa? ( media-libs/alsa-lib )
-	flac? ( media-libs/flac )
-	mp3? (
-		media-libs/id3lib
-		media-libs/libmad
-		|| ( media-sound/lame media-sound/toolame media-sound/twolame )
-	)
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	opus? (
-		media-libs/libogg
-		media-libs/opus
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_kdeapps_dep poxml)
-	$(add_qt_dep qtconcurrent)
-	sys-devel/gettext
-	handbook? ( || (
-		gnome-base/librsvg
-		virtual/imagemagick-tools[png,svg]
-	) )
-"
-
-DOCS=( AUTHORS CHANGES LICENSES README TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEBUG=$(usex debug)
-		-DWITH_ALSA=$(usex alsa)
-		-DWITH_DOC=$(usex handbook)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_MP3=$(usex mp3)
-		-DWITH_OGG_VORBIS=$(usex vorbis)
-		-DWITH_OGG_OPUS=$(usex opus)
-		-DWITH_OSS=$(usex oss)
-		-DWITH_PULSEAUDIO=$(usex pulseaudio)
-		-DWITH_QT_AUDIO=$(usex qtmedia)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index ee18a000be2b..60a5ccdd3e96 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,3 @@
-DIST kwordquiz-17.12.3.tar.xz 4168956 BLAKE2B ae201895e4b04e692af562a4adff052f2d6c6897cd7e441f17a1c4613d0a5094fd34d2ab842f4d0661fca35b1a5512b1906ef54179ce22e135d4a0a196c281d9 SHA512 b07d8673c14752ebf38e4ff18771189a701f52435b4c565e4355f48246eb81660f2d0d6d5beb22ca19774e1ec6c0495cf203dcb0e5634609f7f021751e64f561
 DIST kwordquiz-18.04.3.tar.xz 4168840 BLAKE2B 4bbdcc0119f31a5645e6c77e2d4c4bb424ff6572dc8e0192cf26972761ceef2b2fcf9d03b3453bd4f254148a77c3157465c7a137ab0d10d8fc1f8a57adc6146f SHA512 9b8fe36ebaecd49bea700fe74338aef430a2d0f9449eef4c3b1ca3ef84915e49e1fa22a8aa4fd72786cbf0631cbb39477170b0b5ba4e5f713722dd591b55fb55
-EBUILD kwordquiz-17.12.3.ebuild 1062 BLAKE2B af1b796b5bdf1ee2b0768e8fc2dc796923f3c7aaeb103237dd2b960b4d122bfa4f6b89fa2a8ea8d56ccbed138b54703119e21131ce289291a120e1e90a4165be SHA512 29d5c304d3074e6f46fb31b8bdfe161d6ffba70793c133f2658d11e3a2af0e41d2fa121b6f9b1cec1769cf375b7a71785c89ea9509d982b364bee0bccc5d92f1
 EBUILD kwordquiz-18.04.3.ebuild 1062 BLAKE2B af1b796b5bdf1ee2b0768e8fc2dc796923f3c7aaeb103237dd2b960b4d122bfa4f6b89fa2a8ea8d56ccbed138b54703119e21131ce289291a120e1e90a4165be SHA512 29d5c304d3074e6f46fb31b8bdfe161d6ffba70793c133f2658d11e3a2af0e41d2fa121b6f9b1cec1769cf375b7a71785c89ea9509d982b364bee0bccc5d92f1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-17.12.3.ebuild b/kde-apps/kwordquiz/kwordquiz-17.12.3.ebuild
deleted file mode 100644
index 03f108faee3f..000000000000
--- a/kde-apps/kwordquiz/kwordquiz-17.12.3.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
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A powerful flashcard and vocabulary learning program"
-HOMEPAGE="https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND=${DEPEND}
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index 5b695cf1c1a4..537db934786d 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,6 +1,4 @@
 AUX kwrite-18.04.3-root-user.patch 2791 BLAKE2B 504d19baecc1a31c00fe32ed25c4f5c42400b33e788a94559a0833dad0dba0600bf5f763dffbfb4868c213d1825d852c988cded0bf2937f8e5614e5edb953b84 SHA512 b8d71b7e609ae671071419d75dcc6fcfb1577e25d4dbea5f62baafe00862fb45d4d91b01e90cb874a849897a9fe4d3ce50b02ff1b7ac7faaf6f5fc5b9ccf3634
-DIST kate-17.12.3.tar.xz 5629840 BLAKE2B 384b15a1273ec02d0d3342e761f5c1135f000d1b8485445d07ff5384ea49f60c6d4a6aaadd8371d931cbfcab190e4e5ff820021708dbc44899a01340b980e3bd SHA512 3435afb4dc643064c9e98c86e02521cec9d53fb7ad30320e686db6260e3468b3745643447172218b033dcd46e7c9f02efbd00af26ee820b928ac74f5cf62b0a6
 DIST kate-18.04.3.tar.xz 5639892 BLAKE2B 76b36061ec758964e3644fc3893069791e060566646eb03ce0bb6ed04c6c2707f5f48240887078e309128f09e3316ee1bb7076063a8d937d1c4ee67e1dedc906 SHA512 7a41ef21e28e275a448fa80f6d6a7890e221669343c30f946a4522e7f9b4812407ff5b168939508568ce17965fa2dea965aa63062f4fe059a2612021f877694e
-EBUILD kwrite-17.12.3.ebuild 1187 BLAKE2B d4013638f4e083e2bb09d4fd13b8460576be643f743275a6db02cc662c93c498bcd99c8293ef1aab6a14fca1874f3d066c92544479a1bc0636bd942bdb8292e6 SHA512 46a6a9c2da045780652a90adfd6390c3623c1b5da38f75228bd87fe7ad4ca7a0cafda28d926a8e09f5ab49d4027a4c3cf73025a0c54e0a1e05b875458eea755e
 EBUILD kwrite-18.04.3.ebuild 1244 BLAKE2B 560f4a9565e365369c3d03e37ceddf14b15b4676b214fb2b54b30975c3e3f44ea5503336bbaec6f3ed413075bf508767310b6f9c06a47000df5bd00e9cc650c3 SHA512 7f57248d3385701220f03f7a3d5737a388d407cdb5d5913200284822f76e8151d9ab71875cf45838e319ecc2ede69a1cb84ab5174eb9c8aaea8d1c3864864c91
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwrite/kwrite-17.12.3.ebuild b/kde-apps/kwrite/kwrite-17.12.3.ebuild
deleted file mode 100644
index 36b854673563..000000000000
--- a/kde-apps/kwrite/kwrite-17.12.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="kate"
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="KDE simple text editor"
-HOMEPAGE="https://www.kde.org/applications/utilities/kwrite"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-	# delete colliding kate translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "kwrite*" -delete || die
-		rm -rf po/*/docs/kate* || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_addons=FALSE
-		-DBUILD_kate=FALSE
-	)
-	use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
-
-	kde5_src_configure
-}
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index d2a3e0c30b41..f67655a2ae7c 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,3 @@
-DIST libgravatar-17.12.3.tar.xz 30064 BLAKE2B 0bababb8f69e9d18b336e59e15718f0d59a333c3a77801e2a5a1f39d39cdce498b0ca6a76277131194e1292b2649dbd31dfd5ec035cfa4338a2dc62867629344 SHA512 66491e357c8c1c89261abe1aec07fd3e56c45368404c5e06857c9c8bdc95001176eede18446317971e42731d604467ea0b5c829f7e1fb435bd7ed11b8a15f512
 DIST libgravatar-18.04.3.tar.xz 30448 BLAKE2B 1d13632884be127886eef875b8672954d926239f796156a4ec8616a4ff887c3487572c1bd24176ea37ea05c66a00f5906985a31d0193f1bfed78ee78690592db SHA512 ffdf46a77b47287dd6cb761f2885aaa0e8e9426ab721d8e28bd6b4269b4834375643c909400deb19c7e7db2096bb185540a7bc18d06350459fcf2c6fa84db504
-EBUILD libgravatar-17.12.3.ebuild 723 BLAKE2B 0f5d2a3d1a7011380d42421b390af600d9467276583fb75c8840b83d8841ce32146fe9ffa296245107ec8180b554b9006a6d254f73260134803f139b28b7873c SHA512 bc6df3e5eb4efe3fd4c312ecd077d9e40b291f0c19f280f5074fdb5b46449009cfe95592065f1e95ad2df7a7ee9f3b2a9d867ef7616ec190006fe890e94afc80
 EBUILD libgravatar-18.04.3.ebuild 723 BLAKE2B 0f5d2a3d1a7011380d42421b390af600d9467276583fb75c8840b83d8841ce32146fe9ffa296245107ec8180b554b9006a6d254f73260134803f139b28b7873c SHA512 bc6df3e5eb4efe3fd4c312ecd077d9e40b291f0c19f280f5074fdb5b46449009cfe95592065f1e95ad2df7a7ee9f3b2a9d867ef7616ec190006fe890e94afc80
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-17.12.3.ebuild b/kde-apps/libgravatar/libgravatar-17.12.3.ebuild
deleted file mode 100644
index 8123b790a6be..000000000000
--- a/kde-apps/libgravatar/libgravatar-17.12.3.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
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for gravatar integration"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# bug 624584 - needs internet connection
-	local myctestargs=(
-		-E "(gravatar-gravatarresolvurljobtest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index 97185701066d..96db18e1dfe9 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,3 @@
-DIST libkcddb-17.12.3.tar.xz 423976 BLAKE2B a5d4723e01e53c9b168bab44b54e89d16fd5d6689da6bfb677e023ccc4478e30c1e26d682712b4313991820282628a879e4a016397ca5b84f4b53a2158870f5c SHA512 f2131996ed0727a591a3e8a265c9c65f1d1700377ccaf35e9008a2c7aee1222bb3d37d47de9f740011e9fc9c7c13936f5e473f2ccc6990e683ccce5bdd0e95f9
 DIST libkcddb-18.04.3.tar.xz 426936 BLAKE2B 417919ebddc5e837920921b31c85034bfa89916526cb180fd2a30066ce0c845d9bfa31921bdbdeeb71a07274f65b5d01e6d56e44d204a9bca28a59d0ef7ba109 SHA512 b89db360c2e2abea9a347eb8b3a4dcf9f6d8a4ade689aec7bef7ce674706cb28e078ce73440f320f855b1db80c927c3bd6da71554393a8948ecd5e99537ade8a
-EBUILD libkcddb-17.12.3.ebuild 1069 BLAKE2B 0d275ed8bbda299bf0cd8b9178ce2062e2e8a85e1d98b0c01ef93285955c3905caaa4d30a6fce1cf0a7fb1730a68db6b4cafce6b85c53c8b7e3b6ad4c2551da6 SHA512 52eae08f381c5726122a9f41b123dccb1aa39584519962f187f1de2572ab169991e1a8eab62faf08c98a02565d0cd6152b2438d68633466f560b52cdd3a7765c
 EBUILD libkcddb-18.04.3.ebuild 1069 BLAKE2B 0d275ed8bbda299bf0cd8b9178ce2062e2e8a85e1d98b0c01ef93285955c3905caaa4d30a6fce1cf0a7fb1730a68db6b4cafce6b85c53c8b7e3b6ad4c2551da6 SHA512 52eae08f381c5726122a9f41b123dccb1aa39584519962f187f1de2572ab169991e1a8eab62faf08c98a02565d0cd6152b2438d68633466f560b52cdd3a7765c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-17.12.3.ebuild b/kde-apps/libkcddb/libkcddb-17.12.3.ebuild
deleted file mode 100644
index 9eec8f7438f7..000000000000
--- a/kde-apps/libkcddb/libkcddb-17.12.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE library for CDDB"
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
-IUSE="musicbrainz"
-
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	musicbrainz? ( media-libs/musicbrainz:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use handbook ; then
-		pushd kcmcddb > /dev/null
-		cmake_comment_add_subdirectory doc
-		popd > /dev/null
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index 3169b4b3b35d..9aea1d3e0779 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,5 +1,3 @@
-DIST libkcompactdisc-17.12.3.tar.xz 88684 BLAKE2B 6fc33d00d71d03c6bdc8f35eabfcb21d69c14b81c65b88d1272da509a974958ea8c35df33b5c7834592098245dd46d3af132fc644c6203d9517657b871e54487 SHA512 260bac30666eae88575d5a584c89d78a3f39c9281260f07773cbed150eb7ef7f7b65bb41d904bf346faa311a118a6fea955a3cb127a27ee68c91b37b1d516cc2
 DIST libkcompactdisc-18.04.3.tar.xz 88456 BLAKE2B eab93aef5bf446f0c3dcda58ad06fbe6b3a3c969036f2c344635c3203e42aaf2e4b4a0657221f2a9ac838a5ebf20506329fa3e36c1b01d06e8478a48d4a9229c SHA512 b91212fffa3f977bcaf15476abec544dfeb1af82cd9315d338965e000713a8ef43a41e72f07b9d24932f9aeadc99f08737b300cdb9a5df7ddcb5b6087b9e5410
-EBUILD libkcompactdisc-17.12.3.ebuild 574 BLAKE2B ae958c84b73a13ccd9041222779ebccc2a0c3bdc95d6a2f3e9e7240e75a957e9692499202364a0c92d6da8df44c6ac3ea17cccd3de0643df32d249e6fda3642c SHA512 9167faf732377f25cc22b616da9f5fd8b41e6e9960cae6635e14bebef73084a5d74a2cd6964f3c8f48855db1451b225d2ab13e6337e82dc72afdac3e736cdbe4
 EBUILD libkcompactdisc-18.04.3.ebuild 574 BLAKE2B ae958c84b73a13ccd9041222779ebccc2a0c3bdc95d6a2f3e9e7240e75a957e9692499202364a0c92d6da8df44c6ac3ea17cccd3de0643df32d249e6fda3642c SHA512 9167faf732377f25cc22b616da9f5fd8b41e6e9960cae6635e14bebef73084a5d74a2cd6964f3c8f48855db1451b225d2ab13e6337e82dc72afdac3e736cdbe4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-17.12.3.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-17.12.3.ebuild
deleted file mode 100644
index 1e0358334e14..000000000000
--- a/kde-apps/libkcompactdisc/libkcompactdisc-17.12.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="Library for playing & ripping CDs"
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="alsa"
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	media-libs/phonon[qt5(+)]
-	alsa? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index 063c2cfca041..aad7464ac2d7 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,5 +1,3 @@
-DIST libkdcraw-17.12.3.tar.xz 41840 BLAKE2B ce2fca321aae3fd5121e883299b2e10aaf79befbc4bbce0488f88200cf2816a9b83cd035e2af1c382751e8eca5d369ea88a63eaf71b1e7987eccb9e69f7198ce SHA512 f8248b22636b07083af84bcf66cddbca91cfe3d3966299f1d6c18681474d01fea395c4f855a628cfe5ec857efd4e4965cdc987463b8ff661f3425e81aa2f2eb9
 DIST libkdcraw-18.04.3.tar.xz 42080 BLAKE2B 70d8aed9021c193564152f10016acc327710b2a96abd8f9ceea8ead2e467f51659e68888b8942aa7f2bf7b756515ff4005f5966db0a52add5fb5ee9118b0ccdb SHA512 2544319d3b393e7fb2e21c357f0a602a1a3865f6111d18d301e1eeee5a38b14377e6e3c347eed4af88fdc652122611bacf2c2a32f4debacf7cbef12f270b86d7
-EBUILD libkdcraw-17.12.3.ebuild 335 BLAKE2B ae7616f589ffffed7ca9359049803e5093e7efdd43abe3fa7fa9b3ddd091b303e1199021bd8e981bf8d9b1aec9039e13eda7daf9334a7956b62ef52ebf3e23c3 SHA512 455ff7b3f70c7c8354e83f738f6d442c6331eba752d2079807d01c42c94d8581fa33708c5baa5a800eed348718e2f206628777f8ddf9f9f16a678cf53d442c38
 EBUILD libkdcraw-18.04.3.ebuild 335 BLAKE2B ae7616f589ffffed7ca9359049803e5093e7efdd43abe3fa7fa9b3ddd091b303e1199021bd8e981bf8d9b1aec9039e13eda7daf9334a7956b62ef52ebf3e23c3 SHA512 455ff7b3f70c7c8354e83f738f6d442c6331eba752d2079807d01c42c94d8581fa33708c5baa5a800eed348718e2f206628777f8ddf9f9f16a678cf53d442c38
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdcraw/libkdcraw-17.12.3.ebuild b/kde-apps/libkdcraw/libkdcraw-17.12.3.ebuild
deleted file mode 100644
index df8d8a33e856..000000000000
--- a/kde-apps/libkdcraw/libkdcraw-17.12.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="Digital camera raw image library wrapper"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtgui)
-	<media-libs/libraw-0.19:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index e5f7fd155de1..f44e994b1bcd 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,5 +1,3 @@
-DIST libkdegames-17.12.3.tar.xz 5941232 BLAKE2B 6cb6f92c374f09c4c8f51bc34a163584ba48f44e9efc0408fed539cb9567d98f5c10ed1208a38c3117e64993826e006739a252623237028a9f2e1943d837f5c6 SHA512 159a2d6e84600e3dd92455c143ee0f8084db35e5f13a1d05013e8afbacf2d56cc9f67f1215be38ec420cdf66cb026d9e51b0f0d0daad76e3370374cd4317cd8b
 DIST libkdegames-18.04.3.tar.xz 5950408 BLAKE2B e0f02dff36e4d906c48da59a5b43271bea58aa2606980a31aa1b0f2c11741eae125c3e82a4a75eb391162a8b54248cc7ed687c17ced2a15a2e3f30e3040cb36d SHA512 ac31eb0c7308bfbf9d55f2cbfaea6a50d3f6b1c70420c17e2dcb9269b67831738bb1ddbb254f30bf4c6e34b90272b6c254d2bb5387452d0e6615a87a7be40c46
-EBUILD libkdegames-17.12.3.ebuild 1278 BLAKE2B cc571e37412a87bef3391d21cbbecc7a374f56202910e10d59179e7ebb68f61a91b7cee5d19487d5bd56206e8a21e8072f372244ae62f0df80c5f3352b2a8987 SHA512 e8e8cb5dac8db9f01df93954ac12013ae64cd91c30fdeb240ae164613aa7848f9419323b5385ea544616fbf3cfe49377a6454fff04a26061b1b2f2f8cfba3b7b
 EBUILD libkdegames-18.04.3.ebuild 1278 BLAKE2B cc571e37412a87bef3391d21cbbecc7a374f56202910e10d59179e7ebb68f61a91b7cee5d19487d5bd56206e8a21e8072f372244ae62f0df80c5f3352b2a8987 SHA512 e8e8cb5dac8db9f01df93954ac12013ae64cd91c30fdeb240ae164613aa7848f9419323b5385ea544616fbf3cfe49377a6454fff04a26061b1b2f2f8cfba3b7b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/libkdegames-17.12.3.ebuild b/kde-apps/libkdegames/libkdegames-17.12.3.ebuild
deleted file mode 100644
index 4896ec57cc15..000000000000
--- a/kde-apps/libkdegames/libkdegames-17.12.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Base library common to many KDE games"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdnssd)
-	$(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 knewstuff)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtxml)
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 9dd34ebbc402..594c7bee1153 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,5 +1,3 @@
-DIST libkdepim-17.12.3.tar.xz 339628 BLAKE2B 318002f913bc16750f89c516a1f85e400caa7e11cd0e166fe5ba476927c49476700bc486ee3e20d38fe910ee109c95eb4cc0e54cbdef4bd80ccb0d3965177dab SHA512 e5e2afa569513d937c4f5f88909f158e7fbb067eed1a5a6ea7d6e91a784f75547e6f63e20a1d0bc9022229a695a010af43da6d7aa34b9f86cac57503aff436c0
 DIST libkdepim-18.04.3.tar.xz 341360 BLAKE2B ccb6ee69a1110717be95bd305178f5e4ec017172dff4066779094f3def40d08551f855dad12c794d0c61c6076c1de4a0e1856b579eb687e2688f42779cee9d1d SHA512 0f2cbb71c54ed8477159a2d628222b36e791b9e626c736dcc5318ca9ae2c77a1958efbd3f535ff772fba9606734fe1017c2cfcfb18786694946fa7be40755ed0
-EBUILD libkdepim-17.12.3.ebuild 1065 BLAKE2B 81cf1c504eec9b5df7d634929733a64b718ac73fd33f9392e85302259581c4b764c593e03362517a1fba2097ed7a110e66469faa34e80011697b6591e9dfe73e SHA512 6407762a57ee1d30d4d853e93914c59c0c6781a49eba791386de97b1114cb1067b27e919d0cc57c506e35aefe3310b272b9148a0061fa10f0133b0c1965ede99
 EBUILD libkdepim-18.04.3.ebuild 1065 BLAKE2B 81cf1c504eec9b5df7d634929733a64b718ac73fd33f9392e85302259581c4b764c593e03362517a1fba2097ed7a110e66469faa34e80011697b6591e9dfe73e SHA512 6407762a57ee1d30d4d853e93914c59c0c6781a49eba791386de97b1114cb1067b27e919d0cc57c506e35aefe3310b272b9148a0061fa10f0133b0c1965ede99
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-17.12.3.ebuild b/kde-apps/libkdepim/libkdepim-17.12.3.ebuild
deleted file mode 100644
index 4767f37268b8..000000000000
--- a/kde-apps/libkdepim/libkdepim-17.12.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(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 kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kldap)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index b4de624ab8cc..21fc1bd5ab4c 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,5 +1,3 @@
-DIST libkeduvocdocument-17.12.3.tar.xz 205608 BLAKE2B 5f25f6b96ca0c892fd746ecb3acc1c0799f7fbbef0e33611d28c30a56129ef0f0ae0e94db9abde02152f8394779902951be0c008e41b4938bf84f6a45cfa2799 SHA512 658b3a37483405f70e619054f4e99ddf23e590d4ca02f081f7ba217c6366f1db69c4de3041264fd7aa2610c20f927f810c5904a4b70dc7740609e2bb71349c4a
 DIST libkeduvocdocument-18.04.3.tar.xz 210388 BLAKE2B 5026f210d3fabccb2b980596cbc98e48ddb2a0f26636e35075f414fce131a12c052008603e8683b13ef4ada53b9763744f2f2a08bb51c71425cf4c5bed65fcc4 SHA512 a703357c2444ee20ad38620575e07d6dcd8f49c45bc2e5b5fe464738d829df4d3847fc1f79698d309d88d6a652fe38ebf9776ce4d39dd11ddf774e77ef1dcfdb
-EBUILD libkeduvocdocument-17.12.3.ebuild 599 BLAKE2B 3b0c2e79516e1084349d8088ddc01bede11ef22d9b5e439b5c86e9cd7ba3b7800d1089aab8c9357f0db802ed8bf2f00b509190c226241867567f317bb085d0dd SHA512 5cf55d956909d21739659cc8f2951d93a665e87451e6a30775ccdaa1358cc0302b2c59c3efcfc3c3a27141b05de42dfea553908b68dd22309e11077edecdf26e
 EBUILD libkeduvocdocument-18.04.3.ebuild 599 BLAKE2B 3b0c2e79516e1084349d8088ddc01bede11ef22d9b5e439b5c86e9cd7ba3b7800d1089aab8c9357f0db802ed8bf2f00b509190c226241867567f317bb085d0dd SHA512 5cf55d956909d21739659cc8f2951d93a665e87451e6a30775ccdaa1358cc0302b2c59c3efcfc3c3a27141b05de42dfea553908b68dd22309e11077edecdf26e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-17.12.3.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-17.12.3.ebuild
deleted file mode 100644
index 4b826a7a8405..000000000000
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-17.12.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for reading/writing KVTML"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare(){
-	kde5_src_prepare
-
-	if ! use test; then
-		sed -e "/add_subdirectory(autotests)/ s/^/#DONT/" \
-			-e "/add_subdirectory(tests)/ s/^/#DONT/" \
-			-i keduvocdocument/CMakeLists.txt
-	fi
-}
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index 4753e0fc28d6..c4bf7c6864b4 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,5 +1,3 @@
-DIST libkexiv2-17.12.3.tar.xz 64296 BLAKE2B 048fc2190770694fe76d1f0add3586fe3a8db0bddfb86714d1955753c9243863350912dbab670433f32f46051154b5fa9c0090794e3c46b70128cc42b73b8f9c SHA512 a442ab46a7dbcc7fe39e4907851d272dc8645a2e18c7a04de9723f6456aa04131f90def553ad922f51773574be753f13a0107cc85f39d1b136d1c422d1791fe7
 DIST libkexiv2-18.04.3.tar.xz 64512 BLAKE2B fbd31c115e7292be62aa656c3b8c3b37a34b1740b1658b8d58f5a725d890abd55e2fca7cc646ea74af2adc30279b077ccca6e55c09ee0cc0a3207c5af6203ce0 SHA512 29c8295510d9b07204ab870ce86f5c9aede03459a906e356e8a1b63a89b24ff4d5f93ef13ea6080e1fb88e91e4694885892d88b3e822cade7cf09435f49d115a
-EBUILD libkexiv2-17.12.3.ebuild 356 BLAKE2B aaca5ff52a0b87eb93324ef09899225558c281b241cf6b11aa08a2d16b57118dc3d94a45a6bb5b0475715e205994c646ad54eccb0aa5fcb8aa779ce803f86a26 SHA512 75fb0fa4f9658956aabe61b4b25a8d2cdcd175c9a42d1d33f1a997c142df35243c49f4a9f1e9e94f10db251da8fcecd8bc11fd85e54dd016f868e9b4e0046c8c
 EBUILD libkexiv2-18.04.3.ebuild 356 BLAKE2B aaca5ff52a0b87eb93324ef09899225558c281b241cf6b11aa08a2d16b57118dc3d94a45a6bb5b0475715e205994c646ad54eccb0aa5fcb8aa779ce803f86a26 SHA512 75fb0fa4f9658956aabe61b4b25a8d2cdcd175c9a42d1d33f1a997c142df35243c49f4a9f1e9e94f10db251da8fcecd8bc11fd85e54dd016f868e9b4e0046c8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/libkexiv2-17.12.3.ebuild b/kde-apps/libkexiv2/libkexiv2-17.12.3.ebuild
deleted file mode 100644
index 0c719468faa7..000000000000
--- a/kde-apps/libkexiv2/libkexiv2-17.12.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="+xmp"
-
-DEPEND="
-	$(add_qt_dep qtgui)
-	>=media-gfx/exiv2-0.25:=[xmp=]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 45ce34f1fdf8..ac9e8627f8d7 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,3 @@
-DIST libkgapi-17.12.3.tar.xz 175460 BLAKE2B debb06dd1619024ac29c9529b638f27896494049fe682b3740355a0e375bd0acf27d6e7e431b6fd241fa9285a6a1b1e076b51323aeef7d592e49c624a7e1fa7f SHA512 953ba55c5e645b38bde930a79daaf6129f7271fd2add45609975e51bfcaf516f87ea6f0e3b6811eb655aa0ae0a40d6408a29ed966acf22ee946f7a2b432079ef
 DIST libkgapi-18.04.3.tar.xz 176268 BLAKE2B 2f276af969d20bd22a4e19203499c427cf4d7bdfcaa95165b11449e96f733231dc0d208dcddcf310ca77a8ff380e11dc46d9f0068042d13da44d1e58dce59eaf SHA512 ad60348967b04b050b7809000633585a0a45fc7a8bd6627e5aaa7c62da5b158a6f7c6b46e5144358e7e6e7d427b65b4e6c6e9edf8625fe76f57cee7ed2799817
-EBUILD libkgapi-17.12.3.ebuild 755 BLAKE2B 889eb43fff87414830fb430940bbe90357414780485b0c45d2b9ae39caf3dba7d862c06c45074873acfed8f4556561e17a9c7367bb5da72a9f6b53380abf17cd SHA512 0bbc2a10dba06b6a4d19f32121ef32026f90fd5a50638ef24563409103de7f90b62b639d536dcf6499619357265cd2b48afc1bc3af64b9cd6aef0e845db986a1
 EBUILD libkgapi-18.04.3.ebuild 755 BLAKE2B 889eb43fff87414830fb430940bbe90357414780485b0c45d2b9ae39caf3dba7d862c06c45074873acfed8f4556561e17a9c7367bb5da72a9f6b53380abf17cd SHA512 0bbc2a10dba06b6a4d19f32121ef32026f90fd5a50638ef24563409103de7f90b62b639d536dcf6499619357265cd2b48afc1bc3af64b9cd6aef0e845db986a1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/libkgapi-17.12.3.ebuild b/kde-apps/libkgapi/libkgapi-17.12.3.ebuild
deleted file mode 100644
index 8a625686a4c9..000000000000
--- a/kde-apps/libkgapi/libkgapi-17.12.3.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
-
-KDE_BLOCK_SLOT4="false"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for accessing Google calendar and contact resources"
-HOMEPAGE="https://cgit.kde.org/libkgapi.git"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index d2927d92b337..e5882014c484 100644
--- a/kde-apps/libkgeomap/Manifest
+++ b/kde-apps/libkgeomap/Manifest
@@ -1,5 +1,3 @@
-DIST libkgeomap-17.12.3.tar.xz 149616 BLAKE2B 105229bedee238e85d31e382fde4d3b86e44120f6caa4ed346ba2832f01a71cb9c072a7330679934399a492d4978a72e2cc027810d5f897e4f940d50c19581bd SHA512 8d2a504cd7abf4a70b3ef3d956504279b5e4e8c045771faaced9dec140252a37ccd6ec098e93572530196adb8503de597ba45b340f5a9e787706680e734bbe76
 DIST libkgeomap-18.04.3.tar.xz 150240 BLAKE2B 08d712df6c6d49eb82b21ef4fdff3b6c601f8b289167029c5c673e379e17fb904aceeb36062d437c1e4c5285e8b73a0df8d5485465e228fd4454847df818c3d9 SHA512 37ef1e70742c11e074cea9dab9d96e398637819ad87f6c422c62fab963bfb128c6fab49422135790fb09d2c2db6e920a9e1fccd5c901b460fb4afb567c65e0c6
-EBUILD libkgeomap-17.12.3.ebuild 774 BLAKE2B abed07263428ec8dc362d01d70e992a05d9fe46fcca1649c5f279f84aa78cdc8ab14188e6945179449e42c588766c323129f6854e4f1c7310f7858c62dd72c74 SHA512 98576e08eba5a37853eb64bc01c523f615eacbd2a3fa008592cdec9c94c19e06a6e0763b5d3203f490653678d5496407008d2134eb567e630d2cdaef5820f7bc
 EBUILD libkgeomap-18.04.3.ebuild 774 BLAKE2B abed07263428ec8dc362d01d70e992a05d9fe46fcca1649c5f279f84aa78cdc8ab14188e6945179449e42c588766c323129f6854e4f1c7310f7858c62dd72c74 SHA512 98576e08eba5a37853eb64bc01c523f615eacbd2a3fa008592cdec9c94c19e06a6e0763b5d3203f490653678d5496407008d2134eb567e630d2cdaef5820f7bc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgeomap/libkgeomap-17.12.3.ebuild b/kde-apps/libkgeomap/libkgeomap-17.12.3.ebuild
deleted file mode 100644
index e76edb873914..000000000000
--- a/kde-apps/libkgeomap/libkgeomap-17.12.3.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
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep marble 'kde' '' '5=')
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KExiv2=true
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index 3ed5d0d97635..b7dc4a520c91 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,5 +1,3 @@
-DIST libkipi-17.12.3.tar.xz 103492 BLAKE2B c1833e63fad20cff775d9e047dff4df5ef98df111ddf1742180250248d86413769561f33cb5e32dbf228adc6990684b7376155b502b679a174990c820ae5b9b5 SHA512 de41304046874c95555d25828e4cc89be6391adcad657aa912d0eae62bed1fd52930e420aa24d53ab1fbe47677408416ccd86f3de027839a8cb44cd67a0352a7
 DIST libkipi-18.04.3.tar.xz 103600 BLAKE2B a8bcea9d85ee198eff9530d3cca2b5517db6c33d9746a3cea5e21fb651de5b13260e6ae0036f1840633b434c865d28c85cb846dda21e60a777ac3d7262811dd4 SHA512 3fa2fe8bbc5158bb1b06812ba708ce11feacacee9c9e39030bf4ef570177a8ff13962c02fddf33a6253f8db5d60805c2e1a65fc6264c7ca5d62e81abe3b44523
-EBUILD libkipi-17.12.3.ebuild 565 BLAKE2B acee4da04f26efc545d222e1c19f89798033e9490457538e053b9d2d454a705aca5afa45525db0fd9f46bd79a9f5a5acb3c2ab78f47e63904d3e26d94c345886 SHA512 cd81c2e285559058b0cf2f400cca5ce4ed7ee59f95d695ec92d378e5c1c10d69a25dcd3d23ade4f6ee77fb0c31ccfc92bc4ebe1fd401b7cd10fe0cef63995113
 EBUILD libkipi-18.04.3.ebuild 565 BLAKE2B acee4da04f26efc545d222e1c19f89798033e9490457538e053b9d2d454a705aca5afa45525db0fd9f46bd79a9f5a5acb3c2ab78f47e63904d3e26d94c345886 SHA512 cd81c2e285559058b0cf2f400cca5ce4ed7ee59f95d695ec92d378e5c1c10d69a25dcd3d23ade4f6ee77fb0c31ccfc92bc4ebe1fd401b7cd10fe0cef63995113
 MISC metadata.xml 335 BLAKE2B 5c247ec0a28d838467da7959769e291841df01349fac42c6565236f00d0c20a0f577c3595516ee28f2910ba7b35748accf740ca25004bf299e73220551805a88 SHA512 52f1ab2e6580181b506efe3c169d0697c00fdcbbf12fa711f6affac5bbdb065aefec398bd806c6f75ba9464e2559a371332e35ab33b90bf8cb6d245f220d7d33
diff --git a/kde-apps/libkipi/libkipi-17.12.3.ebuild b/kde-apps/libkipi/libkipi-17.12.3.ebuild
deleted file mode 100644
index adf92e370e9f..000000000000
--- a/kde-apps/libkipi/libkipi-17.12.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="A library for image plugins accross KDE applications"
-LICENSE="GPL-2+"
-SLOT="5/32"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/libkipi-15.08.3-r1:4
-	!kde-base/legacy-icons
-"
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index a3ad07e979f2..739148cc357d 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,3 @@
-DIST libkleo-17.12.3.tar.xz 314656 BLAKE2B 18556390e7dd405f274709df054881ea565973b1fa1b743312506716d9e88dad1680722df35bd0e5d4431394249d5b30caff27456eaa028c61160133374226a6 SHA512 0ed3fd2416b3838a295e877b7f4134f4e5e8abf67229b40a70fb1d2310115e1eb51ee990a3f8f80045169ceddbb5bc4df85b9b9109c3e2fcc9a3f8aaa93cbdb1
 DIST libkleo-18.04.3.tar.xz 318624 BLAKE2B d6a218e686994a163a3217c5a2d3beb8d471e484eb5ff917cad3d0f0a8d7ff336090a6a26beb1117dd09f7283e368d1bd91395d0a562eccbf128bb96a53ef702 SHA512 678c68fdc249dfea337f6f262da1d4e3b20482ab5c4db859a5fef04b8d544c0709e9dcb59fa33bab89a6de550c81ba14883c3d31122849c83674b3dbca00b545
-EBUILD libkleo-17.12.3.ebuild 736 BLAKE2B 9f3303689ba756680690c9760ba4a506b84dd0e08b868130113a5618fabc45ec2648cf8a3c3081a75f124e76a727dd836b8813de6b0950cc5730252e2b62bf7b SHA512 d1cc5597530ec2f1dc6d986835a67aea42a02cf03e4c60d1c893edd4a68fc253c3a06e9bc155a66d8f2e33862ee4657be279a6560e8a2262364910497b3b2366
 EBUILD libkleo-18.04.3.ebuild 736 BLAKE2B 9f3303689ba756680690c9760ba4a506b84dd0e08b868130113a5618fabc45ec2648cf8a3c3081a75f124e76a727dd836b8813de6b0950cc5730252e2b62bf7b SHA512 d1cc5597530ec2f1dc6d986835a67aea42a02cf03e4c60d1c893edd4a68fc253c3a06e9bc155a66d8f2e33862ee4657be279a6560e8a2262364910497b3b2366
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkleo/libkleo-17.12.3.ebuild b/kde-apps/libkleo/libkleo-17.12.3.ebuild
deleted file mode 100644
index 6da54a9c04f2..000000000000
--- a/kde-apps/libkleo/libkleo-17.12.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Library for encryption handling"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index a5c3dc5bc2fb..4eeda4f821dd 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,5 +1,3 @@
-DIST libkmahjongg-17.12.3.tar.xz 1684924 BLAKE2B e6be87c90fd56848d7328564478f39451e9f90819ebf5e3df1555e7da2bbfb4417d6c08586b3e91ee4d76d585bff468d1609c9de2a6b0fa1bfe4a9cb6b65bda1 SHA512 ce98494e7f6169176f1ba6bd612adbe69ff725d20881f9ddea358bf31a52a15913653dc774c00ae7f805d6d4e0c563d77ebbc724d57425583d49bb093c94c83f
 DIST libkmahjongg-18.04.3.tar.xz 1683728 BLAKE2B e821c23da691408b9f6c5fc8ad222317c497a27f221030e830201bfb180ac547269b9a2a4b095b7fe5535aff2ff9fba4c143eb4fd5ddd1ea349870f708b0ffef SHA512 f8ef97f0bf5fbd8c1dd923b26c42138f317a8b87df50261318ee438f29d53a99aceaaf077e24b36ab46e9f564761dcf389160cc657c6bec5ddf1c1ff3eddc87e
-EBUILD libkmahjongg-17.12.3.ebuild 546 BLAKE2B e57ea6057346bd3e9da580787aa6687cc0a81c075412c2b10d5fb4e6eb06bb5e8158430e71325f0ded62c2bdc14088d6eb4d015e198b6a71e46edf5c9faa10e8 SHA512 d3ff2d9cba4ab97be8ef283af7b2e2c140d86a9a36091806d6723779b7200027e16fa5f9f7dd4a452f8484e800105af77c3cf1c5820d9bf570eb077b2253c9d1
 EBUILD libkmahjongg-18.04.3.ebuild 546 BLAKE2B e57ea6057346bd3e9da580787aa6687cc0a81c075412c2b10d5fb4e6eb06bb5e8158430e71325f0ded62c2bdc14088d6eb4d015e198b6a71e46edf5c9faa10e8 SHA512 d3ff2d9cba4ab97be8ef283af7b2e2c140d86a9a36091806d6723779b7200027e16fa5f9f7dd4a452f8484e800105af77c3cf1c5820d9bf570eb077b2253c9d1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkmahjongg/libkmahjongg-17.12.3.ebuild b/kde-apps/libkmahjongg/libkmahjongg-17.12.3.ebuild
deleted file mode 100644
index 8de9b83ae94e..000000000000
--- a/kde-apps/libkmahjongg/libkmahjongg-17.12.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index f93326583b0e..a29ad029190a 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,5 +1,3 @@
-DIST libkomparediff2-17.12.3.tar.xz 173804 BLAKE2B 51c3b5020ad614e947c69e6134954bfcb31a989970e8a5bb38781ba15c6c25b9c2eb05cb5026b7e22bb8481bf1a7a4c95498331aa4626ee6a86f154b13fb225e SHA512 d0a36eebf6bd64f69a49ff2908cb37672bd1ca8778e515e6638d199a626175026cbbca4ebbc7bd8739c683195e203162139833c24b1be4adcb019730d4ddc1ae
 DIST libkomparediff2-18.04.3.tar.xz 176752 BLAKE2B 7747d0332220f7459b735b2d1def2ca6bbdf80923530164d447795e8a3a1e01673661e1918dcfc11a8b8081ec8157990bdc53758455332c9ad92e6b1cf7cca24 SHA512 ad8772a7f1aa85b3c0d5e6fa7720df1399f7dbcc84a5be23da1a65106e139dcd8006f7c99975e07f8b8b1c8d706a89ac4718f10569f419c15e54835dd8e41931
-EBUILD libkomparediff2-17.12.3.ebuild 530 BLAKE2B d8b0ea58712bf6f90fcf89a5cd3a6674c7cfe1639c7abfcf00159fdabdd868679baf6438d03fa6d24811dee5222c11bd195996744a1776e702f71ce2f417902c SHA512 eb1e7e4ffa3bb48746d6032f6b4d08756021609cee91f1fab8aeb81ac3a9135a7bfeea3980ee8bf930813af2e7b8ecb6b9734894b92e9bd000b22627acb43601
 EBUILD libkomparediff2-18.04.3.ebuild 530 BLAKE2B d8b0ea58712bf6f90fcf89a5cd3a6674c7cfe1639c7abfcf00159fdabdd868679baf6438d03fa6d24811dee5222c11bd195996744a1776e702f71ce2f417902c SHA512 eb1e7e4ffa3bb48746d6032f6b4d08756021609cee91f1fab8aeb81ac3a9135a7bfeea3980ee8bf930813af2e7b8ecb6b9734894b92e9bd000b22627acb43601
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-17.12.3.ebuild b/kde-apps/libkomparediff2/libkomparediff2-17.12.3.ebuild
deleted file mode 100644
index 11867f72f524..000000000000
--- a/kde-apps/libkomparediff2/libkomparediff2-17.12.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE library to compare files and strings"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index 5bc9a13748ce..29033a28458d 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,5 +1,3 @@
-DIST libksane-17.12.3.tar.xz 136860 BLAKE2B 35b0a42949e007bdff85f9d6a68bbb52679e7d0307565f526354c21c0e027973ad5953aecb0dad31efc46927eef7b76dfb330083a9a3899a443d19c45868b1c0 SHA512 37c2e0dffb5cfa46254097668988da5691117b5fb4e93154e585025b031374577843d0c34d88515fc6068f80dd54b3865fb8e202b0b2e7c7a16729737dd79dd6
 DIST libksane-18.04.3.tar.xz 137444 BLAKE2B c7f08d7de29e4a5672de8fe588e768ac7088b204782528777835adcd5b021cb261bc421a271bcb6a2e2a18918b4c04dd396a395123a6ebd5fc3878849f8d38bb SHA512 1e9dcc5ab7ac5a8df0bd20db589da05f067e6611d19b796208fe8d08e92568661707a7e36a84e9bd361a57231652baba5ce23211aff41a7db69ff0aa3abe200c
-EBUILD libksane-17.12.3.ebuild 573 BLAKE2B f1fd3da85259cb1b0e8d9dbeccb1af04aee1d6adb46bd8fc1be7c147b24a4707dd5b5766de6a0818fbeb4d0360d9466473074a854a342443607765ae3233dfb2 SHA512 28dffc81aa825234a80e0be688b8ad8ef18f708981682d4585a219267204ad847ab9d0949f66ffaec2cc9c18c155fb061a86e069a94d75b4bdc2a4ead8591ea5
 EBUILD libksane-18.04.3.ebuild 710 BLAKE2B cad1599dbabbfcf697b9972b16f897064d05a6a1a4e10936f3680fa3b75b532f2e3bb11aae1a4218f38f9a0c0c2bcd23a9fb5266a190addbc642db8876254df9 SHA512 c141f44b4008aa7f9434431cb3e903943d79363cc62377a24498639f4c4268d342737052168ca6b70af9099c512cc0277519cfa51d88e10c7df3ffc7cf979d29
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/kde-apps/libksane/libksane-17.12.3.ebuild b/kde-apps/libksane/libksane-17.12.3.ebuild
deleted file mode 100644
index c17955992e0e..000000000000
--- a/kde-apps/libksane/libksane-17.12.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="SANE Library interface based on KDE Frameworks"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-gfx/sane-backends
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/libksane-15.08.3-r1:4
-	!kde-base/legacy-icons
-"
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 2f019fb128a6..00eb21cedc8e 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,3 @@
-DIST libksieve-17.12.3.tar.xz 547852 BLAKE2B 28951b1af9ffec39ae86f718dc4dc860337a57f87a92716dc4db7ea1baac08d972210e655cdee1122fab7c0c30aa3ead36e2b4b52a47fb5d8a5cd4ea9fb9785a SHA512 d22dcb9294ff460511f64385988795d9ef16c3fd1766c9fa4e8696c5cde6250c5b499e135e605d97438aec91cbf831a9bed006aa008599d6d0eb1a30bfa5973c
 DIST libksieve-18.04.3.tar.xz 550564 BLAKE2B 0821a88abe282d7d1d5c250088305ae392f0eedc26d54dd727ca1e3fc42769d1e9d1fd6fbaa22f6ca01a5bc817a39fb9eba983de2463516123cc5d669fb8a4d5 SHA512 65bbf4b13d98f7e0f8f01d4f2a2f7631e8cb72c448f8c46d985d5aed7fcb33bf03dc9f5eb7b7fc57b7e6f092b2360a0ddc8a605b4a130d18a5f73aff3cca93bb
-EBUILD libksieve-17.12.3.ebuild 1464 BLAKE2B 812989087ef5e61c75a37c632fb6a11439d3b444b8fb3403f12310cd46c872b3ba5f6295b340be65717fbe55e91bdcdcd9e63904b057b956935cffbfd63776eb SHA512 27610bb20a24088bf895302ae1e08280ff9ce2681170283247a2420f150ab019f51ad9c742d4391c300533d2bb764e3db6490d2374cf939ed1536a1b109bd049
 EBUILD libksieve-18.04.3.ebuild 1464 BLAKE2B 812989087ef5e61c75a37c632fb6a11439d3b444b8fb3403f12310cd46c872b3ba5f6295b340be65717fbe55e91bdcdcd9e63904b057b956935cffbfd63776eb SHA512 27610bb20a24088bf895302ae1e08280ff9ce2681170283247a2420f150ab019f51ad9c742d4391c300533d2bb764e3db6490d2374cf939ed1536a1b109bd049
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-17.12.3.ebuild b/kde-apps/libksieve/libksieve-17.12.3.ebuild
deleted file mode 100644
index 53f6b57f3aeb..000000000000
--- a/kde-apps/libksieve/libksieve-17.12.3.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_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	dev-libs/cyrus-sasl
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmailtransport)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use_if_iuse handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index cfab5f869593..44ac4a0e5bc3 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,3 @@
-DIST ktnef-17.12.3.tar.xz 299892 BLAKE2B 1dee6c9babf502d91540e7c0322dcd6c4d8ac6002887b677a8e2f549f9bc90a77c448f3f3cf2eca1beaaf38613f65dce70dd61765dbb2015569936957c30be06 SHA512 77e86827a0bfbe614cbe170b503c88b298f155a58ca381e914779a7ea2f82cc1fbd655735cc6586b07d8e0f73e3b38c7ff5b94cc4513fdb6de74a82940c468c4
 DIST ktnef-18.04.3.tar.xz 300348 BLAKE2B f6b0498917e74b102e6996916609e80dc60f3515bb83fdc4ac8730356b47ebb1e97c5dad6b813f72177ccced00b6594c394b5650e0328aa11f0d2745079de1e4 SHA512 532bd7ea26676ca523fa1a0cef924badfef71e7ffe92eb95e8581de250b219a8efe97300dc9b80cb7a4cc777cb8c70f39f0ecb4af850db0f1214c23c87cf5c2b
-EBUILD libktnef-17.12.3.ebuild 451 BLAKE2B b0818698561127b95312c67c06dbf836f350874c1433518ede4a2f26eff96a781e1886fa14291c9e936cb95d8060563f0a30d675a7fd7fcc5db4c971a2e4abd9 SHA512 89d2e17a77c1be864b7dc9f5ae11578046754fd0550ac42668918f2838bcf29a98d7e7d9148cbc458048572b114b517d1cbe9d1adc06da168f7f4dcaaba63ebe
 EBUILD libktnef-18.04.3.ebuild 451 BLAKE2B b0818698561127b95312c67c06dbf836f350874c1433518ede4a2f26eff96a781e1886fa14291c9e936cb95d8060563f0a30d675a7fd7fcc5db4c971a2e4abd9 SHA512 89d2e17a77c1be864b7dc9f5ae11578046754fd0550ac42668918f2838bcf29a98d7e7d9148cbc458048572b114b517d1cbe9d1adc06da168f7f4dcaaba63ebe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-17.12.3.ebuild b/kde-apps/libktnef/libktnef-17.12.3.ebuild
deleted file mode 100644
index a9739fedd47d..000000000000
--- a/kde-apps/libktnef/libktnef-17.12.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-KMNAME="ktnef"
-inherit kde5
-
-DESCRIPTION="Library for handling TNEF data"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index 2bd0cabcdc1d..e2284d214440 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,5 +1,3 @@
-DIST lokalize-17.12.3.tar.xz 2219220 BLAKE2B 1f3d0617e7a504f643a52cecf1edbd50c62d4fb789914308fef9579649f0c272710ea0ee3682bceb6280d264481c228a52809bfb2623e0957ec4b1fea8256352 SHA512 02249c1aa91309bd7269eac593282d4b52ded71c7fdf251f01d63a56d7d0201b0def95b701cb5ff149468fc22edbe4022d1633d09adbbfdc8a8038460f3eed71
 DIST lokalize-18.04.3.tar.xz 2862704 BLAKE2B d90e23be2796915baea2ee6b9e40c4bd1c737e80650b15e47d97e55fc70f4b7895478e5929223929e174249f1e2842ab98301223f6be91a4010b1ad591826a48 SHA512 888aad396535c6f81c1d2e0546eeb4033eddde985ad4e956ff95bfb4fa5e197ccaa0337f29e724175794357846efe6e2cdb7cd22ae0860469b01359ad506d757
-EBUILD lokalize-17.12.3.ebuild 1551 BLAKE2B 01b4ac0e17aaa796ef8db9fa0dd1907eef6f3d95bbb893b47d6f1ac5458bbcc568c9b635c70f02e6f628b5c1f14e0405608da680fdcf00ff0217dab0ed294b97 SHA512 1eb3598f2a061cbe443a386d611083f24fde12fbafa4e18c08823eb5f21d02b5210a2688b821658a0c414768b546becd461c4bb091f3b4b703a887e2bfd12607
 EBUILD lokalize-18.04.3.ebuild 1553 BLAKE2B 2dbb0cf7df0e481d385543cb1c9ea084cfb4520d464ad67f5e02391a624e0dc159cb9514ecda449a193ee9c20f6f5c580e0ee636762d1760d364e9e3388b1ed1 SHA512 baff4358fef9dca4e62a7fcb37c053a6a792d5a07143995b518049414ed8f162e57eae23378f25fb2bd1ee583a673636efe960fb7ba6cf7b76167735359d553f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-17.12.3.ebuild b/kde-apps/lokalize/lokalize-17.12.3.ebuild
deleted file mode 100644
index a970f8b9e414..000000000000
--- a/kde-apps/lokalize/lokalize-17.12.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-inherit python-single-r1 kde5
-
-DESCRIPTION="KDE Applications 5 translation tool"
-HOMEPAGE="https://www.kde.org/applications/development/lokalize
-https://l10n.kde.org/tools"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(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 ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=app-text/hunspell-1.2.8:=
-"
-RDEPEND="${DEPEND}
-	dev-python/translate-toolkit[${PYTHON_USEDEP}]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_install() {
-	kde5_src_install
-	python_fix_shebang "${ED}usr/share/${PN}"
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version dev-vcs/subversion ; then
-		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
-	fi
-}
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index 2cb4e0a5d04d..f634ec442474 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,5 +1,3 @@
-DIST lskat-17.12.3.tar.xz 1216536 BLAKE2B 74fa8783569827a65a4554cb77a14fd61fb966c766b170f441d3c6655036ba0c582ecdbb06bd23a889ea759ccc34cdd80d6050fa8874d0e4cd8d22342c7f113d SHA512 519f68ab80771cd0704eb7c0afb3ef0c8b0f8e11d7cefed7e30a966dd0445adce9f6fe3a539be126640f70fd827f3f59a876d780a887e1086132ef6fdb8948b8
 DIST lskat-18.04.3.tar.xz 1217296 BLAKE2B 2a4da1c93a88a1eb9058c110ea33828e463c1f063396768b8f14302f0ab67bab090dafcc7d209c287522225513dc0abdb4660993e5b05b6d8dc2f181fc75b3df SHA512 8951df28673e51f48ef2002049e34315b8102db2099cfde1d3c671fb2a332f4c44691a771ce9dcb23b46942304bb60a6e80371011fb7340e6038d887357048c9
-EBUILD lskat-17.12.3.ebuild 729 BLAKE2B e827015aceb86093a7a185aadc8532565d70a2d2bf3a1215e5604d2e1b2e29a13127866b96d28a9aeda7b0ace684b1d4cd1a934b6e40d863ff67a0712a01014e SHA512 0169e697827de480129f379829dbf56917c52ee09c8d09aa1a85eee10920a50ff3ab9fcae502acfefbaa9c897dea66171e6a328a913e71d69a13c8b4fe050f2c
 EBUILD lskat-18.04.3.ebuild 729 BLAKE2B e827015aceb86093a7a185aadc8532565d70a2d2bf3a1215e5604d2e1b2e29a13127866b96d28a9aeda7b0ace684b1d4cd1a934b6e40d863ff67a0712a01014e SHA512 0169e697827de480129f379829dbf56917c52ee09c8d09aa1a85eee10920a50ff3ab9fcae502acfefbaa9c897dea66171e6a328a913e71d69a13c8b4fe050f2c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/lskat-17.12.3.ebuild b/kde-apps/lskat/lskat-17.12.3.ebuild
deleted file mode 100644
index a6f4868601af..000000000000
--- a/kde-apps/lskat/lskat-17.12.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK=true
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Skat game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/lskat/
-	https://games.kde.org/game.php?game=lskat
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 4c2ac2263473..84641d502723 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,3 @@
-DIST mailcommon-17.12.3.tar.xz 683392 BLAKE2B bb4796e8ce8fee59e3b4849c2c7c386ada08f77e2c2c15b9425f29c32efc3c65bc4bf9f667fd4e465e7c5f218ea5830ac8a0416a956606c5c12f6918ee8e3b8e SHA512 49c6ad5844cf5f4f884b7cdbbb855973bf8d0e5b9630700e926b75024b6aab98f5f7e05dec6dace3648181f2c57e07344245b2d49c3f293e378310f4b647450b
 DIST mailcommon-18.04.3.tar.xz 692256 BLAKE2B f216b27717513fd034ebc22c392520d24379d317a383a1ede3a7b7be19b163bd104b45daadf75a2986d049d6db3695243c5ff9a5169fe5b75eb525ec20e2fae1 SHA512 0e9a815346ab4fed073b11cac2ee7d9e3612ae494e35937f6c0695e2572f7a07c17a0595274a4f806ee48f79192914506c6c6966811458cdf0b6d7420d8e0bed
-EBUILD mailcommon-17.12.3.ebuild 1439 BLAKE2B 6afe7626b6cf19240d45ffc4057e3be1eb77b2b15cdba71255b01de6a9c36dcf0f805efde511afa09c38ba1b6562c52f263b12883be15a3fb932608984cd03ab SHA512 9f535e7696aaaf7395ddad6927bfe3e6ebddeceeb6ddbbe37511427a722179850d251646959958e6682055b62f9760d1f803e3bfeeb67a2da0c200b970907667
 EBUILD mailcommon-18.04.3.ebuild 1439 BLAKE2B 6afe7626b6cf19240d45ffc4057e3be1eb77b2b15cdba71255b01de6a9c36dcf0f805efde511afa09c38ba1b6562c52f263b12883be15a3fb932608984cd03ab SHA512 9f535e7696aaaf7395ddad6927bfe3e6ebddeceeb6ddbbe37511427a722179850d251646959958e6682055b62f9760d1f803e3bfeeb67a2da0c200b970907667
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-17.12.3.ebuild b/kde-apps/mailcommon/mailcommon-17.12.3.ebuild
deleted file mode 100644
index 73f5cc14a82e..000000000000
--- a/kde-apps/mailcommon/mailcommon-17.12.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common mail library"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-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 kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index fb2064351ccd..e93740069dfb 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,3 @@
-DIST mailimporter-17.12.3.tar.xz 541040 BLAKE2B 42152e6205c7cd0320c6475f731af1cb1877ebbaf7b1b77fd3c84d2474ef7fd9b815e3640fbf962d283627b84cd5096a200e030ff8f22ad4052a8df27fe977ac SHA512 a3485867ef68499660c6b9b078a75892df0fb880a050699543fedfd32992deda641d1477c3f30036d59cdaf926a83ff868cec700a394e595216d0094870f8ded
 DIST mailimporter-18.04.3.tar.xz 541376 BLAKE2B 7a2bd20c220a529642b73f807e11d703cabc9d8cede9d7234611a1e3b63a8aacbbd80e68bd643658db3df82388b474834ee1bf212fe31a908c0089d91b5a11ee SHA512 43428107fafd7c1888249fb77593d1d4476326c2aa31eff5ec5162d042379f2eb92905acbf829955142b3cf6eb191e0f72e5d34725d29c013488bdb334217fbd
-EBUILD mailimporter-17.12.3.ebuild 652 BLAKE2B aaeaf5851aff5c9785c614f4229218af0597bae46c8ff3071037df37037e9d494981209f7b2ce9a8ebc95260e40097860ffba31f915f0d5edfe82a25a31e57ea SHA512 6f7383f6b8195bd05773c49ebcaf97d6dafcb3241694dc5416b294e5e6659b03b437ed39688c8015ad7766fa85e97a1b4201d6229644c89c17d572be46c62861
 EBUILD mailimporter-18.04.3.ebuild 652 BLAKE2B aaeaf5851aff5c9785c614f4229218af0597bae46c8ff3071037df37037e9d494981209f7b2ce9a8ebc95260e40097860ffba31f915f0d5edfe82a25a31e57ea SHA512 6f7383f6b8195bd05773c49ebcaf97d6dafcb3241694dc5416b294e5e6659b03b437ed39688c8015ad7766fa85e97a1b4201d6229644c89c17d572be46c62861
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-17.12.3.ebuild b/kde-apps/mailimporter/mailimporter-17.12.3.ebuild
deleted file mode 100644
index 3d74eb52e527..000000000000
--- a/kde-apps/mailimporter/mailimporter-17.12.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library to import mail from various sources"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index bd6ea50e4bd9..f923f208fef1 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,3 @@
-DIST marble-17.12.3.tar.xz 52353704 BLAKE2B 529d889631fc5c2409d72bc7b1626673957db3db1b8e40478668596a3993dea67fd9f6d341e62ad426d1cc8e4295726471247bb9c2dc7fdf9439c4304f6bcff8 SHA512 a370f6bbce35ad4d4eb5a6d372939691322c81b7108fe64468ac3a2d491d0eb71e6c3135106e33d59115008a527aba60d2bd3508df721b5728286f526f199064
 DIST marble-18.04.3.tar.xz 52432816 BLAKE2B 103aadfd9e9e940b6c090f124f29464925c2e5f6adefbeac476ea5f8fc5c5eacf9af4171959f6a17d6d7fd5d287b2db8b246a08d0af045c5529f8eb92b566744 SHA512 26a29e6648516e99c6ae33a6253fa4922271a412eba14212af24cf33dcab8845533eb4c1a8fea11b61f20c0a5c34007ed9e0db8edb3590b01a01404ac4493704
-EBUILD marble-17.12.3.ebuild 2246 BLAKE2B 3419d417193227f60d58e636982adef8c5cf42dc0ca0f136a3f349dc4b5f1211709f32eedd042faca10d333e905e879b6bfcaa562f2b97626711aced0007ecf3 SHA512 51b20869705dfcfc4a304da541c3a79eb7e3ae354f103080aded77d0929ca4e8541e3441c85f904be32409438411c4c532ef85ec6088bc3d49672851709a9644
 EBUILD marble-18.04.3.ebuild 2246 BLAKE2B 3419d417193227f60d58e636982adef8c5cf42dc0ca0f136a3f349dc4b5f1211709f32eedd042faca10d333e905e879b6bfcaa562f2b97626711aced0007ecf3 SHA512 51b20869705dfcfc4a304da541c3a79eb7e3ae354f103080aded77d0929ca4e8541e3441c85f904be32409438411c4c532ef85ec6088bc3d49672851709a9644
 MISC metadata.xml 555 BLAKE2B ed7e086f8e61359a372578496b4fe57dc271bd0b55dac188774cdc91131771a2ae6b07846fb80c59205350cb0e806e67cb9cd66fc77b29cef6d81dce2f4bc286 SHA512 d686018c9a8e8ee6cfb4504506994d4fbdb75c615b866356f7280b5f6d6a49ad71539cacab5868ada9f67f2ab22a3cc89f78121034424ace4be98307fff2faef
diff --git a/kde-apps/marble/marble-17.12.3.ebuild b/kde-apps/marble/marble-17.12.3.ebuild
deleted file mode 100644
index a962ad299e6c..000000000000
--- a/kde-apps/marble/marble-17.12.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SUBSLOT="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/"
-KEYWORDS="amd64 x86"
-
-IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit"
-
-# FIXME (new package): libwlocate, WLAN-based geolocation
-RDEPEND="
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	aprs? ( $(add_qt_dep qtserialport) )
-	dbus? ( $(add_qt_dep qtdbus) )
-	designer? ( $(add_qt_dep designer) )
-	geolocation? ( $(add_qt_dep qtpositioning) )
-	gps? ( sci-geosciences/gpsd )
-	kde? (
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep kcrash)
-		$(add_frameworks_dep ki18n)
-		$(add_frameworks_dep kio)
-		$(add_frameworks_dep knewstuff)
-		$(add_frameworks_dep kparts)
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep kservice)
-		$(add_frameworks_dep kwallet)
-	)
-	phonon? ( media-libs/phonon[qt5(+)] )
-	shapefile? ( sci-libs/shapelib:= )
-	webkit? ( $(add_qt_dep qtwebkit) )
-"
-DEPEND="${RDEPEND}
-	aprs? ( dev-lang/perl )
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-# bug 588320
-RESTRICT+=" test"
-
-src_prepare() {
-	if use kde; then
-		sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
-			-i src/apps/CMakeLists.txt \
-			|| die "Failed to disable marble-qt"
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package aprs Perl)
-		$(cmake-utils_use_find_package geolocation Qt5Positioning)
-		-DBUILD_MARBLE_TESTS=$(usex test)
-		-DWITH_DESIGNER_PLUGIN=$(usex designer)
-		-DWITH_libgps=$(usex gps)
-		-DWITH_KF5=$(usex kde)
-		-DWITH_Phonon4Qt5=$(usex phonon)
-		-DWITH_libshp=$(usex shapefile)
-		$(cmake-utils_use_find_package webkit Qt5WebKit)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
-		-DWITH_libwlocate=OFF
-		# bug 608890
-		-DKDE_INSTALL_CONFDIR="/etc/xdg"
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index bc767dee38b4..75fbd3cbc062 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,3 @@
-DIST mbox-importer-17.12.3.tar.xz 32868 BLAKE2B 12d8d215e019a65e4f81239cda524cde0ea16dea78ccdde7fc5c7cef12234b2771ad140e29ba9d96b277188dc43f2faebb98f7ebffe9aa12b92ef5d69f777d0a SHA512 018aaa5f533dd70c1e11b164e9ea948dd04b31d6747cd879ee082fe0544b32a5d5223e9708d489c96b1b95f662d549a207c336555a6e16c28cd57345d8d50bcb
 DIST mbox-importer-18.04.3.tar.xz 33656 BLAKE2B 94febc2a7a72db0a5fb9956247e3debf312b0787765f0712c2ac5f364b85cbce05c970343b5fad2b3fff96b69c2e5ef98068a4565f39a065f482e2a91a371988 SHA512 afe51f226326a9b94e81dd65d6cd0fd9ac6e5dd2a50cc6a8ae2b856bec371c8739b375ebf150fb778a76f1d62f175dc80fa9260655d0a9d964fbbf874d9da241
-EBUILD mbox-importer-17.12.3.ebuild 825 BLAKE2B 11afb1b2de82dd61e9d11e97ce26ae6bb992e7258a35e54a81af71a0007a377f31e0c26ca4bba99cbba271788b817f911fa4b49806d189527343aaa0e545c592 SHA512 bcef7a6cf789a20310b5de726944689465a4bcc1263b0f65f4c3f8463834ac1e9fee9024745ed1b0a364b05a2edf42c517f687681f6158bcc3a1ad36cc71a8ff
 EBUILD mbox-importer-18.04.3.ebuild 825 BLAKE2B 11afb1b2de82dd61e9d11e97ce26ae6bb992e7258a35e54a81af71a0007a377f31e0c26ca4bba99cbba271788b817f911fa4b49806d189527343aaa0e545c592 SHA512 bcef7a6cf789a20310b5de726944689465a4bcc1263b0f65f4c3f8463834ac1e9fee9024745ed1b0a364b05a2edf42c517f687681f6158bcc3a1ad36cc71a8ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-17.12.3.ebuild b/kde-apps/mbox-importer/mbox-importer-17.12.3.ebuild
deleted file mode 100644
index 476a85c1e0ba..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-17.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-inherit kde5
-
-DESCRIPTION="Import mbox email archives from various sources into Akonadi"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index a9e246208eed..064e93b3f1b6 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,3 @@
-DIST messagelib-17.12.3.tar.xz 10462804 BLAKE2B 4fb020e5f351a14fa73cd8a648440bb2da8b9658fafd36fa58b7499726bce480e5d452c64a3ca5cc2e8b99596088b858601dc97311bd3ab6b8fceaf0ac2738f3 SHA512 db83fe6de67a4fb2a805d8aaec8de6455509868e1bf664bcd5a3f6d25ec100dce71ca517d4de11c9bacaf194c2dcab78b83c15ef0d0eb82a789ad1af5a352412
 DIST messagelib-18.04.3.tar.xz 10461448 BLAKE2B 812f5679a6bbca72da39c980ce10581b96cc844a7c38b87a9d5ea5eb6b6ec58b26b561fd4abdd782d39012d314aa0a5134683454a604ba28a1cdd301ea53f25a SHA512 4aed5990ccb9f5f1fbe5b6d71a63a2ec2f342a7eee81953417f3ab9537200fe66f95d742ffd6ba4f2a9f794b0b119db2e3f3d0766344c8459e1b23b043f11fce
-EBUILD messagelib-17.12.3.ebuild 1937 BLAKE2B 2237b3b9c9742e7db917847cb813d8a84ee64de76870e5a3c5cb2400b2faf67fc63e5c08ab68d436b02a4e0500bd847c32e915eb01c1c17914a32907505ea6d4 SHA512 29b95b086b5e8b2a4edb98b10ca1b7b7d88afa8f557496c7a88557631b6fa47c05085e7e7a234a6fc8df2319eb8aba4e9aaaaa405530925564311f54038ddb77
 EBUILD messagelib-18.04.3.ebuild 1937 BLAKE2B 2237b3b9c9742e7db917847cb813d8a84ee64de76870e5a3c5cb2400b2faf67fc63e5c08ab68d436b02a4e0500bd847c32e915eb01c1c17914a32907505ea6d4 SHA512 29b95b086b5e8b2a4edb98b10ca1b7b7d88afa8f557496c7a88557631b6fa47c05085e7e7a234a6fc8df2319eb8aba4e9aaaaa405530925564311f54038ddb77
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-17.12.3.ebuild b/kde-apps/messagelib/messagelib-17.12.3.ebuild
deleted file mode 100644
index b030a12737fb..000000000000
--- a/kde-apps/messagelib/messagelib-17.12.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries for messaging functions"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-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 kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(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 kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
-	>=dev-libs/grantlee-5.1.0:5
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-addons-16.08.50:5
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!=kde-apps/kmail-4.4*:4
-"
-
-# bug 579630
-RESTRICT+=" test"
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index 4a6fa1b12087..60e2ef83e023 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,5 +1,3 @@
-DIST minuet-17.12.3.tar.xz 27860148 BLAKE2B 20d897fbebe844fd77da3c1cffd94c021999263b434507a2bc73ce5c2a7e3d0823c2f724a6d51450fbfbc450a72a66cc4823d6c350090372280b51bc5f3458c9 SHA512 ddba91a1d8165412099bd60cc06e57db70b3aa6997bb93c9e3c46ea933df728836cd59f24a2b7ff1e1adc71e802a0c237ea90a72012bbee79c6601f73e650dbd
 DIST minuet-18.04.3.tar.xz 27786944 BLAKE2B 7386bd7a14dcb96225eb7fe070cd914f8a37e0fae5d0f01559cd468bc3d8ff1f26da4ed5b8176e1107b646bb453e5e9a68d4336fe106de46491db4fe880224a7 SHA512 c602b377323b1bc3c115a9297ef042738f25274e5b028756aa307e9b0951dc853771b9e4031d6ee39c868f2db2459ae316f0691a8f5efd291e89bf9c88c5ee19
-EBUILD minuet-17.12.3.ebuild 586 BLAKE2B e62f58a2382c54cf41dbf6f476c22f6e51ad0d93c42fce1718bcccfd91d0a6825b988d2b906d6865d8750b748c1e0005d58a7e60a8debbf809f3db8cf8e1544b SHA512 45d18600f13c35676b18976ebed1cc6d6f447730ac50e80b9b0d4de05b56f31eef1433c8b947999d8d7da724afd4b78bc9481a32d7f254ed65f3863d1bbee730
 EBUILD minuet-18.04.3.ebuild 586 BLAKE2B e62f58a2382c54cf41dbf6f476c22f6e51ad0d93c42fce1718bcccfd91d0a6825b988d2b906d6865d8750b748c1e0005d58a7e60a8debbf809f3db8cf8e1544b SHA512 45d18600f13c35676b18976ebed1cc6d6f447730ac50e80b9b0d4de05b56f31eef1433c8b947999d8d7da724afd4b78bc9481a32d7f254ed65f3863d1bbee730
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/minuet-17.12.3.ebuild b/kde-apps/minuet/minuet-17.12.3.ebuild
deleted file mode 100644
index e8f866532e8f..000000000000
--- a/kde-apps/minuet/minuet-17.12.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A KDE Software for Music Education"
-HOMEPAGE="https://minuet.kde.org/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtquickcontrols2)
-	media-sound/fluidsynth
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-"
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 6a27581a1331..57f5a4b4b39a 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,6 +1,4 @@
 AUX okular-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96
-DIST okular-17.12.3.tar.xz 5737804 BLAKE2B 959f83cbf7713333319400abefe70390b75bd1fdf5d907c362e4e36d65fba3115d6c4091ae04c2058e557a6df1a8587cb5adbfd345cc4702439db2d837d4ed2d SHA512 803e69a918a385798905eeda15afa817ff145406947abc793c62c26879ed9b98ca601adedeb5133972be50e679cc31cc2ad8ccc97c084c64a3cad791a778d361
 DIST okular-18.04.3.tar.xz 5784876 BLAKE2B 5f6c28f3825a9dd3f551044d22ec57fbcbb209afd5e2e2b4900d99b6fb4bf74ab4ed9999c4146c27cecf3004469841950b13039690fd31b8c1c757ea10f5920d SHA512 9ee463627089caec1b4fb63263daeb8ab1001d415a053720adb498bfebe44a3572b322841625b9419a34156866302bfc35eac6a68ae123a99fe61b19287c9c0b
-EBUILD okular-17.12.3.ebuild 2898 BLAKE2B 20461830de043ba6ebae2e954b183d8bafc534e70198d184246bff9154313147b283259d23321569ee6276ad13ddb0d7b064eaab0b5f636c8570b72d5fd9c001 SHA512 85d87372e18d51bbec5b08c4e7fe4dce0eb120a721f47b69c7f53252e4884193a16b4711133af0316417e4c9c1e546a505cd6cd4d1ff7dc7b21a0c4db31a8e9f
 EBUILD okular-18.04.3.ebuild 2928 BLAKE2B 70873bee40c4526a0f624247f3b88ccdd484f47e6bb22c75399dbaaba4583c13de4006892c8d0a5944cd7aa69fa81c184651e029d6ebaffe0b30276eba2ba888 SHA512 e921d939740240f9bdf4883323d23fe81b2fa85bee30c852d6ef9107f11d39d29857cab8d6e11b7d85769a459793f517375f9051495f4ffc0256824a7e2df681
 MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e
diff --git a/kde-apps/okular/okular-17.12.3.ebuild b/kde-apps/okular/okular-17.12.3.ebuild
deleted file mode 100644
index 372bd9b10e1a..000000000000
--- a/kde-apps/okular/okular-17.12.3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 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="Universal document viewer based on KDE Frameworks"
-HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
-KEYWORDS="amd64 x86"
-IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	media-libs/freetype
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	chm? (
-		$(add_frameworks_dep khtml)
-		dev-libs/chmlib
-	)
-	crypt? ( app-crypt/qca:2[qt5(+)] )
-	djvu? ( app-text/djvu )
-	epub? ( app-text/ebook-tools )
-	image-backend? (
-		$(add_kdeapps_dep libkexiv2)
-		$(add_qt_dep qtgui 'gif,jpeg,png')
-	)
-	markdown? ( app-text/discount )
-	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-	pdf? ( app-text/poppler[qt5] )
-	plucker? ( virtual/jpeg:0 )
-	postscript? ( app-text/libspectre )
-	share? ( $(add_frameworks_dep purpose) )
-	speech? ( $(add_qt_dep qtspeech) )
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	image-backend? ( $(add_frameworks_dep kimageformats) )
-	mobile? (
-		$(add_frameworks_dep kirigami)
-		$(add_qt_dep qtquickcontrols)
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-	use mobile || cmake_comment_add_subdirectory mobile
-	use test || cmake_comment_add_subdirectory conf/autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package chm CHM)
-		$(cmake-utils_use_find_package crypt Qca-qt5)
-		$(cmake-utils_use_find_package djvu DjVuLibre)
-		$(cmake-utils_use_find_package epub EPub)
-		$(cmake-utils_use_find_package image-backend KF5KExiv2)
-		$(cmake-utils_use_find_package markdown Discount)
-		$(cmake-utils_use_find_package mobi QMobipocket)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package plucker JPEG)
-		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tiff TIFF)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# mainshelltest hangs, chmgeneratortest fails, bug #603116
-	# parttest hangs, bug #641728
-	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 7da16307e405..f4018aa53755 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,5 +1,3 @@
-DIST palapeli-17.12.3.tar.xz 2061492 BLAKE2B 677f29453a22a4f48b842f4c8d368251344cf9cd2cfcfee0b3e2fd6aed315a2879e6a6c86003debf2ffbcf083a9b1164171fafc14691df953f909185c74a8edd SHA512 7c43d9854fa8d27290b97d8fbb56594ca45593d80ac029652ed355c0bd59eac3c73d0b226a91801a7dd62c76c41a53783dbfbc62238dc26cd6bf3aad3aadec58
 DIST palapeli-18.04.3.tar.xz 2061768 BLAKE2B eb1b8e499be2af52c9111aefce2ae7d9850a6538bf7e4414eb9265916fe7b2ec3f9ed152c45189e8e7d01fb7cb40152605001bbf4d6bb13e2431de1c17a90b89 SHA512 3da548346452020f398229a1c0c7d82062742fb729ca52e6781d809c59d9e7051e3d697dd156e58a4a6c10af04e5beb81609a5c6d70d139cc90ff5dbf5652604
-EBUILD palapeli-17.12.3.ebuild 935 BLAKE2B d6b5a0c2e8e1174f8ad344c1160ef01efc80dbfdd801a2f41521b870b64e4615640c86aefccb24372e620bf6d61dab3ab0ed6a03b6746d0f7794bebcbfd9e079 SHA512 c019e484efbcba665f5a0848132555e341f9447964f2c2d35d963c146b082aa829c98cc87367d00356239a65032a82b48f7bed9a22ba7cac442061cadeca32e6
 EBUILD palapeli-18.04.3.ebuild 935 BLAKE2B d6b5a0c2e8e1174f8ad344c1160ef01efc80dbfdd801a2f41521b870b64e4615640c86aefccb24372e620bf6d61dab3ab0ed6a03b6746d0f7794bebcbfd9e079 SHA512 c019e484efbcba665f5a0848132555e341f9447964f2c2d35d963c146b082aa829c98cc87367d00356239a65032a82b48f7bed9a22ba7cac442061cadeca32e6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/palapeli-17.12.3.ebuild b/kde-apps/palapeli/palapeli-17.12.3.ebuild
deleted file mode 100644
index bc5658603108..000000000000
--- a/kde-apps/palapeli/palapeli-17.12.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Jigsaw puzzle game by KDE"
-HOMEPAGE="https://www.kde.org/applications/games/palapeli/"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index b743a0d0e6a0..683ab6009ce3 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,3 @@
-DIST parley-17.12.3.tar.xz 8826604 BLAKE2B b24d1f7fde26b78c4d7abcdc18994a09adc58a29edd6123c8961d2dc148aa1adb82b0791e98dd4f4f588acf2400ce64b7a911334909b75deca07cfb0dde5dd84 SHA512 301e87605e754aaed520fa1bf96a7cf23b0c0a6523ae59817a6b14a8f69d3689a8646437e580a3257f42b197e6c7f899593cd242e9cd44ea1cd135327e83885f
 DIST parley-18.04.3.tar.xz 8829720 BLAKE2B e49cb4d1474a8eb0785b5e868d4cd56cc0c2616e5c8c2f53ebac478e0e561fdae871106c499563c1c3a17f58bd8dfbcf979a4bd4991cfa4fc13934585367e51d SHA512 438648d1b15b170d33c67b5ac3101558da0c6b67b9c8096d5634fcdead737764579276dcfdca6e55d192366b1eaa5536c2f77ae76bc33e760150de401be18fb9
-EBUILD parley-17.12.3.ebuild 1255 BLAKE2B 2e0d0fedb3759793846d8f2c4e7a25c8a9bca996591a1baf1b38eeca9ab23de3565f6310c85ed404e4b08bf32d22a05e98462cc5af6546a8fb70902f54927520 SHA512 6a1dd8f607503b55fa87cb6b148559f631008a741453703264232268a83f632f5fec0baff9b71c2002defefe5f92594fcaa883867f884f00558ccb9fac6ff952
 EBUILD parley-18.04.3.ebuild 1255 BLAKE2B 2e0d0fedb3759793846d8f2c4e7a25c8a9bca996591a1baf1b38eeca9ab23de3565f6310c85ed404e4b08bf32d22a05e98462cc5af6546a8fb70902f54927520 SHA512 6a1dd8f607503b55fa87cb6b148559f631008a741453703264232268a83f632f5fec0baff9b71c2002defefe5f92594fcaa883867f884f00558ccb9fac6ff952
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-17.12.3.ebuild b/kde-apps/parley/parley-17.12.3.ebuild
deleted file mode 100644
index 18e915c161b6..000000000000
--- a/kde-apps/parley/parley-17.12.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_DOC_DIR="docs"
-inherit kde5
-
-DESCRIPTION="A vocabulary trainer to help you memorize things"
-HOMEPAGE="https://www.kde.org/applications/education/parley
-https://edu.kde.org/applications/school/parley"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtwebengine 'widgets')
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-"
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index e55619f8d5a1..e5a374047fdf 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,5 +1,3 @@
-DIST picmi-17.12.3.tar.xz 1147600 BLAKE2B 9a09704d57b93e6e8ffbd5843570f9c6ab407c31a60313f9c4119aab97237b348b17ad1d8cc1437a664f05411816e91e8870694e8aeb09e9275e3327e0092f5d SHA512 06fff4d49e4e2bea3aab3c0ac9d06552acbe1b4e006ed79d5a1f10c31f4f7255bf132fe6149451536498959eb90fc7dad3c20396f783efe5c16fecb2b4828647
 DIST picmi-18.04.3.tar.xz 1146732 BLAKE2B a9f64f79c629c6bdf7bf5b38b5aaf2b3ec8b71bedf7c54cc5f9b9cce862401b6f09def37824c7196d9adf7799a8e1739749cbecb6ce09317c2676aeb938c89f6 SHA512 a9eecd7e746d2f64bb4587c88137208eda644a6c6f23f21e6405135397ed3f562d5ac2a4c33a88c99a7191a56a0568f489ca8cdb9ebc68e5ee7dc6552ab3a4c2
-EBUILD picmi-17.12.3.ebuild 845 BLAKE2B 724f2fc96d2c3a5ea5aee9e9f745e2190c7b30d3622f8810ced762021488873373cb33a37675d0c50d22f1c1a2ca6fe9c483773fbf704dfa40a49f667dcf9826 SHA512 3734ac1dad577ca724d2a7136512cf4c5e99be5f998ff2be871169f3d80196b88c6af53a1ca7e9b5efc8983e418211bc604af7eae4b2b24d0087ce29198f5aaa
 EBUILD picmi-18.04.3.ebuild 845 BLAKE2B 724f2fc96d2c3a5ea5aee9e9f745e2190c7b30d3622f8810ced762021488873373cb33a37675d0c50d22f1c1a2ca6fe9c483773fbf704dfa40a49f667dcf9826 SHA512 3734ac1dad577ca724d2a7136512cf4c5e99be5f998ff2be871169f3d80196b88c6af53a1ca7e9b5efc8983e418211bc604af7eae4b2b24d0087ce29198f5aaa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/picmi/picmi-17.12.3.ebuild b/kde-apps/picmi/picmi-17.12.3.ebuild
deleted file mode 100644
index ebb345334418..000000000000
--- a/kde-apps/picmi/picmi-17.12.3.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
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Nonogram logic game by KDE"
-HOMEPAGE="https://games.kde.org/game.php?game=picmi"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index a5dc3fa1a0a2..52996eacb0ae 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,3 @@
-DIST pim-data-exporter-17.12.3.tar.xz 267124 BLAKE2B 6c515327b444c9a7ddecdaa4e13f8d2c7f674a6acd1b2d4a5e314f330bb9e505112bad52674639f4a1f2f1ed29f5c5903b5eeba62578b49354a7feea0005fc21 SHA512 e0dd0fd6356b668f662afedb64d3fb9ed68da9b869635b7773bcae23262245e4b3246e0eec9b4e5bd45c28c506a0e54cea5819556bc1681378417830de458a0f
 DIST pim-data-exporter-18.04.3.tar.xz 270248 BLAKE2B 27d8545408ba37ff7790e84d02455785b77b0eb865e5b236fc15eacd81e3df99d37f2c84e40d6cbc5ac9296d0b95a290744e5dc9c2e5103ea9deaa987421cb35 SHA512 29550eca64b6026c900b30303fed29a06b31a7c773f7f387c899afbcd7b735a07efe95cf7366ccbb6ba6b4884d1c1491193ff2f817a032f27002bc8234b82301
-EBUILD pim-data-exporter-17.12.3.ebuild 1233 BLAKE2B 3d01b778d211e289765ed9cdc2943d4c05725fac2585ace174b413b699daf23e2898fccc0a99f8901ebb57a68398e9f9919d5c313205c0e56845eb79ea0bea05 SHA512 da978bfb6782f9ba3b95e453ad1b001da34ae6758bcc0cf1bfbdab98539a7b644f0b24191059c25041148dd85ae2ea8681452240248c1f550ec2f5e885fc3b7f
 EBUILD pim-data-exporter-18.04.3.ebuild 1212 BLAKE2B 57201c91ac3526453e6a96b73d38eda4237d2dab425dd92d2c87671efca4e3f1b40144942f8f7ea35ce54e23000829d0c390e751127c0441382647b92db685b3 SHA512 52cf0e379b1437ce5fe2d05319c148abce6c019f94ca45aaa83dfa634a47fad91e1ee938c54fe234e0ec0b2d3086068b97688b7b987c7b0a0e4d090d3dd0fb84
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-17.12.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-17.12.3.ebuild
deleted file mode 100644
index c9d4606cbb26..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-17.12.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 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="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index f736ced21454..14b0331963cb 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,3 @@
-DIST pim-sieve-editor-17.12.3.tar.xz 444364 BLAKE2B 621dff6212eb50b328ea5a559cff3322fb7a7e22d7ad33937c0a84e3bd4af5b519e1c1abb4a5586e84b042e4f0d4c39416aa0e8404ebc786f400747c85533e3b SHA512 812508b69ed0d4f0d2312cc74a3f800a06246e0984fcde386fdbb9e9a4ba949dfdb8c41a88f5a6d01d4f4c0c019a791a1c72edc50f446dcd9bd68a18c6623bd9
 DIST pim-sieve-editor-18.04.3.tar.xz 447160 BLAKE2B cc28510ee0278a691094c42df113f02299b74830c410f74467ee69b59d2b6a60e5b0861300967c1857c5afa57025d93c1909230c085e1f7caf2ad9b30cd79728 SHA512 344ba01e3f67c359e912e8bbb880aaf7ab1c8a77e793614a1ccc358551e3c163eddef7c48b178678f99d40dcac4a8f1b687084d21d37e39caf98fe75ebb88a93
-EBUILD pim-sieve-editor-17.12.3.ebuild 1147 BLAKE2B 1d382e5e13a982287274b27772e0250fff48428528e706571632cfa50503ce889b8ba4d26472c4168fdbc8c790228de9c2d7cdf87e9ac84601a94eb9b775d268 SHA512 5e496bc3fc0e16dc80eebcba13bfc3a4b0f69d0a166965bbbffe1eca523eb14619d50d61ee95320a11cf4e15af41187793f691924d00c700c71199c6b9bc7269
 EBUILD pim-sieve-editor-18.04.3.ebuild 1147 BLAKE2B 1d382e5e13a982287274b27772e0250fff48428528e706571632cfa50503ce889b8ba4d26472c4168fdbc8c790228de9c2d7cdf87e9ac84601a94eb9b775d268 SHA512 5e496bc3fc0e16dc80eebcba13bfc3a4b0f69d0a166965bbbffe1eca523eb14619d50d61ee95320a11cf4e15af41187793f691924d00c700c71199c6b9bc7269
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-17.12.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-17.12.3.ebuild
deleted file mode 100644
index 76f05fe043a7..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-17.12.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 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="Assistant for editing IMAP Sieve filters"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index c9dc7da07b90..09a33e212dcc 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,3 @@
-DIST pimcommon-17.12.3.tar.xz 287564 BLAKE2B 862d6bea6398edffca88f78901f8c59ab8721b210cd9d4e7e73f16474c7c58357977981d65a808b2d02501927257e96990b79071056e86aad08d97d23491569d SHA512 79aa5f3b7d61de547a07ef659e1a7d0b2c456010cb7ad929218853d5f1057a97e5a0e2d1197cb50a1f5bb201b3702efa0e3e1c154d530c49ebe51578d2690df1
 DIST pimcommon-18.04.3.tar.xz 295512 BLAKE2B ce4697b0e850b7375741e5af2a0abca7b2cd8ded341338ef6f1b358df66d724d0c8f01c45b5d13eb042bcfc3f396545ce68798d37a3009c2d00b51be901e2957 SHA512 c933184da3ce1626a28bc20b851c583e0fc21485855414b0e9c161cbc7eadf7ffe1916dfbbaf9e74fb48eafe152436ac73a5082c2ccbab219aa45497c45f4e14
-EBUILD pimcommon-17.12.3.ebuild 1459 BLAKE2B 85c6ef7e1ac73a542307bc6178c9ccc71e53e4ad0da21ae809f1a55c3a372af0a1cb2a5d51c7a32631ccf53aadb2244306742526968b2c723953e56f66081cf9 SHA512 42388f17e049e53efdb3209e43c522073559eb7be6f289cd273a6d1c518cbefbe8241b30e31cc53b2aea2f0da79293e081f4ccf79845144dfc9124e38d516a4d
 EBUILD pimcommon-18.04.3.ebuild 1504 BLAKE2B 5601b91b70ea6e371d5861dc800ebbeab61213868904d013550849eda59eedb5a595d94c3598a391fa2f3a4a9d54a58d83fc022712b50d05e60dda253a918609 SHA512 a7b3f5b224e75985851bfb105c7ba6e1d1f323049849827a723f13ebd4df06656746106467a072098970c0a0199bb178dcc55d30e62a8bdf4951439d0722557f
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/pimcommon-17.12.3.ebuild b/kde-apps/pimcommon/pimcommon-17.12.3.ebuild
deleted file mode 100644
index 21865d3b31bb..000000000000
--- a/kde-apps/pimcommon/pimcommon-17.12.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-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 kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kiconthemes)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep kmime) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# bug 641730
-	local myctestargs=(
-		-E "(autocorrectiontest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/plasma-telepathy-meta/Manifest b/kde-apps/plasma-telepathy-meta/Manifest
index 1003c494f2e8..604d8eab9c25 100644
--- a/kde-apps/plasma-telepathy-meta/Manifest
+++ b/kde-apps/plasma-telepathy-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD plasma-telepathy-meta-17.12.3.ebuild 936 BLAKE2B 8ba54ecd638b9340f9d950f4a2288d975c3cfbebb2fb9bdd1038e36f70f7156346085aa5c8835eca823fa772856ecdfa748e8fa1277df16befde03790c3a3f96 SHA512 7f6648e8285f603c0d3ace3b178262fb3d76a47dfb4dd65e68aa2d31326f785183b4fead521bd410c75ad65161ed94cbb0c0e09583eda6bf27f8075f225fc47d
 EBUILD plasma-telepathy-meta-18.04.3.ebuild 936 BLAKE2B 8ba54ecd638b9340f9d950f4a2288d975c3cfbebb2fb9bdd1038e36f70f7156346085aa5c8835eca823fa772856ecdfa748e8fa1277df16befde03790c3a3f96 SHA512 7f6648e8285f603c0d3ace3b178262fb3d76a47dfb4dd65e68aa2d31326f785183b4fead521bd410c75ad65161ed94cbb0c0e09583eda6bf27f8075f225fc47d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.12.3.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.12.3.ebuild
deleted file mode 100644
index 6ec91e7ee512..000000000000
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.12.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="Plasma Telepathy client"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="|| ( GPL-2 GPL-3 LGPL-2.1 )"
-KEYWORDS="amd64 x86"
-IUSE="gstreamer"
-
-RDEPEND="
-	$(add_kdeapps_dep ktp-accounts-kcm)
-	$(add_kdeapps_dep ktp-approver)
-	$(add_kdeapps_dep ktp-auth-handler)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_kdeapps_dep ktp-contact-list)
-	$(add_kdeapps_dep ktp-contact-runner)
-	$(add_kdeapps_dep ktp-desktop-applets)
-	$(add_kdeapps_dep ktp-filetransfer-handler)
-	$(add_kdeapps_dep ktp-kded-module)
-	$(add_kdeapps_dep ktp-send-file)
-	$(add_kdeapps_dep ktp-text-ui)
-	gstreamer? ( $(add_kdeapps_dep ktp-call-ui) )
-"
-
-pkg_postinst() {
-	elog "You can configure the accounts in Plasma System Settings"
-	elog "and then add the Instant Messaging plasma applet to access the contact list."
-}
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index 31e91ed8b652..d63d9087a9cf 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,5 +1,3 @@
-DIST poxml-17.12.3.tar.xz 43004 BLAKE2B d6a29c953c091cb7df6a181285ed1a9376db87be2617b00efe9de56ae6bc06d11522a0fac69a7a4d1e2b1a085227c0e17935bb1ff0abca6119bb115b72e2a952 SHA512 c9b45bf37c200b206ab4e114964d6dfce941f974f56d2703ce9ce5ea5314be0224cbf3fa1855d0e423b27b7ca1664a9a372f9322305c76b26bb340e9876a0e34
 DIST poxml-18.04.3.tar.xz 43160 BLAKE2B 7d54129aea950d4cfc238ec03b31aa5e7f7c016f871ca7bd675bda46baef19224de429ca1314a2cb029a00279dd8022c8975c754f85614189abc262636e4aa67 SHA512 176af4e57c90354c0809d99ac1d5260ccc44eaf73a670ccb7aa205f4e67966d36ed68f857a9ce62660186b738688d3bd53df1477cab9af623660062e42862b81
-EBUILD poxml-17.12.3.ebuild 340 BLAKE2B 3a45ed2f3c9c6d5e8ae2fa23280ccf1e95e347eb220486ece8e9460db877e225f2f31a5906585f732cf4fca44a716f5b46526dd879db9c45cc22725d73987f8f SHA512 4efa4312b7453dfd5a86cfaf8b2ff1866f237be9cac5a28049d09b2a2b473c9061021f82918d9327c4d083a5513cd4e6a1029f92a87badab392d9df8d23cb55d
 EBUILD poxml-18.04.3.ebuild 340 BLAKE2B 3a45ed2f3c9c6d5e8ae2fa23280ccf1e95e347eb220486ece8e9460db877e225f2f31a5906585f732cf4fca44a716f5b46526dd879db9c45cc22725d73987f8f SHA512 4efa4312b7453dfd5a86cfaf8b2ff1866f237be9cac5a28049d09b2a2b473c9061021f82918d9327c4d083a5513cd4e6a1029f92a87badab392d9df8d23cb55d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/poxml/poxml-17.12.3.ebuild b/kde-apps/poxml/poxml-17.12.3.ebuild
deleted file mode 100644
index ac31cb59d039..000000000000
--- a/kde-apps/poxml/poxml-17.12.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtxml)
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index 4a7d7f00a5b9..59a2da30848d 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,5 +1,3 @@
-DIST print-manager-17.12.3.tar.xz 237128 BLAKE2B cc1a85c6ed2f160329c5428de7c6de562de7f5c3876fdd504e619801e8ededd792c8b69c9193a787d1600948f7fae3a62a7290e1e50ea5bf39475d9db9c9c66c SHA512 80e40c913da002beb3e473e0e6fa6f02b0e3b699bdc49c390435d9139f46b1fb3ffef54c042b5dc2a1db3b83da2f4f53377710b31281b0154f9654f605b95830
 DIST print-manager-18.04.3.tar.xz 238724 BLAKE2B cd372ce2408287ba5c1eff2b614dcd5eac2d44f7a61aeae9c4376b47fbe7eae786fbd1349ba50a436916c36f8671652776464aff4738ab55c2e91b04052adcbc SHA512 0f3ea85c704a596a299e457b0c73afe844c1f2d14a76952e4abc1f3a90a10ff6e28b380a27f383939c0f9f2412c62c1016be2b63220eb664ef5da5ea627ce6e1
-EBUILD print-manager-17.12.3.ebuild 1439 BLAKE2B 81ab868d0134e4530cb5b9a998946c501eba943c17b2193aff153abd2197ff7974b0b1669b1ddf8464b2660bc4e0646ac0ca7692ce2b8bdfcce4a68c0ddae955 SHA512 6b9979f6d7aa30329cc0e272b7c7ad15c17bfeea61ff516ae4cbeb442f7aa3bfd42144ebff0e0219d45f67c72c37a9b552b4d10584b4be0da3ac49cc3e555e8c
 EBUILD print-manager-18.04.3.ebuild 1439 BLAKE2B 81ab868d0134e4530cb5b9a998946c501eba943c17b2193aff153abd2197ff7974b0b1669b1ddf8464b2660bc4e0646ac0ca7692ce2b8bdfcce4a68c0ddae955 SHA512 6b9979f6d7aa30329cc0e272b7c7ad15c17bfeea61ff516ae4cbeb442f7aa3bfd42144ebff0e0219d45f67c72c37a9b552b4d10584b4be0da3ac49cc3e555e8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/print-manager-17.12.3.ebuild b/kde-apps/print-manager/print-manager-17.12.3.ebuild
deleted file mode 100644
index e5644599315e..000000000000
--- a/kde-apps/print-manager/print-manager-17.12.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Manage print jobs and printers in Plasma"
-KEYWORDS="amd64 x86"
-IUSE="+gtk"
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(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 kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	net-print/cups
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	gtk? ( app-admin/system-config-printer )
-"
-
-pkg_postinst(){
-	if ! use gtk ; then
-		ewarn
-		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
-		ewarn "an important, though optional, runtime dependency:"
-		ewarn
-		ewarn "app-admin/system-config-printer"
-		ewarn
-		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
-		ewarn "and will show the following error status during runtime:"
-		ewarn
-		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
-		ewarn "was not provided by any .service files'\""
-		ewarn
-	fi
-}
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index 8317ef52aab7..2ac4cc2b0970 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,3 @@
-DIST rocs-17.12.3.tar.xz 1529908 BLAKE2B 2913e6b609b349c6b4fe2e08c41ba63c90f0a144676ec9dd64203f01ca0240b934e0de48e2e068dfa2c860be5bfdf4fcf883b27b1c11b7dccc6d832dbff520ad SHA512 5b90ed37b62ba5752843d0d9be46e5139fc7017dc5f620ad5bd07de10a6cb6acf601609edf5856048914fa11866045b2e1fcd859881dc6e9bcaf5239ccb2a6e2
 DIST rocs-18.04.3.tar.xz 1519052 BLAKE2B 14c2143ff855c2719b311c7824084e5c0597fad0969e7d5850429d48b51bc1629a27f13129afb4cc64e65d00be1a5464923102e4111819d071cc82648ccd669c SHA512 90d7af9934d2eb451882013676dee3d6b9aef421043dc39d17e3bfcc05d03b6c21d1f1836f247cada5e9b78d065d1544828bfc5288df8a1250388e48d26bede5
-EBUILD rocs-17.12.3.ebuild 1159 BLAKE2B 26a466581221934abb3f2a63d4a953b1acce35d695b9a0b39cc4f4ac64a78f7b5b7506a9523aaa82c50777051309a24d94ce0f42a7163b5ff50100867ba8024c SHA512 f3d82947fe9726d008005ba100f062e9497e1d5cf714637a44945ba233d991b2c9e45ad9085cfd99ab7fcfaeb2c1c610b6ab770da542a35c8489f96f7f578f2f
 EBUILD rocs-18.04.3.ebuild 1159 BLAKE2B 26a466581221934abb3f2a63d4a953b1acce35d695b9a0b39cc4f4ac64a78f7b5b7506a9523aaa82c50777051309a24d94ce0f42a7163b5ff50100867ba8024c SHA512 f3d82947fe9726d008005ba100f062e9497e1d5cf714637a44945ba233d991b2c9e45ad9085cfd99ab7fcfaeb2c1c610b6ab770da542a35c8489f96f7f578f2f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-17.12.3.ebuild b/kde-apps/rocs/rocs-17.12.3.ebuild
deleted file mode 100644
index 8826630eb7d7..000000000000
--- a/kde-apps/rocs/rocs-17.12.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Interface to work with Graph Theory"
-HOMEPAGE="https://www.kde.org/applications/education/rocs
-https://edu.kde.org/applications/mathematics/rocs"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript 'scripttools')
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	dev-libs/grantlee:5
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.49
-"
-
-RESTRICT+=" test"	# 1/10 tests currently fails
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index 284d3dc18f1b..53fd812a6d47 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,5 +1,3 @@
-DIST signon-kwallet-extension-17.12.3.tar.xz 10580 BLAKE2B f5b674d99146663411ece436715330a990d15d19befaeb481e97669a9fc84c6e726deabb247c084e9761c713d98ad250ea2fa3cfc4996ab640d1aca3e9e27ea8 SHA512 181f990db14bcb7c2247a85dae98026289bfacf3f6052047c7d8590c3e756f06f072569c295d687bd3fb81a45796e6e2436665dd1bf233c0ec6e84bcd03c7588
 DIST signon-kwallet-extension-18.04.3.tar.xz 10684 BLAKE2B 66907d002684bc81bb004f156c89e44b9846ee9c877e2d5faaab38a7f9bdcb48d245e9819652485ebd12c00c182c280936bc8a055ba687c567d24903e55df631 SHA512 30e770b5b8fcf58dbb856fb8e187ffeba50aafa6a8e38090c37842fb84dd9d6374dbd064919baf16584f7c3bd41f7224e8f0f4d8eb9e00954faa3265b21acf5b
-EBUILD signon-kwallet-extension-17.12.3.ebuild 325 BLAKE2B eb4c69958966690f2a85381a81bd7934ab3cbf95711aa7cd7a3c6ae0eb71cec195087ffa317c1a67e9119d4d23886024474f886ab682363ad5b358c3d0aab948 SHA512 ee754c65c63ccde2b638292aea56815f5877c4adf88a1ae99c2a70f45cc332045bb6237e37faece50e0618c6f141af1fef66c9d3d4ae2deb1577455bb728bda0
 EBUILD signon-kwallet-extension-18.04.3.ebuild 325 BLAKE2B eb4c69958966690f2a85381a81bd7934ab3cbf95711aa7cd7a3c6ae0eb71cec195087ffa317c1a67e9119d4d23886024474f886ab682363ad5b358c3d0aab948 SHA512 ee754c65c63ccde2b638292aea56815f5877c4adf88a1ae99c2a70f45cc332045bb6237e37faece50e0618c6f141af1fef66c9d3d4ae2deb1577455bb728bda0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-17.12.3.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-17.12.3.ebuild
deleted file mode 100644
index 8246985d661d..000000000000
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-17.12.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KWallet extension for signond"
-HOMEPAGE="https://01.org/gsso/"
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2+"
-
-DEPEND="
-	$(add_frameworks_dep kwallet)
-	net-libs/signond
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index e96cfcfbac90..f649b97a96ce 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,3 @@
-DIST spectacle-17.12.3.tar.xz 765132 BLAKE2B 824e2f260e6da5daf51463dd9f99d4a4dc405e9b3c9c1149cf8dc6dc4296ac7ae75d2dba7ca341c767b86ef0d6fac44a50cc644e9a8dcee469de7bd5f792e514 SHA512 286a4c4fb0a6d97eb31bed38865f2717b52c215074bee5dc4b5730ba607d6d25ce641d1b611e974178d33d6bff400e88cc0730c6249d21a4308d0092fcff3ef9
 DIST spectacle-18.04.3.tar.xz 1073120 BLAKE2B d97d463aee43452ce2a4aeed4f016f29282f509e8fdc110c36b5f98bf7c7a751c100491be06df1d350bd060999c158c70771b2abdcf9c692c5305dee174a85b5 SHA512 c7ac9ec521162fc30a32e16597dd9309481bba1644e75df55e66fe385f27d320015f9ac0193ca333ec4dae201d634a8c99060d1145d28a7a0b5bc69f51e57e42
-EBUILD spectacle-17.12.3.ebuild 1332 BLAKE2B 86737aa93d36446293c1f7d0526dc78cef05e1b345b913c7357d7b87568122c33a286c8aaa4745e6bbf0ddf173d82a557edd2594a13f388598d70c6d2ce0bd3e SHA512 ecee281e04b20758ed47c6f2033b9ed46d7f146b0581ffa113f185ad9d700cd03f76241478a4339c14dc9ec1c53c28e245a04dea913aee941b65110f09999965
-EBUILD spectacle-18.04.3.ebuild 1332 BLAKE2B 86737aa93d36446293c1f7d0526dc78cef05e1b345b913c7357d7b87568122c33a286c8aaa4745e6bbf0ddf173d82a557edd2594a13f388598d70c6d2ce0bd3e SHA512 ecee281e04b20758ed47c6f2033b9ed46d7f146b0581ffa113f185ad9d700cd03f76241478a4339c14dc9ec1c53c28e245a04dea913aee941b65110f09999965
+EBUILD spectacle-18.04.3-r1.ebuild 1365 BLAKE2B 5ef6f18bb70649547bd949478cfc88b50735b3c31287b3820aadff6be4ad7ffedd536dd4911ca878f810574924b92eba7d98dac10b5560b66eff8779229e3dbe SHA512 8b34910025f44c593757088b6a73aae8d3b117850dcebb9eab330293ae952301fe93d0a358b3ba1afc2b7bf0667f300d7b63cd42fbfcfa32ebb3a91da1defe7c
 MISC metadata.xml 441 BLAKE2B 82a565ee86151104ad5c24329d7649230f817d78c9fc6a393ec028d4d92cb6e8c968deba9f3f344125da283a14eaf671a6105f548eee1051290530a2d33d9143 SHA512 674c31c3c5639f6ba218f5cc9342ec5a00b944212563db07dfd223c4897a3d1f315dc7a0735be7b30d75d3706e6355f3547cd17c9ab20e7387974ff1adfe5716
diff --git a/kde-apps/spectacle/spectacle-17.12.3.ebuild b/kde-apps/spectacle/spectacle-17.12.3.ebuild
deleted file mode 100644
index dfa545000c04..000000000000
--- a/kde-apps/spectacle/spectacle-17.12.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Screenshot capture utility"
-LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
-KEYWORDS="amd64 x86"
-IUSE="kipi share"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
-	share? ( $(add_frameworks_dep purpose) )
-"
-RDEPEND="${DEPEND}
-	kipi? ( media-plugins/kipi-plugins:5 )
-	!kde-apps/ksnapshot
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/spectacle/spectacle-18.04.3-r1.ebuild b/kde-apps/spectacle/spectacle-18.04.3-r1.ebuild
new file mode 100644
index 000000000000..ed9022707a7a
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-18.04.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Screenshot capture utility"
+LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
+KEYWORDS="amd64 x86"
+IUSE="kipi share"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
+	share? ( $(add_frameworks_dep purpose) )
+"
+RDEPEND="${DEPEND}
+	kipi? ( media-plugins/kipi-plugins:5 )
+	!kde-apps/ksnapshot
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/spectacle/spectacle-18.04.3.ebuild b/kde-apps/spectacle/spectacle-18.04.3.ebuild
deleted file mode 100644
index dfa545000c04..000000000000
--- a/kde-apps/spectacle/spectacle-18.04.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Screenshot capture utility"
-LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
-KEYWORDS="amd64 x86"
-IUSE="kipi share"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
-	share? ( $(add_frameworks_dep purpose) )
-"
-RDEPEND="${DEPEND}
-	kipi? ( media-plugins/kipi-plugins:5 )
-	!kde-apps/ksnapshot
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index 8ef068173a1f..1de3eb6f2539 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,3 @@
-DIST step-17.12.3.tar.xz 862236 BLAKE2B b931d732c54467fefbf217326776b4ca664c93f384c11a8bed32c9084b5b31debf463645d5b1f697a62a6dc1f08a2e481246be25518cf1c526d58d0f29614a43 SHA512 40de257c593483bf1ddc84c76b8bab608d8e0ac49b0bd5acbb94a3f1bc6dba0cbe18f30d9e4d4ccdcf5e764a21209229b57abb8c3149dc9fca86fe00a732c4f3
 DIST step-18.04.3.tar.xz 862512 BLAKE2B 7638798a10130f04e219c80dd953f4e226331962f56b8c11342d0181b7f42bf02cb3015bdf60a120d0d8de27dd952bc289438a1dd4196481b35da96614fca1ed SHA512 0634a5e00a8a5e631adbc1090fff41892c6846698706f685c3f4b06457b1ef991fce5539937b2eef039c8e8b13d4ddaf39a40806672d57c16f2c83a736838e79
-EBUILD step-17.12.3.ebuild 1578 BLAKE2B 154226cbb51fc9a345ab059ce1af8c7a7d3cf3dc868f7f3992ee644041ed2010bf16579703c2f83bd1cc7b5fe28de727cd76a19f829796b8ef35da2ced0b5d53 SHA512 7d9dea75d6d531c4c649f059f3fd268b8107b9f57c4cf4ed6de11bb245a312e9892566ec07f1d99e41eb2bc3796f96312da4e2c82e35417cb9cb0b1719ba6e5e
 EBUILD step-18.04.3.ebuild 1487 BLAKE2B d162ed0e9feec7a6e3b987fcbd3d756efa7cbce4107a706b2cbd6965ebb938f6f1b1b4ed5a699454761907b1b36e78dc54c417c39e62c33ad95ac2e3e0bfb7c4 SHA512 f062b320c833e096d29f25275d0281cadc5aa32756e41003f4faba2f246bde78f21994854277b506e830e9984c3f835b0a80c594931722f0959a88ba661f3dce
 MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/step-17.12.3.ebuild b/kde-apps/step/step-17.12.3.ebuild
deleted file mode 100644
index 962619d6b322..000000000000
--- a/kde-apps/step/step-17.12.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Interactive physics simulator"
-HOMEPAGE="https://edu.kde.org/step"
-KEYWORDS="amd64 x86"
-IUSE="+gsl nls +qalculate"
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kplotting)
-	$(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 qtopengl)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=dev-cpp/eigen-3.2:3
-	sci-libs/cln
-	gsl? ( sci-libs/gsl:= )
-	qalculate? ( >=sci-libs/libqalculate-0.9.5:= )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: Drop duplicate upstream
-	sed -e '/find_package.*Xml Test/ s/^/#/' \
-		-i stepcore/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index e5ad2988c3c2..9daed07fdba2 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,5 +1,3 @@
-DIST svgpart-17.12.3.tar.xz 20836 BLAKE2B 1c17ed56a304398cde1be7e6c9fd1faab134666c306dd871fef9bd7a8f5d777e4c909159edb7f5ed56b6b709589640fa119bb7daa4df5a88297d557215b2aa2d SHA512 fe49860728452ec4d7dc42ef5532b162f5baa1d50b83254f27f148a3fea41efb179f90162c4dc83aeaa5639cbfcca251f696ba44d63d898357d535080f4fd329
 DIST svgpart-18.04.3.tar.xz 20972 BLAKE2B fc2a71498aebaf67966a2edc8129f888b1141520406db99d9e2143e218c2c024ebc5b54a98dcd4f7e923e89aad2c9570922a436e83149f31964057481ecd34c0 SHA512 fad16e4d9841d108cf4450b0de8b616aed3a1525966ed09043d6f83de5822c83496ffd93716c6adaee9387bcc18c95b23b4f8a7553f6d121d0f6587967dc533a
-EBUILD svgpart-17.12.3.ebuild 499 BLAKE2B 7ce47fe611520b7e2ce3ab7c3c1d19655b7a255199baa736166dc838e6e007c3501ef95fe6ad20eb73bf7e60ac40529e912586131d038bcd08d1361d35e7e6df SHA512 4ecc4acbd8dad4220fada4b4e3229902df053aa3d858857255174faaaae19d203ad11b1c33e9c105c04a828127086130908fb2eaf93a7d7b126261500b037ee3
 EBUILD svgpart-18.04.3.ebuild 499 BLAKE2B 7ce47fe611520b7e2ce3ab7c3c1d19655b7a255199baa736166dc838e6e007c3501ef95fe6ad20eb73bf7e60ac40529e912586131d038bcd08d1361d35e7e6df SHA512 4ecc4acbd8dad4220fada4b4e3229902df053aa3d858857255174faaaae19d203ad11b1c33e9c105c04a828127086130908fb2eaf93a7d7b126261500b037ee3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/svgpart/svgpart-17.12.3.ebuild b/kde-apps/svgpart/svgpart-17.12.3.ebuild
deleted file mode 100644
index 2d1ece4860af..000000000000
--- a/kde-apps/svgpart/svgpart-17.12.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="Kpart for viewing SVGs"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index 1ae7ba05e944..237b1fe80877 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,5 +1,3 @@
-DIST sweeper-17.12.3.tar.xz 382244 BLAKE2B 9dae94d488241f330b04ade4b07061fd3407020ab6b246339906bdbe9599a316ba90232b2ba684e1f9b502b60347d3b3c8d47b61add4b3b62c1e200c76519eb4 SHA512 0f62ec23f3ab3d6e50787ceceef611cfc02af1c6f7a85e87f59b08f337b064ea34a5a6339f88ef909cb970ac9850eb660a03344cda4772564d4766fa6b727a95
 DIST sweeper-18.04.3.tar.xz 369048 BLAKE2B 4aba6d4403b2e90fda81ef1d79ffce4220ec68f78b2601891a76296f308e42eaabf59beaaac48dc6158ebc00882531f29b2b48df12a785a7736f9b54b43c2ac7 SHA512 d98ed3aca5ea85664c18f6d3a8e5e7055fd1cb12cd17103d75a2261dc81e6b9d4eb54400be3f8b12d2c0109edb8100a7f77353bc8c1597fd0b2a5e3625a21a0d
-EBUILD sweeper-17.12.3.ebuild 880 BLAKE2B 328f32c415952ac91d846bd4dcd71dc18e5afe2345a9b9bcacefefa5a139e69b86bf0829e012fdeb3f1ea19aa3578fa3a0125c617980cb0b16d544f19748c46c SHA512 fa7096464c23a7f51aa6d2341ded2076836b43566aaab5dabb4d7561dc6001ce9c6bf43c09a8641b1b131820c52bb70dcf3c3cbf84293cc1beef09f78acab107
 EBUILD sweeper-18.04.3.ebuild 880 BLAKE2B 328f32c415952ac91d846bd4dcd71dc18e5afe2345a9b9bcacefefa5a139e69b86bf0829e012fdeb3f1ea19aa3578fa3a0125c617980cb0b16d544f19748c46c SHA512 fa7096464c23a7f51aa6d2341ded2076836b43566aaab5dabb4d7561dc6001ce9c6bf43c09a8641b1b131820c52bb70dcf3c3cbf84293cc1beef09f78acab107
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/sweeper/sweeper-17.12.3.ebuild b/kde-apps/sweeper/sweeper-17.12.3.ebuild
deleted file mode 100644
index e41815cb8b9c..000000000000
--- a/kde-apps/sweeper/sweeper-17.12.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Privacy settings widget to clean unwanted traces on the system"
-HOMEPAGE="https://www.kde.org/applications/utilities/sweeper
-https://utils.kde.org/projects/sweeper"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/syndication/Manifest b/kde-apps/syndication/Manifest
index fb1a99ec2010..67f4f44b5846 100644
--- a/kde-apps/syndication/Manifest
+++ b/kde-apps/syndication/Manifest
@@ -1,5 +1,3 @@
-DIST syndication-17.12.3.tar.xz 159804 BLAKE2B bf89604b4976a28016720d74ab5c36de7bbaca08cc15c1db2d03ccad339049fae5fd06eced4e8c60ee278ad4fcaac3ceca3ee8f217839936cc79ea995f4de31f SHA512 a1f2c472194355b570e4128ab4e4be70d6baa3d1c91e35706b7ec242caa950ec3686ab20772aec6fc2ecc7b0d6b390195e6bca5ec8a130951886589df73c1f9c
 DIST syndication-18.04.3.tar.xz 160132 BLAKE2B cae12c0dbac27ad22afa25ad54bf70744b04ad63a73781c2a81950ae41af72ca74d0d666fc0183050237061f5e382de9ee2b6aba1b626ca6e18d799823f00356 SHA512 319ba72973cf67fb748e521100ababc4290d5a7bb9a8b26d5b288d36a1e00118faa23b92be546996ac98b1432fe719d5d8ceb9cd125d2b35d5ffd200141d2b3f
-EBUILD syndication-17.12.3.ebuild 392 BLAKE2B fe48411fd2d0a2ce7b77635085b328069282da9be4e109a6564af6b469d6f7d37641251784f2ceebc6e5f9314ba78aa1f96da97f6b9ae306ce1ed0d52af248df SHA512 68be4e60c5cdd987e45f798912091a6a06bd27307f9b1bb7ecf8701d4468a7d50b6d14f92a0f2084f67cc646a058f4dad20056200b4c473343a3ce25ad750c0a
 EBUILD syndication-18.04.3.ebuild 392 BLAKE2B fe48411fd2d0a2ce7b77635085b328069282da9be4e109a6564af6b469d6f7d37641251784f2ceebc6e5f9314ba78aa1f96da97f6b9ae306ce1ed0d52af248df SHA512 68be4e60c5cdd987e45f798912091a6a06bd27307f9b1bb7ecf8701d4468a7d50b6d14f92a0f2084f67cc646a058f4dad20056200b4c473343a3ce25ad750c0a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/syndication/syndication-17.12.3.ebuild b/kde-apps/syndication/syndication-17.12.3.ebuild
deleted file mode 100644
index 93c13ab8d2ba..000000000000
--- a/kde-apps/syndication/syndication-17.12.3.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
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for parsing RSS and Atom feeds"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index e8ca70c54290..45a7010bdad3 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,5 +1,3 @@
-DIST kdegraphics-thumbnailers-17.12.3.tar.xz 41628 BLAKE2B 41a95cf201d03d7ef0a4b35c9603c61113f3fbf2a5319724b88a14de979c310e2d50f2ac0fa68d60cdb7bf4d396d21d59bb60622b18ad548cd5389b68e8c0e46 SHA512 67bfea3314008d2024d07afe02b4a9b2d7d952460e831c152b6eb79b9214e73c4a90312b27f6fb02666edf2e40baa59c5c924f5750bb56d731ab09c9b2cddd6c
 DIST kdegraphics-thumbnailers-18.04.3.tar.xz 41316 BLAKE2B 336bebbb51f4b2c2650c693e71fa50ef0b08fda87ae16d7b3a4ff386d2c317ae7284eae776642eb942599e8a2a9bf504896860a704cf0d5191ed4cd68b986743 SHA512 d386f56295fdec11646ea04dfa46ad5f60ecf9c8897d6f9cbea477f95953434ea086784cf848198365701b2fe2efe4285f7a9b37fa9d98ebbca84f0859084735
-EBUILD thumbnailers-17.12.3.ebuild 610 BLAKE2B fb61ab186c414471900aeed69873d5c7737d9cdfeb9a82460ca73cea2be4031c0d40f757de7625afc7bb457172b9518433330d28e1b1cd3a8bb1c5225324ac6a SHA512 c45fa2fb6982139f595e19f99421ddd334f97c2f55196e71a7e6c135cd3b94b7b1b6893bf2cf6e159960fb51f40edac12ef3e94326982c2ff9dc8bec7855a403
 EBUILD thumbnailers-18.04.3.ebuild 610 BLAKE2B fb61ab186c414471900aeed69873d5c7737d9cdfeb9a82460ca73cea2be4031c0d40f757de7625afc7bb457172b9518433330d28e1b1cd3a8bb1c5225324ac6a SHA512 c45fa2fb6982139f595e19f99421ddd334f97c2f55196e71a7e6c135cd3b94b7b1b6893bf2cf6e159960fb51f40edac12ef3e94326982c2ff9dc8bec7855a403
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/thumbnailers/thumbnailers-17.12.3.ebuild b/kde-apps/thumbnailers/thumbnailers-17.12.3.ebuild
deleted file mode 100644
index 99b6547eb0e7..000000000000
--- a/kde-apps/thumbnailers/thumbnailers-17.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4=false
-KMNAME="kdegraphics-thumbnailers"
-inherit kde5
-
-DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="raw"
-
-DEPEND="
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtgui)
-	raw? (
-		$(add_kdeapps_dep libkdcraw)
-		$(add_kdeapps_dep libkexiv2)
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package raw KF5KExiv2)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 08ad868252d3..a77e14b23444 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,3 @@
-DIST umbrello-17.12.3.tar.xz 2960868 BLAKE2B 1218ff36c08404312c182dddfd21179dd579e07c11b819f08333568bcd1639f56be3d85e268e2815dbdcd7576e8a33638148aa417a1a4830a85585b301912a1c SHA512 e878e4add5301ee60a11522b678c781c54582fb36d4a59451bdc4a1220559cfe4128451271198f93f0333204c3a42cbff73b75e9d6c83ecf4b75e98c4a5b12fd
 DIST umbrello-18.04.3.tar.xz 3019628 BLAKE2B 1c2fe22828bd7716a1d9af42c6c4a2de15633933463fc553d981b0585b0a1ba0a03fe0372e5890c6189652d97084301ed36599e13eae0c39a3e25c892de94276 SHA512 fefecbdb4bc82e84f8174b45be63e195bd2fd769fd91acd6300e6eec8e4fe1c573c3043fb052682caa4772db0c3d73149d40b14cf181fe8c9889e652be03be41
-EBUILD umbrello-17.12.3.ebuild 1372 BLAKE2B 4cf613b6910521a8477356953063c645532760498ce8b54719f3c29e1720ee3eb0ccd7ff1076b2f69ab588ffdf2ca940941438fa948567f4196a125d50b3ce8a SHA512 65168a40a49253b23bb22c1afdc8e5221924073d5dd1bdfafd9575d1c4bb511e8b9605ed09197e1688ffa3b7da7d605355af9a2ce74f0600ac119700835e6fca
 EBUILD umbrello-18.04.3.ebuild 1372 BLAKE2B 4cf613b6910521a8477356953063c645532760498ce8b54719f3c29e1720ee3eb0ccd7ff1076b2f69ab588ffdf2ca940941438fa948567f4196a125d50b3ce8a SHA512 65168a40a49253b23bb22c1afdc8e5221924073d5dd1bdfafd9575d1c4bb511e8b9605ed09197e1688ffa3b7da7d605355af9a2ce74f0600ac119700835e6fca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/umbrello/umbrello-17.12.3.ebuild b/kde-apps/umbrello/umbrello-17.12.3.ebuild
deleted file mode 100644
index 153c7163daa5..000000000000
--- a/kde-apps/umbrello/umbrello-17.12.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 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="KDE UML Modeller"
-HOMEPAGE="
-	https://www.kde.org/applications/development/umbrello
-	https://umbrello.kde.org
-"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdelibs4support)
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_KF5=ON
-		-DBUILD_unittests=$(usex test)
-	)
-	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON )
-
-	kde5_src_configure
-}
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index 66172afe79e3..9a4421dfcb9c 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,5 +1,3 @@
-DIST zeroconf-ioslave-17.12.3.tar.xz 38576 BLAKE2B 69b06025f51c5d9c9104e60e35cfc0399dd6b0f40097174a402476630656a2a8f2ea72a14d029a92b9eebd7d4e954c1d3c96cc921c8b23002b5ff16ad7b49228 SHA512 1d41a2da78a0e161f8d31a65e6783a8ffe4820837d8e509b241916f78a046f286bbd129c116b88f98f270c61b8bb1bee358004f01d44112dfe25c391fb96c152
 DIST zeroconf-ioslave-18.04.3.tar.xz 38980 BLAKE2B d3167ffc83c70dccf2b1a5cb44aaa307a37b05d87f4fb617319c4f7ae1c8e69182cdd1581fa60fb53b67d1b9acb8bfdaa97c8edb9b1f50c78ee768416efa3299 SHA512 f6be3f1ee9fd4300b62a57e8001df76739521a5797b99f8a3a8407f8a8a96180d2e066654f08a73e51ab7d2adbf2311d209dc2f10d2ae2abe85b3efe5e14b79e
-EBUILD zeroconf-ioslave-17.12.3.ebuild 480 BLAKE2B 86b9ede6f3a8ea99d360448d161804c2670b1f56a2cc45c779d42066638b4d37a18d3576c6b7977deee7de52742a3fb0c2b57906cbd606108b58571ce22f1ab1 SHA512 c3373cc48130617e01e151179a6d61d973f647b158663b2e514fb1e03cf181c9f5daa661eca4cf3d7ae4017030e2a4ebef5c5eeefe4049c588937ee45ded30bd
 EBUILD zeroconf-ioslave-18.04.3.ebuild 480 BLAKE2B 86b9ede6f3a8ea99d360448d161804c2670b1f56a2cc45c779d42066638b4d37a18d3576c6b7977deee7de52742a3fb0c2b57906cbd606108b58571ce22f1ab1 SHA512 c3373cc48130617e01e151179a6d61d973f647b158663b2e514fb1e03cf181c9f5daa661eca4cf3d7ae4017030e2a4ebef5c5eeefe4049c588937ee45ded30bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.12.3.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.12.3.ebuild
deleted file mode 100644
index 3b150f7efc12..000000000000
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.12.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtdbus)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index a509aaa00ebf..0d6e54943c7b 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 2cfca41ab7e4..366eb49420b3 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,7 +1,7 @@
 DIST bluedevil-5.12.5.tar.xz 149604 BLAKE2B 3be0b934e91bc7bd739284674d2bd734db0b1d6d76e1cb1e75b92e72cab46dd86a0e17f455dd570f1c05881826ebaabd6c42653a2b352e8dfc783a5ba60634b1 SHA512 e99ac736110dde8042920ced22aeee965c2080766f2043b20b26937c9573310ebee9db71c347f3e7ebcd46798871b2c14f47ac2177241d3b2d539fe7bffda017
 DIST bluedevil-5.12.6.tar.xz 149504 BLAKE2B 6ad4b44102c79012a58bfafbdb05c29709e45117e89775de38cb45e0da5f85a5d48880e7fc79e31fb46f93b8422fdc5864b7dfeddcedacf0a43f9b060608c33d SHA512 940328b7249d9198bf87a4a7437b615e40280c27a60988975ea569bb3f23609fa2c86eb7cc0aa8c4532611ddf9f0f7a15b1090ab69ce9601569918ee4ff99396
-DIST bluedevil-5.13.3.tar.xz 149284 BLAKE2B a139d47daa9c59e9c9c9c91a3aa220e2829b96270ca71be6f02e87d9f62641e09c0e0457df062e6a2609035fc30b5c99acd7eae2368a2a9d700b5de6f0c9e263 SHA512 abf2d03345e95b7d2adf5db50c9b180131535759950eb75669eacd1f0895bc8f12178438e6aa851b8c54c6cf468fa9672a49b0b173070d74c7ee3fa92547d6c9
+DIST bluedevil-5.13.4.tar.xz 149424 BLAKE2B 82ca790d3bb71dae3b0edf33134c3e952781525de1545d003c287d45fc3543e33cf25f5596a718b2408755d6bc37caacdc7312e8ae14e8125f0313abccd9eb6a SHA512 7341182ef792d71e2f5e119efc336a5a46e921436bfb4abb461a2664b14d8a801d559f1f0a4fcd3588f01ee1b15ffe819fe74b20fb32ef6aa82012c5f67bc604
 EBUILD bluedevil-5.12.5.ebuild 1003 BLAKE2B 57d5960097bbd4ac906c8f3e9d276d501c0526a8fb66843b3ceb3f6367142ef44f2a0a49a66eb128a1f71f16b423343ea7f2d31331f621d02c73231cf88dfba1 SHA512 671c68e6b660dd79464865cc0a98a460a5e6db41606d54b95ac232aae44b12e5e11afc6af19f3b7c2b51ba1db5648516dcafebdedfe5c49d93b5639c1a9cc323
 EBUILD bluedevil-5.12.6.ebuild 1005 BLAKE2B 05e9627ba7e5d8d2e26d71106252e1476927ff424f235b15d0a8e45207f7e84cf9151801cbfecf6d574706fd961ce819b02d9c69ffe5533a0e0f7719d9b13f54 SHA512 d3385bfe6564ad077dc3e35882a7f0e77119640b8b1bb2e7c1ecbac4a62126f058ea438c478eefb43cb35fa129cd35be14b24590ccb5390a5ac5d75a47fb6c34
-EBUILD bluedevil-5.13.3.ebuild 1005 BLAKE2B 05e9627ba7e5d8d2e26d71106252e1476927ff424f235b15d0a8e45207f7e84cf9151801cbfecf6d574706fd961ce819b02d9c69ffe5533a0e0f7719d9b13f54 SHA512 d3385bfe6564ad077dc3e35882a7f0e77119640b8b1bb2e7c1ecbac4a62126f058ea438c478eefb43cb35fa129cd35be14b24590ccb5390a5ac5d75a47fb6c34
+EBUILD bluedevil-5.13.4.ebuild 1005 BLAKE2B 05e9627ba7e5d8d2e26d71106252e1476927ff424f235b15d0a8e45207f7e84cf9151801cbfecf6d574706fd961ce819b02d9c69ffe5533a0e0f7719d9b13f54 SHA512 d3385bfe6564ad077dc3e35882a7f0e77119640b8b1bb2e7c1ecbac4a62126f058ea438c478eefb43cb35fa129cd35be14b24590ccb5390a5ac5d75a47fb6c34
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.13.3.ebuild b/kde-plasma/bluedevil/bluedevil-5.13.4.ebuild
index d57eb297ca48..d57eb297ca48 100644
--- a/kde-plasma/bluedevil/bluedevil-5.13.3.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.13.4.ebuild
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 7d4fc803eeff..3c300fd8fb5e 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,7 +1,7 @@
 DIST breeze-grub-5.12.5.tar.xz 3140852 BLAKE2B 66ded1641a181eb1cc888c890030f46f4b36292917fda7fd32a6e61a36123580c3191a997a92438e51f38f4169cbc80c10a1851fb9602c269e6019713d52e598 SHA512 27dad6a97ae128c8827d65324ea5975718489e5b1961861dcb72dbc17bbb1e38d9d6065583d49fe96d0bdd5ecba31f61efbb3a222191b8b5420e2023ed339aa8
 DIST breeze-grub-5.12.6.tar.xz 3141952 BLAKE2B dc86d799730409933db5892be6848ecf06ae8865069a8b103e780c48463b04749ce4e6c5b9aaf326ed7b87414f7c8ac6147d66c641815b9bd0a453d1636e238a SHA512 50701fa321f6770e94ed8c713ff629e45876c3e2c2c44b53307acf51dc74b3978443e017d7517d62c6d00c67fcd849b1a40f7b3e172d2bb485fbe2b46236dd05
-DIST breeze-grub-5.13.3.tar.xz 3131640 BLAKE2B d3fddb7e3057a18d82287ec0547e3ba0ccce543b5a5fac94de3f067a2634ad569d835c6077015c7ba8df45285f1ee19e7fd52293ebe9997ae91c3b49d62fb3c1 SHA512 43acad2e09b42408daa75ba6c66600f4047ee47c0dcde2c889d1030ce4ea0384a4f19806cb1dc95d084e281556931fc48ed654feb4e7cbda8189b0baf1d9502a
+DIST breeze-grub-5.13.4.tar.xz 3148512 BLAKE2B b2733c35fc359d3b3395d6efc25998debc4a1d222bdb41cf0401df390e85272a0fb2da0fe0bde9ed627a67304b47fc43536e107645e1da825e37148679edec6f SHA512 6c660682d2e67f6bded69618ddaafe63ae0583df0f64cf89ebc805bc8b1c59e85c96ffc8b785608f713c48c754046e023fde8f9312bd20d4be64217f55a7bd55
 EBUILD breeze-grub-5.12.5.ebuild 398 BLAKE2B 34128bcfe78858a3695db8c09bc6666396dab77c982c12bf987c0dc727eda420cfb8b8474e8dc21e0575c4118854bf33f84a81057b52ee619d4b43180f831c50 SHA512 06527001727ebde78101ce6e8672fa30393b4652d706c54d94e463aa1aa062b15ba2ec85adf555fd418465d3802e43b2acba0490fd1279b596e628ca5fd4d353
 EBUILD breeze-grub-5.12.6.ebuild 400 BLAKE2B 33e052f2157f317584cf359e91e95e4fb9792527079fc546b13af9cf6c4b476bf62f9c0545a26f3b37d6a2cccc238d1bc3f703324340b4456f9f81e429c8c4be SHA512 68b00d4e69b7282ab2b09bbcfae825302cf4b6e41a87e627b353b3bf11570df6a09bb4ad88f687e0ae7b708a4092e1239b908f9982653679bfb6afeb3bd97723
-EBUILD breeze-grub-5.13.3.ebuild 400 BLAKE2B 33e052f2157f317584cf359e91e95e4fb9792527079fc546b13af9cf6c4b476bf62f9c0545a26f3b37d6a2cccc238d1bc3f703324340b4456f9f81e429c8c4be SHA512 68b00d4e69b7282ab2b09bbcfae825302cf4b6e41a87e627b353b3bf11570df6a09bb4ad88f687e0ae7b708a4092e1239b908f9982653679bfb6afeb3bd97723
+EBUILD breeze-grub-5.13.4.ebuild 400 BLAKE2B 33e052f2157f317584cf359e91e95e4fb9792527079fc546b13af9cf6c4b476bf62f9c0545a26f3b37d6a2cccc238d1bc3f703324340b4456f9f81e429c8c4be SHA512 68b00d4e69b7282ab2b09bbcfae825302cf4b6e41a87e627b353b3bf11570df6a09bb4ad88f687e0ae7b708a4092e1239b908f9982653679bfb6afeb3bd97723
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.13.3.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.13.4.ebuild
index 8ef3ef186a85..8ef3ef186a85 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.13.3.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.13.4.ebuild
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 76384da57d9d..aadefcd329cd 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,7 +1,7 @@
 DIST breeze-gtk-5.12.5.tar.xz 213800 BLAKE2B b13c218af535b4c7f469c52f76e1bafee7ac89fdc9f75eab43b25930ce8e3ba0759681cf0dfa586b09c987c7af1d1de6c3eadcd3b1bb4f3efe89c5771ab234ab SHA512 448b66642587bddf9a49c64ff7b1fd01aab63283f91d16b572105cda39811edbfeccb13131cb3f0bebdd16dc8ba2f2d0bc4e2970690fa958a1fac1ca1357c1b8
 DIST breeze-gtk-5.12.6.tar.xz 213832 BLAKE2B 2a6e9dcba1e3d17ae7ebfdf97e2cb206a0e0448ac021ce29f0f3eda80dd1e49bc5856345c1e948fae8fe877303d017a828c91bdc49057c176544c7dd8438958d SHA512 59c4f9433011a6699a2e9b8eef4053aa3c7b25d1cb8668a14fcba42c513d232501988ca5c4cedc00375cde917dd7cd1f8e8948c2d3447083f51fdfc4bd061adb
-DIST breeze-gtk-5.13.3.tar.xz 201608 BLAKE2B 573ed01a6439aaaa62b2dfd230d4ce232e3049457f2b9e1ff8f4fd96a4f5bcf49329a024593e77be65e340da97c41274d32556e3f3d3dbd3b57fe3f131ff0893 SHA512 484c7386ea57b877471d9bc248d8a41851a74bf6f3efd92689ddbeaa15d3e821b1255d0b193a1b4f4b357ceae0e53ad4df51a912c479cfd20191a75913677a6f
+DIST breeze-gtk-5.13.4.tar.xz 201920 BLAKE2B d85ed443576edd09178abccc1877be62161350636fc464b6fa9fa219e868e6686012a37033936203d294daf91d397102f3a237cf8b13c62e7c6c1511c3ded019 SHA512 a92e15be18eb95e9f96ec4333e77a1a390a88ad61e407de954a202b86e3e04d51692a78137d4a43d16cea2ff44d5b2073f509a74e49eddc8905ec6d186d5da97
 EBUILD breeze-gtk-5.12.5.ebuild 296 BLAKE2B f1bbe6e13a0a65a151abc8c8a7cf5ec1e0db57167c3237236d061b500c716fee97e9eb7aa3e20d41d7b5d6b898cebe388914390bd7220e1142ed2a2a8d4e767d SHA512 c6cd9fb98a87e8c9ee53dfb708645cf340182e4bc9b88a830d809e642f3b6c3db300fc377865657240b4d110cc9a206be75af38715007aa22efa38f1825723d7
 EBUILD breeze-gtk-5.12.6.ebuild 298 BLAKE2B d2afb0d13195a3d1ebe63a0d39451904bb6fe6f21e9ddcab226b8598bd2c1696cb93b017d55192584221d90dc3041d615fd15558ffb65bb33ee4da6c0ba302e8 SHA512 755cbe7501e95f4481c6d13524815dfe81dd84b9af9f5de023563f5ba9d9cf4232b4518dc8181c03432bca30437de3cb8c992ff5233fbd2f12dd8a3b8217bbd4
-EBUILD breeze-gtk-5.13.3.ebuild 298 BLAKE2B d2afb0d13195a3d1ebe63a0d39451904bb6fe6f21e9ddcab226b8598bd2c1696cb93b017d55192584221d90dc3041d615fd15558ffb65bb33ee4da6c0ba302e8 SHA512 755cbe7501e95f4481c6d13524815dfe81dd84b9af9f5de023563f5ba9d9cf4232b4518dc8181c03432bca30437de3cb8c992ff5233fbd2f12dd8a3b8217bbd4
+EBUILD breeze-gtk-5.13.4.ebuild 298 BLAKE2B d2afb0d13195a3d1ebe63a0d39451904bb6fe6f21e9ddcab226b8598bd2c1696cb93b017d55192584221d90dc3041d615fd15558ffb65bb33ee4da6c0ba302e8 SHA512 755cbe7501e95f4481c6d13524815dfe81dd84b9af9f5de023563f5ba9d9cf4232b4518dc8181c03432bca30437de3cb8c992ff5233fbd2f12dd8a3b8217bbd4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.13.3.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.13.4.ebuild
index ef50e787f58e..ef50e787f58e 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.13.3.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.13.4.ebuild
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 6135b6835a86..cbce2e874cb5 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,7 +1,7 @@
 DIST breeze-plymouth-5.12.5.tar.xz 105636 BLAKE2B 733011a010c8e142e1572031b06093d4285e870448d2ca4035366959e343cada9f2bc7c3fe3db1eef32164b39eccee74bbe655669a4e22e45f479487dfcbb20b SHA512 cafc0df15d1b429d7e5d3253940039d118467fd6fa9ebaad9ff2c1ff9f747a7d82f5311ea181aca675d03f0b7067d7602517378e5e0bfb6476291229dd96deb3
 DIST breeze-plymouth-5.12.6.tar.xz 105504 BLAKE2B ba4f6701e61031f85578f243b5fb8ba5abcd2f01b5596d0edca07ca5058a9a34a9b0b66f3be09900d223cd1eb2b9b72c1b1ea332dea657b3cb3fc6c6d6f262f5 SHA512 1a487020ecc954648c8524cbcc5c10fd07c9d4f6fc2c03145e0d12b327db0359fb2aa42da7fdbbc6425c97bcfc81baaffc5e8b934da2dc06517e8dd7723f17a4
-DIST breeze-plymouth-5.13.3.tar.xz 105512 BLAKE2B 39b767f29fe0a23eaef86f07de89630fcacf830443ac0100091e00e1c92b6463998d36058076a86294629cd543804d702a9943e94a3569c9be8466a441926d79 SHA512 587f668205d105783bd2d78abcaa578ac34a58654f6b90e24e60ff7c49560152fe43df927c95b22caca343cda516980a70f5bf6a9b20e41f0b365a233d64a9a8
+DIST breeze-plymouth-5.13.4.tar.xz 105704 BLAKE2B 6853114f26c3850aeb416b83a33b3f2caca6ac305e40e3552e4bae2e77ca3403a697503f61bd3723021abdab57d794e305fccb002a16663301a0b7ae42a0862f SHA512 9b009ad148317c9f48224ba85339bc0f90cdf07ba5d7089f9a8ade5844b8e99e3422fee74d2faa7d0daa21999d2a9fa11e1c2b02d4faa0ef98713cfaffeb7c52
 EBUILD breeze-plymouth-5.12.5.ebuild 459 BLAKE2B 25ab42a671b0dc5b5f299843f8c56d583cf042ad375ba7f57b60d62510eae9760937a50d8b8cd3ca4154e829d4712970df5183cd88d8c7c125aa3cc48285f41c SHA512 e47b0896263d14f388f5f5bb2dbb8635a075bba76046f2a03e77473829d843393dd4b4eddac6869ee03dda7dbb8fd235c1b2bc99655e580cae138865a0d7dcac
 EBUILD breeze-plymouth-5.12.6.ebuild 461 BLAKE2B d00839097b233bc94d276925c7b75caf9f1f783691b76d36c6d767aab9a69ef7274adb99a27793daa2292f6a7eea2cf5629b5c4fe60d43db0edf5b29be22fb09 SHA512 4c225c044e171ffb0797e0a49cb21919d04d01d40fe336ae1aa2b9517a3f8ce2f0741111bb373c9e454ee10a7ca1de4b61b4817188df32d705964bcbe3cbae43
-EBUILD breeze-plymouth-5.13.3.ebuild 461 BLAKE2B d00839097b233bc94d276925c7b75caf9f1f783691b76d36c6d767aab9a69ef7274adb99a27793daa2292f6a7eea2cf5629b5c4fe60d43db0edf5b29be22fb09 SHA512 4c225c044e171ffb0797e0a49cb21919d04d01d40fe336ae1aa2b9517a3f8ce2f0741111bb373c9e454ee10a7ca1de4b61b4817188df32d705964bcbe3cbae43
+EBUILD breeze-plymouth-5.13.4.ebuild 461 BLAKE2B d00839097b233bc94d276925c7b75caf9f1f783691b76d36c6d767aab9a69ef7274adb99a27793daa2292f6a7eea2cf5629b5c4fe60d43db0edf5b29be22fb09 SHA512 4c225c044e171ffb0797e0a49cb21919d04d01d40fe336ae1aa2b9517a3f8ce2f0741111bb373c9e454ee10a7ca1de4b61b4817188df32d705964bcbe3cbae43
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.13.3.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.13.4.ebuild
index 7c86b9c8d818..7c86b9c8d818 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.13.3.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.13.4.ebuild
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 2bc492c46d56..882af96414d6 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,7 +1,7 @@
 DIST breeze-5.12.5.tar.xz 22207864 BLAKE2B a3963b4e236391d1e8ea0709f7fe68ebc1f4b644a8fc33f83992bba2675853c25addde43edfdf01700eea06c4121f23eebfa0ee64259da31a298d78592f975af SHA512 5d21fe948c8a480ce04c45ce21b56a3b2517c7642de588debfd1e76d2b53bd1e1ef1204cbb28398d5a673a986698baf91dbfb49d95e8810188f21c104e185d46
 DIST breeze-5.12.6.tar.xz 22208872 BLAKE2B c529a92d46f26f9106dbaa00e200b281f14f774794fcafeca98ac99ea51d6395f8c8939dba4d99b949d8c5026910feffab528bbd3500fbe53ebd82eae2e81f58 SHA512 8353ff97a4a85e5c21bb2e5b234f60a272679d0ec204a30a9afe808fdd3ccf92df10dc8fd04bb87ff8f885460813bbac08f5a92d592d002a2f3a44539f00d4bf
-DIST breeze-5.13.3.tar.xz 24782732 BLAKE2B 415af2b9a271d3c46a796cc61a03a8e3335387e15faa8329208b4315858599036d8ddd351a2a8ec751b5c606ef2b6f2360cf098f51b6d59d9c7a2d9899e45f3a SHA512 cd8746c8e5f9103d9ecafcb979b84d8643a7953f0a3980acc8d466b11da0a5bb574c42d36b93571d5e247c1c74a3b433e309b0fdb0332758413332905b5be02c
+DIST breeze-5.13.4.tar.xz 24780900 BLAKE2B 0d28440448d0ad8ef63abf4edb8d56396626ce8127c9d09e9683888b3f73d513defeadd75a76edfb60af9144ab6d2c34838adad445c6fcae0afe31bc9723db8d SHA512 4eca2a3b85e1905dbdcf9c86fca0e745c2bec558832a0bdfdbedc39fde07264690bc544c556bbd054d605f9da42935ef686c1efb1fe42929e1659d1bd849dd6d
 EBUILD breeze-5.12.5.ebuild 1159 BLAKE2B 68fa4833efa841f5aa0d401c2c71651fb4a78b84c0cbcf211e49723534bbea1c0716cc354f21bafa5cfe6ba673e1d457aa54c6fb26cec567c1de0160daa14619 SHA512 8aa3c9f69db433e57a54cb73fbe40e1603a8824fc8fed1a979034504375e5b9ec0a665bcf6d701231fce82d3021c24526e3c796f4cddcd6fbb348045a1ead675
 EBUILD breeze-5.12.6.ebuild 1161 BLAKE2B 6c3bf6be9569027faf463c14cc77bc87333529358fbc5b55207d16b970567dd278f47bb368fda2a43b72b5bdf0f3df339c489644eba821ffc7d48824fa0fdf5c SHA512 3d0db8f04d2bd98c920a082eedfa11a744a2f25c6adca0a40cc1a402c8ed99e15b777c45ff924df6f923640b84f876cdd8b587c5ae82f41f8da019d709bfd16b
-EBUILD breeze-5.13.3.ebuild 1133 BLAKE2B 50489146fb3a7879071196814cb2834b29828a7960fe6bd42bf69c3690c3a7df04a0409de3ebe34c2c02abf05e892d758091580b4c48f2c101914d33c8681eac SHA512 680e3ef0a4988a100b06ce77a043fb990e10b611ad715560e8283a34500000e8ac940450cd6f5d8952d930508f3fe7d690bf1210822016803ee3b55b6cc5b0e8
+EBUILD breeze-5.13.4.ebuild 1133 BLAKE2B 50489146fb3a7879071196814cb2834b29828a7960fe6bd42bf69c3690c3a7df04a0409de3ebe34c2c02abf05e892d758091580b4c48f2c101914d33c8681eac SHA512 680e3ef0a4988a100b06ce77a043fb990e10b611ad715560e8283a34500000e8ac940450cd6f5d8952d930508f3fe7d690bf1210822016803ee3b55b6cc5b0e8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.13.3.ebuild b/kde-plasma/breeze/breeze-5.13.4.ebuild
index 4e014274d742..4e014274d742 100644
--- a/kde-plasma/breeze/breeze-5.13.3.ebuild
+++ b/kde-plasma/breeze/breeze-5.13.4.ebuild
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index a391bccab31a..a6ccbba39247 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,7 +1,7 @@
 DIST drkonqi-5.12.5.tar.xz 737996 BLAKE2B e16e9dd2b902e68bfbac2618152cafe978adeac53007b3e79f4a3f05ecd34b8a5652888e6875e05b4ffa1d1fb6a016389c27e19b7c880c48d271a4040e9698a7 SHA512 eb6a24a3c3b6dd8e2451b0a0ce365ec9c17a00864ba54f26796d195af0f7194a72eb31c816b77a5a6c86f0c9df0e5438cbc4fc0bcdc6415194ca54290b20a7a4
 DIST drkonqi-5.12.6.tar.xz 735872 BLAKE2B 8d86c9dd53e100913f1f2e363b39d5eceb56223e33f011194c3c5cc99a30526410e215f31af09b6e551a3c16e98c05942d9fbee7597416778ec05bb182d887f1 SHA512 92866e56ffbcbc1df3cff7b52195e5b78d4abb17772871d326de77d8f9dd33b7cd50df220aef3213b2a75be284b2cf6c13f5ff76b83a2f69232901351f3d85d6
-DIST drkonqi-5.13.3.tar.xz 736248 BLAKE2B 7a992b81d71b6abe9417086fcc4de2568d3a3a3d82b8bbc84595a12198bdf869da1d3d1b8a5104f1666a148df75d03716474c03e84afaa0acb79fce2c6f3fbc2 SHA512 ec98b6957e8a9ede70639624b9d2523683a062b832f8d6d646c8acb5186fd6f06eda3a9f5cd4f5182e762ba78475cb1528f00f936956eb57b9c20abcdd86ffb0
+DIST drkonqi-5.13.4.tar.xz 738628 BLAKE2B 52dc9bb8d927a0e45d8ef4d4d718403127b5812f20ed32d1509577fa7905d785fdcc957cdfaf7c63bb3b75d473c4d0c00793712138d03e7e68958b3c7e77fd8b SHA512 e1923a21ac6d8d212b190afc3ca733b3c2cb0187a856a3ce4f71d842c52c619573246aae19311dd7ffd95a8392cc3e3f73e106fb10a7148d4be4a59d45350099
 EBUILD drkonqi-5.12.5.ebuild 1364 BLAKE2B 132aad2974408663c60d2d080a448f07a1301f9bfc88d1db88f0dced96a52db6bbc2d3f8d59a6705bf63ecdfced8c213e044cd96bb268590b51a45a2d27d5ff3 SHA512 bac62f1b28b419e68c9c38fd333aced9f4ea3729f9d260f53816c4b54ed5f55cb3f3aa60fb27f5137d363fb5fe9ab0e29c7d0b20fe0a702724c5f6547763b83e
 EBUILD drkonqi-5.12.6.ebuild 1366 BLAKE2B a1e50162598d1f0e60c9dc941ba2c8909f2cc3411c50b01fbe70d148ca20d6be2899f5dc6ed2459dc9d3946881f1994cdbd6150ceb1bf28fe3cb01d65d5c981b SHA512 154578eaa885cc2772f9c8ec239bc880b0e6f10e42bc6c9253dae951251a7f64bc7fb4d0e277cb27a03ff1a2dd642c53d8ac26a19b8fa36c027478029e53fc0d
-EBUILD drkonqi-5.13.3.ebuild 1366 BLAKE2B a1e50162598d1f0e60c9dc941ba2c8909f2cc3411c50b01fbe70d148ca20d6be2899f5dc6ed2459dc9d3946881f1994cdbd6150ceb1bf28fe3cb01d65d5c981b SHA512 154578eaa885cc2772f9c8ec239bc880b0e6f10e42bc6c9253dae951251a7f64bc7fb4d0e277cb27a03ff1a2dd642c53d8ac26a19b8fa36c027478029e53fc0d
+EBUILD drkonqi-5.13.4.ebuild 1366 BLAKE2B a1e50162598d1f0e60c9dc941ba2c8909f2cc3411c50b01fbe70d148ca20d6be2899f5dc6ed2459dc9d3946881f1994cdbd6150ceb1bf28fe3cb01d65d5c981b SHA512 154578eaa885cc2772f9c8ec239bc880b0e6f10e42bc6c9253dae951251a7f64bc7fb4d0e277cb27a03ff1a2dd642c53d8ac26a19b8fa36c027478029e53fc0d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.13.3.ebuild b/kde-plasma/drkonqi/drkonqi-5.13.4.ebuild
index 08c83e00ef5a..08c83e00ef5a 100644
--- a/kde-plasma/drkonqi/drkonqi-5.13.3.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.13.4.ebuild
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 6c287bcff064..cecc3f74f7e3 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,7 +1,7 @@
 DIST kactivitymanagerd-5.12.5.tar.xz 85024 BLAKE2B 568ef25da41bfe8edb0a07d9c6f72d73640331262ed50f8952d0efc44404c7f8702157146ae24d2ebcc1c1f5520ab7646b5e43269757240511286ab73140d2f6 SHA512 59c3d0dfd07f5bf620860c0a5e6d5989855ba323134e826c2ae79b3e40fc62768ef179f6969d9abace249963d99ba0db0eaea0de23686b67eb0fafcd2f1af84f
 DIST kactivitymanagerd-5.12.6.tar.xz 85448 BLAKE2B 5020eac2f3a2c69250c41a9573f5a6f7128371a364b640f59af39d802bf87c51b615469ddb940c4989a0305764ad76933efe5bbc51d2d5be10329e9b31356ec7 SHA512 2ddd088b7d947e589e173eeefc005d6ab6c58f6588a851d21b5c27e9d106881c4950045b74592dd56749465ca46c10762fd704a86a97588b1c34cdc6fd9d72d2
-DIST kactivitymanagerd-5.13.3.tar.xz 85056 BLAKE2B 081741e4ba47cfba43a855fe366b8ce05b6fd56aeab8807386504d13484e6eb5d459e7b2b7d15d10b1e3843a8b9d4953668963bc2c3ac91eed5e3234500b5a9e SHA512 b7e514f8d55d159ee2df0b6932223c55dc9e77f430c94daf09e2ad804fe32936ed465598d79072a30ccd45fb1092b7101c26afb200ffc7f17c0d7bfca70ea04d
+DIST kactivitymanagerd-5.13.4.tar.xz 85204 BLAKE2B 23b2ca06d5936fc6ada86ea6367d454a700d6ff5a85a524bdd5b3479a9fec809426e9524e703268c1913b16a66bcd9ddc1c8e7bddf3c8eddc67b66950afa160d SHA512 86d7016be1bbb5b1d8e8748e301eceaf8bbfdae5f3e77643ace1f052ff78150acd4498bf7ac4fc59ab2164597e9f0c449dba0ae7ded24951970eefb6f52a911a
 EBUILD kactivitymanagerd-5.12.5.ebuild 886 BLAKE2B f7585849689d9db572c6157d21e7784fa70efafee71596809db33fcff09f2a76b60eaba7b75ef2becb72ce241f8c28b42fa7fb2c895df887f743e96545a4553e SHA512 f9536e1bf8f5271ea2e833ee3b21d4487e08ff0ab25dd509f4ed4f9cb011cff363ea81b9f5705b3fa6140b80fc36625d3354505e4214bee51259057c1f707de8
 EBUILD kactivitymanagerd-5.12.6.ebuild 888 BLAKE2B 08dffbb6f68abe07727655187f6082abf0c8522e4069a1141e7ac822fc7cbec4d1d18a0205e019c58c02c00817909e226d67c4c93edc38b18c8366a59aeb7239 SHA512 00425be891f6a8a2888077a84099ae2acaf06a64a74a3f1ab8a2d425113551690a693c23c6fb4526ccdf882cc4bee20a96b22c591e3a54caf59dd07edb91cc42
-EBUILD kactivitymanagerd-5.13.3.ebuild 876 BLAKE2B afe62a6d95d95e1c8d4e1baafef23dffca366c695655d9d6acdd67d1aaac85ec9204d0e959ee0c51c1d46b444aef90bf7646cfe2152cbf62d0647d09f49055f5 SHA512 86e7d841b47095b7ece127d338c18eb8880a51c89600b836c940d54b6910adda60d96a8e662c15ccd885e1a8495469702e48f5c79d8f9cf897b1ccdd13ee067a
+EBUILD kactivitymanagerd-5.13.4.ebuild 876 BLAKE2B afe62a6d95d95e1c8d4e1baafef23dffca366c695655d9d6acdd67d1aaac85ec9204d0e959ee0c51c1d46b444aef90bf7646cfe2152cbf62d0647d09f49055f5 SHA512 86e7d841b47095b7ece127d338c18eb8880a51c89600b836c940d54b6910adda60d96a8e662c15ccd885e1a8495469702e48f5c79d8f9cf897b1ccdd13ee067a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.13.3.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.13.4.ebuild
index b5a7682165a1..b5a7682165a1 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.13.3.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.13.4.ebuild
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 362b98d96a09..b253fadb6867 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,8 +1,8 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
 DIST kde-cli-tools-5.12.5.tar.xz 572368 BLAKE2B 3ae149989fa56a1a4e5bc77c2c3233c956fa31cbb23ceb2cbaa0eec1683d0135083ab7cd99d3d69f96c1ec925fbee7a18a8a23ea7d17de3929b5f8844f124125 SHA512 821cc978ad460f357dcb994de0cd92f0ef52c8de70731533a624ec62c6daf24846ef603eb9142f94712527cc9aaeaa4ef0b62c03f798ef53b7afbfec1f33cb6c
 DIST kde-cli-tools-5.12.6.tar.xz 578096 BLAKE2B cbf5b0dae1b008fb14d26c01c187b15179194b59fa16010f75513060c83972b1deca3f87dc33d064ea78ac771d2c30d3637b8048709d64214122c63686caf847 SHA512 f45a0781660609bbbfa3a7b1cf3fe16cc8a29797061f0ddaeab1182d3065442c167a5fdfa43fab84d5dcc382a6b393138d63ea68e5615fbd93c5cd76b121872d
-DIST kde-cli-tools-5.13.3.tar.xz 580360 BLAKE2B 1227fc5a2396ebe8e732620e5b37b0ecdf0d5254162931c966531ee3c7af4279fa3a7863090101d95bb6e80c1d6f0495ef41766ddd833949264f48c1603c77e3 SHA512 a22537e906746a6d88109311e9a648829847e277cf181e1482e8c84bec0436247c4b1bd20f50b1e501b7d69749bbfaa74ec53d2038e054459d2452e11e825105
+DIST kde-cli-tools-5.13.4.tar.xz 587020 BLAKE2B de97e2041843e46fc8409b95a15c5d610a5ea062c7bed832d4ecfbc3da1bd178962080095b8149de343b52ae3c4540d5ff0826fc009ad09b80bddab7a903246b SHA512 bd1a236768330d816632e8ee16650ba49840f4c06aa35b5e45ed26a7d1751df2ec0a98390333678ebced3d8e53275a5d39f1b57c5d63b9e81939e32018a0a82b
 EBUILD kde-cli-tools-5.12.5.ebuild 1415 BLAKE2B 62733ac6b500c63456858a16de37fd9feafe80d9e06c1965f7b5d30e4e659f6f76ddadd54e46c4acd6cc85e4310c3e27e1cf1ee7e3de05acc7e2a97d5cc6a2e5 SHA512 9e97dda7e652e8703e0a74acb425f6949fcb09a11ce0db6cbdc5b48ea7f79223e07fcd6c84f5b29ac1bd574baccfe4c97e01c26b5ef3954ec379ca7b722c1eb2
 EBUILD kde-cli-tools-5.12.6.ebuild 1417 BLAKE2B 35c251d4e8e872dac6d1a8ac9f80ac2e72575ae19f1421e9bbf8837e99a4faa4c08c7025ba8103664d4cbe8d8fff9958bd2575a4b7c8bf6b7e894636cdbe8944 SHA512 e8b7be68b473f7e47132de03006662d3dac69d348b4345bacc190e387e74dd11f9c9fcd0e6653e73c6fbf2f2383bcd9079e1718c5bf7be5fd0306a7ae9b1f0c0
-EBUILD kde-cli-tools-5.13.3.ebuild 1515 BLAKE2B 2311f5f34bf0b8814fa722f8f536021c3931e4b8beccd4118742d98a40c65addb92ec62a30e9ababfc00424caeda8b70611a4bb681a13de81aa8b9fc58a156bc SHA512 815b90690d3bd86b61d26a06232048fcaa995a81f8b3dd2667b741e921b37864e6a7a197d0fd81d2c03a1628cf27881859373ee20df8dd9c6da576aaa0038029
+EBUILD kde-cli-tools-5.13.4.ebuild 1515 BLAKE2B 2311f5f34bf0b8814fa722f8f536021c3931e4b8beccd4118742d98a40c65addb92ec62a30e9ababfc00424caeda8b70611a4bb681a13de81aa8b9fc58a156bc SHA512 815b90690d3bd86b61d26a06232048fcaa995a81f8b3dd2667b741e921b37864e6a7a197d0fd81d2c03a1628cf27881859373ee20df8dd9c6da576aaa0038029
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.13.3.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.13.4.ebuild
index 15089440b220..15089440b220 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.13.3.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.13.4.ebuild
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 67f7b22d9804..d47c4fe48fd2 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,7 +1,7 @@
 DIST kde-gtk-config-5.12.5.tar.xz 156896 BLAKE2B 72a8b5430bffd08bc7714ca65bc2eacd757862b207300a35c451f311afb183cc5c1cd189cb73cea60784c16bfb2aa23ad53c4195d39e39e1ae2f13ee23784576 SHA512 bd433166e65d65c0978ed01d2f1a891a2ea8fdcc2687af0eb02bd593c87ba05f33361623b4a984dc752c0a5cc88e1d68093bd28bd32f79370fa66835b13c1698
 DIST kde-gtk-config-5.12.6.tar.xz 156860 BLAKE2B 83d2e5bf9f37705a66d9a5929c0f116bb7d8d62a53030016b3d73465009bf5eff09a0d5baea4ce218e33c6af22a6f50beaca48c29f0c16495b67b4905426ab2d SHA512 05682cf2acef5532aef62b68ca4c3602df1a0141fe791cc0ad3b7ea7893e00327b3b98d515c95db4333e4e6a7c19b3b98f7d9a47e551c571d5492591f7225882
-DIST kde-gtk-config-5.13.3.tar.xz 156220 BLAKE2B b72292053b5806bb9d1e6004c5da179965f9dbefbeda696aeb7b7fa5b909f9943d74ef0a3a6e0995fabfeee68deb13c30373819435438244537801fccf44aba4 SHA512 b420dbbd4e74dafc8ce64940a3aaf83f225d00a302c8a77c4401272bb5cd0d3a4b3bcc660d24665503d6512e780ed45c7b3fc92c98362655ec38ddb6948ceff0
+DIST kde-gtk-config-5.13.4.tar.xz 156468 BLAKE2B 1083f493f64466a04ac5b5ba94b55ae434db7ec2d92d58fb5e3906a2bcf39f243ab4a252fd0e8cb32ca9810234dc989095d6ea772ec8c78dfd75023b26d28a48 SHA512 2dcd227e9852a0a348ebee80f41fa26fd4732e88b25ba065d1d3d76c6dc8739ba2af5bc0089e9ee77a6506c7dfed18d9a6f1c862e48a6120bba1396fb9118ddf
 EBUILD kde-gtk-config-5.12.5.ebuild 1251 BLAKE2B 89caef72d7afc767b8e7fe245f01cc87b4b31306c6cee36654a3e9f147d6419a0d3677fd996883e0ab22ef8c8e56496ebacc0900df1f1d6baaf99ac9c3e66aaf SHA512 aaf94b4008e155657afbd6aefe358d4fefcff2c329da066fdd3fdf2897c21bee03b42526c1e3d0496d2b06dd80328c02024ef9b1fb67b40911c86175dcf4fa5e
 EBUILD kde-gtk-config-5.12.6.ebuild 1253 BLAKE2B e0bf2aa2633289dddcda686116dff24c52663e032ee939d2677f20d1c5c2bef4f1e3151e435495008ab0d7d816980f7bd2f6af275dd1b1c33a457712f8602992 SHA512 6551166ff3b4b20090b418e1f8b34c894f343df4c6065e09185ae97158bc8a469a221f581f76f42a93e419e6e7776e9eb31012da4629c548f40f773c3930e803
-EBUILD kde-gtk-config-5.13.3.ebuild 1253 BLAKE2B e0bf2aa2633289dddcda686116dff24c52663e032ee939d2677f20d1c5c2bef4f1e3151e435495008ab0d7d816980f7bd2f6af275dd1b1c33a457712f8602992 SHA512 6551166ff3b4b20090b418e1f8b34c894f343df4c6065e09185ae97158bc8a469a221f581f76f42a93e419e6e7776e9eb31012da4629c548f40f773c3930e803
+EBUILD kde-gtk-config-5.13.4.ebuild 1253 BLAKE2B e0bf2aa2633289dddcda686116dff24c52663e032ee939d2677f20d1c5c2bef4f1e3151e435495008ab0d7d816980f7bd2f6af275dd1b1c33a457712f8602992 SHA512 6551166ff3b4b20090b418e1f8b34c894f343df4c6065e09185ae97158bc8a469a221f581f76f42a93e419e6e7776e9eb31012da4629c548f40f773c3930e803
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.13.3.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.13.4.ebuild
index 13b77b96ddfa..13b77b96ddfa 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.13.3.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.13.4.ebuild
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index e2e9d86dee7e..463e7f58aeee 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,7 +1,7 @@
 DIST kdecoration-5.12.5.tar.xz 35572 BLAKE2B ac84eddfe6a095aa611d61ef4bbf3f823e780d9c1e4503cc4cd76a7eed6a670235650b07a0d9ae55b9ff1b39835c5f75c2372ede2b3aba377e6aa2a8b77f5f02 SHA512 4e13f61c46f5fc825f9b759ee5406fbbad6eb040b737c7994e5c60d5daf5c035877df9cb84c53ab672dafd035c3e67c5b27b8107d0383bfdaf61f4d9388ccada
 DIST kdecoration-5.12.6.tar.xz 35304 BLAKE2B 4fa426fa7346729af98f7d6aade4195a62f288d4124c721a21a229d93b7fc49128d9b12c03fde2ece98d818dee5fc14b4c817cf4b8fceeb997f5c5f882f2f129 SHA512 1d31414f8d2bd8b82c1c09aca1b76f5efb60200411f1606d543f5b27ed470df4dcb891481cf58d80d2f411ccccf2f6eb4dae6064d5e3a7a2a7c51d354b562691
-DIST kdecoration-5.13.3.tar.xz 41280 BLAKE2B 80be5cf5fc92c03357f6fc286d3b95a96ca38c1b8b0bc943e7b02470b1f6b234f126611efa53f60b443eb423a463a0844a97a34ea4b467b0373ec3791074f6ca SHA512 ca28de6c7eb91cd0829b464a581c6abfe561e6127e75a55add4082206699d8dec83e4445941a23bbb7d44190abcf2dc36dcca9dd06aa60debc780d098c61241b
+DIST kdecoration-5.13.4.tar.xz 41804 BLAKE2B b4919a9b7232aae94d6e7d3b2ac8e36f7eb956487eff38c1f051e5e2fb7ed888e3166a14a70181ef74733820f4ad9226a792b0d31994d3e934a2ea7b5c4ebb36 SHA512 b886dc7b9e6d27729b154631e84edaad5e25b69ae59b1cc1cd5bc8d588074d4cd45f9f72bb1ca28c4f2881942689dd4fef0b6dd759019882948f9e052019ce2f
 EBUILD kdecoration-5.12.5.ebuild 368 BLAKE2B 6926d03e513b21a5d09bf629fda76c1e351709b0ca5e4ce7cba51cab88f9a3eefd2038b269090f16bef9ac78a5724cde7e6880bd8992afb35c5c3d56fed05935 SHA512 940302029114e1ce499159a58a6fa0881cb31f4b5ef61f53eafb726142bfa79d22dfe04970771ca9711bc66ec2cc2fc7058a7a9e845eb322da7e22a60197efa4
 EBUILD kdecoration-5.12.6.ebuild 370 BLAKE2B af3340879708d1a5ea4f9f940c9bc28323c5f6cb14429e2f1b03049b720d2daba1634010af6abe5aa300bdf2b123589da9e153ae675b73bb160e1afa3840d9da SHA512 9246769e79f1eb0c096f8cc90b8bc00be2369467f05cd4b4c7e7b59d3e465233277cf7522c1c02f4bb241bb7aead8b7a0d6a2b81f9da189b73f43bce27c5961f
-EBUILD kdecoration-5.13.3.ebuild 402 BLAKE2B e07c3c63256e2026e35226bd4e6786f9eec514a693df0d7ed2c7f614bf75aac86f5a3aa29dd33dbe87d7f2af22abfa6c7acd315d328042b70adc4b3062714fb1 SHA512 717ac803c99817c12ecaeb496fe8ea00c4cf169088f7c24091d841b52121008ebbf573caebc09e4ef364776d3b7538381633afea113e3c9259fbcff81d84dca9
+EBUILD kdecoration-5.13.4.ebuild 402 BLAKE2B e07c3c63256e2026e35226bd4e6786f9eec514a693df0d7ed2c7f614bf75aac86f5a3aa29dd33dbe87d7f2af22abfa6c7acd315d328042b70adc4b3062714fb1 SHA512 717ac803c99817c12ecaeb496fe8ea00c4cf169088f7c24091d841b52121008ebbf573caebc09e4ef364776d3b7538381633afea113e3c9259fbcff81d84dca9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.13.3.ebuild b/kde-plasma/kdecoration/kdecoration-5.13.4.ebuild
index bb208109e760..bb208109e760 100644
--- a/kde-plasma/kdecoration/kdecoration-5.13.3.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.13.4.ebuild
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index bb7041bbbd32..0a7ad09f0ef0 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,7 +1,7 @@
 DIST kdeplasma-addons-5.12.5.tar.xz 567064 BLAKE2B 19f7c5401f371af7fbda416076b48454de134bc511e1f76e25e8f7544857181a65f9614247b9bac2df11e67f0505b3820fbcc83758e19c56624e7060dedafcd4 SHA512 38a2f5c5d3296167337d8288e52eb0d5045db755df4ae85e3dceba1fa8456eff8b82dc34384a4bae23054daeee39221440c27a0d17548933f325e8d47acb13d7
 DIST kdeplasma-addons-5.12.6.tar.xz 567872 BLAKE2B 491bc252caa9d81436508c4ecf0143feb60ff78fc43b75c90d12659aac10a22680a0a306f4b638283c17a050639d0a7207edf6b28980991beae494d3e3eecaa4 SHA512 5bf0834d204b4ec1dfeb80ca52d4babd067768e77f5937280573608b59099f535065c2804bf2359651f9d8d78e310fec598de55bbcb0089a54e3c8d52c00daf9
-DIST kdeplasma-addons-5.13.3.tar.xz 592744 BLAKE2B 5ef45a701b2ef7148d95915a170a7567749d9ab37fc421aa0c77b18ad8c3614d6a3e83b0fedf0db814480c357e6091482e2f6edf8907996bbe0f7f703524f8a1 SHA512 38d427b121e823234e278a47a89c37a61cfadcd0c3b4d50ded73308fc4ec0cfdc0cf9bd753fcdbf9e2ce70a964e66ebf8b411a63f1892c7f09d33040b857d077
+DIST kdeplasma-addons-5.13.4.tar.xz 598836 BLAKE2B feaa7e8cde363b7e74ff7cce88edbf60b517120f08e7e76159e2ef16db99eb95b8193cc5e10eb0e7e045e3677a2e12f34c4e29eda10e0b5ecb03e73bbaa3c865 SHA512 92515dc56453612c16e80c961c1258d8a642cddbbfb87e84b719cfe858a0ac83a412ddf134b6f76ce5548b350e51cc489187716c4d0784ae561b8fefbb4484ad
 EBUILD kdeplasma-addons-5.12.5.ebuild 1578 BLAKE2B a35bf9e74d2e4ab7dd3175984851a5a695d0c4cd039cf9528a6514035367c7cca9065891bf7440d4910bb4fa4f169a6a94191c7877c0dc4490f89dd8fce2a2e9 SHA512 44aa312c5b4b8564ccc57e1338fcb34e087c22ca07076beb7c2e6754ed22b8114157a7b54cf8876d32e426e4720d4e308545951659451ff32a958e8f72328d11
 EBUILD kdeplasma-addons-5.12.6.ebuild 1580 BLAKE2B 185c8f56b34e5f9a68de6196acd3720adaa717765d99d715b946e8abde923dfcd39dd4f1ed1c0b4101dc8a2021070a6059d031cb1f44a3ab361e02c13c438b08 SHA512 f4aac2c159ba60a36fc8b837b4aefb4f845e0c3c92596a3d7529cb14328ca6389e2d7d218effe97098a06649067d116f87ff715b9326aa87fe3298d99c61667b
-EBUILD kdeplasma-addons-5.13.3.ebuild 1533 BLAKE2B 474f7ef99e4362a875ec60c5a0cfcb95413244b15ad4b00b5283b6671c8434118802bef9cf243cdd40bc46b3e3cb658adb4c1dc6426bee21d082f5f09997ce3c SHA512 453dbd7073db6aaa686ab21ba1aa154fc6e94001b6d9bd56f2c2c41a48b711429ced1df468aced60dd9ffc0b5cbe3cc64c0f60929f693652a614172bddc8d3eb
+EBUILD kdeplasma-addons-5.13.4.ebuild 1533 BLAKE2B 474f7ef99e4362a875ec60c5a0cfcb95413244b15ad4b00b5283b6671c8434118802bef9cf243cdd40bc46b3e3cb658adb4c1dc6426bee21d082f5f09997ce3c SHA512 453dbd7073db6aaa686ab21ba1aa154fc6e94001b6d9bd56f2c2c41a48b711429ced1df468aced60dd9ffc0b5cbe3cc64c0f60929f693652a614172bddc8d3eb
 MISC metadata.xml 559 BLAKE2B 00a42c97d16a3ef5135cbceb9c57f37ea8ba2d78b9fad893aa2371f5013cf6a566397b51a1c19d2a257eb4f6772d9bef4b1b2725664c5193f0d51d6d3c367288 SHA512 35433c51484bdaff4ab3aee94707dd5dc3810986c5e65cbb00be7a3fa6798909918b4dcb3c89b58b41765311e24eaa7b288546311df0ffd4facb1be8250253c2
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.13.3.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.13.4.ebuild
index 7dda709291ab..7dda709291ab 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.13.3.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.13.4.ebuild
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index be01ecf502ee..336bf5449301 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,7 +1,7 @@
 DIST kgamma5-5.12.5.tar.xz 60520 BLAKE2B 32b57acb6304cf68dea7c4c61902f7646fbab40a26e70e1ecc0df13a7b417c6f40cb16ff33e9f3a0306bf8328f35faf0821373a64d2936a9763ec2a05ff9c50c SHA512 dc1bc7fe868548a4136bf981dfa086cf9a0d20b0b01905608646f99e29f5e57a5e5b4fff704df79e8d8fc5b500d21c440e6172b99f6175fc959eadf7e0566790
 DIST kgamma5-5.12.6.tar.xz 60620 BLAKE2B c987717208d0193c849100a9c0ff407ad46536b727a75580fcf244fdb8766571cea3c3a8da9e24a617551ec08d3c0a8291e0617353d95571930718d91fe12f69 SHA512 afc659f4de1cc247837c519ca3a245d15c459eb1b5be6675a24381e1bace6b3e981e2e4f7f9bbc982b5a8e7a780e33b9f2a1684d5a915ee47d3e835ca78cc921
-DIST kgamma5-5.13.3.tar.xz 79228 BLAKE2B 25fd859c8e6b2506c069cbc7541fe3c44ed4ae0daa342e01cd8be261b58a8c0607503901b0fa8cd0ef1a3fbb9bace8d9dc977d6a655a96c510214f1196e918d1 SHA512 bde153e32ee85a9af69174d98548259520fde05b7bcea6a1cf40b181d1728af1175adb4b34b873758f445ad0e55e154d87141e6dd39dbca222a00a8ff965f644
+DIST kgamma5-5.13.4.tar.xz 79420 BLAKE2B c1032bfca891c44e11237f0ee0c7d862a5d4848f6ab1fcf53e77b3e2ff8678fbd3e5bee7dab10eb124884b3b10eb94c4b55ef1841bb0870ea7cf2d8b2b154f90 SHA512 82733c7c20a11ebc0c713d0bb0521c57a17f4f9f127f0b86f3bcea05dd3bf89537c6787ba34dec4e7555e0cadf6279280554f853742b47d84b0a3de21e045f20
 EBUILD kgamma-5.12.5.ebuild 531 BLAKE2B 2e87de7e198549a0dc3d4e0cff27b72413acb4db6e147b6bbfb33f4aef2d8716c4042b3a9289f560852ec49e12b9bdcb9b4ebf52a76d99fac5844c18cd09d503 SHA512 6ca5e677045e73d737234140d42c814a29683f46aa653dc9a6adcd395824abc9d22409cc1a33a79b00c61df0a11f02d692722f3e1e18755f8839f7e461cfba50
 EBUILD kgamma-5.12.6.ebuild 533 BLAKE2B 4d793b79956e5bc887603de5cc96f2232fe46ef532f2e0a54fde1393381321dc89b013898b73df8ceea280d8e6435aaf45ba5f8d36409f55d4a72d35eb114b27 SHA512 a614245bdb6d51a506d38a2570a2aa9c21d07bfa56fec57bf80c2e5c3c1679af7b5277a8ef131f79486ed0d20b12b9b8792a853c336e64667e853a60b7a2d643
-EBUILD kgamma-5.13.3.ebuild 533 BLAKE2B 4d793b79956e5bc887603de5cc96f2232fe46ef532f2e0a54fde1393381321dc89b013898b73df8ceea280d8e6435aaf45ba5f8d36409f55d4a72d35eb114b27 SHA512 a614245bdb6d51a506d38a2570a2aa9c21d07bfa56fec57bf80c2e5c3c1679af7b5277a8ef131f79486ed0d20b12b9b8792a853c336e64667e853a60b7a2d643
+EBUILD kgamma-5.13.4.ebuild 533 BLAKE2B 4d793b79956e5bc887603de5cc96f2232fe46ef532f2e0a54fde1393381321dc89b013898b73df8ceea280d8e6435aaf45ba5f8d36409f55d4a72d35eb114b27 SHA512 a614245bdb6d51a506d38a2570a2aa9c21d07bfa56fec57bf80c2e5c3c1679af7b5277a8ef131f79486ed0d20b12b9b8792a853c336e64667e853a60b7a2d643
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.13.3.ebuild b/kde-plasma/kgamma/kgamma-5.13.4.ebuild
index ed2ecec465ed..ed2ecec465ed 100644
--- a/kde-plasma/kgamma/kgamma-5.13.3.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.13.4.ebuild
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 30677d22d8cd..43e16c94ab6b 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,7 +1,7 @@
 DIST khotkeys-5.12.5.tar.xz 1064388 BLAKE2B f57451b0fceef79c99e238d8abc68ad8081c42ff48ac6ab1a82aa37785696a6eddae228d1909d7ceec9552ddcae7c507cb1319f90f0169cdb7f741b81dc1bdd9 SHA512 7d69a90900e644a38d3b905b019b4cd0038626c1dfd55755483b1a6f02b05b4c93bb59011cd9163293a8a3603b77c21c9c03c4312d45d0cf7bdfab7817974e18
 DIST khotkeys-5.12.6.tar.xz 1434448 BLAKE2B c553adb03a06bda89b369906a4e59013728f17b8e15a502dd824b528a6e8e46a8ae6bdd0ab4c1a19e50465ebcec928aa5281ba42776f3d26334c755ac3d030c6 SHA512 31057bff8eedc43c52ec71d91a2b4d5dda6759f7325918d905dece24ea4012a3979757c2337571acb9678661122db91258261a5139e20db402ec332a111fda39
-DIST khotkeys-5.13.3.tar.xz 1379988 BLAKE2B 0982689e9d76b19314e16dbebf2a440e615c3dea1805cf6d0e5eb12ba86de71c16aacf907fadeb460e787e642fdc1c602f7e68a7cf9501088c9fed057c274122 SHA512 75c8ae20718f07c4d713bb72f04af0973e6dc01c3bfa81be5dc296cde36d452b4da03fb2fabf388e2aeca35db33f0b3a0739ce3dd0852f366be97b8ffe4bc5d5
+DIST khotkeys-5.13.4.tar.xz 1382036 BLAKE2B b5c2aba593d40d620eb897d5d856059184416cd257b5e1032459bd4017e6f94f5d136b707dd2e02bb94dbf147ee7184579669b7732a1a3122f41ffc19693cabb SHA512 ee17889763b7a1a05c47f1f2ee95c8bf007266437b8a165b7775248fcf39e6b896ccb124c8e6b4df21145dd28ccd3571de4c1e9020de7100a2c9e87b16484be3
 EBUILD khotkeys-5.12.5.ebuild 1125 BLAKE2B 3a64f9bfa2b328ca5aabd46d99244cc6b26a16a64aa47b10ec2178ac13c89f92135358de6f46d9985b37ccc281f632ecf7565eb5f03dfd430cd286f08e91e1dd SHA512 34d8aca0ef5ef2c4d86370d8f05cb38b069c68660ec072eabb9f7a2cfed0a0ba04af47dc59d86b33baa7d5d56227a990df77a4cb8326014f659ff59093150871
 EBUILD khotkeys-5.12.6.ebuild 1127 BLAKE2B 500d0ac049cc6045f182b5eae8bfa719b2d28b172a3ff79198a9d75c47ca1e6334502c30b01946aac228c9eae7dc813d503a1330e384432fccbd76d1c2e3561e SHA512 9597fc10fc5e1b1b1574a4bab2cbf6421a4d36679eaea7ef673e2489538b98759a318d2dc795ff59adbc1066babacb33c486a1a18871cdcc6510762ca8e1a639
-EBUILD khotkeys-5.13.3.ebuild 1127 BLAKE2B 500d0ac049cc6045f182b5eae8bfa719b2d28b172a3ff79198a9d75c47ca1e6334502c30b01946aac228c9eae7dc813d503a1330e384432fccbd76d1c2e3561e SHA512 9597fc10fc5e1b1b1574a4bab2cbf6421a4d36679eaea7ef673e2489538b98759a318d2dc795ff59adbc1066babacb33c486a1a18871cdcc6510762ca8e1a639
+EBUILD khotkeys-5.13.4.ebuild 1127 BLAKE2B 500d0ac049cc6045f182b5eae8bfa719b2d28b172a3ff79198a9d75c47ca1e6334502c30b01946aac228c9eae7dc813d503a1330e384432fccbd76d1c2e3561e SHA512 9597fc10fc5e1b1b1574a4bab2cbf6421a4d36679eaea7ef673e2489538b98759a318d2dc795ff59adbc1066babacb33c486a1a18871cdcc6510762ca8e1a639
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.13.3.ebuild b/kde-plasma/khotkeys/khotkeys-5.13.4.ebuild
index edfaf921288d..edfaf921288d 100644
--- a/kde-plasma/khotkeys/khotkeys-5.13.3.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.13.4.ebuild
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index eb7abb4fe243..13ab42747813 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -2,8 +2,8 @@ AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e1
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.12.5.tar.xz 1270224 BLAKE2B 5c2b0148f82862d32393804bd98ca99ec71f476d4103f015f159420223bb695b8d237673aa94c12d9be4147b36c52d9cbbd0d8f0e69208f6afcb18363283a50f SHA512 f8178452b2611473733ec707be1683234bcd22bac381d6d8fa47e695653c5d2983dab37dd24dea19024cd4a68e4736bb08a3b197c8a6932a45c927ee7a61638d
 DIST kinfocenter-5.12.6.tar.xz 1276012 BLAKE2B 633f47373b7439ae48720c97debedd1e134c07d3a7b9028b0d7aa13e952c8945e2499c9c9d4582d25b275cdff57ceb8727ad0f58e7ffac063efcab66664f0490 SHA512 521d588d73bb32fa2020b8c4faacbdaa86e65fca421829566fb9a21a15750f6d9c912c2d948f8a11ffcd304d51d5f062c79147fc8703c345fd4a1153dc937ff6
-DIST kinfocenter-5.13.3.tar.xz 1276704 BLAKE2B e39077832916e359b4997391be21ee566c68503b78d001360020b422030adf5fb267bbac44055c997ca931e3de82d2d6d67e69dd8fc31bbe2e792b6261d0ded4 SHA512 f7fba43cbb74270b4e6465db8ad3bb6327cb3d47c0f08627bb18ca72e99ba90a26eb3ad67c4e6d7af3d1a280a8c483590ea94e6d39bf9b39d8c371544228afd5
+DIST kinfocenter-5.13.4.tar.xz 1288580 BLAKE2B 6ee51648c4802a192995f430a2ea2f2653b79acf5d3a8219f08caeddea4a677cba03ab93353e488db0f751d20744f97a9a42a5852d48bfd0d2540c4ffd0c6b9e SHA512 d871a2c4bbd20b2ce2d23887aeccfd999b6df549afb5cc6188d8b719600482623c6b049ce06190458251482be0834f1ab9a02b7c773b06594ea3fc7aaf0df01c
 EBUILD kinfocenter-5.12.5.ebuild 2509 BLAKE2B 15b97b961dbcff0823c480d5f63757cc88b7d90206b7fa48083c7555067c691a39ef98534bcb94bb1b2f500ca47ae6981d44a887e3b4edc4dab78af26f59fcef SHA512 52f58bed4f004c0b01021ff264a40fbf090c463c56dcc1bb805824b26fc37480abd9cabbf7fba3fa75f3fd56c149f22c5fa30cecf273c6fb6ffc95a668a2210c
 EBUILD kinfocenter-5.12.6.ebuild 2511 BLAKE2B 7db6111f9c2b3fda0e257e91602d937b0cbed89c75e8b05e726b1fe25d110e7e9b28ebf494ec832ee171bef8d76a2ff023c13e68fd8cd99b9dd01e0ccbeada2b SHA512 50e683ae8a4cd6115d07834b59dabca586c43a27fb99db467e0f0e565f847102fc17a4a5069be2a15b131068679757fb2945b624863074b87a9c36572d2dcd76
-EBUILD kinfocenter-5.13.3.ebuild 2511 BLAKE2B 7db6111f9c2b3fda0e257e91602d937b0cbed89c75e8b05e726b1fe25d110e7e9b28ebf494ec832ee171bef8d76a2ff023c13e68fd8cd99b9dd01e0ccbeada2b SHA512 50e683ae8a4cd6115d07834b59dabca586c43a27fb99db467e0f0e565f847102fc17a4a5069be2a15b131068679757fb2945b624863074b87a9c36572d2dcd76
+EBUILD kinfocenter-5.13.4.ebuild 2511 BLAKE2B 7db6111f9c2b3fda0e257e91602d937b0cbed89c75e8b05e726b1fe25d110e7e9b28ebf494ec832ee171bef8d76a2ff023c13e68fd8cd99b9dd01e0ccbeada2b SHA512 50e683ae8a4cd6115d07834b59dabca586c43a27fb99db467e0f0e565f847102fc17a4a5069be2a15b131068679757fb2945b624863074b87a9c36572d2dcd76
 MISC metadata.xml 390 BLAKE2B a47af94b17ade0ad2f4b4a44bac8ac1245c29a6551a059c95967ce2d5cd4420a975210bf0e4658c2152aaf5a894f934cac0d35aae015368bf1f8f8b1cbbbb069 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.13.3.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.13.4.ebuild
index e0627f416eeb..e0627f416eeb 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.13.3.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.13.4.ebuild
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index bbdb04c4ad50..1c80fdea28f9 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,7 +1,7 @@
 DIST kmenuedit-5.12.5.tar.xz 652192 BLAKE2B cabbc2849e6311ce14b83bfff52e03b73f32443eda49e652f94604f9d71f1894a8b75f2e8eca25edd16939c05dfcd5e7985461c5ffad2e785c2af1ed337a2122 SHA512 d73ee3d80ac9954f7e636ebeda3a8306dc4f2ea6b0b4430a0bc87a57afc2fed760fbd4b7e20543ce17303aac65dd8ca9035aae0bd148ced78c5ec8c71b96abd1
 DIST kmenuedit-5.12.6.tar.xz 657044 BLAKE2B e7db78098360f97799b546cec03ae7586e4322294073c4e14f39623c67f8a40d2d23ee25324612d68c1e5e4c04913e346637c62276f2c8e2e2cc4adb2db48d0a SHA512 42414774c4c50f72c6ab5357039f5b64ec05283c6d7b279f80b1a5be23aa4171149d77969c7cce7d22753e398cbd4a016ff9c6a7f8f2ce98853b7582c556b1e7
-DIST kmenuedit-5.13.3.tar.xz 615412 BLAKE2B 3e0ab738f9173d65b0b3dc4e4c574d013b4d1179eb68f27f0b28ac3fa085c9915eabd1544828b43ce9ddb79acf0cf166f07c2eac4d3ebc773803bb0b3e99fe0b SHA512 861038769a64acb0a2c4ee2ac174d28619d49cc13d7345f8b680ac5cb15cf1391834fe52cf785fba1c116599aea7bacfaa931f3f35804cb5442c7d34cc5a5f2b
+DIST kmenuedit-5.13.4.tar.xz 775100 BLAKE2B 16d49119d1a6c6a4911ceb4e4ee36aa5fa5b3771e008870dee8094ed08d16dfc2fe1f65c17936ebc2a32cf364f117a2e77ee32c97bb29570015998e5aea7f064 SHA512 18b250ff68e23c2ac9509d0976013005d39b80562f12e16029f69f257d5ed3e75bfa10618d2f91aec4c6993f6c9ac70a080379243ec230f2129ec02b7c73bda2
 EBUILD kmenuedit-5.12.5.ebuild 1028 BLAKE2B 61939d330fe0251115207ac560cdce1b00517a31f97c0e176ee335431fa3da77b498b1346fdb668d7120af7a2850e2f02bd80a258fb13dc15527e69b3cc2f46e SHA512 7c150deda5597fe3cf45a74a53e08375b38731b770f09c0836fceeeec1dce0656a347d5d0eb2276f0605217b89570c6ae5b81e6e2560e680d2edd5d4fad265e7
 EBUILD kmenuedit-5.12.6.ebuild 1030 BLAKE2B ca866e167ca43334565ec69f02b94b0792d943f99959380c8b76efd25c2f8d44469415ea48865ee45cd9eb5ff37237056bbe10029ad41f90ea20f1d2f5e2b11b SHA512 b6e1aedda37e0b6ec05707c7c98c70d707304f9c8fb80bb20946d260d1ebf3071969d30c20d0d35dbacf2fcab8bc973d6562e62d1426f5a66ca4178f4fafcd76
-EBUILD kmenuedit-5.13.3.ebuild 1030 BLAKE2B ca866e167ca43334565ec69f02b94b0792d943f99959380c8b76efd25c2f8d44469415ea48865ee45cd9eb5ff37237056bbe10029ad41f90ea20f1d2f5e2b11b SHA512 b6e1aedda37e0b6ec05707c7c98c70d707304f9c8fb80bb20946d260d1ebf3071969d30c20d0d35dbacf2fcab8bc973d6562e62d1426f5a66ca4178f4fafcd76
+EBUILD kmenuedit-5.13.4.ebuild 1030 BLAKE2B ca866e167ca43334565ec69f02b94b0792d943f99959380c8b76efd25c2f8d44469415ea48865ee45cd9eb5ff37237056bbe10029ad41f90ea20f1d2f5e2b11b SHA512 b6e1aedda37e0b6ec05707c7c98c70d707304f9c8fb80bb20946d260d1ebf3071969d30c20d0d35dbacf2fcab8bc973d6562e62d1426f5a66ca4178f4fafcd76
 MISC metadata.xml 328 BLAKE2B cc8d80521bd21c44133754342167f505138a6950cddbb2ebd25a8c5d33aed81ae968049931a5a0b959e7cdf70625e41e0d7e2ea87658d628a1b35da5203d955c SHA512 9286db1913899ebcf8b0da8ae3ebd12b760e2b3631399538210ff9d4b15c7b62e28fd138e75689c5bd03a5d6ee4e412036ac7f10a45a56bee9cb04184036a2e9
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.13.3.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.13.4.ebuild
index b504d5a6e14e..b504d5a6e14e 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.13.3.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.13.4.ebuild
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 41f8359b2bf1..3e38b7142360 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,7 +1,7 @@
 DIST kscreen-5.12.5.tar.xz 117820 BLAKE2B c7c073a9fa6e982f5474f11ab5073ce5279bd8f67faa20cfec18e18b8ea01228b508f642e4b0c0d00168ff9b3033b75935fc3e00603cea7e91340fd0b3b922a9 SHA512 d2f7bd25c93409e6198a1a3f65c3a85ae22e1031daf3115814e5f4f5252e1f6c6e0c7d94e3208840598a4ef2ec7bec31f8728f96eb735a887b00ce5e34c4466e
 DIST kscreen-5.12.6.tar.xz 118028 BLAKE2B 34c9838c078c2fb40d87bf572d59129d00fc0bfdd4ad408e824bb98a1b67243f11a08bc2a3fe335f1b71873b204c3440a1cbccacac32d898d538610525a2fc9b SHA512 3d7dea7734aecedac49078b64ccd62081eace836800dec24d2a9cd18bc9799405bcc029d93734e9037e31e8cd4cf5695ee66485827b364c60ec08ff4b56f5e85
-DIST kscreen-5.13.3.tar.xz 113260 BLAKE2B 749d666aad9722505b4035c18222e87524f285b773fb18ef55154dfa369c1045f67452bc68df307a8bc4828f7970f2f7fb941b9cc953830d7360bcd935597e47 SHA512 602ec0c0bb1397712867afeff274129ee2bd8e9722de3c5890c04bb46812e8377fcea4889dfb891454e32a9fba7c69d9c682082c92fcb329d2db26feaf83b86e
+DIST kscreen-5.13.4.tar.xz 113420 BLAKE2B 16e103cef3733b24819be1fdea18ba3f5a914b78727a046ab4ba1a9283d00c6aa857226ee6d34ee0c3fb2eb482ab5b321890b67a3a69ee53166dea19c02714f3 SHA512 9f9572c47c990c42b8328ac95663e5b9ee10adb7298630687d81a3f84ee6a6ef062b3f78dd9d943946aae261c6090bc8401edcdde1407122e45a288883d7d6b0
 EBUILD kscreen-5.12.5.ebuild 893 BLAKE2B 96a21fedd04dd1f65d9400bc67aa2d2324c7b39bbccb2ed937f53c11a42386d1f14f8661d74720228b31007d610ea791f1095c1b5e69f1c602c245c16d367de0 SHA512 806d196ec98ca72aa1e2b81d5ed136cc0e61ca616e2ffed6ab0f08ea46dee62fdbb093bb891c73b473053b11a0abe8a74cd884f36f8c3d657067cd32e8182f5f
 EBUILD kscreen-5.12.6.ebuild 895 BLAKE2B 05a0a5838845a9961b4bd3fc0b7d4640953df52eccea95e58c33eff0b04a0e8c045f11146d48b36f3d726ba8e3105df9f47d14425b6d38e4d34cad4327ab1c96 SHA512 4225eba2e3ac0044655210a7916fd0eeadf98f095d5f202170eb1a5f9bcdbd3c6e03bc8cdda70985f971fac7f8b0a5f3954d32bb7cb9cf1a485e8801ddf32ccb
-EBUILD kscreen-5.13.3.ebuild 966 BLAKE2B 22255fb7cbed18b5cc0aff47ae5cad6d51c06a04683dce95ff53f990aa17d671ad4b6b001ee70c6336828ab831d7992f7b46169435f5e38d5a9a563ef1f62c2b SHA512 69ee43966bbeeaaf01aa8bdabc1a7aa0f267d5fde491931bbd3d515072a173d4d8232779d8184cefaee8a55395b85534dc342488dfce440880dcb5b0cbdcad57
+EBUILD kscreen-5.13.4.ebuild 966 BLAKE2B 22255fb7cbed18b5cc0aff47ae5cad6d51c06a04683dce95ff53f990aa17d671ad4b6b001ee70c6336828ab831d7992f7b46169435f5e38d5a9a563ef1f62c2b SHA512 69ee43966bbeeaaf01aa8bdabc1a7aa0f267d5fde491931bbd3d515072a173d4d8232779d8184cefaee8a55395b85534dc342488dfce440880dcb5b0cbdcad57
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.13.3.ebuild b/kde-plasma/kscreen/kscreen-5.13.4.ebuild
index e201e30c3a21..e201e30c3a21 100644
--- a/kde-plasma/kscreen/kscreen-5.13.3.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.13.4.ebuild
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index ba8bf7c8d0e2..8fa3e67438e4 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -4,8 +4,8 @@ AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f
 AUX kscreenlocker-consolekit-unlock.patch 792 BLAKE2B 65ada31a191a5ae478a8a5edf27d0555ab4e81a20dbfb128cff1de520386f914b9730f22bb709be97f0ab9a38c9aba1d0a4596039b2438325ad55ea3969f7fea SHA512 21f06f101a9a04a80393a040d29506de8b4de129f3c6433d5455245ec6a9dca9630a59338612396032bd66e345fb59fb78bcd1b486b5d46138be616da632ff18
 DIST kscreenlocker-5.12.5.tar.xz 118332 BLAKE2B 87705ff5aff4d73c8b7823f4aa505be282fa9a152352aacf1682d5d7f4dff06fdca1b39d30a43dddd6c0dbfd267586d2a74bbdbd8bdacf487a251cb496311dce SHA512 c07cae22cc4500aeb4d38388d2033a677171659a76d81ff55155a97aca439babcb912f47586697657c7944c80b0d250770ed3a080fad0ed9463058dc879f390a
 DIST kscreenlocker-5.12.6.tar.xz 119116 BLAKE2B 3c83018188e0fe321aff84f2a6f93222238f417cd0c1dbee88e6a46f293001092bb43d39345c3c1c26878b00c1b9410271a970303ecbb8bdf39231a319dea458 SHA512 4d9320027b8c3150f75bb2afeb4c708f0230a9cfe239c28edf5db1c90e247a391a7643f876b3d9afd9e6afadb830f962b05c05125d11253f5542aac2b48f8956
-DIST kscreenlocker-5.13.3.tar.xz 121908 BLAKE2B d7c3e6e347aa16f99dffd83f6721f63c885c9f5464b4fa8bac1f4aa389ad590977e27cd83b35a48be7ef6610f529102535d9917f49918f4da78841b2bd8cc489 SHA512 1a3dd06b71a043ac6890d062163466944d2431b4d7efe1b83ec7363d7375b418585bd518efb33b0130bfb21d6c3c1f782e6c21519ac3b9cf7765618882f1f4ee
+DIST kscreenlocker-5.13.4.tar.xz 121644 BLAKE2B 67ba7b8774e43c7dc8e7173419fa1491bc7f538b1ac2350886448a8c3eccbd9ad7ec375b07b3582b9f82724a3582032dcf2b417c141a6d8e58d6552e08236c2e SHA512 478c0d11021f8f202be8ee60631bcaf010eb11bc953812d538285d6ecb2cd96b769a4afd34797806b7e345a22c351d5bbc049c9d17e65b05048e165015cca46e
 EBUILD kscreenlocker-5.12.5.ebuild 2231 BLAKE2B 64e6f1fcec4c10f1b132f982885b7e147bd4cc5683dde7db7f6156eb6657bfb28348de634f18c63aee355397527552cc658e26fae2abae217a29de3cedc42544 SHA512 f29c740fd2c2191f64595192ca48c6eb4bfa07eb0739aa157de6b33b96873f27b3368039a18d100cd4af24aa6873b6bb3e65f5b7d8dc368bb7fa03072b556edb
 EBUILD kscreenlocker-5.12.6.ebuild 2233 BLAKE2B 5e3762e24013e037a2ae6df853e91cc9f2795282e45f09f92fd7dc877d77560cd984721dc64a5ed012993df80907733d85845776785aba0060aa232e2d2f3df2 SHA512 a4119d5817b03e0d588762f45bdbb15399b1244df0944d9a3b71d9ce5b12078f5bdc83421e5ce348ffcc2268538f2d8e3605902fdcf5c92f4b877c8d8b6c7358
-EBUILD kscreenlocker-5.13.3.ebuild 2127 BLAKE2B 98be7d075d0a12eb2097e0bc70c4fe0bd348b8ca971f8c13b0c51720ddf7fd05f171cc540633b28e7c090796b4971397d65ab9aed58fd2cc96be8454a389cb3f SHA512 8fa4af6398741fcf4cfbb2ab9da4ebe10e50c5cad46bdc2fb7176fa826a1cbe9e05430fd85194663708bdcfea236451ebca9d3aa6cef6a9dc64da73d184650ad
+EBUILD kscreenlocker-5.13.4.ebuild 2127 BLAKE2B 98be7d075d0a12eb2097e0bc70c4fe0bd348b8ca971f8c13b0c51720ddf7fd05f171cc540633b28e7c090796b4971397d65ab9aed58fd2cc96be8454a389cb3f SHA512 8fa4af6398741fcf4cfbb2ab9da4ebe10e50c5cad46bdc2fb7176fa826a1cbe9e05430fd85194663708bdcfea236451ebca9d3aa6cef6a9dc64da73d184650ad
 MISC metadata.xml 397 BLAKE2B 0fad03b144a175f0f5f9d8e0c0ba4f75e6cd4f211ba0207e73a7968b7d49bbe0977860324a51ebef324ea0f915eb92dc23978558e000085ff21bd8fdb1d53187 SHA512 1d3749f74eab5cd2e17f73bb44e9f8d7ce03060db8d422a835597f13dce6c39c232eface04d9e74ed3ef66e9a45bb7b4b64c4cd82f6b5aedc62627bd77801c76
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.13.3.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.13.4.ebuild
index 4fcb306fa5a5..4fcb306fa5a5 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.13.3.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.13.4.ebuild
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index b53433c8a732..d20cafd345b5 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,8 +1,8 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
 DIST ksshaskpass-5.12.5.tar.xz 21200 BLAKE2B 70d134502538dc5aed5ff8d65a1b5c3c3f9e714f849e9cd9b66f43b170db4ea4e23c2a011ad2dec81d05bc26090e64453b592a5677969a2b3ed812e7d1459f4a SHA512 4e798ac709d656104cddcb637aaf352c3f55660256f7edecd2caa6c78cb2ccba065c1c9e17e39a14fab72ca760c18b729035598fc6f9055fa1a6d6b9fe6ea453
 DIST ksshaskpass-5.12.6.tar.xz 21264 BLAKE2B 41c0d67308041c5eaf40c925e303f7ae5f1d0c0aaf654df18bc45c30e9d444ec950323a356ae60d98581a5e2670cec79d672b843e040539fa0d0543cd7775887 SHA512 d01ab87ba927e4e46f84ace3cec09431148fb0312cda2bd8972d185fbd3408525f01d90ade9865b481b19486c75ecb13cef47fbe2f41a37fdbc99b502a3b7433
-DIST ksshaskpass-5.13.3.tar.xz 21528 BLAKE2B cb4e3fa1d79de3b6affd9a5551808ea080b9f9ae6f0304ea22bbf82ea2cc28b85bef40f9aa1ed4663c00ac012f7d700fcccb766dde0199e2d32fabe34825d95e SHA512 a9ed9d89822a1881e0fe3a2a0204d8bf1edc9ad095cd208edf01aa0d441263d342e6d415b48ccfd71e917fc29ec2e0e71bc0c68241985480ffdff04a02ec3673
+DIST ksshaskpass-5.13.4.tar.xz 21460 BLAKE2B 62d383ddeeb22e8806a1fb54c791cd7634c83d83daba7e4d9fb99d02234ada73e277222327d9fe981ad715e6f51573a95fb69e8246dd490efd7fe5de72a88e09 SHA512 1572e60bc3e748009f591227147da479909835a408b19bfd1d7d46be452d461d94e583a53eafd1241be90be2faa86852268cd5d109420877eaff4d055d10b402
 EBUILD ksshaskpass-5.12.5.ebuild 1235 BLAKE2B 76ec180a4af4bf1b0f861f3f86e8ba4df59d796a58bfd95dcf1e1dac2dcf9eb7e7682a714fef94cfbe1609518381e8d812b10f6665d2aa2100b6ac337181f5a7 SHA512 02ef5de19976e1b1aaa20ac0c6534bca3094a4befad0da39d557199455ec37d8f058e5aecea2be2a808bb98d5723ca511147ab7148a205fa39515d960d3b41eb
 EBUILD ksshaskpass-5.12.6.ebuild 1237 BLAKE2B 1c99e53800164ee9b4fc7a1b3f0e455d73731bf4134c4ef564ab87232172821c4f0b21cc6585b71af7260f624fc2e72bf65eb1f464c3cb2306387c41a494eecd SHA512 8dee7f813fb760cabaa932423c2cb099647141f664abdae30996d212226aa9c42f5b683543d021ec2abe48d19086e22a26416806375849c07c0db7900ab5b0ff
-EBUILD ksshaskpass-5.13.3.ebuild 1237 BLAKE2B 1c99e53800164ee9b4fc7a1b3f0e455d73731bf4134c4ef564ab87232172821c4f0b21cc6585b71af7260f624fc2e72bf65eb1f464c3cb2306387c41a494eecd SHA512 8dee7f813fb760cabaa932423c2cb099647141f664abdae30996d212226aa9c42f5b683543d021ec2abe48d19086e22a26416806375849c07c0db7900ab5b0ff
+EBUILD ksshaskpass-5.13.4.ebuild 1237 BLAKE2B 1c99e53800164ee9b4fc7a1b3f0e455d73731bf4134c4ef564ab87232172821c4f0b21cc6585b71af7260f624fc2e72bf65eb1f464c3cb2306387c41a494eecd SHA512 8dee7f813fb760cabaa932423c2cb099647141f664abdae30996d212226aa9c42f5b683543d021ec2abe48d19086e22a26416806375849c07c0db7900ab5b0ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.13.3.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.13.4.ebuild
index 3009c8d5ff69..3009c8d5ff69 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.13.3.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.13.4.ebuild
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 3147e4932781..2f8a50f1257e 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,7 +1,7 @@
 DIST ksysguard-5.12.5.tar.xz 486676 BLAKE2B 4c706d719920beaf1ec831d23d918a254e01281e89232b1b36e9ca0f5a3134b3b688f7b37af3f41836808a3a3d8ac8052da65df80198ab8ad20fcfa288e868db SHA512 02f5b64a39e395869479ab93ef683136b7017dfb51e55dc03206641bd46052e656547244fc2b6cd86902d5a4f08a5a8fd7d1d5ba0fed73c765a2cfbc39f4bd32
 DIST ksysguard-5.12.6.tar.xz 490700 BLAKE2B 983efe089236f929f0eaef8c43c17a57223c1710d153240b10a76cdacbda974b4c135b3002a89edc72be605fcf07a61e02de9c00aa7291d84777b71190a2e86b SHA512 ca0d21e6ed8fc8b042c6a0fbbfd0fa57811bf0e90da323df32c7905f8ce96155b67916d3038f8a993ab8e12383c1a3131d5d3bfb028cc374ea46129046f5ad81
-DIST ksysguard-5.13.3.tar.xz 492048 BLAKE2B 8465f9fe9331442b16960a6d67f853b4bdcf88d7d4023741d829bcd7af94e4fda627d4bedcb9cf08ec5b3de5c62a02166aa25b6cbe6b672a5457040b743d38a4 SHA512 ebd7c473341ab10d7875c3ae8971922e6a182cd30340f0877fb8b191f26dae7bb71c5682ca025a72137fdfee31d8fecf53b824c113325e67d56756140ba28a47
+DIST ksysguard-5.13.4.tar.xz 498168 BLAKE2B 89ea8ba2b3406d7c379737bb264b454a337dbe294376d73730c780515ad7ee7ca96712c2bf62ca51480df8f08ac9b22e944d18f8e0e0c048df32764c75d9542e SHA512 9b4035bda56d111f17d7751fde127a99dcb54c5b21f0f3b6881aafbd9f6e38ac76d54158cb6b4f36ecdb1d1f7eb992e6f58114396d843bb078b6ec82f8b15c5e
 EBUILD ksysguard-5.12.5.ebuild 1143 BLAKE2B bc2409ea028c763c822431abd58fe334cf5f3ab8430b43ec61cd53336e278f4a8bcb518e01d1de86607053fded35b8924bce024ababea2c904bd89159e57a6cc SHA512 3f50f88f16dde5a45742d8012d5a5601955b59c191aa82d0fa410425fa56e13faf3f8370a4f86d2eceda48790d9ffc12aeaf647a1689f5c1310ade072a8037c3
 EBUILD ksysguard-5.12.6.ebuild 1145 BLAKE2B 46054b5abb67d1b8f049c8bcc974ee3e2bf7c2029c151aa31688cab1b251e2913aa54bc6587361b2b7030ffed33aef8615af3a8d3641f1463458f374f29a635c SHA512 201d5337ec13c6b615401ea9b0ecf478224d454dc6dde1c9defddd9de9a980f9ab9f3b9061e1c3a84a5013cdb0964a7238b4a3b3caf83f741ce8c36fa9247209
-EBUILD ksysguard-5.13.3.ebuild 1145 BLAKE2B 46054b5abb67d1b8f049c8bcc974ee3e2bf7c2029c151aa31688cab1b251e2913aa54bc6587361b2b7030ffed33aef8615af3a8d3641f1463458f374f29a635c SHA512 201d5337ec13c6b615401ea9b0ecf478224d454dc6dde1c9defddd9de9a980f9ab9f3b9061e1c3a84a5013cdb0964a7238b4a3b3caf83f741ce8c36fa9247209
+EBUILD ksysguard-5.13.4.ebuild 1145 BLAKE2B 46054b5abb67d1b8f049c8bcc974ee3e2bf7c2029c151aa31688cab1b251e2913aa54bc6587361b2b7030ffed33aef8615af3a8d3641f1463458f374f29a635c SHA512 201d5337ec13c6b615401ea9b0ecf478224d454dc6dde1c9defddd9de9a980f9ab9f3b9061e1c3a84a5013cdb0964a7238b4a3b3caf83f741ce8c36fa9247209
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksysguard/ksysguard-5.13.3.ebuild b/kde-plasma/ksysguard/ksysguard-5.13.4.ebuild
index 5e2260a85627..5e2260a85627 100644
--- a/kde-plasma/ksysguard/ksysguard-5.13.3.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.13.4.ebuild
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index b872e01eef1c..846a9dc4be26 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -3,8 +3,8 @@ AUX kwallet-pam-5.11.5-CVE-2018-10380-2.patch 4704 BLAKE2B f41887afa091c158efcd6
 AUX kwallet-pam-5.11.5-CVE-2018-10380-3.patch 1681 BLAKE2B 70874293466ab9c7ce23f1e5eac2727bb48a2a457c7433afca6b3e66117f842115a582ff6dd724183d3e4274cc3b477469123280f84920a99669b24720c585b2 SHA512 cd84684cc2c3538b2fbb762bac2abc05092ba2ad59f95aabc30af395f3c288f770f6b71dbf88042759a7c704d52c13bb79ded90272d0a63080a83da6c375bf8d
 DIST kwallet-pam-5.12.5.tar.xz 18584 BLAKE2B aa5cef35532288e4ff01c483ec2971c4729bd6d3a039981f5873348a39a6b618d43e635cd24a1d8e10f50ff0e9df005ee7aa31c2f1a9695e93733d6157577128 SHA512 b62518019ec2c8c5251198f9498c66b4768cf91851dd112dea1ac5d2e6ef1a500905afcdc2ff88cf4d26efaed7af508af022b811ba42424a71b4199ae03b0eec
 DIST kwallet-pam-5.12.6.tar.xz 18596 BLAKE2B 5ec1638bd71518eaf91becb548392e4df78ff56922c0574ee8981dcc35a3f8d4c00562bbd5cabe9192a727f127cd66ecd3e5b2c3a1a1c59082d5fc1f8ad95d7b SHA512 d0fb215b40ed3bc7c5b6236a4c9e34cf1ecca2ceadfe411c51747d72c503712258ab70e67e2b0025ec0f4488caa6c21bcd4573e2eab98be5b9aae70ae3b5ce48
-DIST kwallet-pam-5.13.3.tar.xz 18620 BLAKE2B e2f70e181619655d72d3bf7c2acc16136449f878c67096676fd1fd5809d51836f8888f33f55099fdeea9f6d6d2e413c2b55eb96fe2f0796e52bdaa45a0f07d47 SHA512 34b9b918d7b3aea75c4d53e76ede49ec9074b4deb4ffff7e3ec34d8801efa19dc385856add74c770875e981818b4b319e835d244f79146b284ed370a383161de
+DIST kwallet-pam-5.13.4.tar.xz 18752 BLAKE2B d546e79a0102760c0b4bb22540b487e44fad33615a2a8e57254944803666558040197d6815b639508c41753c3a630b6df4b9892f3f2ba699ed7f0fb5ac495c58 SHA512 acdc9803b03a29afe1dce50fd62e3df482710f292d9da9b7f71f22ff57248ed3a6f7eba430011fcde7432f49aecbadcae1ace31bd3bd55ab4db333c6e4b372c0
 EBUILD kwallet-pam-5.12.5-r1.ebuild 706 BLAKE2B 407beed9615900fac5d8d0c178a582238ad5e6a2cf2135346089b6863e13cb75fddcea965424b7f6c67ade10bcdc81cfd9497857a8a90f82bdc2503a7c765f7b SHA512 8266f8b9d03f6c7e4e08a2c6e657cb6c44ec716e3619cb6dfedaeb3abfa611b439d7b128be21956cbaeda0d3397b57fae35f5c9182ba02125cb6fb7aa4eca5a6
 EBUILD kwallet-pam-5.12.6.ebuild 639 BLAKE2B 2050e8d5536ac921c663db3912957c054a7222ce9428e731972302b50375a5de3dbb4aa6799fde9c6c070fc0c0083791a8f36863c799d6c793ab102685511d55 SHA512 1f2770a2b879c386e35627ca74a4b583e9fdd3dcc7a8468ed1f993c26d8fa0e4eb7c700509841a2d6b434bade703c4bc61523e61f276f3b41d1521c445a33ff9
-EBUILD kwallet-pam-5.13.3.ebuild 639 BLAKE2B 2050e8d5536ac921c663db3912957c054a7222ce9428e731972302b50375a5de3dbb4aa6799fde9c6c070fc0c0083791a8f36863c799d6c793ab102685511d55 SHA512 1f2770a2b879c386e35627ca74a4b583e9fdd3dcc7a8468ed1f993c26d8fa0e4eb7c700509841a2d6b434bade703c4bc61523e61f276f3b41d1521c445a33ff9
+EBUILD kwallet-pam-5.13.4.ebuild 639 BLAKE2B 2050e8d5536ac921c663db3912957c054a7222ce9428e731972302b50375a5de3dbb4aa6799fde9c6c070fc0c0083791a8f36863c799d6c793ab102685511d55 SHA512 1f2770a2b879c386e35627ca74a4b583e9fdd3dcc7a8468ed1f993c26d8fa0e4eb7c700509841a2d6b434bade703c4bc61523e61f276f3b41d1521c445a33ff9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.13.3.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.13.4.ebuild
index 8c9a7437fc09..8c9a7437fc09 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.13.3.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.13.4.ebuild
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 9c99c5e7e240..0287cc779650 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,7 +1,7 @@
 DIST kwayland-integration-5.12.5.tar.xz 18580 BLAKE2B a40a33e09af47fcc036167a4d7228a7a160b0e7fa6a2520afbef1cdaf707b96a7cbda52c0a4486bb44d4dd9129834fe48bb582fe31adc0b3d01e73d364eb94f3 SHA512 6fab883acaf5bd7dc5d1cf4e5eda78240b358e3e4aec8c0ec53f9e5b20db613df04cb9547dc5a977811421a121a623a121dbeda183ce2f9a415a781275b98de0
 DIST kwayland-integration-5.12.6.tar.xz 18508 BLAKE2B aaf8ea243200b692233afeeb678d0a891bd10c2580a6727b76892d9f59d8efd63eddaf8f89e368a32b91ac7d19e642552fe35e00f71f7bda92d0722fdc21d120 SHA512 697279d6ecbb9d1287ef864a9e522e4930163442235ef81902d6ca60e28acfa58ca4878b1d823a35d0c07d6f2157c037fa645314f97c16d5b74f2135a9a23940
-DIST kwayland-integration-5.13.3.tar.xz 18508 BLAKE2B 0ad151a32637ae94bd4bc3d5287d72a0f6897b58e3c2ecae785448691658f51f3f1b0d22a14ee63edde1b15e381aaf87f327899f5922bfaf9cd5d43a18241705 SHA512 4c605d1ecfd2903195ea393e11e58a18f8854df2eb329f5dc733fe7eac7e16399c0e4ef7b69f849d651cc0955e950adc2161fd3dc156365abc2b3dc7e81df494
+DIST kwayland-integration-5.13.4.tar.xz 18580 BLAKE2B dbab9101ddddd04c1be1b6908ddf7a81227bc2b9fdea1d8b967eed35a4f0082ad1c01ccce17654d38a7b2ff89503745a12f77de2a0a419efc706ac97af8e2201 SHA512 aa01f4bd8f647813c40a11f05f9384dd32ec5833d9f365288cf7dcde3bc87dbcf638b58d486a3d3a014f4f77f04ad33e0fed0c1c7d3b6c3a9e2742402fd235ad
 EBUILD kwayland-integration-5.12.5.ebuild 503 BLAKE2B 1b4b9be2a97f6051ab0e45da929edd0c106f056f06f8918e2482eeb22087ba790a0eb4a5b3234481f107adc7315d1dc547439cd04c6e82460a9a59707267fe65 SHA512 c21a517a77603c7560c7833cdb53dde7c4599ba5d777c90987e8d606c22ff8a1e4a43378611bbf820f4e65d1238d7f1a5e98f8786f48c8a28dc73512473bf923
 EBUILD kwayland-integration-5.12.6.ebuild 505 BLAKE2B cbdc8f11c9246ed71cb0e595c35f58ed4c0adc76e7adb195c5840204e5fe1bd2a6648b065d35a0e100d8902c7a310c47f734fda96cf1121869804a02885d15b0 SHA512 57306cf35020b521fd7fde9cd28324fdc23f170c7b56da613a87fd8005e879b3390beb2b262dadd5e3812c520baf58f88605044f33cac081790500b7171dc30c
-EBUILD kwayland-integration-5.13.3.ebuild 505 BLAKE2B cbdc8f11c9246ed71cb0e595c35f58ed4c0adc76e7adb195c5840204e5fe1bd2a6648b065d35a0e100d8902c7a310c47f734fda96cf1121869804a02885d15b0 SHA512 57306cf35020b521fd7fde9cd28324fdc23f170c7b56da613a87fd8005e879b3390beb2b262dadd5e3812c520baf58f88605044f33cac081790500b7171dc30c
+EBUILD kwayland-integration-5.13.4.ebuild 505 BLAKE2B cbdc8f11c9246ed71cb0e595c35f58ed4c0adc76e7adb195c5840204e5fe1bd2a6648b065d35a0e100d8902c7a310c47f734fda96cf1121869804a02885d15b0 SHA512 57306cf35020b521fd7fde9cd28324fdc23f170c7b56da613a87fd8005e879b3390beb2b262dadd5e3812c520baf58f88605044f33cac081790500b7171dc30c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.13.3.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.13.4.ebuild
index a2771a46748b..a2771a46748b 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.13.3.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.13.4.ebuild
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 0be3fbdf2d3f..5089d55d95ea 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -2,8 +2,8 @@ AUX kwin-5.10.95-test-optional.patch 1023 BLAKE2B 9e3f9e831a7164ad4041732785f771
 AUX kwin-gstreamer-optional.patch 523 BLAKE2B 471af1885be73ef7ea48054ff9451faba750008117903cedb073e2ba217cb48f386b48824af95813e81646afebddcc99e01646d507b26a94e8c55fb5b90f9c40 SHA512 e8a4106f8754e5e1b426f1ae3141d17ba4469c1dac44f34f0ec7292d3242d7848b5f7748c56f08db576e1f826c171a1020d5fe73e2aa4dfdea813e37c565a4e3
 DIST kwin-5.12.5.tar.xz 4981704 BLAKE2B 0631d7cd1f387ef63512601be39fcc280ad3dd751fa0ac8836da969fe526b68a95e81027d1943d8f0679a78ae9e9e062f4d292482497ba19227997a5d746a35e SHA512 9a99645455f17b14ede45d656a83eb753fcd02c2ed4cca10045db84a75c610ba0732ffacca780805b3f990ab1ada6861f9036588d45c1bf487dbf1ff5bf9ba22
 DIST kwin-5.12.6.tar.xz 6514844 BLAKE2B ae159163a3be8e46a63ad2e2b8bf0aa8ab45d4b1fd9d5ef2506fd674824cd650bc4f4ab7c1e328d61883f06427f2704643494a8464146c8d93d12b24e5742290 SHA512 ee9edab9d63d86e95c7853ecfb60e440c6cfcb49252040a36fb9bd61b78ee90290fe276be4cc504acf2a31abdafd8693f23b6165432fd9aa23f5cdb08d3706ee
-DIST kwin-5.13.3.tar.xz 6518616 BLAKE2B 63f98e6a0ea9be9d76d77a40f2a861996f2c8e5ba6f09f99919dbf9c29df329c70718a84f044c6ae5dae50542eb7ec1ccc30b99ae26afdbdb527cb4909d35550 SHA512 5022802dbefaf823b949792dd2385e6e26404d782e6be2a7f904d4d2f0c7e4153f8a45539b2eba7172adb0acddb483328b23abadb0af641f32fedbf5c53b807e
+DIST kwin-5.13.4.tar.xz 6521664 BLAKE2B 93dcedf19296358ab7041c1753fb6aeab71c686b61233e1c58e75b71224a711d15ed0041c2ecb4d9e1c0672103d84715bbb0c7e0ad4538fcd877bd1290933e9a SHA512 fce3f6fa426dccbd0683ab2de2707a673e2bcf7f3d5a032adf92ba09065e5cb3a1975359fabef71502b57308a1af38b758588ed9ba7e2da883d6bad7448e71dc
 EBUILD kwin-5.12.5.ebuild 2661 BLAKE2B 260007308479977f25dddb9c01d014a63e8067901dbd7a9a126074380a6ac36d6290709533a7e051a57dc39dbaede636060971874cc78f57bfe52c3262dbdb7f SHA512 a4ca33fc2c85625ce1c38aed86f8977983e9f307021ada8cf5ec1c2692542dea34a82ad3c3bacc92faebe0062fa13e5e8f88e1c9c1064435fb944cb86a7144ea
 EBUILD kwin-5.12.6.ebuild 2663 BLAKE2B 1a632bd22ff1f91319803b33b30a0cda72c93689bb6a81e0f2f39052af9a6c2340a2864880c9c5a2b18dc0751f2933a090dd5c7e45fc5f236692375b35ebe6a1 SHA512 3d30b225fbc8101cf42a48d9f9f3dd54cde8ec6b77dc1f6565bde41a4b86c2eca03f2bc8431b706fe5298df805f11ccd36e365ffe0ed0befb28c54964ea8b9bc
-EBUILD kwin-5.13.3.ebuild 2634 BLAKE2B d853af28e3de2e43ef8e7cf6c1c933e53d6c882c8ef1e266376b3e2a49b4a4d6fce79d396dd728900a221a3c54899f8d9f5a2ad7be1284ce7868c1fa4306abf1 SHA512 329e6a894a098d87f6029d1ae345225259259617a757b6da8e65dc19e7ee624270899149eaf1497c15729deffdd38a54ece8f5c79253d4014abb3958015f674f
+EBUILD kwin-5.13.4.ebuild 2634 BLAKE2B d853af28e3de2e43ef8e7cf6c1c933e53d6c882c8ef1e266376b3e2a49b4a4d6fce79d396dd728900a221a3c54899f8d9f5a2ad7be1284ce7868c1fa4306abf1 SHA512 329e6a894a098d87f6029d1ae345225259259617a757b6da8e65dc19e7ee624270899149eaf1497c15729deffdd38a54ece8f5c79253d4014abb3958015f674f
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/kwin-5.13.3.ebuild b/kde-plasma/kwin/kwin-5.13.4.ebuild
index 1f924f5f1f42..1f924f5f1f42 100644
--- a/kde-plasma/kwin/kwin-5.13.3.ebuild
+++ b/kde-plasma/kwin/kwin-5.13.4.ebuild
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 67238a27ca68..9773ca2529fe 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,7 +1,7 @@
 DIST kwrited-5.12.5.tar.xz 20376 BLAKE2B eb9f017b3611c3c1b67c0015f956d54848a270e53a452b4caf362026c2ed6a393182df531c48f23f7e5a183fb1e710cb13ed883793d00069794aa20ddc35cea5 SHA512 4b076761fec04b38cf8690e1aa9c3d600343c8945b9d1fbad1ed9184f3edfc1a02ddc1867024c7d3d2b29b9c608037d24b14b2ca59fbb03418ff5e48e26404ef
 DIST kwrited-5.12.6.tar.xz 20332 BLAKE2B 7a56539ec5ea48282c22acd17beb102aadce9a4456097dccebfdb716574aba42c7fae5e9ea80a48bdedfbfe52ccf6d3cfb76ea0f737ba2224f3c9b055b01e8ee SHA512 abd4d415d1fdabb6cc4cae88182cbf6c8426d958ba2704f8760dec9a13a487973bdb1755743a854ecce2941ade2e100ebcfc8f5e7de3eb08647094d02e502c65
-DIST kwrited-5.13.3.tar.xz 19904 BLAKE2B d25c98c0c05fd0905d0a7b230ad7892ce2c1643a0a480d8de7de85a388af6ee58f1a991bdb0f4693c37580892427583d159f1aaf7e103d44314b354262fff99e SHA512 25a694fe98e10a0b22e62baabf4460f6b39686c2331e2115924afdebf2bb61827f205bd0b21c399de2849287806dc48693ea3d117708316acba5ffae889860f1
+DIST kwrited-5.13.4.tar.xz 19928 BLAKE2B 2d99b91f01bc0547684318351c74e507255e696c9ff683d0525a8f2259a3ee19c76cc7cf4f88b46981202f31db7f57bc2b8e52b8f929231fe634096555840b05 SHA512 09fa0a2fb72c56311a47111bc6ce5f7217522c0cd1288b5b9719f9cd0f57e951e409245a1139124080fbc391f4c98f757ade2a78756c60b95cb7fdd3deb37627
 EBUILD kwrited-5.12.5.ebuild 501 BLAKE2B 10c4a3455ad22aa30db3d80773b354a1d5db3860625103e325099b06de6f3b45093f74d538f1fbca081f3ea926a4c4b91e738380a9a5abd2b624255ffc9a7c80 SHA512 aa11e4f344edb76da01f6e8ccedb8be4ef3e58eccb1de6de2b39550c8faba29308c8759671ed03d1d720e8dd0fc1787db343349a2885c48bd911600611586e3f
 EBUILD kwrited-5.12.6.ebuild 503 BLAKE2B 75f08b16b27beeeb0a8997247a7ee1182279a152b3d96ea6ada42cb856ac23e9df8d77f02a4a18595410409070523e6664bd99f1e83c447188c12d154f3d1167 SHA512 2b975e63c0972504c5a1cbcd365ec8acf9bbb2f0ad4c324b53742f70366a4b561659e23964e9389a68704067de7dba5e537ad4368e9e66d6ccdb3f7f7971f736
-EBUILD kwrited-5.13.3.ebuild 503 BLAKE2B 75f08b16b27beeeb0a8997247a7ee1182279a152b3d96ea6ada42cb856ac23e9df8d77f02a4a18595410409070523e6664bd99f1e83c447188c12d154f3d1167 SHA512 2b975e63c0972504c5a1cbcd365ec8acf9bbb2f0ad4c324b53742f70366a4b561659e23964e9389a68704067de7dba5e537ad4368e9e66d6ccdb3f7f7971f736
+EBUILD kwrited-5.13.4.ebuild 503 BLAKE2B 75f08b16b27beeeb0a8997247a7ee1182279a152b3d96ea6ada42cb856ac23e9df8d77f02a4a18595410409070523e6664bd99f1e83c447188c12d154f3d1167 SHA512 2b975e63c0972504c5a1cbcd365ec8acf9bbb2f0ad4c324b53742f70366a4b561659e23964e9389a68704067de7dba5e537ad4368e9e66d6ccdb3f7f7971f736
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.13.3.ebuild b/kde-plasma/kwrited/kwrited-5.13.4.ebuild
index 9e8c97481c25..9e8c97481c25 100644
--- a/kde-plasma/kwrited/kwrited-5.13.3.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.13.4.ebuild
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 269f2cc0c90f..b82597a97a7b 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,7 +1,7 @@
 DIST libkscreen-5.12.5.tar.xz 94848 BLAKE2B b5d50776596cbbcb3b2bb93e00041fe385f98eab04bacb556077c91dd9ab7a191449f051be17d78b60bc207843afe2b4edbf33c9e72a828e2cd35787438908da SHA512 67d74a8b422559099bbaa55b547bc4de05952512dfb76ad73cfe209b8f3e13ba09e23b64f4fc4f2a992dd04e47d99f8dced9a24583349067fde8d9949dfb1ad3
 DIST libkscreen-5.12.6.tar.xz 94500 BLAKE2B 0b82b172288567934aa958a5718302735ac91b43a23708098bc686d256466ba0aff707ab2af0f7f7f43d0059a0eac2110fcb5e52241d36671aa52702ab590c43 SHA512 71c600e0a5d310fe075c9a82360ee176c575b7860e15372882126847e9b7a103ed088a5d616a0168139c7b36f81312ad1f5fd6371894e56d7a900db81c8e2316
-DIST libkscreen-5.13.3.tar.xz 78012 BLAKE2B 298a9a907c552839627735e57df6ced0db78b5c869943451569389bbf3b24229ca8aad88527821931e0ca9cbf2f4131f27e900d1416ce961f13cee3b2e8713b0 SHA512 99b510f340b126f51bca358fc475a5829b8a6ad9a86a35ed0d28258108afbc0c36a7acaeb7c42bebfb4ce45cc5245b10a8e6d0239d734408ca3dfa884142ab17
+DIST libkscreen-5.13.4.tar.xz 78500 BLAKE2B 5e3421bf057a1aa5ca0103f8794bda5525ca9d083151036c5abe50dff4ea7c50b544e8a815726256a3894e362adf4189099c7e915465672d1ba4ce52434ca4a8 SHA512 446a939f4e3bcb6ddc2ef8c53b4f98a9d36c8057ac1e32fb4361e69d3cb193cf00e6682e73974054aa0187a9f22ecaef5546c392ad45dc7f43042501419222dc
 EBUILD libkscreen-5.12.5.ebuild 501 BLAKE2B 315265c1c6421fce51b41f6a6d108b5ecac4ff1d43bd8a19a3f87e246b6834b8a54ff4810a0d789424037ea43d67781229daaea1947927b13edeb48a67069448 SHA512 bfd421bd2e8a96688fa0ae0673954f7a115d2443e2aff066ed3d4a4f9cc5b4d5537f80d1fe7f323dfe847303bc65196bd45130d59e25efc9769d35474c06aba5
 EBUILD libkscreen-5.12.6.ebuild 503 BLAKE2B 9b2e2e3a9ebc3053d147e95be68294c96d76e2d9ae39d25a1b9918f32f3f069b6e520fe97ddeaeba5c2b06c630d286c1051f4099411747be8053784b23e35959 SHA512 fc1115a2e8f49a183e694ba8b468fd4c4f0c327c777e2e0d88bc68405963551c03cfb3838c8a1310e8b7bbf6838b02582a897e098511a3360c572d59da348eeb
-EBUILD libkscreen-5.13.3.ebuild 503 BLAKE2B 9b2e2e3a9ebc3053d147e95be68294c96d76e2d9ae39d25a1b9918f32f3f069b6e520fe97ddeaeba5c2b06c630d286c1051f4099411747be8053784b23e35959 SHA512 fc1115a2e8f49a183e694ba8b468fd4c4f0c327c777e2e0d88bc68405963551c03cfb3838c8a1310e8b7bbf6838b02582a897e098511a3360c572d59da348eeb
+EBUILD libkscreen-5.13.4.ebuild 503 BLAKE2B 9b2e2e3a9ebc3053d147e95be68294c96d76e2d9ae39d25a1b9918f32f3f069b6e520fe97ddeaeba5c2b06c630d286c1051f4099411747be8053784b23e35959 SHA512 fc1115a2e8f49a183e694ba8b468fd4c4f0c327c777e2e0d88bc68405963551c03cfb3838c8a1310e8b7bbf6838b02582a897e098511a3360c572d59da348eeb
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.13.3.ebuild b/kde-plasma/libkscreen/libkscreen-5.13.4.ebuild
index 56ac7823247e..56ac7823247e 100644
--- a/kde-plasma/libkscreen/libkscreen-5.13.3.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.13.4.ebuild
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index a5e2fd71e559..2bc28b2ccbf7 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,7 +1,7 @@
 DIST libksysguard-5.12.5.tar.xz 570008 BLAKE2B 201e722ca5313ce228eb3a8ae488416b904c672c029c632bee909b1cadc286d359b21fc7c79ef8f6bde8e57913bbe97f320a4506385ae03c88de3e948240de1f SHA512 61d3d42d5cebc06f775bd2737a4195ea790392906d007e2f08ed3455f63526bdb9fbfb40add63e97b107ece7aabfed056e56bb3f4dfee34e3514a391428633f7
 DIST libksysguard-5.12.6.tar.xz 568416 BLAKE2B 1adbb486ce82df95ceea3be33fc65045df250951e0a0759e068a4909555a46f6adbbd8535b3e2852532d85c0d5b91c538b9653184c01747da6706e565e4c30b4 SHA512 3dc937f43f03352df6f503eb0b2d493a8f7b9ab9f017e06ce5f8d111ca10690f98736b0f7c6b8942e99f192e9c9ba98b1c0fd2d8515e0ce416c775e000a13d9e
-DIST libksysguard-5.13.3.tar.xz 568340 BLAKE2B c4baa9c2fcf0f3221986c6bb9956f3d484e49c2ca743dd76c6c89e1c719033ba4b5217b425dd13d55119fe1c2ded181f2ab2490b5082274ab523612053c8969c SHA512 2565fb5a66fa6722c1d40aa0ad619f24276df0c45c923f9ebae1ede75fd6349ff4dfff653e2d13bc406b4278c0e2f30c9dba4caa6112c3b4220130ed0a14494e
+DIST libksysguard-5.13.4.tar.xz 571548 BLAKE2B 153ba211fb1e314270a36c366689c4034b57f351720f1639b08477e185e4da6ea54d57c53f595e1cb887bfd6d39f5d7cc115fe2802c2bddedeab83e24606ee93 SHA512 64274c57ae3c8dbe7060b1f4e2ca642532400a7f1a0acc9e308ba8d448b9c98aaf8fa90408d511593b3250bb297f16d2c09ffcba43be04d9f25aa871879a3144
 EBUILD libksysguard-5.12.5.ebuild 1244 BLAKE2B c7c06328f314b42982a0ed518fc9283b80dc03db0c4d0eb9744ef6ec47de6c11b3ff71b535f1d8d6c8e208b58ebef3c503023f4e51aa2499f10ed2463c32e797 SHA512 31f4c77e2c5b21ca4f4442f28595faeb50a177c6ef8f67ce48fb7350edfe5bc568099aa97c1e39fe8a0966893db7419637d140c81b879ab90e57418121b61e8f
 EBUILD libksysguard-5.12.6.ebuild 1246 BLAKE2B 3a0bb57b58da15ca581da93600a1bbd9a3ca33184859c751c620829a36731cb500e91fdabeb3690e110731e4247a1caaa8920589e219df2dffdbb6ad2b2a7e53 SHA512 d2adf30172eea8e7c4ad4d0a4dace307b79459b47b7d5f3e8def80f317a7c47572b22cde2ebcb0f317b59c70ba8a93e259c67ac47dc8abb7291811faa787fd72
-EBUILD libksysguard-5.13.3.ebuild 1246 BLAKE2B 3a0bb57b58da15ca581da93600a1bbd9a3ca33184859c751c620829a36731cb500e91fdabeb3690e110731e4247a1caaa8920589e219df2dffdbb6ad2b2a7e53 SHA512 d2adf30172eea8e7c4ad4d0a4dace307b79459b47b7d5f3e8def80f317a7c47572b22cde2ebcb0f317b59c70ba8a93e259c67ac47dc8abb7291811faa787fd72
+EBUILD libksysguard-5.13.4.ebuild 1246 BLAKE2B 3a0bb57b58da15ca581da93600a1bbd9a3ca33184859c751c620829a36731cb500e91fdabeb3690e110731e4247a1caaa8920589e219df2dffdbb6ad2b2a7e53 SHA512 d2adf30172eea8e7c4ad4d0a4dace307b79459b47b7d5f3e8def80f317a7c47572b22cde2ebcb0f317b59c70ba8a93e259c67ac47dc8abb7291811faa787fd72
 MISC metadata.xml 381 BLAKE2B 50486844ab6d038f69a97e298953a1eaef11d9ee011c4b10fd3210deaeaf4298f0d93c514a2227a2ede9227aeeeed3a68b37ae1badd3783a23cf35ab208f8fe6 SHA512 a504dc62874b82d6df35261af6e3875b0af5879be5c90f9e1c2754d6980bb26aa3c75632d825b8347687a9cf48908a671c807afc574f177a12ab7881c7ef8d43
diff --git a/kde-plasma/libksysguard/libksysguard-5.13.3.ebuild b/kde-plasma/libksysguard/libksysguard-5.13.4.ebuild
index b85ee65b5d1a..b85ee65b5d1a 100644
--- a/kde-plasma/libksysguard/libksysguard-5.13.3.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.13.4.ebuild
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 7ac6e639b545..08c86757f54b 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,7 +1,7 @@
 DIST milou-5.12.5.tar.xz 57492 BLAKE2B eb1315c0794674b70bf7a1ebd19c60c1a5cf94cd053f80920586cfde78ce328ccd889b480c9955ea035f71fe1d80066482797a23bcda5f14fcf984c081bea3af SHA512 7c96c7dbe8b4c45362a0e5a2152892776c2cfa52c748811459c280737f8695f4ee63332a38ce6618b2c4eb7773e2f5e21d9e4d366a22b89f749b42195828774d
 DIST milou-5.12.6.tar.xz 57460 BLAKE2B 0d29e21c60d7ba9714dcf46427285f68652d3713037643d29d26965eb2614df9c17ad3561206ad57725eda31e9a2e4bb3123a78e4c3353b5ce35327f2c4a8165 SHA512 3feb387c9698117a7646132d43f0ae5dfb42341b2725a3bbeb6cd8653fb1e6a2fe79aa538aa532b1b808140376f665a7c746b923fc8fcc2fa4ef5015757da6ff
-DIST milou-5.13.3.tar.xz 57448 BLAKE2B bbd74d2fa3f7b5a34399e23cb7baea2c947265b0ef2c77c2c6cc7dbc041f589a4d1fec374f567f19680b48df5b5aea876a634a24775479bc38af258b95ab5a75 SHA512 5408d696040a3852d9c11ca5a65e420046904f0375d820bf531fb54ccb6378ae873302701d1a2044800fecbd042378da1f10f78e3f452a240d31a62a068c087d
+DIST milou-5.13.4.tar.xz 57924 BLAKE2B 7bbae043d16dc54993ce6b716b4bb1ae276e59d88042edb95ed8616d8c2cb342343236766591b90609e84fac5e2d9df79985e13d6f381065e1724bf86eb86374 SHA512 d75e19db409b8659f515a9f8ccf5f7db9e03dc61675329dd40863d23daa96903721d79b5ca3d9f58bdc230459cf37f5e4a647e8f1697e05e745c2cb0401db86c
 EBUILD milou-5.12.5.ebuild 692 BLAKE2B 6cf9633673d92a1fe2654f5f0cd4ea60e5db47bf4120ed090ce9cbb691255b5a854ca55d2aa608f4a0751766e0ff0c05018cfbe35bab4782c68fc7d221efe05b SHA512 78fb4c265c8b09fbca47b998191c7fbcaeabf7224d0a43caeebadf942071dd92e3ca088e4de5a5678c85ffd50a140c66914a23654c9e3541e1f67617a81efc73
 EBUILD milou-5.12.6.ebuild 694 BLAKE2B 3e957664f5e86b816f680c716d1b2248cb9126b58f5311c162d916837a29521261f33d1569daf80a2aa60c96b37bd6d4395f014af07017fb8be1278a43d4a13a SHA512 05034f125f1bb8399609d2a50c21408a3d4e1393935ca64819f3dc77ab52b247c1c737d48c689431bdec84509e03ab64ae0580d0570e4a6b4b9bbefffe454b40
-EBUILD milou-5.13.3.ebuild 694 BLAKE2B 3e957664f5e86b816f680c716d1b2248cb9126b58f5311c162d916837a29521261f33d1569daf80a2aa60c96b37bd6d4395f014af07017fb8be1278a43d4a13a SHA512 05034f125f1bb8399609d2a50c21408a3d4e1393935ca64819f3dc77ab52b247c1c737d48c689431bdec84509e03ab64ae0580d0570e4a6b4b9bbefffe454b40
+EBUILD milou-5.13.4.ebuild 694 BLAKE2B 3e957664f5e86b816f680c716d1b2248cb9126b58f5311c162d916837a29521261f33d1569daf80a2aa60c96b37bd6d4395f014af07017fb8be1278a43d4a13a SHA512 05034f125f1bb8399609d2a50c21408a3d4e1393935ca64819f3dc77ab52b247c1c737d48c689431bdec84509e03ab64ae0580d0570e4a6b4b9bbefffe454b40
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.13.3.ebuild b/kde-plasma/milou/milou-5.13.4.ebuild
index 05a6dae87be6..05a6dae87be6 100644
--- a/kde-plasma/milou/milou-5.13.3.ebuild
+++ b/kde-plasma/milou/milou-5.13.4.ebuild
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index c3d1fce2dd1d..5ed431754866 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,7 +1,7 @@
 DIST oxygen-5.12.5.tar.xz 4467896 BLAKE2B f9477184cc13553086f6b828ab953dc91e42aa9bd50a85d553ed7347e2e588dfc8b5aaab9eec12481e20121044ebd4412fc728e22d437ede54451c0a2245c6be SHA512 92acb2cc2033a8b07a0ac75772f696f5c1196e0c5a424ba6146d576bc956fcfc172b4a65a79551b2d43be4b56d5289bee091ebb837fe40dc60f076ca7d5898b4
 DIST oxygen-5.12.6.tar.xz 4467020 BLAKE2B 4112d881bba6b30ab295af576678068227c2831459c21eabbd59c9c57e7cc2a1c08cf2d40cc6496bd0ee38c2384ad8f91a4246e6cb3b33328406019c62dab539 SHA512 7f558f92dc218a8218c6b87fd432985ef446d88e7a73911bc557481bd7d0ccdda7a9ebb350c6f71547f3c35cda1f844cda8aa735e0fcbdb413aedb25b9d0d8de
-DIST oxygen-5.13.3.tar.xz 4472052 BLAKE2B cfc92408f6d69d7e3d14b6c2e47f26767780c3166995490e529af528c35be9c25c4c1da51cf120278c96bc1100e78d576c80a2eb0d574a1d0e795e681f890f4c SHA512 9a15a7c728dd9aaff6b2786ecb9c46549e01d0c2530abd8646fb5053696d21546d46fab888a0d7f4fa12065e3d404e88bce09f0d4d05d29013ec9ac5185b0cff
+DIST oxygen-5.13.4.tar.xz 4469624 BLAKE2B 3071b9e5a9fe4d5335f804ca996204c69e0a491c724af78b496e142789c6700c8cde3d50b6691a2cf8f1cc0eeb092f7209baf3c79a6ac96ac0472f0c0842d54d SHA512 43e69f539064b51c63184682b8df2793cd3246a5906cb38aad60d83a63f19c56cab9529de2365d5d5b3035617ff91eecd90b14a3fcda1fadb527744fe9fd4a7b
 EBUILD oxygen-5.12.5.ebuild 1129 BLAKE2B 51f53fbab179d76e4eef5adeca269e10e956954e61a32e2315ed6a62f27b20e7fc81dd1f6b1137a53389aef2b82c9a2b3d7457e27e13baf2300a5447a28804cb SHA512 f5cbb0a73bb9a87f2e64015ad39157191fecf10cfd1598cf4674441123032477b51646f9760fa90d24b8561b63f702b00d8e65f253ed8eef7bc1bb845643c01f
 EBUILD oxygen-5.12.6.ebuild 1131 BLAKE2B 22ba1a44212c649c6582e6253eaed956e3621d6ca94b989948d20fd99699ac5afaae812334f303a8a54b88377af1548792679eaf28db6693beb0b62d2628bef5 SHA512 74e9ce2fb1e37ff8395ca820a1ece9bf28623fe7aaecd41b59bde2572601f048c4a0ffcbfd5b1f68536b13744eaa0dc06d4552c4e13d7d56e89ccc2a7db2c30a
-EBUILD oxygen-5.13.3.ebuild 1131 BLAKE2B 22ba1a44212c649c6582e6253eaed956e3621d6ca94b989948d20fd99699ac5afaae812334f303a8a54b88377af1548792679eaf28db6693beb0b62d2628bef5 SHA512 74e9ce2fb1e37ff8395ca820a1ece9bf28623fe7aaecd41b59bde2572601f048c4a0ffcbfd5b1f68536b13744eaa0dc06d4552c4e13d7d56e89ccc2a7db2c30a
+EBUILD oxygen-5.13.4.ebuild 1131 BLAKE2B 22ba1a44212c649c6582e6253eaed956e3621d6ca94b989948d20fd99699ac5afaae812334f303a8a54b88377af1548792679eaf28db6693beb0b62d2628bef5 SHA512 74e9ce2fb1e37ff8395ca820a1ece9bf28623fe7aaecd41b59bde2572601f048c4a0ffcbfd5b1f68536b13744eaa0dc06d4552c4e13d7d56e89ccc2a7db2c30a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.13.3.ebuild b/kde-plasma/oxygen/oxygen-5.13.4.ebuild
index dbf174a24cc8..dbf174a24cc8 100644
--- a/kde-plasma/oxygen/oxygen-5.13.3.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.13.4.ebuild
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 5db87de27e8d..e604aefab9f3 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,3 +1,3 @@
-DIST plasma-browser-integration-5.13.3.tar.xz 98280 BLAKE2B 937b53edf24ee8b116ad36bd8b2f9aff6945b7174dc9a8ead31b455801244eeff87335f9884cd529d96fcad9087f7fc3301ba3f0f8104fce44804b9439223c09 SHA512 aee05887dff57fadace18b984597afbd21e82822472d37c71ac826dd183f34ea2b9f6183e0930cd4933470f14dda3bc0c7ca7168de9f9148adca617be9b49343
-EBUILD plasma-browser-integration-5.13.3.ebuild 788 BLAKE2B b1b40d51830e07e5e60d2ef76edd922401238c3830d5e5365f43c49487b08d53c0aa96d529b53899c01d7d22b1061d7bafa38336885b55cb7869ba86d05ea47f SHA512 d686ddecd04bf6f7dfbc56f34234d74cc00ddeaa796913908b2a8f9484901178d7c993fbbe4f826067021ee74c780617ea46713615f45461d9fcb530e416e3bc
+DIST plasma-browser-integration-5.13.4.tar.xz 99700 BLAKE2B 1f13552374a41f59e81375392276135fc6ad90615df94c4bac6d58947e63f75f1560fd176611e3769a2a7720e8c1102e08b265e84037ed47926ccc98801d7482 SHA512 b050309e160d71e0f7a7c2b32d9d01696d4d3d52aa895debec268d050a03e4b0fff9b3d7e10a271d8650c23bc73698aa1c9cdd99e994df46831b8ba56c17552a
+EBUILD plasma-browser-integration-5.13.4.ebuild 788 BLAKE2B b1b40d51830e07e5e60d2ef76edd922401238c3830d5e5365f43c49487b08d53c0aa96d529b53899c01d7d22b1061d7bafa38336885b55cb7869ba86d05ea47f SHA512 d686ddecd04bf6f7dfbc56f34234d74cc00ddeaa796913908b2a8f9484901178d7c993fbbe4f826067021ee74c780617ea46713615f45461d9fcb530e416e3bc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.3.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.4.ebuild
index 605c95adbc76..605c95adbc76 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.3.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.4.ebuild
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 611dc632ea9c..2181b84f428c 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,8 +1,8 @@
 AUX plasma-desktop-5.12.5-submodules-update.patch 1016 BLAKE2B 7ff9a57181b1438027cdf2aaf0e5d6dad25125c79c9cdb349b1d4b271638f1fb77f0742b3d67060ad74f26a820765260796eacd8cd994263fc00fcb13b82ace0 SHA512 c283923a0f5473e6017b1160f3a15f7ec277196cc55b14c03bc77a56188b44c9d58010abfe85d1e6c2c25fdda1f3b35ea3bbe9525bbbd80c8ab82d6e28960a9a
 DIST plasma-desktop-5.12.5.tar.xz 8558436 BLAKE2B ecd8a0ce7532dadde5f435e4c620333572b30e50a5003493495784bb31f7e9a4c1b0b1a023290b0443fa90ee7e663fefb9854016bb8eb5a03f82f879d6522fc6 SHA512 d19f8d640304bc1ffa0839e8ba453ddea76710f26fe580789c64e1b97d2a67c151ec62b2d0503fc35ad31cb8da4ef1125f3154e366b7f2bb4b8fb9bb2e0a6abb
 DIST plasma-desktop-5.12.6.tar.xz 9172156 BLAKE2B 054045e1264926e5d0c87876c87cf48164a99c343f7c3fdb22dbae036cdc7e6fbb147c97c33a047c0a5c0cb75b62c88b802ccb79bcce022f9ccf9abeebde419b SHA512 435add4f2133f3e54023ad42b1360dc3ea3c44789692a38e5d95fcc825a1b7a9e3bdc05d03a375c687f3f0544c8f2ea4ccf047ec099ea3da32ed539ca57c8d76
-DIST plasma-desktop-5.13.3.tar.xz 9139596 BLAKE2B d2162ef03adda158f84a843fffa98f2b2e81668ddfb54294313b3dfa13a5fb889261fc0bfa088e6ede2d4c48b04f746e90f49abc5ea34522f3cf8d8dc213ac44 SHA512 2909d91c9d01e93d569644489e461a8b95b321754b550fb3b3cbc3d151fea53b58e557dbd6e50c41c64f12ac07a4fee205dea4002ee35fd7c9c1b26d8f03a02f
+DIST plasma-desktop-5.13.4.tar.xz 9155072 BLAKE2B e2cf970b2a1c521f2207fb9869501ff616e94d679221b12a18448d402085aacf2f5fc4ac2fdb018bc662060054b61ff754abbae4ede562a1b6da0dcc8f49bd9d SHA512 c990b5d5ffbec70a1f410688c1304c2cdeabd5be017ab9b2a382abd57719505902938e43e5bddd046618f9143d8ee0a61b80aeb53a892315d92897dd80d66b24
 EBUILD plasma-desktop-5.12.5-r1.ebuild 4495 BLAKE2B 51f2671d3e48f65707b28cf6eb29f6ff26e5e444e06e16ec918d40b803d4c247168f226000ad167530852ff27d721331c0a3d4cd6c3c1aee72e7fcb6fe953f41 SHA512 a2d9148faf259057b3e6b7746b804fd1ae6384714adb57b53f306246992541968faaf9d44acc22e4f4ae34c46068310d37ea3fb66457fe0e52a424c32c96f592
 EBUILD plasma-desktop-5.12.6.ebuild 4412 BLAKE2B 890435931325f175740024daebbdeb981061607c539e64b2bcf4bf51b3f929d35e219e08399875db12599c3fd6fa393efdc4e1b79912654deaba12172275a59c SHA512 aa47ac7390a855b6ae64ac663e060cd3b2a7b8421b760c3bf75695f0d35865310f96418956267785b09e32c6adbcc0e17d4e8a275b7a58bad934b4afd5a12057
-EBUILD plasma-desktop-5.13.3.ebuild 4465 BLAKE2B 1fc5b2a75a9b6daa86b61d40eb3585015aaac3db83ff788c3a4c2eab1f7c6c6fa003f6e51e8fdd0adde159dc4901a2bd82c5a96126a133acf318897340419a9a SHA512 fc122e194676a8981bf0ff9be9bf2048cb99cb313d2fbacf4fe1927271c43374f1cb05aea44dd0324cc9e37021ebf38efda541edeab5452bee900363fc8be024
+EBUILD plasma-desktop-5.13.4.ebuild 4465 BLAKE2B 1fc5b2a75a9b6daa86b61d40eb3585015aaac3db83ff788c3a4c2eab1f7c6c6fa003f6e51e8fdd0adde159dc4901a2bd82c5a96126a133acf318897340419a9a SHA512 fc122e194676a8981bf0ff9be9bf2048cb99cb313d2fbacf4fe1927271c43374f1cb05aea44dd0324cc9e37021ebf38efda541edeab5452bee900363fc8be024
 MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.13.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.13.4.ebuild
index 649e0d876dc4..649e0d876dc4 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.13.3.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.13.4.ebuild
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 6904acc949fc..272a069a15ee 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,7 +1,7 @@
 DIST plasma-integration-5.12.5.tar.xz 53664 BLAKE2B e37d44a0a33116ab1b2b1f1edb74a8616ba33aa41438b93f9bf2f45abe5bb49cda57a579b35b8af94a171074387178888f5b80909e50e9c2be4a7a11a1eb0198 SHA512 5ae667a11ea85c6e9f353939bc22d84c36cbb53f053244a93e7c1d185d20452a7fc3d2afed65427ef938910fa537648006c2dda77346419a6a4492a2e292c787
 DIST plasma-integration-5.12.6.tar.xz 53412 BLAKE2B 3acee7e76786ab570f5c001589137f85decf42bd6857c21a2448269d4735309dcdb7d1f5233ed8c95de4ff5c783a07950f9627525966ba33a47c889da658ddec SHA512 df231e8041fb94f01b0950890f784d118ca0aa1a34e7e483f78351de237cc2ba46a05be9c7addc5a2c5d319be7e17b6e2c5f171da28aa7cfd9b34b585a3c8155
-DIST plasma-integration-5.13.3.tar.xz 53332 BLAKE2B cfc64208b3142f667b3156503c1e39bc1e9556b1ba241533adb4d49373803781f7154cd44478bde37c1605382d49da47fa7e2a37082c66c6774e53898a270a4a SHA512 89d8b3cd14cd650e8706d031d5c6689951f534819ea34ffe38a5ae54f1eecf6d32c3d2a1d167a72846e4422530e492ecb82b3ccbb406079dab183d14a49ef59e
+DIST plasma-integration-5.13.4.tar.xz 53700 BLAKE2B 483dc26c457c9967208c055c6ef36c488010484c9bd56669ba2e5128550f36465d347a2985e3a9e329cddbf5e5c7c9edcb9eac64db47c43b02bc9be83515b14f SHA512 9ad91ff2d66f2b7058add7d13a601042660a7cd1f4fe41a368b0599ab35f8de45c6462d6010c1b0a76c0abae5046458919511649531463588afe7501bb19aefc
 EBUILD plasma-integration-5.12.5.ebuild 1062 BLAKE2B 85677c190ba956334daaf097c03844c989a2897cc089b6eab540c346885cd3f895a906b3a42b555093fd83978ad61abdf6913808f4523f745bab4e346d6a763f SHA512 d0c91184d4d21d945e16881f879a80d689281632f4c1c0822fcc3153d02be427198dc6f7e12af76ddd0d26f362f1caef714f21a41685e6bb604534b58b8053a5
 EBUILD plasma-integration-5.12.6.ebuild 1064 BLAKE2B 85c18e1cd9d36aa41e3067524e11b87fd4fff69c6202a436a80660824b3839d34fac188cea374c64e4edcb3df04564986692f84c71247ef5838b93287956551c SHA512 f4fa6d0cb0b11d269643af29ce695b48859adde40ecb56b7ec299b36df4af341da6d3587242a59fbbcd91e162aed2ef23c5d49896a0db7ea96db8dfb26c622b4
-EBUILD plasma-integration-5.13.3.ebuild 1064 BLAKE2B 85c18e1cd9d36aa41e3067524e11b87fd4fff69c6202a436a80660824b3839d34fac188cea374c64e4edcb3df04564986692f84c71247ef5838b93287956551c SHA512 f4fa6d0cb0b11d269643af29ce695b48859adde40ecb56b7ec299b36df4af341da6d3587242a59fbbcd91e162aed2ef23c5d49896a0db7ea96db8dfb26c622b4
+EBUILD plasma-integration-5.13.4.ebuild 1064 BLAKE2B 85c18e1cd9d36aa41e3067524e11b87fd4fff69c6202a436a80660824b3839d34fac188cea374c64e4edcb3df04564986692f84c71247ef5838b93287956551c SHA512 f4fa6d0cb0b11d269643af29ce695b48859adde40ecb56b7ec299b36df4af341da6d3587242a59fbbcd91e162aed2ef23c5d49896a0db7ea96db8dfb26c622b4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.13.3.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.13.4.ebuild
index 1d60d9295f03..1d60d9295f03 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.13.3.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.13.4.ebuild
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 1a407dd75fb4..684c837311b4 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,4 +1,4 @@
 EBUILD plasma-meta-5.12.5.ebuild 2139 BLAKE2B 6361bc64d16cd1d3971c72a8943e0ff2530da112809d6f2cfe9e558e51083ab55b4abaf4f6fb0a637b62b30f5d5be03243e77a383edea2edc843256f8dcd7c62 SHA512 c73d0a40a44b16a7bde0277ec019ffdcde5a649cf2b1c5ba9bb3bf12a897137f7993cd205b30f21e8fdf484fefbd1196fee67a35ab8e92aad21bf12e228c2694
 EBUILD plasma-meta-5.12.6.ebuild 2141 BLAKE2B 77e2d03c8d7b4340ec792cb2c5ffbc56e31b7ccb5ad32fc64430be4084e854ed5a7000be52e798b2981a9629e9854d3bee11716b514cd8041a92306972affa37 SHA512 c89023a7bc618edc734fc0e60bdac42f14daca2d77cb9a34f875ec815f8b1368ef9905a7929209ef54fb8d393e4c67ef02564149fa5a216bc0ecef49f093e674
-EBUILD plasma-meta-5.13.3.ebuild 2233 BLAKE2B 77b371fbe460a3dd2ac0db7bf04c7650ffa1fef910f57aaaa87441dd3ca7ea8e803eeffa8c4f24173d752d906659bb2fd7fbc84bb0c22e1003e57e10d1223cd7 SHA512 fa082c43246d02e6da6dfb12dea0c72c68c8757f5d7b2075b7b2858c05f4566ce94cb51f7f885d1fe2d808918b89c297265c6252531b3527d07740371d7cf19e
+EBUILD plasma-meta-5.13.4.ebuild 2233 BLAKE2B 77b371fbe460a3dd2ac0db7bf04c7650ffa1fef910f57aaaa87441dd3ca7ea8e803eeffa8c4f24173d752d906659bb2fd7fbc84bb0c22e1003e57e10d1223cd7 SHA512 fa082c43246d02e6da6dfb12dea0c72c68c8757f5d7b2075b7b2858c05f4566ce94cb51f7f885d1fe2d808918b89c297265c6252531b3527d07740371d7cf19e
 MISC metadata.xml 1304 BLAKE2B 09af233977178dbd8bc6943d87db1b5523e3f94d9f7db522d56788e21de9d7d0a9f9fb9bc38331623619524021cf961b35d033cbb5b3155c365154db6df1642d SHA512 f891053e1f87c4daab4024cdd3631e778c2a1c0d5f39b40aefb9ddb263b7d8cd3ec9adaae416562717837a789fbb76baccfd05b1ef11b491a4782926f66a35e4
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.13.3.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.13.4.ebuild
index 0d1ecf9e0e14..0d1ecf9e0e14 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.13.3.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.13.4.ebuild
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 98b677f985aa..0ad4d3728b83 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,7 +1,7 @@
 DIST plasma-nm-5.12.5.tar.xz 703236 BLAKE2B f522d11a182b589beae46a2aae6c59b6964da7d073e8bae14464cd99fb29d9fc0188113a7a00ed568646daf7a22ef2000c3ccaee848361f50caaff6087364c40 SHA512 7c61743d028d27ead7b7c373757f5ea82703808702d31546477558a631607c15d867140624391b803a72f5675c96853e1eea07c7af3001718a96c36d6c3191c6
 DIST plasma-nm-5.12.6.tar.xz 704664 BLAKE2B 5dd1741873d4b79a8d69d32065e95e9133244b01cce43e7242f07a4039e96cdbc93d864627cd6876f03a396da6d636cc877fe73fd879be14d65e839cf2b2e26d SHA512 aa1554ebf73bd0495722ebd58da5d12b6703335b6fa395f5a330911bbe563f113ed5fc3d78e20427b6af932da6e39faea539a6e6a1e3db9f61eb64bab7b62c60
-DIST plasma-nm-5.13.3.tar.xz 701100 BLAKE2B 96c16b0884717012a10dcc86218dc01833e51cf1a6f0d5951f8d77c7095ca65ec07da8ea2e0cc333f8aa2ef5500caf190ab69b099cf62d3295a742f5c34ea1fd SHA512 1e0c05261255ec78cb4b8bf711cf96c1829de12cb012257e8696dd5ab59a287daeb08253dbda1db1676c722924cb83c38430c257a8a716e2d632badfdd48868b
+DIST plasma-nm-5.13.4.tar.xz 705288 BLAKE2B 9ce40696f69f0858b1669dd19819f496c04f2b199815f0fdfee02f28b65870bf8c1f9ee931d9a159cfce3ce9e141bcfc6650d69977cb2dad1009592017ab496c SHA512 088182a80df38f4a12be6cfa410dfbcff28c6838f8d346c6ae006e7369752a0c69fd07dc973c80b6a6f8cd9b49f687581c41028334f524f1e53cb091f169e985
 EBUILD plasma-nm-5.12.5.ebuild 2031 BLAKE2B 0b13ba56e88e56e93769b285533f5fb69e1fd955f5d7dddc2d56f97b1ccf621fd8da3d1c40baa3885a17a3f3446326bf2d58d36c904735e33847d7208c6ff205 SHA512 ced1801c4b9382015865ea013a987c63d7c4cb705be46a594ba8d52a09e13c6d3330d5e7b57df26c1f56e43be9a1ab80f39b55ef6b90dccab4d5798c4e101891
 EBUILD plasma-nm-5.12.6.ebuild 2033 BLAKE2B 440db0bf00b37b828df37bd07314c48eff1f413c0421903ca2f180d72ee2a4d0058cc80f97a5cc64ef8b9eb66e21edb5992f82d764da220f44a74889a9a03c41 SHA512 0ef6c2ec2bccffc94f04d5b53607b842e02c5425f6212c50e3521ca60a5ee4a875aec2941d842a4a0a24840ca8173e26db6ca3fc8f57eadec8a29f9d56b2491e
-EBUILD plasma-nm-5.13.3.ebuild 2033 BLAKE2B 440db0bf00b37b828df37bd07314c48eff1f413c0421903ca2f180d72ee2a4d0058cc80f97a5cc64ef8b9eb66e21edb5992f82d764da220f44a74889a9a03c41 SHA512 0ef6c2ec2bccffc94f04d5b53607b842e02c5425f6212c50e3521ca60a5ee4a875aec2941d842a4a0a24840ca8173e26db6ca3fc8f57eadec8a29f9d56b2491e
+EBUILD plasma-nm-5.13.4.ebuild 2033 BLAKE2B 440db0bf00b37b828df37bd07314c48eff1f413c0421903ca2f180d72ee2a4d0058cc80f97a5cc64ef8b9eb66e21edb5992f82d764da220f44a74889a9a03c41 SHA512 0ef6c2ec2bccffc94f04d5b53607b842e02c5425f6212c50e3521ca60a5ee4a875aec2941d842a4a0a24840ca8173e26db6ca3fc8f57eadec8a29f9d56b2491e
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.13.3.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.13.4.ebuild
index 626c931ef3d1..626c931ef3d1 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.13.3.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.13.4.ebuild
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 7ec6f4baf8eb..b9d13e183f97 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,11 +1,8 @@
 AUX plasma-pa-5.13.3-automagic_gconf.patch 530 BLAKE2B 49fa6547b997c0f31627941b333c30ce0ba1165910c235a8319e4855fc5b5acb8c8355b47cd87e57aa49d1f320ed9d6b395887376ef55a5098c436bcfa7d4e4a SHA512 5baaeafc2e4426251d445f954ce25b6561e9e5e36064f803068d8d60d6186cecc4d7eb97da20406160c166800bfa4e54543566f21ac4afa398c3cf4588d23546
-AUX plasma-pa-5.13.3-optional_gconf.patch 9170 BLAKE2B 02d4ac961579c4cdd58e0ac5d494f4f91e01e66d541a8ac7fcaafc19714dcce928d32a6f9cce97b88ef91ac167dea6e404314c06778b31d66ed68d0605706c76 SHA512 999db3e8b1c10dfece350a0f12deb52e51cf6da0d217bf3470c5e2375df26e8526fb88f8c9d72d283aff5819708f068dd87e0eadeec8f7272ab14cdd6ea4ff12
-AUX plasma-pa-5.13.3-wrong-port-avail.patch 2797 BLAKE2B d17cb7f3220219ebed54db3fa5d6f9b2dede0d90bef21237cd4f48d961bad56109a5ae459e6691305bd8de73e6e9a500c46c745e991f9fcaefea6db27da23cca SHA512 67811d1427aa38265fb1d62cdf7a864318c150f7fc29ba7226deed529d76ae220db1469958563bf5b3ea30bcb07537f08f4982276b41ed1d9b55bf51a585d5fe
 DIST plasma-pa-5.12.5.tar.xz 86068 BLAKE2B 5133b667527e083d390b8d0e4352fdbb2d6ccc7abf6676e07b5f141787372bd8c00cb600f08e4fd20707476108fe661c779820645f06e895c53e4aa1411bc3a1 SHA512 7fedeaaeafaba7e2d7568fddcaff1793640979090aaf8ab7131c462b2bc0c2766f76d37cd0133c02c05a23efeb9e11b11350848d59b9869bf7bfcbd55924163e
 DIST plasma-pa-5.12.6.tar.xz 87396 BLAKE2B 9fdb9426e1e9ba1e92d8e9bd724930de6f5f4055ebb6f74e2b5f6abf4efcc012ef9a6193762232abc063dd17bb7cd1d7e3b12e2a7250d3e9a9f6fdbb270fa24f SHA512 6d5cb3c5ab911d286782b84c7904e6317d2346e2fdcef5611704aa64967dbe0fd3b5794f35c4744ce1a5617d9c873d0ac39c30bfaf0e56fbbbe64cfa55a1df22
-DIST plasma-pa-5.13.3.tar.xz 89888 BLAKE2B 5942e736d17097c098a809461f6829fe392df71edbe8e727b7cb94d6cc1109b301569a9d3d56ac8a5c77db8e9c818716273b431d06429a02ff774527744dbd03 SHA512 deee784b383e4f7118d652b48fd9041dc6d099c2ad78a7dfbfb0a044f7a5fd934e7f3a446158b0e88bc2cbb58185f5c162aedb637def11092050ee187d61e1c6
+DIST plasma-pa-5.13.4.tar.xz 90504 BLAKE2B 1413d0424742d6dfed9a4d902e6d0685d94eba5ce7e615f95f1775d30c629bf93117670ac3e72e2aef0517755de6db1ee4cabea56abf0160d86412d18700255d SHA512 347ec79201403eeb5859c54d29e7d1daee273972afce1014e3b8c81ae6256877e945c0748ab10e4ca1b195f085248c9f03c3db0c27d978506e8eb71fb5bc37a0
 EBUILD plasma-pa-5.12.5.ebuild 654 BLAKE2B 92ab0bdf33a2abbeff636da7fd356b4bd94c2c7d3bc73adf0867c3563e6ed06bff4ff1706c49eb5d6730f16667c29b8d234899a24a1016b7af51b98400778ed8 SHA512 7aadaba73defe948c5eaeab2a08810ccc02bdfbc32acdc9b6729185c8c0c1c3f05a6bf93137c46dea46fe2ec2c1fd92388b47dc117f6d3688b211355751a0040
 EBUILD plasma-pa-5.12.6.ebuild 656 BLAKE2B 983c94164589679c8600b9c09c6e4e1c8c08708c9435f09626e6634fec3644fd5af322290b57f7fbb9d268f3eefabf2460e75140e3899ba4a4d4983d4f733b24 SHA512 caaa8c3ed5652cf042a60ed86134afb1d0034fd8da500008cfdc3469db9b17a6074be1b27d9935f1c866522fce30c656cbcadfdb11919f19ea6111d44f1be1c5
-EBUILD plasma-pa-5.13.3-r2.ebuild 751 BLAKE2B 0ffd8ebcf4378de9960c50327213296fbcc36283b8e1ba0a6b1f17486400cd1846867cef237aabecd32beeb32e3008143c5d2f3b9a015b637c4b8ad017349f73 SHA512 5dff2fed2e866994b01f532486957ca6e595df9b4c5d2d295b2d1cf3beccc483eb52b35f0ccd7ae9e5366c75a4c28f89929c6ac88db4bdf319e8e3dff5c5d69f
-EBUILD plasma-pa-5.13.3.ebuild 711 BLAKE2B 0c191688c39821413fed24e59393e66c5267e9e815beeb322a21f5fadf290de93ea6de1d0fe78c953290c1e172a1db06527c4d2f4240ca572ab9b198c4edd9e1 SHA512 934f5645283ba3297801dfb078326d059af98d831dc54c5c257ed64f6fc6f120df60c1020d0f485a940ac5aa3054d4d8a836feb95aba240e0a0f8cad72428c5a
+EBUILD plasma-pa-5.13.4-r1.ebuild 673 BLAKE2B da86550308ebb800dbf7c08aaa6fd738466c0d13fd20d2a0a872eace239d631fc04c98266157e910fb7c54376265f21ff5a015eb8051979ba8eba5b57f4e5247 SHA512 588c4cb1fc7b1a562e35f76268612177a863994023d174c8b201eed6abf7af9e7b78650671f2d33e6e040aba4bbcee416496e7fe82ca67ae55db8cba2e75a2cd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-optional_gconf.patch b/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-optional_gconf.patch
deleted file mode 100644
index f14fd180c249..000000000000
--- a/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-optional_gconf.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-From c9fae1fb3f8e8a820fd480ce227d7fabf87bd045 Mon Sep 17 00:00:00 2001
-From: David Rosca <nowrep@gmail.com>
-Date: Tue, 26 Jun 2018 10:56:04 +0200
-Subject: [PATCH] Make GConf optional dependency
-
-When building without GConf, Advanded Output Configuration will be hidden in KCM.
-
-BUG: 386665
-FIXED-IN: 5.13.4
-
-Differential Revision: https://phabricator.kde.org/D13734
----
- CMakeLists.txt                           |  9 ++++--
- config.h.cmake                           |  3 ++
- src/CMakeLists.txt                       | 18 ++++++++----
- src/kcm/package/contents/ui/Advanced.qml |  5 +++-
- src/modulemanager.cpp                    | 47 ++++++++++++++++++++++++++------
- src/modulemanager.h                      |  3 ++
- 6 files changed, 68 insertions(+), 17 deletions(-)
- create mode 100644 config.h.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e494ced..2505696 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,8 +19,11 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
- include(ECMOptionalAddSubdirectory)
- 
- include(FindPkgConfig)
--pkg_check_modules(GCONF REQUIRED gconf-2.0)
--pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
-+pkg_check_modules(GCONF gconf-2.0)
-+pkg_check_modules(GOBJECT gobject-2.0)
-+if (GCONF_FOUND AND GOBJECT_FOUND)
-+    set(HAVE_GCONF TRUE)
-+endif()
- 
- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
-     Core
-@@ -41,6 +44,8 @@ find_package(PulseAudio 5.0.0 REQUIRED)
- find_package(Canberra REQUIRED)
- find_package(GLIB2 REQUIRED)
- 
-+configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-+
- add_subdirectory(applet)
- add_subdirectory(src)
- add_subdirectory(data)
-diff --git a/config.h.cmake b/config.h.cmake
-new file mode 100644
-index 0000000..1643e50
---- /dev/null
-+++ b/config.h.cmake
-@@ -0,0 +1,3 @@
-+/* config.h.  Generated by cmake from config.h.cmake  */
-+
-+#cmakedefine01 HAVE_GCONF
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e6cddfc..09d108c 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,5 +1,4 @@
--include_directories(${PULSEAUDIO_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR}     ${GCONF_INCLUDE_DIRS}
--    ${GOBJECT_INCLUDE_DIRS})
-+include_directories(${PULSEAUDIO_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR})
- 
- set(cpp_SRCS
-     card.cpp
-@@ -15,7 +14,6 @@ set(cpp_SRCS
-     sink.cpp
-     sinkinput.cpp
-     modulemanager.cpp
--    gconfitem.cpp
-     source.cpp
-     sourceoutput.cpp
-     stream.cpp
-@@ -38,6 +36,11 @@ set(qml_SRCS
- set_property(SOURCE qml/dbus/osdService.xml APPEND PROPERTY CLASSNAME OsdServiceInterface)
- qt5_add_dbus_interface(dbus_SRCS qml/dbus/osdService.xml osdservice)
- 
-+if (HAVE_GCONF)
-+    include_directories(${GCONF_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS})
-+    set(cpp_SRCS ${cpp_SRCS} gconfitem.cpp)
-+endif()
-+
- add_library(plasma-volume-declarative SHARED ${dbus_SRCS} ${cpp_SRCS} ${qml_SRCS})
- target_link_libraries(plasma-volume-declarative
-     Qt5::Core
-@@ -47,11 +50,16 @@ target_link_libraries(plasma-volume-declarative
-     KF5::GlobalAccel
-     ${PULSEAUDIO_LIBRARY}
-     ${PULSEAUDIO_MAINLOOP_LIBRARY}
--    ${GCONF_LDFLAGS}
--    ${GOBJECT_LDFLAGS}
-     ${CANBERRA_LIBRARIES}
- )
- 
-+if (HAVE_GCONF)
-+    target_link_libraries(plasma-volume-declarative
-+        ${GCONF_LDFLAGS}
-+        ${GOBJECT_LDFLAGS}
-+    )
-+endif()
-+
- set(PRIVATE_QML_INSTALL_DIR ${QML_INSTALL_DIR}/org/kde/plasma/private/volume)
- install(TARGETS plasma-volume-declarative DESTINATION ${PRIVATE_QML_INSTALL_DIR})
- install(FILES ${qml_SRCS} DESTINATION ${PRIVATE_QML_INSTALL_DIR})
-diff --git a/src/kcm/package/contents/ui/Advanced.qml b/src/kcm/package/contents/ui/Advanced.qml
-index b305cf1..0cd9eb9 100644
---- a/src/kcm/package/contents/ui/Advanced.qml
-+++ b/src/kcm/package/contents/ui/Advanced.qml
-@@ -56,6 +56,7 @@ ScrollView {
-         Header {
-             Layout.fillWidth: true
-             text: i18n("Advanced Output Configuration")
-+            visible: moduleManager.settingsSupported
-         }
- 
-         ModuleManager {
-@@ -71,6 +72,7 @@ ScrollView {
-             checked: moduleManager.combineSinks
-             onCheckedChanged: moduleManager.combineSinks = checked;
-             enabled: moduleManager.loadedModules.indexOf("module-gconf") != -1
-+            visible: moduleManager.settingsSupported
-         }
- 
-         CheckBox {
-@@ -81,6 +83,7 @@ ScrollView {
-             checked: moduleManager.switchOnConnect
-             onCheckedChanged: moduleManager.switchOnConnect = checked;
-             enabled: moduleManager.loadedModules.indexOf("module-gconf") != -1
-+            visible: moduleManager.settingsSupported
-         }
- 
-         Label {
-@@ -88,7 +91,7 @@ ScrollView {
-             enabled: false
-             font.italic: true
-             text: i18n("Requires 'module-gconf' PulseAudio module")
--            visible: moduleManager.loadedModules.indexOf("module-gconf") == -1
-+            visible: moduleManager.settingsSupported && moduleManager.loadedModules.indexOf("module-gconf") == -1
-         }
-     }
- }
-diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp
-index 635adc8..5245ac5 100644
---- a/src/modulemanager.cpp
-+++ b/src/modulemanager.cpp
-@@ -21,20 +21,22 @@
- 
- #include "modulemanager.h"
- #include "module.h"
-+#include "../config.h"
- 
-+#if HAVE_GCONF
-+#include "gconfitem.h"
- #define PA_GCONF_ROOT "/system/pulseaudio"
- #define PA_GCONF_PATH_MODULES PA_GCONF_ROOT"/modules"
--
--#include "gconfitem.h"
-+#endif
- 
- #include <QTimer>
- 
- namespace QPulseAudio
- {
- 
-+#if HAVE_GCONF
- class GConfModule : public GConfItem
- {
--    Q_OBJECT
- public:
-     GConfModule(const QString &configName, const QString &moduleName, QObject *parent);
-     bool isEnabled() const;
-@@ -67,17 +69,21 @@ void GConfModule::setEnabled(bool enabled, const QVariant &args)
-     }
-     set(QStringLiteral("locked"), false);
- }
-+#endif
- 
- 
- ModuleManager::ModuleManager(QObject *parent) :
--    QObject(parent),
--    m_combineSinks(new GConfModule(QStringLiteral("combine"), QStringLiteral("module-combine"), this)),
--    m_switchOnConnect(new GConfModule(QStringLiteral("switch-on-connect"), QStringLiteral("module-switch-on-connect"), this)),
--    m_deviceManager(new GConfModule(QStringLiteral("device-manager"), QStringLiteral("module-device-manager"), this))
-+    QObject(parent)
- {
-+#if HAVE_GCONF
-+    m_combineSinks = new GConfModule(QStringLiteral("combine"), QStringLiteral("module-combine"), this);
-+    m_switchOnConnect = new GConfModule(QStringLiteral("switch-on-connect"), QStringLiteral("module-switch-on-connect"), this);
-+    m_deviceManager = new GConfModule(QStringLiteral("device-manager"), QStringLiteral("module-device-manager"), this);
-+
-     connect(m_combineSinks, &GConfItem::subtreeChanged, this, &ModuleManager::combineSinksChanged);
-     connect(m_switchOnConnect, &GConfItem::subtreeChanged, this, &ModuleManager::switchOnConnectChanged);
-     connect(m_deviceManager, &GConfItem::subtreeChanged, this, &ModuleManager::switchOnConnectChanged);
-+#endif
- 
-     QTimer *updateModulesTimer = new QTimer(this);
-     updateModulesTimer->setInterval(500);
-@@ -92,14 +98,31 @@ ModuleManager::~ModuleManager()
- {
- };
- 
-+bool ModuleManager::settingsSupported() const
-+{
-+#if HAVE_GCONF
-+    return true;
-+#else
-+    return false;
-+#endif
-+}
-+
- bool ModuleManager::combineSinks() const
- {
-+#if HAVE_GCONF
-     return m_combineSinks->isEnabled();
-+#else
-+    return false;
-+#endif
- }
- 
- void ModuleManager::setCombineSinks(bool combineSinks)
- {
-+#if HAVE_GCONF
-     m_combineSinks->setEnabled(combineSinks);
-+#else
-+    Q_UNUSED(combineSinks)
-+#endif
- }
- 
- bool ModuleManager::switchOnConnect() const
-@@ -109,13 +132,21 @@ bool ModuleManager::switchOnConnect() const
-     //Note on the first run m_deviceManager will appear to be disabled even though it's actually running
-     //because there is no gconf entry, however m_switchOnConnect will only exist if set by Plasma PA
-     //hence only check this entry
-+#if HAVE_GCONF
-     return m_switchOnConnect->isEnabled() ;
-+#else
-+    return false;
-+#endif
- }
- 
- void ModuleManager::setSwitchOnConnect(bool switchOnConnect)
- {
-+#if HAVE_GCONF
-     m_deviceManager->setEnabled(!switchOnConnect);
-     m_switchOnConnect->setEnabled(switchOnConnect);
-+#else
-+    Q_UNUSED(switchOnConnect)
-+#endif
- }
- 
- QStringList ModuleManager::loadedModules() const
-@@ -134,5 +165,3 @@ void ModuleManager::updateLoadedModules()
- }
- 
- }
--
--#include "modulemanager.moc"
-diff --git a/src/modulemanager.h b/src/modulemanager.h
-index b8fcd0b..8108fe0 100644
---- a/src/modulemanager.h
-+++ b/src/modulemanager.h
-@@ -38,12 +38,15 @@ class GConfModule;
- class ModuleManager : public QObject
- {
-     Q_OBJECT
-+    Q_PROPERTY(bool settingsSupported READ settingsSupported CONSTANT)
-     Q_PROPERTY(bool combineSinks READ combineSinks WRITE setCombineSinks NOTIFY combineSinksChanged)
-     Q_PROPERTY(bool switchOnConnect READ switchOnConnect WRITE setSwitchOnConnect NOTIFY switchOnConnectChanged)
-     Q_PROPERTY(QStringList loadedModules READ loadedModules NOTIFY loadedModulesChanged)
- public:
-     ModuleManager(QObject *parent = nullptr);
-     ~ModuleManager();
-+
-+    bool settingsSupported() const;
-     bool combineSinks() const;
-     void setCombineSinks(bool combineSinks);
-     bool switchOnConnect() const;
diff --git a/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-wrong-port-avail.patch b/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-wrong-port-avail.patch
deleted file mode 100644
index 7670ec7c7d0d..000000000000
--- a/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-wrong-port-avail.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From b97846017df57698f9e77c8aab077d5a3f17e7ea Mon Sep 17 00:00:00 2001
-From: Andreas Krutzler <andi.krutzler@gmail.com>
-Date: Fri, 29 Jun 2018 09:39:28 +0200
-Subject: Fix wrong availability of profiles and ports.
-
-Summary: Fixed bug where available ports are displayed as unavailable/unplugged and vice versa. It seems that this bug was introduced with D9671.
-
-Reviewers: nicolasfella, broulik, drosca
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D13694
----
- src/port.h    | 13 ++++++++++++-
- src/profile.h | 30 ++++++++++++++++++------------
- 2 files changed, 30 insertions(+), 13 deletions(-)
-
-diff --git a/src/port.h b/src/port.h
-index 8a8126e..bbf32db 100644
---- a/src/port.h
-+++ b/src/port.h
-@@ -40,7 +40,18 @@ public:
-     template<typename PAInfo>
-     void setInfo(const PAInfo *info)
-     {
--        Profile::setInfo(info);
-+        Availability newAvailability;
-+        switch (info->available) {
-+        case PA_PORT_AVAILABLE_NO:
-+            newAvailability = Unavailable;
-+            break;
-+        case PA_PORT_AVAILABLE_YES:
-+            newAvailability = Available;
-+            break;
-+        default:
-+            newAvailability = Unknown;
-+        }
-+        setCommonInfo(info, newAvailability);
-     }
- };
- 
-diff --git a/src/profile.h b/src/profile.h
-index d8188a2..cd29c62 100644
---- a/src/profile.h
-+++ b/src/profile.h
-@@ -49,6 +49,24 @@ public:
-     template<typename PAInfo>
-     void setInfo(const PAInfo *info)
-     {
-+        setCommonInfo(info, info->available ? Available : Unavailable);
-+    }
-+
-+    QString name() const;
-+    QString description() const;
-+    quint32 priority() const;
-+    Availability availability() const;
-+
-+signals:
-+    void nameChanged();
-+    void descriptionChanged();
-+    void priorityChanged();
-+    void availabilityChanged();
-+
-+protected:
-+    template<typename PAInfo>
-+    void setCommonInfo(const PAInfo *info, Availability newAvailability)
-+    {
-         // Description is optional. Name not so much as we need some ID.
-         Q_ASSERT(info->name);
-         QString infoName = QString::fromUtf8(info->name);
-@@ -68,24 +86,12 @@ public:
-             emit priorityChanged();
-         }
- 
--        Availability newAvailability = info->available ? Available : Unavailable;
-         if (m_availability != newAvailability) {
-             m_availability = newAvailability;
-             emit availabilityChanged();
-         }
-     }
- 
--    QString name() const;
--    QString description() const;
--    quint32 priority() const;
--    Availability availability() const;
--
--signals:
--    void nameChanged();
--    void descriptionChanged();
--    void priorityChanged();
--    void availabilityChanged();
--
- private:
-     QString m_name;
-     QString m_description;
--- 
-cgit v0.11.2
-
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.13.3-r2.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.13.3-r2.ebuild
deleted file mode 100644
index 3c1d7097d87d..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.13.3-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/libcanberra
-	media-sound/pulseaudio
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-wrong-port-avail.patch"
-	"${FILESDIR}/${P}-optional_gconf.patch"
-	"${FILESDIR}/${P}-automagic_gconf.patch"
-)
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.13.3.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.13.3.ebuild
deleted file mode 100644
index 5b563ea9d021..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.13.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	gnome-base/gconf:2
-	media-libs/libcanberra
-	media-sound/pulseaudio[gnome]
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-wrong-port-avail.patch" )
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.13.4-r1.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.13.4-r1.ebuild
new file mode 100644
index 000000000000..81b3f937328b
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.13.4-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/libcanberra
+	media-sound/pulseaudio
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.13.3-automagic_gconf.patch" )
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 7a9020c575a9..dd396341fe89 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,7 +1,7 @@
 DIST plasma-sdk-5.12.5.tar.xz 243568 BLAKE2B a8c5b448843c14a1d0f4dfde1ae7857edcdc61e5ad8c295c42ba3d96e1721162e6ece0de2f4bcd50fbd48e7d5c5a497686313c67838c8b1d3e676d7d58e4aa2c SHA512 c04d5d5fd1782fb3dbf53ff3ca1f05a79b399fbc43ac2698ca68ae713d98c93b87519c10b879b8afe0c8e8cf900016ef42b531bfff40c16951fbe3dad225965b
 DIST plasma-sdk-5.12.6.tar.xz 244444 BLAKE2B bfa5401015489a873168e6f18035f3f95224c65301e406a6ac4146d942fc9fb622d8e2b166500edfcde576141a954eeb30c5917b5d704847803230499241de9d SHA512 29684df360941f863a064c104855f21d8b455ba098946c8600aae1064d0bbd3da39e10b4b07f65abb9babc512d24ed925b07b244fcd015966474aeebaaf4cb00
-DIST plasma-sdk-5.13.3.tar.xz 246900 BLAKE2B bebade56120efed8a024a4ae10db41006a10c09fbac7d0d4e984bca20cc2684bf083bc2407a9ccaf3c0472785c5dce37bd5d1a874db9fb3ff1b2a8b44b53c1d5 SHA512 3218e33e411e3c46f1ed68d67b0cd28e68d1ecd90aae0b356ab2ad3097288e902441c4ac7f621c1ace3950461f6f02642d6f6d6bb92c879bc5d244d30b0b7672
+DIST plasma-sdk-5.13.4.tar.xz 249044 BLAKE2B 223262c03e6738560e403c36573137a2a9f7a0c91494a50d7dacf319eb9515ca70322d012a60b536d568a7b065cca39ceff260a493566413a22cf5462b00a191 SHA512 cff77edc0326180d7ef3f5a0477515912ed94e737950c22f683d7d5c4d41ab8cb359ab1970f9b76b86126727d54efc31b3bdce63fc15b9e95aecb5bd10f65ac9
 EBUILD plasma-sdk-5.12.5.ebuild 969 BLAKE2B a4fc74c2bd385e5d6bf936276de015c1616ead4b35df629d19aa7051b69ccb12dcdd968dd8b0250cffd07987a0762d210999a64f235c233bd714ad64be63eabe SHA512 b942f87567b41693f6568bf9975a907af75b4601a5f1b2bb8c024975c4a4223a7ed2e1e1d870103357632369e9da4fa58f4fee2bb8838a7bfe552857b9ac54c1
 EBUILD plasma-sdk-5.12.6.ebuild 971 BLAKE2B 751a5ebc2e3cb9958f2929b04f3b141dfcc2a0202e40bc9a142abd51d10e4b7640f12a4576cfa51567ee8002cf2a501af02326f9369bfcc1b53ba5f7150cd65a SHA512 bd7f1c21926ec057dfa456a14bca1933ca046a4e9f6b5d0511197dbc6b45ae2961095bfa0de444d4a3ac8b41def52afbd04785aaeeda73eab76ce03ca841dbf1
-EBUILD plasma-sdk-5.13.3.ebuild 971 BLAKE2B 751a5ebc2e3cb9958f2929b04f3b141dfcc2a0202e40bc9a142abd51d10e4b7640f12a4576cfa51567ee8002cf2a501af02326f9369bfcc1b53ba5f7150cd65a SHA512 bd7f1c21926ec057dfa456a14bca1933ca046a4e9f6b5d0511197dbc6b45ae2961095bfa0de444d4a3ac8b41def52afbd04785aaeeda73eab76ce03ca841dbf1
+EBUILD plasma-sdk-5.13.4.ebuild 971 BLAKE2B 751a5ebc2e3cb9958f2929b04f3b141dfcc2a0202e40bc9a142abd51d10e4b7640f12a4576cfa51567ee8002cf2a501af02326f9369bfcc1b53ba5f7150cd65a SHA512 bd7f1c21926ec057dfa456a14bca1933ca046a4e9f6b5d0511197dbc6b45ae2961095bfa0de444d4a3ac8b41def52afbd04785aaeeda73eab76ce03ca841dbf1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.13.3.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.13.4.ebuild
index 47de95ae2130..47de95ae2130 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.13.3.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.13.4.ebuild
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 78b23f30c5c3..e9b86dc5d5ed 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,8 +1,8 @@
 AUX plasma-vault-5.13.2-nm-qt-optional.patch 1679 BLAKE2B f49742dda0b7de7bc76ec11002043093d2d955d3f53501096b7f66e3d031727a28e6f97dd85ab27d2b4d7c4413ff2831c79595e73ea76daaf0b4704c993c5e89 SHA512 faed86fca848ea89d3d00f5f72bae9c18aad2e5f091eb78a89c91b9f2e9c979e61d9f720ea9cbbb312fdd54b9b0da26559c6263b90c037934bb296c4ef5caa1d
 DIST plasma-vault-5.12.5.tar.xz 105108 BLAKE2B 4a4d574a08e52e3bad11ccc58cb509bc2a837767b10ea2cdf78320ab725d797a7a769c13209f06dfdc827ce1095a7ae3c73fe0bd3110430070e9b1957392f1ca SHA512 bb28a762b318707d61d7ae8621e0da31db9efb9171503c6f2ed9d53f29e78caf5716a86f7c9a6ae00cba2f6a1135456e5664e2f284d5a25214788b1099fa8345
 DIST plasma-vault-5.12.6.tar.xz 104956 BLAKE2B 812d9e3dbc28ef9bfa636b739fecae4f60fa67d3e153554e70886bd865a27a50daffbc29fe9fd53fb5132ceb9a8d5b85be02264b7099baa2fac91c5c78852ec9 SHA512 5241d6a13099fe69fa279de6a6058ff4479b6f59d5348854de5a113304c5be333191d820802466ec75ccb43833e6abdb543b9b9089b12dd8bd78a69a8cce34bb
-DIST plasma-vault-5.13.3.tar.xz 114408 BLAKE2B 010c0c48b47146617053ca7e75070f1282a0e5761d1047384ae58268cbf6e9ea4d55a1ecfc8bbb70d3f002f5aa58775a77a7e1656ef85effb4fbd9b0e9a8ea31 SHA512 056f159da9915520766c4e953657ac1b510816cb792d6e3bd185d1365f1d3ce70f8557c6ef4bc33d9eff04741ca31cc20a539cdd56b2365589f362ab80940927
+DIST plasma-vault-5.13.4.tar.xz 115100 BLAKE2B 0bfc21b28cc53c6a1afd81100350a415a49bb7baa682ee76771f2608d66c721bf0c0ebd1d2413a07c5b8b322a2c3c1850aa20ccb114e3df589b4eb4091eb0fd1 SHA512 bdb8fcadd8980ace532ce8dbdda7c10c37fb2201060e94d366c8541d3be5e9e48974d1569fb51ad1f706e45741369ecb5d5514b64af7e934865752ed1ca8d28b
 EBUILD plasma-vault-5.12.5.ebuild 856 BLAKE2B f7672f6b4868877e27e27c0028176f8f7ba0642c1071f23eda887f3fa174b8373dded2eccc36623e2623ac6de82396d8d9490aa38b72a94fc177c50aafccebeb SHA512 6e64d0bd6b08f47f5f73924cb4dc240a01405148286de6e8e3d01604ca27ff9fd1a24ff772c0dfc5ca5e218ada804e48a6cd9a4400f2f5284fbaa6e2ca52b329
 EBUILD plasma-vault-5.12.6.ebuild 858 BLAKE2B ac47bfa4f2c6dbf18a37da67e2ba603de151b533a8923ca0659e1e519dd56166c347ee23d89dd4ee26666293b670fc585c859392aa564a15089f8b771f9b36b8 SHA512 025bf8d31ea304fb5d3f18841519bdfb2ffb913b78cf2dc20ed743d9daefff56234b31a2472fa8f3f465eae91c05891b9b4c4cabdc0c5fba8017a26973b00b87
-EBUILD plasma-vault-5.13.3.ebuild 1137 BLAKE2B 8ad0836a50c02b632047fa67be439aa70aa1b5308624e1e6be93e1d60fe0ed07b599d2f304d66c78be326203434f48014396119185eb5bde7e005353d30fba65 SHA512 ed2ace4ad487ab4a4f53be35c8cfeb68c90ddd87ad09623a253fcd313c3b915a157846724b8bebd0bc96f7713cbcc13a583c38bf7dc393d6aaf7587b0f1047d0
+EBUILD plasma-vault-5.13.4.ebuild 1137 BLAKE2B 8ad0836a50c02b632047fa67be439aa70aa1b5308624e1e6be93e1d60fe0ed07b599d2f304d66c78be326203434f48014396119185eb5bde7e005353d30fba65 SHA512 ed2ace4ad487ab4a4f53be35c8cfeb68c90ddd87ad09623a253fcd313c3b915a157846724b8bebd0bc96f7713cbcc13a583c38bf7dc393d6aaf7587b0f1047d0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.13.3.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.13.4.ebuild
index 2e3dc39df9bb..2e3dc39df9bb 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.13.3.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.13.4.ebuild
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index cd5893d808f9..8485a04c8809 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,7 +1,7 @@
 DIST plasma-workspace-wallpapers-5.12.5.tar.xz 45917408 BLAKE2B c8591cabf917153e317516b9b186259e1712aefc5597172f1c13228bb55bddcb91f00eb1f1c35d39f43ee2674bc58a8f197838f81c450b757b65bca608d149c6 SHA512 f6e30b638a09a7d704c70d19c52c8faabe72a28cd74a0ab2ffd9fd665edd8481d58df3afa0068ac2cc3fc5d9d91a4d2b0b4ec5491cd87f0f785dc16525d43f86
 DIST plasma-workspace-wallpapers-5.12.6.tar.xz 45916176 BLAKE2B 790558df9b03dbafc0987e791c66ccdd30d2257cd249ace4b5efb64c705d28ca013db592e8ea8d3ca21f82882f3ffe2414a109767aa4aabc1a535327b1cf39a4 SHA512 3985927ad538b74a5b9ff9b00cf9ba9838103acbe6091040c3f2a489876805dcfa28547bf30e5f7b9fe608ded53bf52addf1a741314855b5e1aa7916890bafed
-DIST plasma-workspace-wallpapers-5.13.3.tar.xz 45915556 BLAKE2B 58e9736a6a88dd55ace1c0a798f02f890247df6050bc50500b7af24a5fb4b77f622533c4d38ac7367fee0f8f24766c7ebdee1e2ed2741b4cca9b4f322e940fbc SHA512 65b7f1330d5f57249efaf216d812f17b4512577d25e703e8eafbc41236844baf75782ff3ab1b75c9864c05c86f7a4291259bf870b3c6be7a687673e58f8180db
+DIST plasma-workspace-wallpapers-5.13.4.tar.xz 45917464 BLAKE2B ef05d8742098a36941b840e85c6f435348b71c5dd82f51fbd9e9af326f1058123b2f1b6acec030faeb3d63b13ff30c1385dfe4bfab1ee964ee78b8883df9c0b1 SHA512 f8e0d57cb427c34748aad676172022beb3760c3fb0c668f4e0d8ba89fce08c5cb3e8b55ae2fad864ff8f37187fabf41839cda2f8030e5a6202063d034f5afff2
 EBUILD plasma-workspace-wallpapers-5.12.5.ebuild 395 BLAKE2B 6a3ad24b7176ce43b892681d54bb0a649fc9ed1cdcd8d89dee3232213b57d8174f88acf5703b960b72f648b1f1e7db698bd151ac9584557142550367cce53a73 SHA512 0fa14c8bb2ddb2ef24d50687813feaf8cf69b6834ceb412a2ce8ad8b3292acc62d08b3240fe1af7a259ba24fec96a94369196ef38f642ffba3115833f937499a
 EBUILD plasma-workspace-wallpapers-5.12.6.ebuild 397 BLAKE2B 80a13f6292de55be231da6fe54f6238e97ea5bc6f8f1cf02968dc66816cef60f634daaadc1fd5b72ff0a917baad3cc73b6daafc26af0ffb0fe443495ad2903c4 SHA512 38a2fd96cca7fdd375e0e46b96992e1372b241f942e408d89dd73831269bfbf498483d3315b9d41458a8a6a94c1622d619a5d5fbc0ddd2788e5589b625368945
-EBUILD plasma-workspace-wallpapers-5.13.3.ebuild 361 BLAKE2B d63f9366a84c9ff391c7b84bdcdffad7045451ab861ad960128bb09f6d4c707717de3d651186600f2eba838776679cec8728cfe8536041af7342ee082fa212e4 SHA512 e97040d60acebd82171d7b58835afa82e83c6c5a1b588e9cb256891a287a289948ff0ffb8a502bab7ef7c178b77bf5ce3ddd80e5f5c5d181d54a46db2ebda3eb
+EBUILD plasma-workspace-wallpapers-5.13.4.ebuild 361 BLAKE2B d63f9366a84c9ff391c7b84bdcdffad7045451ab861ad960128bb09f6d4c707717de3d651186600f2eba838776679cec8728cfe8536041af7342ee082fa212e4 SHA512 e97040d60acebd82171d7b58835afa82e83c6c5a1b588e9cb256891a287a289948ff0ffb8a502bab7ef7c178b77bf5ce3ddd80e5f5c5d181d54a46db2ebda3eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.13.3.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.13.4.ebuild
index 12fd86d0561a..12fd86d0561a 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.13.3.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.13.4.ebuild
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index bb9904437c11..25ab1cd0a7ae 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -6,8 +6,8 @@ AUX plasma-workspace-5.12.80-tests-optional.patch 905 BLAKE2B 02350e6aa907b91c84
 AUX plasma-workspace-5.4-startkde-script.patch 1090 BLAKE2B bb2b0f20bbc2ed467994c98840ffeefc71d4f621713e413ff09a855689bde66b81a61e607457b3fa1ae51a67a3a3e47049193fec530448483c6f87e63f713981 SHA512 45149d5a3db48d77da7a74fd0a5faf14c8f99aaceddc725c9056cac315fd3bae78506e7cd74f6548045e4daf73bf2a605a712311018ff11a4a26c7d9f2afee84
 DIST plasma-workspace-5.12.5.tar.xz 4564204 BLAKE2B fe821adb76f7bca59f03c50a8da649c0a063a0ab61952f48c259d256b7cdfc9ec799625e2ef6b66732ffb9472148dd40d9cedc2f728a4b0fdf127ce3b61cca3b SHA512 c086b13893ab422b701e31652015618d8e3752e4ee5a8b9721eee7085307d251ea716e72bab52f458655cbf49d9a1a94deb47482fd6ecb030b20d7ea1bb52deb
 DIST plasma-workspace-5.12.6.tar.xz 4565260 BLAKE2B 72e539b1688c0c58c5fcb02b9de14edc36c849040baf7cd69a79e8d4f2e9a1e0b4cdca1086af3804de36969cb61a41e7def169862f890debab5d3bf5ead95ff5 SHA512 efa67214814a0193c3359bc7599174eab29f93826dcad61310f0fc7ce946ac779f35f2e8d0b231360dfd2ddeda398b8b12bf4a155ad6746e60e56a388f446488
-DIST plasma-workspace-5.13.3.tar.xz 4544768 BLAKE2B 4d3cece1c48e1fdd7221e755cacbf85875551a9e6ca7b923633d99522796d80adbc7bd390dbdca054aa4e809de6dc63fb89827552bc175f68014a4e2564094d2 SHA512 63a1aecd1f5cf7125e5785963f641b073fea9a71f6c552c7b297d8b175a07faece5b44db65db115b8d1c3169775713820c33a40be8f41da33885adf898a5c334
+DIST plasma-workspace-5.13.4.tar.xz 4579896 BLAKE2B f9faf4f2cd09abc4bfb79d15e6d8aae88dd5b5505d183737e0762ad5603cb61d23f40cd040bf9b89200ddf9a7797221f833d1ecb52af0aca84959c3684c77508 SHA512 23fa64101389741470df308bb346c89d25b465a662acf08463852690727405b3c379936f7fea1ec658a6b20ee631548f99b3e23f2b30d9c0f71edca32763b7ad
 EBUILD plasma-workspace-5.12.5.ebuild 4705 BLAKE2B d67bf20a99438d4d5c8f0eff9f5b065c567e0f4534b4a44e3a373dcd712278b14bcbf2ece60c2eadb5698156c55a4d8313229bfd84b052c73ed227e2d3d60ac6 SHA512 791629ab4a7f7e62068fb0579598d43c6c382e151d509e8ef946d059c30853c9b2ed2f1f679162dce1d0e3e4da648977d24c840d82a754244ae3ba6c7b6345a6
 EBUILD plasma-workspace-5.12.6.ebuild 4707 BLAKE2B d1fe8a6c2694f16c06716a6ee6ba4af66014105ee52628c372bb890bc8aa1e34d12696ad5861664020aff588fd871a223e600928804e2da58d072a7a9282cca5 SHA512 528b25f1e926ac06fa21bbb2a57423a97c9170fdb2b193d3271ab0db170859175dfc71b2eecb8c394e0e831bdc3eedb49a24968d1ed9cd32572d7cc5dfa3dc71
-EBUILD plasma-workspace-5.13.3.ebuild 4724 BLAKE2B fcc2a3a9b9f0c77eb7bd4bba17975bb52d25b8e9daa8a6c0fc4d51b9e480c8bbf550ea6566d4311449f49a2c58f35051e475c55091b126c2c57e3177d7319dac SHA512 ccbca9be65b0ca09cc42114ef53bad1be3f78acb198513d5be903b0bffcf040b8e5e72096f0ef2a6c955e7b81a1cba9bc630a0ef0a216db62f37f9c724aa2ce8
+EBUILD plasma-workspace-5.13.4.ebuild 4724 BLAKE2B fcc2a3a9b9f0c77eb7bd4bba17975bb52d25b8e9daa8a6c0fc4d51b9e480c8bbf550ea6566d4311449f49a2c58f35051e475c55091b126c2c57e3177d7319dac SHA512 ccbca9be65b0ca09cc42114ef53bad1be3f78acb198513d5be903b0bffcf040b8e5e72096f0ef2a6c955e7b81a1cba9bc630a0ef0a216db62f37f9c724aa2ce8
 MISC metadata.xml 583 BLAKE2B f9b40b080569e6ec92f7a4f23bd6c7e7fb7711b44d3a00cef525478e9ad9a1b2eda3fe0a4686d625cf8530b6f7aa36b6f70eb71401a06ef2856ef3d0c068e11f SHA512 8b7b81edd1518c2b1ee18d609288c209d197d35f869d687e1019a10f29a2360bd071218ad3facf65217665287b3ceab84a78341e6cd799a7326fd3da2336958f
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.13.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.13.4.ebuild
index 34326ab2bd3d..34326ab2bd3d 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.13.3.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.13.4.ebuild
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index f2aef950a359..e6445e348c9a 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,7 +1,7 @@
 DIST plymouth-kcm-5.12.5.tar.xz 38968 BLAKE2B 5707e49bcf9a03cc1546523075dc8c60dd00277c92866350babb36bbceff34b9612369d034c6983db0622821a6eb0025bedd0be7cd0412be010ca4e486a2a9af SHA512 67c630182eaf891bf4b28c9889f76b40c61525a992d3f80985f69ecdf831d9869456ff59b0c3f0cb9581b1f2412a56d907e9af3a8beaee3b1966ab64254b8c69
 DIST plymouth-kcm-5.12.6.tar.xz 39448 BLAKE2B dc0d3292ed4f92ff6d731e5057db04202b869f2ecd7a59583f7894cd8120785acb8f0938944e47a523b3ea8b2272248d76544d9db03761a59817a9b1303461dd SHA512 1c6f1eabc9c814e908903c2fdc5372a73e5b579c743e99e5fc44d72dde70d95a582ee80d1ff9b930aa5e6df26d0c185bcee466604d7102e91332bcebf7e3d7bb
-DIST plymouth-kcm-5.13.3.tar.xz 39472 BLAKE2B 347985bc7da4be577afc23ec5a5debc686fb2c293100459d8153f356dc7a97bea76cfc39cc18cc5b1891b0ae24ec5df6c3e830ed91f776c2475e54378c94883e SHA512 4c940a424adfae78dd76df25825269f31e33e299defc6bc57d3a5b9f2e0513572e40710b5004969dd178e1be0d806dcfc49858f97b8754c07bd5fef597c05913
+DIST plymouth-kcm-5.13.4.tar.xz 39548 BLAKE2B 6f111d00db068693d075ab5a6dd13583b02b3435cb58d39a437040cc40fc142b0b3aee36f180cea12075ead252e4fb6b83101a26e380d0c04f4c2df19bf25a6d SHA512 ec8977e44e923b5d8dad64d30f144061ee20b8296926c1835d6c782a669da2ce59bb1204203488c820fe5bf9442adfe4fce7af75eb7757c6301b238e26abd75c
 EBUILD plymouth-kcm-5.12.5.ebuild 796 BLAKE2B 589a5ec6877dc910559b491081dda3c8a2fed924f60b775c248b1e4f6c354ee18790d5bcbd0e2ec30651d567574d8ddb21bbee870efba1d33a53df8f88e7dcc9 SHA512 106d4743791473dc7ef56d39a4a9028e693d83a51018da96d9a8f6846a2929ede3f5403254635e48d252d387fdaa8b62f264ebb4bf97b29bf374738c28567a1e
 EBUILD plymouth-kcm-5.12.6.ebuild 798 BLAKE2B 57bda54427164cafa92240014189f901650e01abf7ecc073f35af00b88fb1c6233192400e57e47bc293ed36983c5a541cdea5cb25b68521e4a0aa3b981935bd9 SHA512 8d58ab3c4dac137e9cf64326a0ad4481bf5f9e03c27b13d9cbe0cdff24f1b37fdf6363f70ece1f058c585b894acdeeedc8a9457611d795d870fd40435bcde10f
-EBUILD plymouth-kcm-5.13.3.ebuild 798 BLAKE2B 57bda54427164cafa92240014189f901650e01abf7ecc073f35af00b88fb1c6233192400e57e47bc293ed36983c5a541cdea5cb25b68521e4a0aa3b981935bd9 SHA512 8d58ab3c4dac137e9cf64326a0ad4481bf5f9e03c27b13d9cbe0cdff24f1b37fdf6363f70ece1f058c585b894acdeeedc8a9457611d795d870fd40435bcde10f
+EBUILD plymouth-kcm-5.13.4.ebuild 798 BLAKE2B 57bda54427164cafa92240014189f901650e01abf7ecc073f35af00b88fb1c6233192400e57e47bc293ed36983c5a541cdea5cb25b68521e4a0aa3b981935bd9 SHA512 8d58ab3c4dac137e9cf64326a0ad4481bf5f9e03c27b13d9cbe0cdff24f1b37fdf6363f70ece1f058c585b894acdeeedc8a9457611d795d870fd40435bcde10f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.13.3.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.13.4.ebuild
index b22a94e9b199..b22a94e9b199 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.13.3.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.13.4.ebuild
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 815ce18ae04e..43ca90cd0e98 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,7 +1,7 @@
 DIST polkit-kde-agent-1-5.12.5.tar.xz 41624 BLAKE2B 6f9e105afa00715064765087084f3b3d5fb8c0c78ccce6466ebc59e7a40b11ea9be36c8f165c86bee1af3071b26fd3d0e6db0ab3cd3579b61d93ac5ab1146e79 SHA512 fba769258b3c461bef83d8f978e6033119bbe5479b8efc349d2fd48955e5d9fa73fa928867fa08110941f01e27ada438b375005083b84a2be9bda6589b999562
 DIST polkit-kde-agent-1-5.12.6.tar.xz 42120 BLAKE2B 8f8ea94f1b9558461f198c2b9c085886d225fb3fb4d7bb5a9c480b40376a1e9ac5696122c09d30e5245e00c93679e84488f72e7790052eec0d4e15cdaa7a080e SHA512 7a156c6674dd453a5a1f2e00de0b451fcf25f3524d72762bbf09b047257e0a5b63ef6ecac33302ef0122630bd326c88841b553a7090891583eec8514810671f3
-DIST polkit-kde-agent-1-5.13.3.tar.xz 42520 BLAKE2B c97881105f3a8c5a8ff80d54535f014a64510b4a17e8e7d44e42c7a3c558be715a510b129ed2a001ab0e8af3ed050a9d863d6f6f72b84e915e6698b7cd6e9555 SHA512 5c526f0e01b3fb8cbe5f25a8717d9072869f962fd459cbfc1675afdfd41663350cabee4987707bba9c60d5a5319a497391341c94c87eb3de3f35278530747504
+DIST polkit-kde-agent-1-5.13.4.tar.xz 42784 BLAKE2B e3a4da1717c1064b3e5e9ed646e7d80eb79c34f29b344074b60ae62ce0f66fcffda953c12478a1f4d092a3745a9407c50f4e65a999ac7d2d66cb9b0ebe9ab974 SHA512 fc9e9b3cedaf31d777e32cd1c93783681f963c606ed6bc59299e4410c4ef59ceda8f75bb8f95fa733f6aca2d24680b036ce30f04fb7312dadbcfc0c0afcb055b
 EBUILD polkit-kde-agent-5.12.5.ebuild 719 BLAKE2B e879a3556ff23140c9e997264e5ee347a2ba22fca5ac59eee68ed1e84759edb09465ee4f28d4a9d0a6ac9cb6d6427bffab5767f7594f9f8e09c99854d24e2992 SHA512 558547980ad45e24b1e557bf807484ba05b41f9c3131510f322696d55e3cc6f0a756f84fd63f768c42025342731b10a1d5798c307ae27f9403dd28868a1d00f2
 EBUILD polkit-kde-agent-5.12.6.ebuild 721 BLAKE2B 24ea1a19dd4d1dce29e67fe934e4e4e9db207f2fe7dbb4051d0a077d6e69e4bb01b80f20e5227bbf717df8a6417170d54c3a3b02f995c504955620c75a2685a7 SHA512 b842c139b0ea485d20b0a3f49d2a89814f08699a0715e8e70674db428b83f131dc9638d5c7369f5f26363fb8d9885130af16bbd5de67c4456f5dfc623413b096
-EBUILD polkit-kde-agent-5.13.3.ebuild 721 BLAKE2B 24ea1a19dd4d1dce29e67fe934e4e4e9db207f2fe7dbb4051d0a077d6e69e4bb01b80f20e5227bbf717df8a6417170d54c3a3b02f995c504955620c75a2685a7 SHA512 b842c139b0ea485d20b0a3f49d2a89814f08699a0715e8e70674db428b83f131dc9638d5c7369f5f26363fb8d9885130af16bbd5de67c4456f5dfc623413b096
+EBUILD polkit-kde-agent-5.13.4.ebuild 721 BLAKE2B 24ea1a19dd4d1dce29e67fe934e4e4e9db207f2fe7dbb4051d0a077d6e69e4bb01b80f20e5227bbf717df8a6417170d54c3a3b02f995c504955620c75a2685a7 SHA512 b842c139b0ea485d20b0a3f49d2a89814f08699a0715e8e70674db428b83f131dc9638d5c7369f5f26363fb8d9885130af16bbd5de67c4456f5dfc623413b096
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.13.3.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.13.4.ebuild
index d1b6abb46a4e..d1b6abb46a4e 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.13.3.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.13.4.ebuild
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index bf44c36e6eef..94f1f2557348 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,7 +1,7 @@
 DIST powerdevil-5.12.5.tar.xz 382664 BLAKE2B f94788e91455dcf17340f1b3041f15db218481360e5d0979d0a785acedd74378ea195610a9b01457f06259176db998e328c2d05cb67d706d456b671bf6a110e4 SHA512 e40342c5565276671c9752b071c84b1c5d648c8c8c56dd127bc57d690be28518cd5782809ffe0253bbb1241034c14652ea29880c1ba0266e1df300e771a4d117
 DIST powerdevil-5.12.6.tar.xz 536436 BLAKE2B b3470bd3655087a3889ba3b2f8a644172af49b52243443cffd490122f67c1e075dccbef550d85b977517333c73d05bd4fee6dcfda3e74d2ee0c1858921e2ab4a SHA512 b77e1990e59bae684d19fd796789aa0216d111952941642c354fc760e862cd5008c923aa5f1783c8699818fdfd36333a2ad56832834e3ce2232905ec399e0846
-DIST powerdevil-5.13.3.tar.xz 539036 BLAKE2B 4e75347a6bddaac64b0c087744f7ddeb12cae77d1cf6a0bf168ff0220a51ec128e1d91b5935bc5747fd8cf096866e77cc5c668d46f74db154a2498451aad1067 SHA512 612fb3996275537e251ff44965938e52b74f90fcddcd4571465328d0bc152099477343610bf10538c9a9bd4aad8c1a7322f7f77059ca1d67183b06dab4d1f308
+DIST powerdevil-5.13.4.tar.xz 598948 BLAKE2B c0a7ef685b758981bf94283fe4b3ee21ddb7f2061d0eac3186303c33d40a2ad392342bed638a2833a69858ebbcba5f248b89932ced6edabbeee785be1303eaaf SHA512 291ede3ddbeb4683bf69e7cbb7908d036e0836f3e6d855122ad7e5aaa67f42aba91472882146c27f4ddd5957cae629ea1aa23c71e7c39072df4d716a3b02ead9
 EBUILD powerdevil-5.12.5.ebuild 1702 BLAKE2B 63d2e9474b231d3d923bb58414dec3f048fc8461764ae4b891e570c3084618f9eecc9993afa22864d757672cba2c902f7babee535309efa2bd53451f8301f2b8 SHA512 ac8dd6ef3412e85e12eb83be8c1767b1e52511a60207dd26deca1e0eac91366e9ec86a724d83d0d80d36f3dc510e893d22c469ad52c172397fee1577075c5fa7
 EBUILD powerdevil-5.12.6.ebuild 1704 BLAKE2B 4bdc0745eac643a9cc4671736d1e0eb0a054c360c63587f823ecdc2941717697a1e5ff1c793713a11c35574e2b0d56860eeb45fac11fb9653838a18687db09c7 SHA512 dd1e730e8af4c771326521707272cbef59c3914405a01f4841569a06af203825689e273d8a5a15ce6b100b4ad65eb105f00de6a3d1917f6a93822fafa0106353
-EBUILD powerdevil-5.13.3.ebuild 1788 BLAKE2B 340f9d5dc53957dbe0a3097b28393ecd7ed9af90c73c037d896afa94c3d59ce58011ac9c7070d97f89505ebe4a2c153256c84aac5eb70de5b998c3871b8dd0f7 SHA512 ae488943f2012b8c5b4a87181492665fc62cfdd3f6fbf183f84cbdd00dd5074fe9ba5a8156d51ecc8ee6d5581b22b22987b26860b6e7bca19ae6ec03afb52801
+EBUILD powerdevil-5.13.4.ebuild 1788 BLAKE2B 340f9d5dc53957dbe0a3097b28393ecd7ed9af90c73c037d896afa94c3d59ce58011ac9c7070d97f89505ebe4a2c153256c84aac5eb70de5b998c3871b8dd0f7 SHA512 ae488943f2012b8c5b4a87181492665fc62cfdd3f6fbf183f84cbdd00dd5074fe9ba5a8156d51ecc8ee6d5581b22b22987b26860b6e7bca19ae6ec03afb52801
 MISC metadata.xml 642 BLAKE2B 51a6b9a3c4cd0040241ac6be1b9669d7b7b77bda831ddec18380fb4f2b1af4072d0ede8281d3b05da41a6744db95b588dde3efccd4b339e289aee053645231c1 SHA512 870a09abe650b373cd7a4050308fbcc83da772acaf615c36232701fe53835f8bf9d4d092259da42417f97387ed2b37f19d4f4fffbec31087dfa7188bb8bb7056
diff --git a/kde-plasma/powerdevil/powerdevil-5.13.3.ebuild b/kde-plasma/powerdevil/powerdevil-5.13.4.ebuild
index ed23ce04aed6..ed23ce04aed6 100644
--- a/kde-plasma/powerdevil/powerdevil-5.13.3.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.13.4.ebuild
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 152f22863d2d..b0d1277e72ea 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,7 +1,7 @@
 DIST sddm-kcm-5.12.5.tar.xz 60164 BLAKE2B 87bb31f9b057c944d91ab49d848fbb20f72a6843e6a151d309d0d9d039956b662f059551929ff81cdcace084553c7bf699f843649024c3ff653aec2462880b82 SHA512 a2b03c35d0234764a76a1bcf525cac68a91678c952731a2aa929d596f6454135d347af5985f8dceb8834ef6fe9e91380349be073457a53ed43c9ec4e0278d262
 DIST sddm-kcm-5.12.6.tar.xz 60480 BLAKE2B c580dc68500d49a3decdd02bbb8cf02194d02aaa98b920232431b0c2645f9b163a1e113c2f94acb0991e8a62562888a61e6946d86c2746885b391f21df0f501a SHA512 f9b43d4dba83c80b6cac1a55f8a7e99c500a01578a67354d8c54d049ff42ffb1a7b0ba2912e089a382b960397b4031b46e49882ba272d9ebd5c60dde843077fd
-DIST sddm-kcm-5.13.3.tar.xz 60328 BLAKE2B 70b3a6b96d88d5cf05a6dada6dc78d930fdeab0ae56aeaaec689db8b16639b15b66eb12cee5eb8fab8182508fc69c886bafc63d8ba9cd71c249adced18b9faa4 SHA512 32e24823e2e76c6b945cba64196e5283b0d8c75194e404b7e2d2d97f162e475f50c4b3adb7d920e6c5e51020d9b43239a582e5543fa89d392194dbabe2428534
+DIST sddm-kcm-5.13.4.tar.xz 60660 BLAKE2B abb8865608050deae7fed415d5e58345b6e16d735660406ccffd44c4c137201f09949cd72c1541e2d710802adc1b62f9a560df26f0038f938d0e2c96f15281ea SHA512 6b3da32e99242864f2a25ce34c5a46ec3c7fed8e929b351b08a07e97f7368a3afa27d81d6d1b017a9671b95c2cb6b2e724a42cb1f4f58d14c1308727fd8d0ad7
 EBUILD sddm-kcm-5.12.5.ebuild 903 BLAKE2B 4d6baf95830ff57b93ab0850cbf15c657ca4636f282dfbbda5b8c6865beccea8bde071100b483ffa7380b63c79be02c77fa859eed76b88298855fc7944db90a8 SHA512 154faf670b577a4af410a3c4dbc5efee5e6cc5ebb02d2dd77b140434fb0d01f4b0fb9440335ea107ca1f46f3ebccec6d9c0622c5f371e0a5bbf7bb97ad1d395b
 EBUILD sddm-kcm-5.12.6.ebuild 905 BLAKE2B fc09dea6d864f6058e4d1f3716816141ecb430e419856e8bb4b35a5c77518157aa41988f9f504aa3e45db03382c157aae443b249567dcfd7bb669b0970a717b2 SHA512 68e1f97fa3f3b80f70d1d514ed4cde4461c10b9a2bc5146506cb9177ddcda25fd048e1a36d16466706ba66fbdc857dc185f9342a3c497791d1f657f3384b120f
-EBUILD sddm-kcm-5.13.3.ebuild 905 BLAKE2B fc09dea6d864f6058e4d1f3716816141ecb430e419856e8bb4b35a5c77518157aa41988f9f504aa3e45db03382c157aae443b249567dcfd7bb669b0970a717b2 SHA512 68e1f97fa3f3b80f70d1d514ed4cde4461c10b9a2bc5146506cb9177ddcda25fd048e1a36d16466706ba66fbdc857dc185f9342a3c497791d1f657f3384b120f
+EBUILD sddm-kcm-5.13.4.ebuild 905 BLAKE2B fc09dea6d864f6058e4d1f3716816141ecb430e419856e8bb4b35a5c77518157aa41988f9f504aa3e45db03382c157aae443b249567dcfd7bb669b0970a717b2 SHA512 68e1f97fa3f3b80f70d1d514ed4cde4461c10b9a2bc5146506cb9177ddcda25fd048e1a36d16466706ba66fbdc857dc185f9342a3c497791d1f657f3384b120f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.13.3.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.13.4.ebuild
index f2bab93c9538..f2bab93c9538 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.13.3.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.13.4.ebuild
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 62be9e99af45..4cf7e34149fd 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,7 +1,7 @@
 DIST systemsettings-5.12.5.tar.xz 172136 BLAKE2B 7ed9f5909e202a7be792502abc816430db8921335753c8631a9486eb2c95ea1d0c56646a709a25541e0f8edc0d63325c7d829535cd4032454bd8234dac1f4892 SHA512 c08170379d776724d2bb3d0426483b841f4e491c0c410ac7e258f9c43461791102ab5209674e50ce716f01ad528d1e4d942e13d16caf67b9c53e21905ff716c9
 DIST systemsettings-5.12.6.tar.xz 175140 BLAKE2B d67d2246338da0712ffc984104d365966b464f455597ee99db402bce9e9c0f4483f472965560ba38459dcc40b9a10ebf8cbd71ccc4f89f0bc5c014a131eb8c00 SHA512 a34cf8277751f956d9d7369c99d9999d8315f34b1d0975dbed375a12b35727dcaefd78582ba627f2c649fdf3371fa99acddcfe7fe262545795b4a7f10c4f53b3
-DIST systemsettings-5.13.3.tar.xz 178700 BLAKE2B dd6968cb1cf2e46fd929a8cd799593f1d1cb9c6e8716fe56f9e427cadcb3342bd4dc044227623fd78bfc698820de41dd8dd728c45cea5f625e8c68c5599eb056 SHA512 0b56a8d23bbceff63a929f411b3646088c1435f5e6aa8327f9bb207ee41cc0bb3392e9c200cdb96c723082df27c4a4080a93681feeadbcf63438dd5ff4189b89
+DIST systemsettings-5.13.4.tar.xz 179912 BLAKE2B 922364ac29257d8a189d0930f7bd190970a806e06ece5db57eccac7cdbc51f4907e73e7633f1d9570fdde12b02c2790fced602725d758044a467be7fc77593f6 SHA512 a77dc00fcfc7103d68d08f06bbae8e5c631254fbed5e55fea6f7cefb6408b77ee0d1c2478e30128e434ae2e05cb9936fe1b8bba792c2a1abe57f07ce769509ad
 EBUILD systemsettings-5.12.5.ebuild 1318 BLAKE2B 1ec8de344bf654c495b567df6d77d7a8c66cdcfb318893d32b5877535fd21ac7faa2ba5b4e77bd03fe8f3f98bc206ac58a826811035e7974183307345625f49b SHA512 02da22d75b85f23e84646fb0372b331f12f5ca379baf55579d3a4905ed61a0e096f375d7195990e5d07062471ffeb8ddf5fd0936e433eaf68afc359ea203bbde
 EBUILD systemsettings-5.12.6.ebuild 1320 BLAKE2B c27960f4875d3eb0d3853313171fb17f2711fa5a9de21e4872f1a6b7868542efa3aadcee68809b4ddb00fefbb3fc4fdce698c1165dcaee7af2301da9e0488136 SHA512 f50342ab1da34e8a9f67c7cb415bd94912cd6bdbf19aa9bd4a62df34b6feed73bb3c43ecd453f1e0da5cdb7cde64a5c7afe3902ea7b9b10ff7d4bd69daa12a0c
-EBUILD systemsettings-5.13.3.ebuild 1356 BLAKE2B 37a5abfe0604abf74b74d8943d3067f4a76138fb91f5ce2adfab5966d7411401d4c7a47c2b2941218f9b87937f95a9802652a670e0d1c2b19c206af12fb1fae2 SHA512 3e63744ad07a320cf45635c515c240da59adb93acd049fb2213413cdd2bb86f3ecfbfbc737883bb245f203243e0a03c6abee7a86909c2f563f832b1c90cbc3c8
+EBUILD systemsettings-5.13.4.ebuild 1356 BLAKE2B 37a5abfe0604abf74b74d8943d3067f4a76138fb91f5ce2adfab5966d7411401d4c7a47c2b2941218f9b87937f95a9802652a670e0d1c2b19c206af12fb1fae2 SHA512 3e63744ad07a320cf45635c515c240da59adb93acd049fb2213413cdd2bb86f3ecfbfbc737883bb245f203243e0a03c6abee7a86909c2f563f832b1c90cbc3c8
 MISC metadata.xml 363 BLAKE2B f3d12ec4c4202f55b6f32033a4bb62d41da1cd188c5661a308c315f8eb86fc7190cb3c4316d4a393f686b722f09e5a3415a48c5216ad8818579d7bd9db8022cd SHA512 c90aba5c6ae443cbdbd45523a53548a5fde61d0eca8af6180eee3f9e0e92e546df3533abf58c9ac2b1a60ffb6dc6751b64f6128be1e8d623e5fc90aff90771eb
diff --git a/kde-plasma/systemsettings/systemsettings-5.13.3.ebuild b/kde-plasma/systemsettings/systemsettings-5.13.4.ebuild
index 92404003beb2..92404003beb2 100644
--- a/kde-plasma/systemsettings/systemsettings-5.13.3.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.13.4.ebuild
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index dde947b8bb29..0fcb4619a105 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,8 +1,8 @@
 AUX user-manager-5.12.5-fix-addAccountToCache.patch 3634 BLAKE2B 13a41b87627fbbd81dd1a3ed7083df5843a100f26ee1bd3576d98e8a61fd33df717cb1aebaf91bf49b3058089f73dc7e18ebe0ea411a42d7a8a44862df3efc8e SHA512 a0d04f03f76fab413d1f721453c996c3f88bb571eeeffe57ac85870d29447766b6ea66bbd5928b97355022778b5c74ba95021cc886c38b3911c788e3ad5661d4
 DIST user-manager-5.12.5.tar.xz 544812 BLAKE2B e885a9be4ecbedb04ea0b957606a3b8d91cf0b0b71f5efe7fd68c29d3c577dd1c2394653dbe5948f40f74f8e2f478a2feb38d05003de762ae1e88eafae7f5932 SHA512 c553287b20d0d25c79972b2de375696c8759026a4f8d2203c3f2e9b547461bd93e27a5e14a5584ccb045a25ac107bc875dbe105e97d59aefdd588406a41c515e
 DIST user-manager-5.12.6.tar.xz 545144 BLAKE2B 4e8173992d8ec22709423cae01a50c7d005cc241dc71ea25cce8e8de8e287e685594e0241f980f49aee71da4dba86da08d9eadadbb6e905cf04d658a0743db26 SHA512 17aa16065209059b21ea8e35ce25f646319e9aecd8c7ea2ae8903a5cd0005c9d1b0ceccec57449d4a257624f8ddf9d08a664454914fb083e39d7266f34df8eff
-DIST user-manager-5.13.3.tar.xz 545516 BLAKE2B 0d27732d0793fecb70f2a770a5359b9f0a9907769cb96d13bac94ff37d2ffaece71463ddd28998a7672347bbcc3bf7169ae9fda2aaa93725d625bea6d6dc35d0 SHA512 8ec5f5fda6eb1d1f6682f5427df09d14fce4aa77ab36e6ffa71198262e28e401a6d31477529f9b9e346f00c5362a5f160732deaa6b531f951cd20936bcb83df2
+DIST user-manager-5.13.4.tar.xz 544976 BLAKE2B cfa8dfcbf05c242318566f1cc4ba863677d1178739ac39d3b7400d568ae358f2403db1b91301a5fea59bb0ebf7312ede669e3e03ca40530b2bdbf65e39450c3f SHA512 0e7f6ca5ff02cba06b4cae831083fe999e127659156947b8c48fe0c279dd7939cf05c1f420380b0e65882c1c7f87db0aa230c3cc62290735658c07070da3399a
 EBUILD user-manager-5.12.5-r1.ebuild 728 BLAKE2B 2e699e57889c2585febcea22bfb5c340962dc58ef5ca0af9b8ea5b19d17b3319bce2bb0eb2177d6aada3b7bc21c134a051f09c1a1de80932831c788c5c5adfb3 SHA512 35d5158acde94e6277c18eb3f022b074eb4835f33e119ce63cfd435129cd17014afe673b02a41b3ebab102908cbfa2c29857e9e63733aa75ca2d3ee81360453d
 EBUILD user-manager-5.12.6.ebuild 670 BLAKE2B 1aafa076398b02922fadbe55f44967398971d0e868f48cb5eae1ccc8ef92a9d4297ea5ad989989cf950acb546af80d35f4d44d3172f88ce1f276009d3402ebf0 SHA512 51ec1c8eb1ec9c686a9be09066524500813f8794c5fe61c8bb95f32e53f69d9426f328b7ccde22e7027fe3ea3591604d2b10b87752560293085aee08bb78ecd0
-EBUILD user-manager-5.13.3.ebuild 670 BLAKE2B 1aafa076398b02922fadbe55f44967398971d0e868f48cb5eae1ccc8ef92a9d4297ea5ad989989cf950acb546af80d35f4d44d3172f88ce1f276009d3402ebf0 SHA512 51ec1c8eb1ec9c686a9be09066524500813f8794c5fe61c8bb95f32e53f69d9426f328b7ccde22e7027fe3ea3591604d2b10b87752560293085aee08bb78ecd0
+EBUILD user-manager-5.13.4.ebuild 670 BLAKE2B 1aafa076398b02922fadbe55f44967398971d0e868f48cb5eae1ccc8ef92a9d4297ea5ad989989cf950acb546af80d35f4d44d3172f88ce1f276009d3402ebf0 SHA512 51ec1c8eb1ec9c686a9be09066524500813f8794c5fe61c8bb95f32e53f69d9426f328b7ccde22e7027fe3ea3591604d2b10b87752560293085aee08bb78ecd0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/user-manager-5.13.3.ebuild b/kde-plasma/user-manager/user-manager-5.13.4.ebuild
index 55c31690044b..55c31690044b 100644
--- a/kde-plasma/user-manager/user-manager-5.13.3.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.13.4.ebuild
diff --git a/licenses/Elastic b/licenses/Elastic
new file mode 100644
index 000000000000..7376ffc3ff10
--- /dev/null
+++ b/licenses/Elastic
@@ -0,0 +1,223 @@
+ELASTIC LICENSE AGREEMENT
+
+PLEASE READ CAREFULLY THIS ELASTIC LICENSE AGREEMENT (THIS "AGREEMENT"), WHICH
+CONSTITUTES A LEGALLY BINDING AGREEMENT AND GOVERNS ALL OF YOUR USE OF ALL OF
+THE ELASTIC SOFTWARE WITH WHICH THIS AGREEMENT IS INCLUDED ("ELASTIC SOFTWARE")
+THAT IS PROVIDED IN OBJECT CODE FORMAT, AND, IN ACCORDANCE WITH SECTION 2 BELOW,
+CERTAIN OF THE ELASTIC SOFTWARE THAT IS PROVIDED IN SOURCE CODE FORMAT. BY
+INSTALLING OR USING ANY OF THE ELASTIC SOFTWARE GOVERNED BY THIS AGREEMENT, YOU
+ARE ASSENTING TO THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE
+WITH SUCH TERMS AND CONDITIONS, YOU MAY NOT INSTALL OR USE THE ELASTIC SOFTWARE
+GOVERNED BY THIS AGREEMENT. IF YOU ARE INSTALLING OR USING THE SOFTWARE ON
+BEHALF OF A LEGAL ENTITY, YOU REPRESENT AND WARRANT THAT YOU HAVE THE ACTUAL
+AUTHORITY TO AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT ON BEHALF OF
+SUCH ENTITY.
+
+Posted Date: April 20, 2018
+
+This Agreement is entered into by and between Elasticsearch BV ("Elastic") and
+You, or the legal entity on behalf of whom You are acting (as applicable,
+"You").
+
+1. OBJECT CODE END USER LICENSES, RESTRICTIONS AND THIRD PARTY OPEN SOURCE
+SOFTWARE
+
+  1.1 Object Code End User License. Subject to the terms and conditions of
+  Section 1.2 of this Agreement, Elastic hereby grants to You, AT NO CHARGE and
+  for so long as you are not in breach of any provision of this Agreement, a
+  License to the Basic Features and Functions of the Elastic Software.
+
+  1.2 Reservation of Rights; Restrictions. As between Elastic and You, Elastic
+  and its licensors own all right, title and interest in and to the Elastic
+  Software, and except as expressly set forth in Sections 1.1, and 2.1 of this
+  Agreement, no other license to the Elastic Software is granted to You under
+  this Agreement, by implication, estoppel or otherwise. You agree not to: (i)
+  reverse engineer or decompile, decrypt, disassemble or otherwise reduce any
+  Elastic Software provided to You in Object Code, or any portion thereof, to
+  Source Code, except and only to the extent any such restriction is prohibited
+  by applicable law, (ii) except as expressly permitted in this Agreement,
+  prepare derivative works from, modify, copy or use the Elastic Software Object
+  Code or the Commercial Software Source Code in any manner; (iii) except as
+  expressly permitted in Section 1.1 above, transfer, sell, rent, lease,
+  distribute, sublicense, loan or otherwise transfer, Elastic Software Object
+  Code, in whole or in part, to any third party; (iv) use Elastic Software
+  Object Code for providing time-sharing services, any software-as-a-service,
+  service bureau services or as part of an application services provider or
+  other service offering (collectively, "SaaS Offering") where obtaining access
+  to the Elastic Software or the features and functions of the Elastic Software
+  is a primary reason or substantial motivation for users of the SaaS Offering
+  to access and/or use the SaaS Offering ("Prohibited SaaS Offering"); (v)
+  circumvent the limitations on use of Elastic Software provided to You in
+  Object Code format that are imposed or preserved by any License Key, or (vi)
+  alter or remove any Marks and Notices in the Elastic Software. If You have any
+  question as to whether a specific SaaS Offering constitutes a Prohibited SaaS
+  Offering, or are interested in obtaining Elastic's permission to engage in
+  commercial or non-commercial distribution of the Elastic Software, please
+  contact elastic_license@elastic.co.
+
+  1.3 Third Party Open Source Software. The Commercial Software may contain or
+  be provided with third party open source libraries, components, utilities and
+  other open source software (collectively, "Open Source Software"), which Open
+  Source Software may have applicable license terms as identified on a website
+  designated by Elastic. Notwithstanding anything to the contrary herein, use of
+  the Open Source Software shall be subject to the license terms and conditions
+  applicable to such Open Source Software, to the extent required by the
+  applicable licensor (which terms shall not restrict the license rights granted
+  to You hereunder, but may contain additional rights). To the extent any
+  condition of this Agreement conflicts with any license to the Open Source
+  Software, the Open Source Software license will govern with respect to such
+  Open Source Software only. Elastic may also separately provide you with
+  certain open source software that is licensed by Elastic. Your use of such
+  Elastic open source software will not be governed by this Agreement, but by
+  the applicable open source license terms.
+
+2. COMMERCIAL SOFTWARE SOURCE CODE
+
+  2.1 Limited License. Subject to the terms and conditions of Section 2.2 of
+  this Agreement, Elastic hereby grants to You, AT NO CHARGE and for so long as
+  you are not in breach of any provision of this Agreement, a limited,
+  non-exclusive, non-transferable, fully paid up royalty free right and license
+  to the Commercial Software in Source Code format, without the right to grant
+  or authorize sublicenses, to prepare Derivative Works of the Commercial
+  Software, provided You (i) do not hack the licensing mechanism, or otherwise
+  circumvent the intended limitations on the use of Elastic Software to enable
+  features other than Basic Features and Functions or those features You are
+  entitled to as part of a Subscription, and (ii) use the resulting object code
+  only for reasonable testing purposes.
+
+  2.2 Restrictions. Nothing in Section 2.1 grants You the right to (i) use the
+  Commercial Software Source Code other than in accordance with Section 2.1
+  above, (ii) use a Derivative Work of the Commercial Software outside of a
+  Non-production Environment, in any production capacity, on a temporary or
+  permanent basis, or (iii) transfer, sell, rent, lease, distribute, sublicense,
+  loan or otherwise make available the Commercial Software Source Code, in whole
+  or in part, to any third party. Notwithstanding the foregoing, You may
+  maintain a copy of the repository in which the Source Code of the Commercial
+  Software resides and that copy may be publicly accessible, provided that you
+  include this Agreement with Your copy of the repository.
+
+3. TERMINATION
+
+  3.1 Termination. This Agreement will automatically terminate, whether or not
+  You receive notice of such Termination from Elastic, if You breach any of its
+  provisions.
+
+  3.2 Post Termination. Upon any termination of this Agreement, for any reason,
+  You shall promptly cease the use of the Elastic Software in Object Code format
+  and cease use of the Commercial Software in Source Code format. For the
+  avoidance of doubt, termination of this Agreement will not affect Your right
+  to use Elastic Software, in either Object Code or Source Code formats, made
+  available under the Apache License Version 2.0.
+
+  3.3 Survival. Sections 1.2, 2.2. 3.3, 4 and 5 shall survive any termination or
+  expiration of this Agreement.
+
+4. DISCLAIMER OF WARRANTIES AND LIMITATION OF LIABILITY
+
+  4.1 Disclaimer of Warranties. TO THE MAXIMUM EXTENT PERMITTED UNDER APPLICABLE
+  LAW, THE ELASTIC SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND,
+  AND ELASTIC AND ITS LICENSORS MAKE NO WARRANTIES WHETHER EXPRESSED, IMPLIED OR
+  STATUTORY REGARDING OR RELATING TO THE ELASTIC SOFTWARE. TO THE MAXIMUM EXTENT
+  PERMITTED UNDER APPLICABLE LAW, ELASTIC AND ITS LICENSORS SPECIFICALLY
+  DISCLAIM ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+  PURPOSE AND NON-INFRINGEMENT WITH RESPECT TO THE ELASTIC SOFTWARE, AND WITH
+  RESPECT TO THE USE OF THE FOREGOING. FURTHER, ELASTIC DOES NOT WARRANT RESULTS
+  OF USE OR THAT THE ELASTIC SOFTWARE WILL BE ERROR FREE OR THAT THE USE OF THE
+  ELASTIC SOFTWARE WILL BE UNINTERRUPTED.
+
+  4.2 Limitation of Liability. IN NO EVENT SHALL ELASTIC OR ITS LICENSORS BE
+  LIABLE TO YOU OR ANY THIRD PARTY FOR ANY DIRECT OR INDIRECT DAMAGES,
+  INCLUDING, WITHOUT LIMITATION, FOR ANY LOSS OF PROFITS, LOSS OF USE, BUSINESS
+  INTERRUPTION, LOSS OF DATA, COST OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY
+  SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY KIND, IN CONNECTION WITH
+  OR ARISING OUT OF THE USE OR INABILITY TO USE THE ELASTIC SOFTWARE, OR THE
+  PERFORMANCE OF OR FAILURE TO PERFORM THIS AGREEMENT, WHETHER ALLEGED AS A
+  BREACH OF CONTRACT OR TORTIOUS CONDUCT, INCLUDING NEGLIGENCE, EVEN IF ELASTIC
+  HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+5. MISCELLANEOUS
+
+  This Agreement completely and exclusively states the entire agreement of the
+  parties regarding the subject matter herein, and it supersedes, and its terms
+  govern, all prior proposals, agreements, or other communications between the
+  parties, oral or written, regarding such subject matter. This Agreement may be
+  modified by Elastic from time to time, and any such modifications will be
+  effective upon the "Posted Date" set forth at the top of the modified
+  Agreement. If any provision hereof is held unenforceable, this Agreement will
+  continue without said provision and be interpreted to reflect the original
+  intent of the parties. This Agreement and any non-contractual obligation
+  arising out of or in connection with it, is governed exclusively by Dutch law.
+  This Agreement shall not be governed by the 1980 UN Convention on Contracts
+  for the International Sale of Goods. All disputes arising out of or in
+  connection with this Agreement, including its existence and validity, shall be
+  resolved by the courts with jurisdiction in Amsterdam, The Netherlands, except
+  where mandatory law provides for the courts at another location in The
+  Netherlands to have jurisdiction. The parties hereby irrevocably waive any and
+  all claims and defenses either might otherwise have in any such action or
+  proceeding in any of such courts based upon any alleged lack of personal
+  jurisdiction, improper venue, forum non conveniens or any similar claim or
+  defense. A breach or threatened breach, by You of Section 2 may cause
+  irreparable harm for which damages at law may not provide adequate relief, and
+  therefore Elastic shall be entitled to seek injunctive relief without being
+  required to post a bond. You may not assign this Agreement (including by
+  operation of law in connection with a merger or acquisition), in whole or in
+  part to any third party without the prior written consent of Elastic, which
+  may be withheld or granted by Elastic in its sole and absolute discretion.
+  Any assignment in violation of the preceding sentence is void. Notices to
+  Elastic may also be sent to legal@elastic.co.
+
+6. DEFINITIONS
+
+  The following terms have the meanings ascribed:
+
+  6.1 "Affiliate" means, with respect to a party, any entity that controls, is
+  controlled by, or which is under common control with, such party, where
+  "control" means ownership of at least fifty percent (50%) of the outstanding
+  voting shares of the entity, or the contractual right to establish policy for,
+  and manage the operations of, the entity.
+
+  6.2 "Basic Features and Functions" means those features and functions of the
+  Elastic Software that are eligible for use under a Basic license, as set forth
+  at https://www.elastic.co/subscriptions, as may be modified by Elastic from
+  time to time.
+
+  6.3 "Commercial Software" means the Elastic Software Source Code in any file
+  containing a header stating the contents are subject to the Elastic License or
+  which is contained in the repository folder labeled "x-pack", unless a LICENSE
+  file present in the directory subtree declares a different license.
+
+  6.4 "Derivative Work of the Commercial Software" means, for purposes of this
+  Agreement, any modification(s) or enhancement(s) to the Commercial Software,
+  which represent, as a whole, an original work of authorship.
+
+  6.5 "License" means a limited, non-exclusive, non-transferable, fully paid up,
+  royalty free, right and license, without the right to grant or authorize
+  sublicenses, solely for Your internal business operations to (i) install and
+  use the applicable Features and Functions of the Elastic Software in Object
+  Code, and (ii) permit Contractors and Your Affiliates to use the Elastic
+  software as set forth in (i) above, provided that such use by Contractors must
+  be solely for Your benefit and/or the benefit of Your Affiliates, and You
+  shall be responsible for all acts and omissions of such Contractors and
+  Affiliates in connection with their use of the Elastic software that are
+  contrary to the terms and conditions of this Agreement.
+
+  6.6 "License Key" means a sequence of bytes, including but not limited to a
+  JSON blob, that is used to enable certain features and functions of the
+  Elastic Software.
+
+  6.7 "Marks and Notices" means all Elastic trademarks, trade names, logos and
+  notices present on the Documentation as originally provided by Elastic.
+
+  6.8 "Non-production Environment" means an environment for development, testing
+  or quality assurance, where software is not used for production purposes.
+
+  6.9 "Object Code" means any form resulting from mechanical transformation or
+  translation of Source Code form, including but not limited to compiled object
+  code, generated documentation, and conversions to other media types.
+
+  6.10 "Source Code" means the preferred form of computer software for making
+  modifications, including but not limited to software source code,
+  documentation source, and configuration files.
+
+  6.11 "Subscription" means the right to receive Support Services and a License
+  to the Commercial Software.
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 3a8ba10350e5..b940393ff1d1 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/licenses/oracle-java-documentation-10 b/licenses/oracle-java-documentation-10
new file mode 100644
index 000000000000..eb0e67aee03b
--- /dev/null
+++ b/licenses/oracle-java-documentation-10
@@ -0,0 +1,53 @@
+ORACLE AMERICA, INC. IS WILLING TO LICENSE THIS SPECIFICATION TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS AGREEMENT (“AGREEMENT”). PLEASE READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY. BY DOWNLOADING THIS SPECIFICATION, YOU ACCEPT THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU ARE NOT WILLING TO BE BOUND BY IT, SELECT THE "DECLINE" BUTTON AT THE BOTTOM OF THIS PAGE.
+
+Specification: JSR-383 Java SE 10 (18.3) ("Specification")
+Version: 10
+Status: Final Release
+Release: March 2018
+
+Copyright 2018 Oracle America, Inc.
+All rights reserved
+
+LIMITED LICENSE GRANTS
+
+1. License for Evaluation Purposes. Specification Lead hereby grants you a fully-paid, non-exclusive, nontransferable, worldwide, limited license (without the right to sublicense), under Specification Lead's applicable intellectual property rights to view, download, use and reproduce the Specification only for the purpose of internal evaluation. This includes (i) developing applications intended to run on an implementation of the Specification, provided that such applications do not themselves implement any portion(s) of the Specification, and (ii) discussing the Specification with any third party; and (iii) excerpting brief portions of the Specification in oral or written communications which discuss the Specification provided that such excerpts do not in the aggregate constitute a significant portion of the Specification. 
+
+2. License for the Distribution of Compliant Implementations. Specification Lead also grants you a perpetual, non-exclusive, non-transferable, worldwide, fully paid-up, royalty free, limited license (without the right to sublicense) under any applicable copyrights or, subject to the provisions of subsection 4 below, patent rights it may have covering the Specification to create and/or distribute an Independent Implementation of the Specification that: (a) fully implements the Specification including all its required interfaces and functionality; (b) does not modify, subset, superset or otherwise extend the Licensor Name Space, or include any public or protected packages, classes, Java interfaces, fields or methods within the Licensor Name Space other than those required/authorized by the Specification or Specifications being implemented; and (c) passes the Technology Compatibility Kit (including satisfying the requirements of the applicable TCK Users Guide) for such Specification ("Compliant Implementation"). In addition, the foregoing license is expressly conditioned on your not acting outside its scope. No license is granted hereunder for any other purpose (including, for example, modifying the Specification, other than to the extent of your fair use rights, or distributing the Specification to third parties). Also, no right, title, or interest in or to any trademarks, service marks, or trade names of Specification Lead or Specification Lead's licensors is granted hereunder. Java, and Java-related logos, marks and names are trademarks or registered trademarks of Oracle America, Inc. in the U.S. and other countries. 
+
+3. Pass-through Conditions. You need not include limitations (a)-(c) from the previous paragraph or any other particular "pass through" requirements in any license You grant concerning the use of your Independent Implementation or products derived from it. However, except with respect to Independent Implementations (and products derived from them) that satisfy limitations (a)-(c) from the previous paragraph, You may neither: (a) grant or otherwise pass through to your licensees any licenses under Specification Lead's applicable intellectual property rights; nor (b) authorize your licensees to make any claims concerning their implementation's compliance with the Specification in question. 
+
+4. Reciprocity Concerning Patent Licenses.
+
+   a. With respect to any patent claims covered by the license granted under subparagraph 2 above that would be infringed by all technically feasible implementations of the Specification, such license is conditioned upon your offering on fair, reasonable and non-discriminatory terms, to any party seeking it from You, a perpetual, non-exclusive, non-transferable, worldwide license under Your patent rights which are or would be infringed by all technically feasible implementations of the Specification to develop, distribute and use a Compliant Implementation.
+
+   b. With respect to any patent claims owned by Specification Lead and covered by the license granted under subparagraph 2, whether or not their infringement can be avoided in a technically feasible manner when implementing the Specification, such license shall terminate with respect to such claims if You initiate a claim against Specification Lead that it has, in the course of performing its responsibilities as the Specification Lead, induced any other entity to infringe Your patent rights.
+
+   c. Also with respect to any patent claims owned by Specification Lead and covered by the license granted under subparagraph 2 above, where the infringement of such claims can be avoided in a technically feasible manner when implementing the Specification such license, with respect to such claims, shall terminate if You initiate a claim against Specification Lead that its making, having made, using, offering to sell, selling or importing a Compliant Implementation infringes Your patent rights.
+
+5. Definitions. For the purposes of this Agreement: "Independent Implementation" shall mean an implementation of the Specification that neither derives from any of Specification Lead's source code or binary code materials nor, except with an appropriate and separate license from Specification Lead, includes any of Specification Lead's source code or binary code materials; "Licensor Name Space" shall mean the public class or interface declarations whose names begin with "java", "javax", "com.oracle”, “com.sun” or their equivalents in any subsequent naming convention adopted by Oracle America, Inc. through the Java Community Process, or any recognized successors or replacements thereof; and "Technology Compatibility Kit" or "TCK" shall mean the test suite and accompanying TCK User's Guide provided by Specification Lead which corresponds to the Specification and that was available either (i) from Specification Lead 120 days before the first release of Your Independent Implementation that allows its use for commercial purposes, or (ii) more recently than 120 days from such release but against which You elect to test Your implementation of the Specification. 
+
+This Agreement will terminate immediately without notice from Specification Lead if you breach the Agreement or act outside the scope of the licenses granted above.
+
+DISCLAIMER OF WARRANTIES
+
+THE SPECIFICATION IS PROVIDED "AS IS". SPECIFICATION LEAD MAKES NO REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT (INCLUDING AS A CONSEQUENCE OF ANY PRACTICE OR IMPLEMENTATION OF THE SPECIFICATION), OR THAT THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE. This document does not represent any commitment to release or implement any portion of the Specification in any product. In addition, the Specification could include technical inaccuracies or typographical errors.
+
+LIMITATION OF LIABILITY
+
+TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SPECIFICATION LEAD OR ITS LICENSORS BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT LIMITATION, LOST REVENUE, PROFITS OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED IN ANY WAY TO YOUR HAVING, IMPLEMENTING OR OTHERWISE USING THE SPECIFICATION, EVEN IF SPECIFICATION LEAD AND/OR ITS LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. You will indemnify, hold harmless, and defend Specification Lead and its licensors from any claims arising or resulting from: (i) your use of the Specification; (ii) the use or distribution of your Java application, applet and/or implementation; and/or (iii) any claims that later versions or releases of any Specification furnished to you are incompatible with the Specification provided to you under this license.
+
+RESTRICTED RIGHTS LEGEND
+
+U.S. Government: If this Specification is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in the Software and accompanying documentation shall be only as set forth in this license; this is in accordance with 48 C.F.R. 227.7201 through 227.7202-4 (for Department of Defense (DoD) acquisitions) and with 48 C.F.R. 2.101 and 12.212 (for non-DoD acquisitions).
+
+REPORT
+
+If you provide Specification Lead with any comments or suggestions concerning the Specification ("Feedback"), you hereby: (i) agree that such Feedback is provided on a non-proprietary and nonconfidential basis, and (ii) grant Specification Lead a perpetual, non-exclusive, worldwide, fully paid-up, irrevocable license, with the right to sublicense through multiple levels of sublicensees, to incorporate, disclose, and use without limitation the Feedback for any purpose.
+
+GENERAL TERMS
+
+Any action related to this Agreement will be governed by California law and controlling U.S. federal law. The U.N. Convention for the International Sale of Goods and the choice of law rules of any jurisdiction will not apply.
+
+The Specification is subject to U.S. export control laws and may be subject to export or import regulations in other countries. Licensee agrees to comply strictly with all such laws and regulations and acknowledges that it has the responsibility to obtain such licenses to export, re-export or import as may be required after delivery to Licensee.
+
+This Agreement is the parties' entire agreement relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, conditions, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification to this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 1090120ef51e..a149e9588f55 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index c5c6fb651baa..cc231d672ba1 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,4 +1,7 @@
-AUX POST-UPGRADE.txt 1101 BLAKE2B b162d5e445195412a126b0977b1f21b6619757ba0a8cef4aeb7da84850707b4476e15819ebc903b49b904ca9118db796ede72f8f4917283d46a933ed24a77226 SHA512 715c6c377b9816f0f836acace019c39cf22d536d1a0ae5538cbf3dcf3fec12ae584450881264dab792c941627f1af649f776bca6d5015b13c08648fde726b948
+AUX POST-UPGRADE.txt 1020 BLAKE2B 40e8eb52fcb1c7b46843a136e1617c825e6cb2dc9031f225635ceb19a2c7f4aafd1f4baf7fadc033514da429c7f6893bd6950ef09fb55570db60267ddc5f7219 SHA512 45b3fd6d2323ac8b43117908385c9ebb681b59b3f77aa516074d13196a259d9614369eeb1a8969fa514555e7240846c2d85502b8a9fed9a31a0379b1086861c1
+AUX roundcube-1.3.7-pear-removed-installed.json 6981 BLAKE2B 3caa7d2d18f4fdda2d5ec6cdbc78f4f8fc6a55b176ab6f3158cd6ad930581b2ee291d7fb7f01bf20e9ff9e6bc9bed3b677575ef23cf4023fd27658cbf97574dd SHA512 a49112c063b24757f12cebdfc6d2ab4e84842b33f622e8cea07fb9b248fdfdebce83a190b91bfa820a69e8f4c62bc7b37bc3663bf1761216eed99c3f463fd69b
 DIST roundcubemail-1.3.6-complete.tar.gz 5529370 BLAKE2B 49fd04d81b7047c61d33007b49aff2fe8d68fb0572d305b51aa0ae997c06e4924a3ff32861c19741f0c4d82adb9abb317781de8c1b324120e57d77f413cfa480 SHA512 fc1627d4b539742524c43b3faaa8cb5d64f934ad03f7cf8a461580a3a38dccb11140d08499b988742a0892534b1eda52f37a50f0911015983b6e27703294c70e
+DIST roundcubemail-1.3.7-complete.tar.gz 5533537 BLAKE2B 48d0c8e50d3d4878fa901bde40791bd9f6b11498f1acfed798bdd889817dc58baeec1985ad67b82326b48428f08b40730f301d2383df5a8700cf89bd31c01c0f SHA512 2e6c1e94866750835d843b4f4ea77148e467dfbee3a15e20bd7c9086c11ad9919f0ddc6097c40cacfcdbc2ceacf2f6fb1b7e8546a7fcb9f20d0e5bf84283d724
 EBUILD roundcube-1.3.6.ebuild 2573 BLAKE2B fe8366da66738483a876bd8c2f481905a73ff24eb3f2cda13f879500ee12bb158bd6950a57806f2d628384d32ed1e8d82f28ae2e7b470f10605fa918593401c8 SHA512 a1eae4d3c3d1eedbda34664a4b225efdcbc3dc95b45a202a7a0ec499a576f6f08de5094cc5b9684e748958925ed4f75da41f58bcc483ba4dfef9342836c85868
-MISC metadata.xml 860 BLAKE2B 8135a487928f879b6dd9665e171dc18e53f4cdbada44b71e41891e376ce6e4c76a80cb85d3dbbb9303fdb2c4be330952c144305499c5193f52b2d3ab9e538307 SHA512 b17b6d05898493d08d52f08b333f762518442ae519b23e8f2811fb6a369c6b26688a380656e8e95d7da706834547d6fe7d52db6992ebf0bf5b9a30ad0d21c56f
+EBUILD roundcube-1.3.7.ebuild 2418 BLAKE2B 5f94c7b4843c18fa073d4ab14cc0b1f55cc860c93ad6192a70b34f4d3f313b49dc1d0a6bd3a09f4c5e3d7032af8fe5295b3987a95c79c349ee985fdc1591d4b0 SHA512 cff69ccdfb35d8cb42c4a707164f1b46bdac9f6c613ee7242a26a4d197d296ea6b87e29ed999d55e7543291835dc3d2e59d5e64a781d7cd7c645e90b0fd27b64
+MISC metadata.xml 955 BLAKE2B ca9dd109384433cdaca59b820aae795a4555459cf36f057b17949d601bd5ece8222dbb59502872ac6a16387e55839f859b91a6c6718523aaf66e4b677d25d33e SHA512 ff1b796f79f002814b038763305a404ee2b65d49346a10b423dc8df982ccd4116548c8159bbcd551ccdcdb5824ef6b0774abf6a6bdc851beb896f6e5ed97bf1a
diff --git a/mail-client/roundcube/files/POST-UPGRADE.txt b/mail-client/roundcube/files/POST-UPGRADE.txt
index 785b8319a6cc..82b48d70f260 100644
--- a/mail-client/roundcube/files/POST-UPGRADE.txt
+++ b/mail-client/roundcube/files/POST-UPGRADE.txt
@@ -13,8 +13,6 @@ Post-Upgrade Activities
    php composer.phar update --no-dev
 6. Update your database and configurations by running:
    ./bin/update.sh
-7. Update the cached javascript libraries by running:
-   ./bin/install-jsdeps.sh
 
 SQLite database upgrade
 -----------------------
diff --git a/mail-client/roundcube/files/roundcube-1.3.7-pear-removed-installed.json b/mail-client/roundcube/files/roundcube-1.3.7-pear-removed-installed.json
new file mode 100644
index 000000000000..972f5e2beab0
--- /dev/null
+++ b/mail-client/roundcube/files/roundcube-1.3.7-pear-removed-installed.json
@@ -0,0 +1,226 @@
+[
+    {
+        "name": "composer/semver",
+        "version": "1.4.2",
+        "version_normalized": "1.4.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/composer/semver.git",
+            "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
+            "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^5.3.2 || ^7.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "^4.5 || ^5.0.5",
+            "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+        },
+        "time": "2016-08-30T16:08:34+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Composer\\Semver\\": "src"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nils Adermann",
+                "email": "naderman@naderman.de",
+                "homepage": "http://www.naderman.de"
+            },
+            {
+                "name": "Jordi Boggiano",
+                "email": "j.boggiano@seld.be",
+                "homepage": "http://seld.be"
+            },
+            {
+                "name": "Rob Bast",
+                "email": "rob.bast@gmail.com",
+                "homepage": "http://robbast.nl"
+            }
+        ],
+        "description": "Semver library that offers utilities, version constraint parsing and validation.",
+        "keywords": [
+            "semantic",
+            "semver",
+            "validation",
+            "versioning"
+        ]
+    },
+    {
+        "name": "endroid/qr-code",
+        "version": "1.6.6",
+        "version_normalized": "1.6.6.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/endroid/qr-code.git",
+            "reference": "cef5d5b7b904d7bb0708eb744c35316364b65fa0"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/endroid/qr-code/zipball/cef5d5b7b904d7bb0708eb744c35316364b65fa0",
+            "reference": "cef5d5b7b904d7bb0708eb744c35316364b65fa0",
+            "shasum": ""
+        },
+        "require": {
+            "ext-gd": "*",
+            "php": ">=5.3.0"
+        },
+        "time": "2016-05-29T07:37:18+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Endroid\\QrCode\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Jeroen van den Enden",
+                "email": "info@endroid.nl",
+                "homepage": "http://endroid.nl/"
+            }
+        ],
+        "description": "Endroid QR Code",
+        "homepage": "https://github.com/endroid/QrCode",
+        "keywords": [
+            "code",
+            "endroid",
+            "qr",
+            "qrcode"
+        ]
+    },
+    {
+        "name": "kolab/net_ldap3",
+        "version": "1.0.6",
+        "version_normalized": "1.0.6.0",
+        "source": {
+            "type": "git",
+            "url": "https://gitlab.com/roundcube/net_ldap3.git",
+            "reference": "4c21bdebaa62d05a36f3ef3eee4e9742875d7e57"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://gitlab.com/api/v4/projects/roundcube%2Fnet_ldap3/repository/archive.zip?sha=4c21bdebaa62d05a36f3ef3eee4e9742875d7e57",
+            "reference": "4c21bdebaa62d05a36f3ef3eee4e9742875d7e57",
+            "shasum": ""
+        },
+        "require": {
+            "pear/net_ldap2": ">=2.0.12",
+            "php": ">=5.3.3"
+        },
+        "time": "2017-08-07T14:48:10+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "lib/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-3.0+"
+        ],
+        "authors": [
+            {
+                "name": "Jeroen van Meeuwen",
+                "email": "vanmeeuwen@kolabsys.com",
+                "role": "Lead"
+            },
+            {
+                "name": "Aleksander Machniak",
+                "email": "machniak@kolabsys.com",
+                "role": "Developer"
+            },
+            {
+                "name": "Thomas Bruederli",
+                "email": "roundcube@gmail.com",
+                "role": "Developer"
+            }
+        ],
+        "description": "A successor of the PEAR:Net_LDAP2 module providing advanced functionality for accessing LDAP directories",
+        "homepage": "http://git.kolab.org/pear/Net_LDAP3/",
+        "keywords": [
+            "PEAR",
+            "ldap",
+            "vlv"
+        ]
+    },
+    {
+        "name": "roundcube/plugin-installer",
+        "version": "0.1.9",
+        "version_normalized": "0.1.9.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/roundcube/plugin-installer.git",
+            "reference": "782420af7fb3f24295a61101d7e9296110c894e4"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/roundcube/plugin-installer/zipball/782420af7fb3f24295a61101d7e9296110c894e4",
+            "reference": "782420af7fb3f24295a61101d7e9296110c894e4",
+            "shasum": ""
+        },
+        "require": {
+            "composer/semver": "^1.4.2",
+            "php": ">=5.3.0"
+        },
+        "require-dev": {
+            "composer/composer": "*"
+        },
+        "time": "2017-10-29T16:13:28+00:00",
+        "bin": [
+            "src/bin/rcubeinitdb.sh"
+        ],
+        "type": "composer-installer",
+        "extra": {
+            "class": "Roundcube\\Composer\\PluginInstaller"
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Roundcube\\Composer": "src/"
+            }
+        },
+        "notification-url": "https://plugins.roundcube.net/downloads/",
+        "license": [
+            "GPL-3.0+"
+        ],
+        "authors": [
+            {
+                "name": "Till Klampaeckel",
+                "email": "till@php.net"
+            },
+            {
+                "name": "Thomas Bruederli",
+                "email": "thomas@roundcube.net"
+            }
+        ],
+        "description": "A composer-installer for Roundcube plugins."
+    }
+]
diff --git a/mail-client/roundcube/metadata.xml b/mail-client/roundcube/metadata.xml
index 3426ba6898d2..9d188db0f13f 100644
--- a/mail-client/roundcube/metadata.xml
+++ b/mail-client/roundcube/metadata.xml
@@ -14,6 +14,9 @@
 		<remote-id type="github">roundcube/roundcubemail</remote-id>
 	</upstream>
 	<use>
+		<flag name="change-password">
+			Allow users to change passwords through Roundcube
+		</flag>
 		<flag name="enigma">
 			Add dependencies to support server-side GnuPG signing
 			and/or encryption through the enigma plugin
diff --git a/mail-client/roundcube/roundcube-1.3.7.ebuild b/mail-client/roundcube/roundcube-1.3.7.ebuild
new file mode 100644
index 000000000000..67784de81116
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.3.7.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PN=${PN}mail
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="https://roundcube.net"
+SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV}/${MY_P}-complete.tar.gz"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="change-password enigma ldap managesieve mysql postgres sqlite ssl spell"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+# :TODO: Support "endriod/qrcode: ~1.6.5" dep (ebuild needed)
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml]
+	>=dev-php/PEAR-Auth_SASL-1.1.0
+	>=dev-php/PEAR-Mail_Mime-1.10.0
+	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
+	>=dev-php/PEAR-Net_IDNA2-0.2.0
+	>=dev-php/PEAR-Net_SMTP-1.7.1
+	virtual/httpd-php
+	change-password? (
+		>=dev-php/PEAR-Net_Socket-1.2.1
+		dev-lang/php[sockets]
+	)
+	enigma? (
+		>=dev-php/PEAR-Crypt_GPG-1.6.0
+		app-crypt/gnupg
+	)
+	ldap? (
+		>=dev-php/PEAR-Net_LDAP2-2.2.0
+		dev-php/PEAR-Net_LDAP3
+	)
+	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	spell? ( dev-lang/php[curl,spell] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Redundant. (Bug #644896)
+	rm -r vendor/pear || die
+	# Remove references to PEAR. (Bug #650910)
+	cp "${FILESDIR}"/${P}-pear-removed-installed.json \
+	   vendor/composer/installed.json \
+	   || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG INSTALL README.md UPGRADING
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
+	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE.txt"
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "You can review the post-upgrade instructions at:"
+		elog "${EROOT%/}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
+	fi
+}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 1828ac2210e3..f5092d4c20e7 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/inconsolata/Manifest b/media-fonts/inconsolata/Manifest
index d0c71cc315ae..f645fd78cc59 100644
--- a/media-fonts/inconsolata/Manifest
+++ b/media-fonts/inconsolata/Manifest
@@ -1,3 +1,3 @@
 DIST inconsolata-20140821.tar.xz 72544 BLAKE2B 7d08482d9a58c864f629112d608df08d79beb71ceccc6fa4eb1c669843d7d43e2828cd7f288798b0d8cf8eb2b5bdf6f969315afc6bda7f51de716744ad6906c4 SHA512 295c0ff893e421c4d2dcb298a608c76b1790646774e1d77a820a7fa626771a34e2353e6d27b8d49b177541b7f4d2343a12152a75eec05e15e384e0118b19c773
-EBUILD inconsolata-20140821.ebuild 502 BLAKE2B 6f48a0b98aab0d41baa2f14cec17e22e8aa07c85055e040c8844f68cbb23b7b4b2663d31f315d501316b904a6461cfb614618737f34d08d6dbae142a303c1b31 SHA512 b3d9520c6ae7dd9f5b2f7c9e7e5e11da781a36d176e1a83b2951df288939ed592367c3d34e177f07920032e43b63cb3ae7a41e14020086a4ccadeb15a9c99e35
+EBUILD inconsolata-20140821.ebuild 507 BLAKE2B 2e57a65be642707cc1b3b29ade87a3d688d6703ffc118f8699e8fd2b75af8b44a8fd27a74830742baee034c15babeba403c7f54e099eda27f551afb9ad5514ed SHA512 eb0a6934aaa180a7c7f025fbc598673ac036b5754bc1bc59ff05942ea50ad33f6896d5670d601b3a0e31f778d3eccbd7b5ca35eadf2f17b21a82abe3baa32001
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/inconsolata/inconsolata-20140821.ebuild b/media-fonts/inconsolata/inconsolata-20140821.ebuild
index 5b6d596891c5..43eeae2fcb7c 100644
--- a/media-fonts/inconsolata/inconsolata-20140821.ebuild
+++ b/media-fonts/inconsolata/inconsolata-20140821.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index cf42e560c390..ec5f6f30ff5b 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index 8c6a2188e97c..5f357bdf6009 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,5 +1,7 @@
 DIST DisplayCAL-3.5.3.0.tar.gz 10559161 BLAKE2B a3eb968dcd0b5edbcf22a0ec84da55d8660ffa8782135a908db8ea7a6480ce7be9a59528d35a73b7eb57c9c0dd46996407ea3de834a85e6da1c5d006b8aa33b3 SHA512 ddb405c1d8b7bc5aefac80fb79edbb03c2a3b32821c8bbbdd6d095312fff57e8ffe5e53cc5b53c56fa32e6bcbc10cd76598441d750008c38a512ed1f62d7cd9c
 DIST DisplayCAL-3.6.0.0.tar.gz 10565171 BLAKE2B 394a925d28f513ededc1bc40b3ce7b5a2687a0c172006fd14b9081188e3ca80c0cd5f634ac84a9917d6aa301e083bffd05db622e292262f6d41db2a86c23a920 SHA512 6d0cff6344bb0dfcff58e88f93e2d0f7a3cf5f8e32b596f9f5e07b0e80ccb9b4ff429aa9fa63b5941f7622e0a7dcd227d0a1066e82d0843454f01d96dea97993
+DIST DisplayCAL-3.6.1.1.tar.gz 10433827 BLAKE2B 3e06ea90d820bcc96eb8de8d2fabf9d60997092e1529b3a0a6544bfd42f89380bb2525e27c075a3b8c55721d659b485188e8e7f2e872622ed9e6b6ebc87ac662 SHA512 03835117f53fb8c9d7cedfe67719b70878c3b62c20894a999c971d1d820dc7ec386ad68b8d4cf19496005abf2235e789526e6632b11d82f971f944b5f4dfdac6
 EBUILD displaycal-3.5.3.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
 EBUILD displaycal-3.6.0.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
+EBUILD displaycal-3.6.1.1.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.6.1.1.ebuild b/media-gfx/displaycal/displaycal-3.6.1.1.ebuild
new file mode 100644
index 000000000000..72a722b64356
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.6.1.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils xdg
+
+MY_PN="DisplayCAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
+HOMEPAGE="https://displaycal.net/"
+SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=media-gfx/argyllcms-1.1.0
+	dev-python/wxpython:3.0
+	>=x11-libs/libX11-1.3.3
+	>=x11-apps/xrandr-1.3.2
+	>=x11-libs/libXxf86vm-1.1.0
+	>=x11-libs/libXinerama-1.1
+"
+RDEPEND="${DEPEND}
+	>=dev-python/numpy-1.2.1
+"
+
+# Just in case someone renames the ebuild
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Do not generate udev/hotplug files
+	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
+		-i DisplayCAL/setup.py || die
+	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
+	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
+		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
+		-i DisplayCAL/postinstall.py || die
+
+	# Remove deprecated Encoding key from .desktop file
+	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
+
+	# Remove x-world Media Type
+	sed -e 's/x\-world\/x\-vrml\;//g' \
+		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index fd71cced0338..1cbb3deedf6b 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST eog-plugins-3.16.6.tar.xz 398836 BLAKE2B fcd3c6dc61ca6d935580caffdf9c941d34265f8caa6cd3d682e0d7679888f6965f64ac30b807c00417e904b4e0eeff1a213a8f6d284c130abe265f9c97fc636b SHA512 e3bff786785ae36a41bc7c5fcb3cf75233595777409f373c4a6597fa6e432f72c7a75608e09ab66e1033ca0d12e3855346d7f7e0c571014b5aaef40184a3383b
+DIST eog-plugins-3.26.3.tar.xz 470712 BLAKE2B cd5845481006b681555f35d1f353ed624baa83fc8fc45bb889b2418f31a776bf9e08e270f911f61f431123825a5b96fa684f72e378ddd0ad1107ff44a5c98519 SHA512 5ea0bbf692fa71fa77b0b78307cceee067c95e80c2e69e173990c1154df8014912f24f8d023eda79da56b7c1bdf0870e5e92b968a68c4961af3fc1382d4f468c
 EBUILD eog-plugins-3.16.6-r1.ebuild 1603 BLAKE2B f260b6b3e7f3f2710b5875bede7448dda4e717205d4abc03ff4f8d102cb3c3e6ad3d1d85108f2382f8b2aea984de910228b2b150c1cd7f9b9483264b3124c8d0 SHA512 46bbf6a0236ce8957d28beb82414c6c3bb6b7e7ae0411f1cf295e0aca0bc5296448076e1aec09f0d970217556fcbe0bdee635741db81f6eb4ef4d2423bf9cf51
+EBUILD eog-plugins-3.26.3.ebuild 1652 BLAKE2B 5c0cf60a96213a7e486362c5b7fa78d36617f6cc6b9bcdad2b1896a890ebd0fc70b8e2c4aeb94b87e187e7ca91317a08c7c96718ffca0c70ec0f26f1d329c11b SHA512 7e1631b5cbfc22acb3524ac3f3c4105d91d104aa28fa77d3bfc8930ccd24cdc23853b3edf2323438459cbd2537929248536c64de8b41d148a41d7902d4531e10
 MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild
new file mode 100644
index 000000000000..93902b0bb3c4
--- /dev/null
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Eye of GNOME plugins"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+exif map picasa +python"
+REQUIRED_USE="
+	map? ( exif )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libpeas-0.7.4:=
+	>=media-gfx/eog-3.15.90
+	>=x11-libs/gtk+-3.14:3
+	exif? ( >=media-libs/libexif-0.6.16 )
+	map? (
+		media-libs/libchamplain:0.12[gtk]
+		>=media-libs/clutter-1.9.4:1.0
+		>=media-libs/clutter-gtk-1.1.2:1.0 )
+	picasa? ( >=dev-libs/libgdata-0.9.1:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/glib-2.32:2[dbus]
+		dev-libs/libpeas:=[gtk,python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		gnome-base/gsettings-desktop-schemas
+		media-gfx/eog[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection] )
+"
+# libxml2 required for glib-compile-resources
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
+	use exif && plugins="${plugins},exif-display"
+	use map && plugins="${plugins},map"
+	use picasa && plugins="${plugins},postasa"
+	use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows"
+	gnome2_src_configure \
+		$(use_enable python) \
+		--with-plugins=${plugins}
+}
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 2477f3ddbb43..2eb401c114fd 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,3 +1,5 @@
 DIST eog-3.24.1.tar.xz 4632496 BLAKE2B 24d6957285d5dae7fa2299165b1bac236e75dfa77938132c1d3f8f7312ed4a07d5d3a770fdbdbcf5ee1966a43b4443d331fbedec47575836e2170fa3022e657f SHA512 c007b6f2cd2b59747db72a5b86ecb34ac87fe0910a2d33df466eb05ebe5ff638fb9e57b15f2ea9328c95037334a2fd9010895241ff285628b7ed7b6d65912fb0
+DIST eog-3.26.2.tar.xz 5516240 BLAKE2B 5e63edd97c50e059af8d282d4596193fdb4e8a5767ebf9391c8c4f0b202136b1ef67c5d5d601e9863126b0db25e51927c4ac1fcb713fbd1a7ad21ccf207501af SHA512 40941d77739d1ed572dd7c4864435e5944c9dd48f5386b2ea11e16da52f7fa550844e4636ee35947172e921df596542d13928c79f7f511ef70ec92b832b1f1db
 EBUILD eog-3.24.1.ebuild 1343 BLAKE2B 63fa0d9614a37e9f3d40b2de61560a7642df4b14bb8196ff6de563b6afb5d0195f0832c27d41516659efbacadc977876b2ec09d736434d3026ddee8d913da0c2 SHA512 460f0f6c1e435cd970b0a67197d1885137c69d673eecd0e00dd5e7f9ebb8d52b2d22771b234786d3c31d175fcc24aad72314d0f0b14b11eea921b814fc725c50
+EBUILD eog-3.26.2.ebuild 1392 BLAKE2B ab4c6c3050f32db033e18892b4760207d5949ef5d160f7872554d234c8fe694ed90ce5d025363364485378ae1a6b80c6d2ec12fa4f582b78b707b30e6880ba08 SHA512 543ea9f99bef7802c2f1983f31f91125f5ece6f9eeee594ed0c050668557f1f9062623a99d0947af5a1ca39bcaa26d8fb736142804f95ffbeba357f808c71825
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.26.2.ebuild b/media-gfx/eog/eog-3.26.2.ebuild
new file mode 100644
index 000000000000..08ea37d31c23
--- /dev/null
+++ b/media-gfx/eog/eog-3.26.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="debug +exif +introspection +jpeg lcms +svg tiff xmp"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.42.0:2[dbus]
+	>=dev-libs/libpeas-0.7.4:=[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=x11-libs/gtk+-3.22.0:3[introspection,X]
+	>=x11-misc/shared-mime-info-0.20
+
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	x11-libs/libX11
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	svg? ( >=gnome-base/librsvg-2.36.2:2 )
+	xmp? ( media-libs/exempi:2 )
+"
+# libxml2 required for glib-compile-resources
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=dev-util/gtk-doc-am-1.16
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable introspection) \
+		$(use_with jpeg libjpeg) \
+		$(use_with exif libexif) \
+		$(use_with lcms cms) \
+		$(use_with xmp) \
+		$(use_with svg librsvg)
+}
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 6acdc4485177..726f4736cb1c 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -2,6 +2,7 @@ AUX exiv2-0.26-fix-docs.patch 2532 BLAKE2B c648454a7c9a56c2d4a3844cbe212630ff6c3
 AUX exiv2-0.26-tools-optional.patch 1386 BLAKE2B 84e0903934187aaa914c0a4fe04afe63ed3314ea76d6929b7435899a731bb90831418b2162e1dca4a487b88041fe7b9aa50a3c438e66ac3893dd1d12b363714f SHA512 efdd848dd728fcb0ba5dbc305fef6eb6af4385b5bd09e2c3722c0dea2009207c282b95a07cdb608fc2298d18686c764dded2fd9de4166dbecabf7eeb187e6483
 AUX exiv2-0.26_p20180319-CVE-2017-18005.patch 17451 BLAKE2B 8003fa352503d287f5f96572196cd67f4de8d90fda221588f77bdd2d053407f1e1dceba6aab317fc5a003aa5b6f0d99336f4a8e4fb21696b5d20b81a3d4af29f SHA512 94ed0a17a7ca9bd1155fc4c67ca67bf59dafedf5570cf4d7e59bda6f4b4c0749d98fd1c2d8929612a2fe5840565ce070acf21ac68d9d6882fe5c0a98ee18b343
 AUX exiv2-0.26_p20180319-CVE-2018-4868.patch 1694 BLAKE2B c288075acac8c2335da2b04cac24ac7b3a414e05d04a1e951cdbd3d90997756fa5c1dae5d2b193583e529a7eacc0cbb88d5c8345c3be76798d1897af7a7f250d SHA512 7506ccc0914dc78e369129efb0736638ee7a4ebf98d76feed0ce6a7c9d2885f5f7c984376df288f0694ec05654b89c39be42a989bcedd64d0fcecd6c605fe601
+AUX exiv2-0.26_p20180319-clang-fix.patch 1793 BLAKE2B 7312324ed80314e28dfdf4066247d64db89928cdf09b186b200efc071d5dd6630e3a22d7ed10f312ccbcace291f6e3a17fdce8bd42d4e094e6c07d85ee42d45b SHA512 54c96c831aabfaca93bfb2fee4b13a080be6bbad4b634890d26e42c6a069571277f75bbc517c0e212e99fc12add77d12fbaa0652e2a1506ac94e2e8c043901ed
 DIST exiv2-0.26_p20180319.tar.gz 28383543 BLAKE2B 753a2ebdb2033490c0f66cb1fb2574f02125f17813f6cbaf5eca66e053af9a2cdbc1266f0a033f0706ec22b31acd6e87271e426a335a58ee947757b52d283489 SHA512 852ce2cffcc0a2d902a939933127fdf5fa0b50020e1faf3ab0a375b129b9f61c7b97b76d4f39e376e7288d7cc045867bd1a96ae15dd0b7c0bcd1ba15259628e1
-EBUILD exiv2-0.26_p20180319.ebuild 3308 BLAKE2B 609ff16f1e63a841ffcbd72b5ecfb31f67c83c44dd1bc26807f68a312efe6d931dfd4390db7f61c10f0c27bfe8badd399e9f4131769aeb98b118124c1f292e92 SHA512 1d7b08a55cb9fd57f9d73ad7b72b59c851046109372c4575d260c703153cda44cf4f84ca08e58558b51deb73ad1736a7622f4306ff575abc73fb2cf682ab6d92
+EBUILD exiv2-0.26_p20180319.ebuild 3321 BLAKE2B 5a4bfe2aa47b7793ae10a39f428422c4aeed62805ab9b7f0c26a0af2c682968941ff9910c5d12eaf50093df593198e0b9bf8f22b194777ce3c79117b390cce81 SHA512 c4a200f82432e06727aef721384a994953ce3adadcfd315ad765927e75ec9f4422c31b98f6b7bd3c9660b31edd551a2c675f90d57d04491441ffb1524171422e
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
index 478ea7a79b15..eb2572dfcf35 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
@@ -48,9 +48,10 @@ DOCS=( README doc/ChangeLog doc/cmd.txt )
 S="${WORKDIR}/${PN^}-${PN}-${COMMIT:0:7}"
 
 PATCHES=(
-	# master, pending backports for 0.26
+	# 0.26 branch
 	"${FILESDIR}"/${P}-CVE-2018-4868.patch
 	"${FILESDIR}"/${P}-CVE-2017-18005.patch
+	"${FILESDIR}"/${P}-clang-fix.patch
 	# TODO: Take to upstream
 	"${FILESDIR}"/${PN}-0.26-fix-docs.patch
 	"${FILESDIR}"/${PN}-0.26-tools-optional.patch
diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch b/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch
new file mode 100644
index 000000000000..a80543a5ecd7
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch
@@ -0,0 +1,47 @@
+From 176ba44cc31064183fdfbce55a7dd7e6b5e2a962 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dan.cermak@cgc-instruments.com>
+Date: Fri, 8 Jun 2018 23:46:04 +0200
+Subject: [PATCH] Fix C & C++ flag adding in CMakeLists.txt
+
+---
+ CMakeLists.txt | 22 ++++++++++++----------
+ 1 file changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2e179bf5..98a172ed 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,21 +74,23 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/")
+ 
+ if( MINGW OR UNIX )
+     if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
+-        ADD_DEFINITIONS(-Wall
+-                    -Wcast-align
+-                    -Wpointer-arith
+-                    -Wformat-security
+-                    -Wmissing-format-attribute
+-                    -Woverloaded-virtual
+-                    -W
+-                   )
++        string(CONCAT WARNING_FLAGS " -Wall"
++          " -Wcast-align"
++          " -Wpointer-arith"
++          " -Wformat-security"
++          " -Wmissing-format-attribute"
++          " -Woverloaded-virtual"
++          " -W"
++          )
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}")
++        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")
+     ENDIF()
+ 
+     message(STATUS "Compiler info: ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) ; version: ${CMAKE_CXX_COMPILER_VERSION}")
+     IF ( CYGWIN OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0))
+-        ADD_DEFINITIONS( -std=gnu++98 ) # to support snprintf
++        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98" ) # to support snprintf
+     ELSE()
+-        ADD_DEFINITIONS( -std=c++98 )
++        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98" )
+     ENDIF()
+ 
+ ENDIF( MINGW OR UNIX )
\ No newline at end of file
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
deleted file mode 100644
index a385fd22987b..000000000000
--- a/media-gfx/freecad/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX freecad-0.14.3702-install-paths.patch 1143 BLAKE2B bbf14f29381fa7d808af53c51ce439ac21acb269648df647ddf3abc5ee6f01de44ffbc62bd1274aec1a167cf3f449c8498768af2af50fc0b9e3a5963f1857a46 SHA512 12181e4b48e4fb6284b574cb9872af713323d8f229a6c1746424968b0d22300bd6ada6437854a730dd4c5310eb36ebb06a35375ab012d36e9d3af4fb4271d884
-AUX freecad-0.17_pre-no-webkit.patch 1353 BLAKE2B c1a3b1cfea471cd027aaf921eabaaa036bda8fc5f6569358aa5990b1d400e0868429fb19c9d19013f93f8143a044961bf3e914a442f47a2ebbad0c0433819f78 SHA512 aa109102d428a7160538bbf53a05d335b44a8aca8bcdc3d43a258f2f30d1c8a4fb4f46021bc472ca3aa5c4fb3b26675222894b595c3e0e5a321cbfab348a928c
-AUX freecad.sharedmimeinfo 312 BLAKE2B 731f28f904bebac03c8a64778d5e36f9b26fa33c347fa0b67113752aea12568f5a19968e730a53da89a7c7d08db6f8d80f11ab30d011e6b4db973c8549f710bd SHA512 bb55cad8387032af0e06ce7f1b4cab4354a34a915b9f550de25e05bf24d4161d9ea152d5692d65df4b362622f76a11d78894deaf7fee60c7a3fc0bfec38fa10c
-DIST freecad-0.16.6712.tar.gz 111706423 BLAKE2B ef6386fb953a9acfc51856b4a898aaefd1c24750b5eb07e5266392e54e357252327d594311030c3cc19144ead6e7f274710b532f7cd4993008850a3af6ec31c2 SHA512 ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e
-EBUILD freecad-0.16.6712.ebuild 3537 BLAKE2B 91c4bebaee48dbfbe209e36693616e8e70676c0e6e9e186cec582ee3ccbaa7ed54f6ce438bc1e498035e438e94f3cb3a18f1c5679da433b3fe9db899a984bf95 SHA512 80d0044bf5d12175353aedf8b05a3e9811013390fccc66cc071ae2c9564e7994e519ee86edc1456861654f57045b85b6ebbe54b36197af6d20414c69c721c991
-MISC metadata.xml 376 BLAKE2B a1e6c119bd4edce1e1e39c3ef95ed00c8d48f2b3391c2ead629b1936cf1570501de97988163b786669ef9d5cdea20d7ded01286dd1633278c703a5efd5813f0a SHA512 2b159882b18f33adc78ede30133528a915130d21fcfd111a099861b2ee719b59338cd81af63a289bb5812ce04dee238a6eb4596a95a5abedbc453f631e827f53
diff --git a/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch b/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch
deleted file mode 100644
index d042695e88c6..000000000000
--- a/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- freecad-0.14.3702/CMakeLists.txt
-+++ freecad-0.14.3702/CMakeLists.txt
-@@ -69,9 +69,15 @@
-     SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad" CACHE PATH "Installation root directory")
- endif(WIN32)
- 
--SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")
--SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files")
--SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files")
-+if(NOT CMAKE_INSTALL_DATADIR)
-+       SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")
-+endif(NOT CMAKE_INSTALL_DATADIR)
-+if(NOT CMAKE_INSTALL_INCLUDEDIR)
-+       SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files")
-+endif(NOT CMAKE_INSTALL_INCLUDEDIR)
-+if(NOT CMAKE_INSTALL_DOCDIR)
-+       SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files")
-+endif(NOT CMAKE_INSTALL_DOCDIR)
- # Don't set it without manual adaption of LibDir variable in src/App/FreeCADInit.py
- SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")
- 
diff --git a/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch b/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch
deleted file mode 100644
index 60dcfed22c7d..000000000000
--- a/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Remove Qt4-Webkit dependency
-Author: Anton Gladky <gladk@debian.org>
-Bug-Debian: https://bugs.debian.org/784464
-Last-Update: 2017-09-06
-
-* asturm: tidied up and amended to use and not override BUILD_WEB
-
---- a/src/Gui/DownloadManager.cpp
-+++ b/src/Gui/DownloadManager.cpp
-@@ -33,7 +33,6 @@
- #include <QMetaEnum>
- #include <QSettings>
- #include <QFileIconProvider>
--#include <QWebSettings>
- 
- #include "DownloadItem.h"
- #include "DownloadManager.h"
-@@ -224,11 +223,12 @@ void DownloadManager::updateRow()
-     ui->downloadsView->setRowHeight(row, item->minimumSizeHint().height());
- 
-     bool remove = false;
-+/*
-     QWebSettings *globalSettings = QWebSettings::globalSettings();
-     if (!item->downloading()
-         && globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
-         remove = true;
--
-+*/
-     if (item->downloadedSuccessfully()
-         && removePolicy() == DownloadManager::SuccessFullDownload) {
-         remove = true;
---- a/CMakeLists.txt	2018-03-02 22:39:46.374140506 +0100
-+++ b/CMakeLists.txt	2018-03-02 22:41:59.904216932 +0100
-@@ -351,11 +351,6 @@
-   set(BUILD_MESH ON)
- endif(BUILD_JTREADER)
- 
--#a runtime dependency
--if(BUILD_START)
--  set(BUILD_WEB ON)
--endif(BUILD_START)
--
- #leaving test module for someone else.
- #image has none. as far as I can tell.
- #mesh has none. as far as I can tell.
diff --git a/media-gfx/freecad/files/freecad.sharedmimeinfo b/media-gfx/freecad/files/freecad.sharedmimeinfo
deleted file mode 100644
index 6d5e93e7d13c..000000000000
--- a/media-gfx/freecad/files/freecad.sharedmimeinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-	<mime-type type="application/x-extension-fcstd">
-		<!-- <sub-class-of type="application/zip"/> -->
-		<comment>FreeCAD document files</comment>
-		<glob pattern="*.fcstd"/>
-	</mime-type>
-</mime-info>
diff --git a/media-gfx/freecad/freecad-0.16.6712.ebuild b/media-gfx/freecad/freecad-0.16.6712.ebuild
deleted file mode 100644
index 0c65c49697b2..000000000000
--- a/media-gfx/freecad/freecad-0.16.6712.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
deleted file mode 100644
index fd959a35b4fb..000000000000
--- a/media-gfx/freecad/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">free-cad</remote-id>
-		<remote-id type="github">FreeCAD/FreeCAD</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 7df3894a2842..5a2bc14b188f 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -6,6 +6,6 @@ DIST GraphicsMagick-1.3.28.tar.xz 5416660 BLAKE2B 874e1e2669db46c458b0e7aa68b24e
 DIST GraphicsMagick-1.3.30.tar.xz 5496116 BLAKE2B 408f68334b290ae30d06e4b0efa6e11e89ffa9c00781e2f0ceb25cd6fc308f1be86b5ed9bd52f594e1abd3351f1b7dbfb12e87117ba85f4b4c01d07d7480772a SHA512 4f04245b8abef85de96a1527ad4adc1fadea144a1917db3ea21632a9fe732bdaa7021ffdbbeb7c2ead814ca7b6a14e81bb68a962bbfb64fa6809a235f1b0be5c
 EBUILD graphicsmagick-1.3.27.ebuild 3324 BLAKE2B 309ac3fb37a14f5aef75015135b678a79165b5f915a1954595e15321992856474703efb49fdbce07c06f41a53ac9381e52356de171a204d456d1883428c5ed69 SHA512 1db593b2b9df429e57b33346c1b3fe83fee14d6902a1175b38e8e62aa58018ab6c3ad1fe58ec9b662324fe57b9163f0c55098d98724fd656dd159c5635559498
 EBUILD graphicsmagick-1.3.28.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
-EBUILD graphicsmagick-1.3.30.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
+EBUILD graphicsmagick-1.3.30.ebuild 3256 BLAKE2B 4bed8642349e4e833b63423f0e805c52e726e0f566a7c3c5ba0be953394e38cca6894974603de533955c1d6be8a584cfcf1a8527b50e399bb2f3a8b5fb5738c9 SHA512 a2606ae0b22e81d6c22360a7ae4c377d0a55598171303f9ccbd857a7c1bc252e7b4e592896428aa40f65ca525bdfeced7e2a8d8f1f6d643dd4e05f9fdb2a41d6
 EBUILD graphicsmagick-9999.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
 MISC metadata.xml 1220 BLAKE2B 991045c4a8f2fa2c7d71b585b88af2a0e0d4d260ca64b67131a096f9948272365e2d7303a7fbd5faf6da2bf952645061462ec8d643f14f301d0a12c37dd5f849 SHA512 1bb5a109f05ee51df889358ceb97669aaaa75356390ff85b7ad2ea7659fcc4cf7ad811b2795121ff9957ad58f27fd47dfaf792e0d5afbe31d84cf755158c66fd
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild
index c5f11fb693d3..4957382cb795 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 91bc1c84cd29..af871f7ee236 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,35 +1,6 @@
-AUX imagemagick-7.0.26-FTBFS-on-i386.patch 1228 BLAKE2B 113d732c49e8341c9f9b7a9722ff561a9d37951a1278f6bc8a11af306016a798518f39d0ebfb5b85800dd211c9da3f60eebca4d7e5cd9f751ddf298d9dcc39db SHA512 f56936b02ed7fd3ce7d886df21980d7c1a6b9a9c92c4e3d46a4a33a7b30ff050c399d063595ba1efe62a56e2d3e5a6b36e901e96d7546b12db60fd18824fd164
-DIST ImageMagick-6.9.10-3.tar.xz 8922536 BLAKE2B 36936b28aac025bd948d9925707877b6f6b5a9eb50f1afc2f318a0596c9096b7853f4db44c42994fe32b7ba0fe42eafb9d705ead0faf6f75eb9e7e07bc1c97e4 SHA512 760e8b003415fcf6c83e542346800f1f2d8834cd47ba343eead1f0fa228f2f44af7ca9b4379de52498a3da76aa35f25d0ec939cefa71718400702bc6801fffbe
-DIST ImageMagick-6.9.10-5.tar.xz 8921204 BLAKE2B b11c6dded5b42b797585e8253441fa6265de9f06241206b9ce29781df6c8896e9dd0ec967191ff28fcae445130d38e7e781728cbc27752b33b3422d971459952 SHA512 b6c068918a2c23bc86d84a1fd81bd8c0aea83fee0c33b5c686c7c6180231be2b27c1c43be111555017d2065fa97ba36c084e1479ff771846b73d500d67c7f85b
-DIST ImageMagick-6.9.10-6.tar.xz 8913200 BLAKE2B 7009454e8d1d3bb27ef143dd3d0810df1548ff66d36cb48d0a91aee11246e2c2c4908947b95058b8cd2a83a4d69318564e4881a45636dca666fdec95e418c26a SHA512 984acc4610c205ead3b32ae4c059470dc4361e48cee6d9314bd3f8beed6b88b4adc824d59f059ead840293afae5595bdc3161e57ac9b2d4d49b90d32df46e49a
-DIST ImageMagick-6.9.10-7.tar.xz 8916444 BLAKE2B 59211b1fe876226f53999706b7d992306f67687ab6170e3a1846e66806ef92b4eb2808eea8bcc69ffe7ad40bef36fcd4417124b784534d474647b413747dbb1e SHA512 3bda2478b79d9a35dd7b3dd1206d23e2b8ddb71a881e1d8f036fa3488d10245c11587ef7f8624febc758af65ce0d28d642d485deffc033e144f791977aac7beb
 DIST ImageMagick-6.9.10-8.tar.xz 8909952 BLAKE2B 0868759a5c6982c29d315bda69c1dec3b190fbea3757cf8e368b42976c9f35c4cd53610643e05e8872b0669768206559b2b726b494494f305b71dc2140d7d09c SHA512 63f131d4aa455e3f3a4a891359601d932aa6d43ff22fb9c6bed1a98a1a758da610db90cf951c131aaceabdbc8af0418d1a8e3752cabb39f95735ef18cd6745f2
-DIST ImageMagick-6.9.9-31.tar.xz 8819864 BLAKE2B f6cdb19bff58a0b318a9af78f3fa429137cc4e79bbe075f9c6444204ce8a4324dde5792ab7232e6898a4993ad558c514a143c14469370de822038d1d669fdffa SHA512 85cbe4e4991a08a5c11c01b4276525fa1d63bcef9a9814fee1f8ede3a5ed432da8d3d84965ed75105723948d07ad879f7cf07d5121f0d624df9275dd4e41cb8f
-DIST ImageMagick-6.9.9-40.tar.xz 8919136 BLAKE2B 04b9585948194e6ba03efa549d9ef6a8b12fce141346ddd7dc1b40e72349dc603bc6154a3826496dae47ff8c0eb5b6a5b80ae51a60d0d8a632debcd9229cf3da SHA512 416c2e248e3d1c6d89b930b8179194a9e1dfd160b9de1a75f98ceeb4199dd1b5f3b1d0ce646c26429054e7970680c40b77e2bf0a97ca82bbe84aa66648393fb4
-DIST ImageMagick-6.9.9-47.tar.xz 8918196 BLAKE2B f28948d5728cbd2b011091ded2c12b507d1939ae5f2e0872c098ea488a3668d5f15782de023a6775a60790feeabcbab3ae62917f5f160bbc5ec59b65527775d5 SHA512 7bf7ae7fc276c2857f546370851ef7aaf1704c1b5bbad1a739d964e8e48a4ece9d9274e154a5aaa18c24f31e60e03d2df661cca922a3fff780cbcddd86524cb5
-DIST ImageMagick-7.0.7-19.tar.xz 8546416 BLAKE2B 6750dba45f7971f7a7e74ac7ae3ec94732a2bd31f638afac8a91abd595e81aadca1372ddb46dcc3bf2dcb258ececfa69a8e8ad5ff753930462d46804863c0f4e SHA512 656520f719a375c837b2ddebb7e5920e9c06a9f81f3529b8a7c405958ca75f7464790ff931b7a32e104ef500570e71ff80d3dfb7c5cf777b2a5ad8207fde7928
-DIST ImageMagick-7.0.7-28.tar.xz 8611096 BLAKE2B f4e70f32c5716f5e4673d9b938ea3924fbfc1005084bfad06afab493d50bcee2e43cd8b5ca0f83945dbc80f731c914633c2a401172e8d4e0289c7c9afe4b1209 SHA512 0a370ee3b8eb42c563bb15fa469208ee70520aa148af1752721e29be90a6a95a5773674f2d685d1f2fca77903f9592ffcbb9d7214ea96818848ea9dd135aef08
-DIST ImageMagick-7.0.7-35.tar.xz 8614296 BLAKE2B 7c3c65d3fa630040febd40370fe93d3ba946b3d71cfef4daa340154a111f58af8e5028813fd35d1db99796d691f4d13999c3030b8ab7dc82494d0d89e2853359 SHA512 65aac1f1b4546212608acc1bf8b7b0a6fc7e45c9273183725dcfaf04e16948112fd4cfb295d88e5860dff66f04c54cc504af067e32c46cf8662f4ff72c64688a
-DIST ImageMagick-7.0.8-3.tar.xz 8613672 BLAKE2B c3ad7bb2d0917d2551b7c8ae0d80a8ab95e31d40cf18c26d7df363c3df209d7923a62a7fb90aec581fc4101139bc369a82289a96f51965f533b1956a9cfa4eed SHA512 0594de337c9eb1d116b15eeac0f1bceefeb86f13a41bc6721b120fa2e58f0ca5e2e1454b4e2b670c93545f13406f8bdbf54e5b3470e34841b5e9ac9d26821b70
-DIST ImageMagick-7.0.8-5.tar.xz 8611448 BLAKE2B 7a4f38ec458d010644d88cda605355d5871952b055ba9e088fe164448e2a0332e44e1545fc5929df455298ee56be65b66846faae4738912314177be050c683b0 SHA512 d760e630fd82b7636a031728e1f078efb8bb962e60cdc912cdfad29d3e6f74c1b5047941e711db89aa847d2e7c8c6ed44f451fa8ccff431c20d92ef49ef1915d
-DIST ImageMagick-7.0.8-6.tar.xz 8636756 BLAKE2B de30cbf334e47232c4f2addc789342a96da72f13f1f88d0db08462cf8ad80487d78dfae51f23a63c83100f78a60beb79781c44cff1b25f084badbb009fedf965 SHA512 4d498d2b7e9345b71e08a541aeaa1ee0ee62c781e92638cdd38a9a830b8fa291afece032b731ee79e1142d26cf94817356f0492cef257039beac33f865e9f588
-DIST ImageMagick-7.0.8-7.tar.xz 8634788 BLAKE2B dbb5103f314d83b4318b2cfd6dcb5931e4c20c7a2c8b8f57c52b85ea8a46ca27733a4828203723f337acbc5fb4dc2ae446b789a6d2ca46ad8e2e0d0f7973fc29 SHA512 b1db005899b7c55c1794be1edfb0596989d8e4b4e521a1dadf28b837ba16b337587ac0a0a17c1c441a0085df56cfc3386d9f750fa83fd5ea8e3eb2d1398e58cd
 DIST ImageMagick-7.0.8-8.tar.xz 8639896 BLAKE2B 5971dbbee9726fab15e19e531bdbb50af710c67be84759030768958a33688b5492bb20758917c976dd9c08307031d041d5de7ae9a2326fecff6ba3a7dc226e84 SHA512 8cc18deb4c14feb71de2624637e1df708ddbcaebd543c03e177a1cfe6c2f63e09af7e787c730f11d3d0332659d2642e5076f6a83f3580f5c0afc8bdb9537733a
-EBUILD imagemagick-6.9.10.3.ebuild 5134 BLAKE2B 59fe466ea5b6c330b626274a4b22de05b7ed18d62f28986be097f6c50b68617dd83c2207bf220455f18545919ade85286a45192befd7977b573f6ec663c8ebcf SHA512 b84b26c37a083db69e5d28ee4a13d143fac2b4d4e0b2f67b1a3a9a243f59b83820d48ebad01d385e0ced40223648cd78c1618473061b7159790d5b76768cc237
-EBUILD imagemagick-6.9.10.5.ebuild 5186 BLAKE2B b6a74aa80f1d156fdf2f44b4a6a9fb0896bb8ae7876e22f766724e36f23638c1a93cde03178b89f88421de9f3b902ca84552422bb76dfa82bfe4186389f847e3 SHA512 95535e041888bc88c766cc55c1c1b8ec9dead286a98c150e15b2e107e2b16100eafc040fd693b45477bbbf842b156fb3f135c850c949e6bc4e9ae2a82cba24c6
-EBUILD imagemagick-6.9.10.6.ebuild 5194 BLAKE2B ff0cb28f803d22d4ab9a01715668c4aa749edc8376d117910748cf22d5e492ca6ce2b6b4b5e5cc2a128797f2a812e21604fd4d2ca6a8a9d0129effd923feea94 SHA512 7f505cfb89213208d0fea6edff576dfcc495f0ef3c396baa076acf50359f2dd631d48242fb315a6ca3764e2460bb34ad9092d4d0b21306e62a3a75ff3a51afc5
-EBUILD imagemagick-6.9.10.7.ebuild 5134 BLAKE2B 59fe466ea5b6c330b626274a4b22de05b7ed18d62f28986be097f6c50b68617dd83c2207bf220455f18545919ade85286a45192befd7977b573f6ec663c8ebcf SHA512 b84b26c37a083db69e5d28ee4a13d143fac2b4d4e0b2f67b1a3a9a243f59b83820d48ebad01d385e0ced40223648cd78c1618473061b7159790d5b76768cc237
-EBUILD imagemagick-6.9.10.8.ebuild 5134 BLAKE2B 59fe466ea5b6c330b626274a4b22de05b7ed18d62f28986be097f6c50b68617dd83c2207bf220455f18545919ade85286a45192befd7977b573f6ec663c8ebcf SHA512 b84b26c37a083db69e5d28ee4a13d143fac2b4d4e0b2f67b1a3a9a243f59b83820d48ebad01d385e0ced40223648cd78c1618473061b7159790d5b76768cc237
-EBUILD imagemagick-6.9.9.31.ebuild 5120 BLAKE2B 0d046adad40ac52ebb6f091eae800054b7c22ebd425f6e64a7de68fd6f10ecd699c537a5284f39f496f02be1ecfc44252209599589a3c8686f81988a8e7adfbd SHA512 b45803b538b7d1c6e3d4c3abcd363354b561e01360eaf36cf587e61bae66bbc2543d754dbae8b782cff89aafec267538253f6e3af34211e146e152d1a688e140
-EBUILD imagemagick-6.9.9.40.ebuild 5121 BLAKE2B 686029e7c87384f8f6e06c0eb0ed3a348a48b0e52bddca4f4942cc105b2f1d280859031c9aa6ea9198c981373e74a9f9dd19e95e553e62b6e9d6f9c3d41b8265 SHA512 4c02b42d699833cc4ab7597d576d21d64f991bb947d9193992ce3100d0599fa0cd71306c93316521409b096bd813f3720a474283491dc3e937a8a68264b3b3e7
-EBUILD imagemagick-6.9.9.47.ebuild 5129 BLAKE2B b7b332d8137559fc443657fe4510668dce05852e1012d055cf8612668182ead6b20850a0182340ca9f6ebdb96356ab63c99c788ff4eb3ffc961a166d80059c3e SHA512 aa9cc3f5bed77db0a14ad9fc2400393287ff6656d31fc9dce58b969c04a38c6efbd4b6c48a9cef0e19407315226766725147341bd9bf86db184d729586c9bb20
-EBUILD imagemagick-7.0.7.19.ebuild 5126 BLAKE2B 944cdfc402eaf48aeeb4fc8fe7411233774ff8c44cab855aa50b79c22502adeeb38879fc8c454c428504b8d290e4fa7b41386a3a0404204df322928cf180425c SHA512 a9b3b238e38e931d534fe4826b0ba525bc6c9850a1aca244c701199d66fa989faf86d7c0a4995a0012e5bb68bbf09e15628494aebe8bbb3b8dc8a725a5e95885
-EBUILD imagemagick-7.0.7.28.ebuild 5127 BLAKE2B 8f974d1ca9caeafa2894d3210407f9f0455bd342c3c92505e595bb623ee1e729cecab7f4229f124a74e8ca6d25d942646b69af2c3f01ccf7fe617bdf167ab0c2 SHA512 4f87c1cf80d6e9fa77e2a7f5241e7958afc151c4d434b87f305e9a528ed1f238fe383f0276916b138ac11c769c3acfcefa5b4a420e16c2f0dcb41e66eaaecf34
-EBUILD imagemagick-7.0.7.35.ebuild 5135 BLAKE2B 4ae4afe162f2ee49efff7e8411db1c3b6091ce92d5f87bf361e2efe4b4414b8357a480b5f29d4c65f7291f673e7e5324dd42dd84dd4f387e40230394cf60cc70 SHA512 73588fd964051bc8ba3e1465b25e63a90882d8b452a04a9cd40070953a6c3c59ccfc8fd64b4a7f537d6d1811b7f8160db534abcb46bd6e0be4260e0ff1138b77
-EBUILD imagemagick-7.0.8.3.ebuild 5140 BLAKE2B 74b6c3c78f577c69ff89683178ff13eb658102dc029bdd40cae417c4183e69738de26f2a3d8da3976eaaaa3ad778bfda85358dfd93d4a09716d1710be1d3c282 SHA512 4e04c9ffcb86309f24b3a2df881cc604826db6123f54d4960db9afe6d2270eee725613994eef368a3481261ba2e02cbb64a7fdacd607181d73f9ee42ef2ded7a
-EBUILD imagemagick-7.0.8.5.ebuild 5192 BLAKE2B eb7eeb353817652e4727feec98b14f38d4a41fffa04c7c049b8ffa0464b3ebfd1bd32e4856b43c15c3bbf0f6b107acfb7d8844e701f11037eadfaaed0bf76147 SHA512 88d555134172c3994879bfae7ab94d9c941c54a409e5b2a2dd612181af7854a2b1ff12197d3e73a60db5b7d285d886cfe61d5cbd63d3d1fb35db5712ee134330
-EBUILD imagemagick-7.0.8.6.ebuild 5200 BLAKE2B c4b5732ddbfa435ffc44643f499da8babb26d52852595abcd2173f0929c4ac693c3a990bd00009a0bb388aa7b100d3e470975298d1fa7147a70ee360a5909dfb SHA512 3240cb6179cb5d08d462bbc700cf77bf5e1a0359b09495bc58c050889f9805cd068cbae24098e869372e2191ead596e2f35e4b645c698562a1cf0920fa0702ab
-EBUILD imagemagick-7.0.8.7.ebuild 5140 BLAKE2B 74b6c3c78f577c69ff89683178ff13eb658102dc029bdd40cae417c4183e69738de26f2a3d8da3976eaaaa3ad778bfda85358dfd93d4a09716d1710be1d3c282 SHA512 4e04c9ffcb86309f24b3a2df881cc604826db6123f54d4960db9afe6d2270eee725613994eef368a3481261ba2e02cbb64a7fdacd607181d73f9ee42ef2ded7a
-EBUILD imagemagick-7.0.8.8.ebuild 5140 BLAKE2B 74b6c3c78f577c69ff89683178ff13eb658102dc029bdd40cae417c4183e69738de26f2a3d8da3976eaaaa3ad778bfda85358dfd93d4a09716d1710be1d3c282 SHA512 4e04c9ffcb86309f24b3a2df881cc604826db6123f54d4960db9afe6d2270eee725613994eef368a3481261ba2e02cbb64a7fdacd607181d73f9ee42ef2ded7a
+EBUILD imagemagick-6.9.10.8.ebuild 5125 BLAKE2B defc438b96f73a2af272220759e0d1e0c510165cb12eb2ffa2fdb8f571ffafb59037c62e92ed3c31f045b77bc90afcc11fc7eced7af39ca17be78df778d7131b SHA512 870751296c3b2e2a399037fa7f9d5206e2bc2e1efd1c0386f7f663c5e79a95ec6bc1011df1716a8da046f6a0c2a49fd2295b5ecacc325b5423e3735c43b31662
+EBUILD imagemagick-7.0.8.8.ebuild 5131 BLAKE2B 20cffac4ad29a620deb03c1a408a0550d191fbe79e05b85c26437298c15c004e1300ef6f6f698b4933fb27b0c059be391b2937e283fb157ee9e90ee53dce8710 SHA512 e21135d9cb19c096a372fe85f05e50f66e31899e77a4a84bdc201f9e924cc2495ed807090b42250612e494a6cc6be221a2852c123493188a5f931c00c794f508
 EBUILD imagemagick-9999.ebuild 5297 BLAKE2B dd922782da40926064b6fdceb7cd0c9cb16f7187ac94ace7aee3c2581bc5d4bc86dd19d4eb9068083d93f401970f2a673af445c589b93ab0709735a67af18b79 SHA512 24762b7a8642ad54f88dabfdf5966b99e406977eafc486544720c466f1eac54e84ab7a496b81d8438e04ff0ad2bb943680c258a37a66cd28b8bd4677aadd7dee
 MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
diff --git a/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch b/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch
deleted file mode 100644
index c568ed345ecd..000000000000
--- a/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Gentoo-Bug: https://bugs.gentoo.org/653752
-Upstream issue: https://github.com/ImageMagick/ImageMagick/issues/1019
-
-
-From 0c26fea274e615ff6b179bdd30e970a55f6c3f52 Mon Sep 17 00:00:00 2001
-From: Svante Signell <svante.signell@gmail.com>
-Date: Mon, 25 Jun 2018 16:06:19 +0200
-Subject: Fix FTBFS on i386 any
-
-bug-debian: https://bugs.debian.org/898914
----
- Magick++/tests/attributes.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp
-index 9ebc67f2d..e969def27 100644
---- a/Magick++/tests/attributes.cpp
-+++ b/Magick++/tests/attributes.cpp
-@@ -154,7 +154,7 @@ int main( int /*argc*/, char ** argv)
-     //
- 
-     // Test default value.
--    if ( image.backgroundColor() != ColorRGB("white") )
-+    if ( image.backgroundColor() != string(ColorRGB("white")) )
-       {
- 	++failures;
- 	cout << "Line: " << __LINE__ << ", backgroundColor default ("
-@@ -1068,7 +1068,7 @@ int main( int /*argc*/, char ** argv)
-     // pixelColor
-     //
-     // Test default
--    if ( image.pixelColor(40,60) != canvasColor )
-+    if ( image.pixelColor(40,60) != string(canvasColor) )
-       {
- 	++failures;
- 	cout << "Line: " << __LINE__ << ", pixelColor default ("
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild
deleted file mode 100644
index 1d46b538e85c..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
-
-MY_P=ImageMagick-$(ver_rs 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	local mesa_cards ati_cards nvidia_cards render_cards
-	default
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild
deleted file mode 100644
index 768f4c5cbe1d..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
-
-MY_P=ImageMagick-$(ver_rs 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	local mesa_cards ati_cards nvidia_cards render_cards
-	default
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.6.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.6.ebuild
deleted file mode 100644
index 07ebb1e3f538..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.6.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
-
-MY_P=ImageMagick-$(ver_rs 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	local mesa_cards ati_cards nvidia_cards render_cards
-	default
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.7.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.7.ebuild
deleted file mode 100644
index 1d46b538e85c..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.7.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
-
-MY_P=ImageMagick-$(ver_rs 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	local mesa_cards ati_cards nvidia_cards render_cards
-	default
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild
index 1d46b538e85c..02f80cc50b4e 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
deleted file mode 100644
index f92a349caf39..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
-
-MY_P=ImageMagick-$(replace_version_separator 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-gfx/ufraw )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	local mesa_cards ati_cards nvidia_cards render_cards
-	default
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
deleted file mode 100644
index 7805c757cc97..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
-
-MY_P=ImageMagick-$(replace_version_separator 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-gfx/ufraw )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	local mesa_cards ati_cards nvidia_cards render_cards
-	default
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.47.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.47.ebuild
deleted file mode 100644
index 52e77059cb1d..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.9.47.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
-
-MY_P=ImageMagick-$(replace_version_separator 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-gfx/ufraw )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	local mesa_cards ati_cards nvidia_cards render_cards
-	default
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
deleted file mode 100644
index 0c38238d52c4..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
-
-MY_P=ImageMagick-$(replace_version_separator 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-gfx/ufraw )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	local ati_cards mesa_cards nvidia_cards render_cards
-	default
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
deleted file mode 100644
index ba362cfde7f7..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
-
-MY_P=ImageMagick-$(replace_version_separator 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-gfx/ufraw )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	local ati_cards mesa_cards nvidia_cards render_cards
-	default
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.35.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.35.ebuild
deleted file mode 100644
index 1db0353011d7..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.7.35.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
-
-MY_P=ImageMagick-$(replace_version_separator 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-gfx/ufraw )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	local ati_cards mesa_cards nvidia_cards render_cards
-	default
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild
deleted file mode 100644
index 49b5b2b7bbd7..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
-
-MY_P=ImageMagick-$(ver_rs 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	local ati_cards mesa_cards nvidia_cards render_cards
-	default
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild
deleted file mode 100644
index 95dea12510ff..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
-
-MY_P=ImageMagick-$(ver_rs 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	local ati_cards mesa_cards nvidia_cards render_cards
-	default
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.6.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.6.ebuild
deleted file mode 100644
index 15b1ca966bf5..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.6.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
-
-MY_P=ImageMagick-$(ver_rs 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	local ati_cards mesa_cards nvidia_cards render_cards
-	default
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.7.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.7.ebuild
deleted file mode 100644
index 49b5b2b7bbd7..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.7.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
-
-MY_P=ImageMagick-$(ver_rs 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	local ati_cards mesa_cards nvidia_cards render_cards
-	default
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild
index 49b5b2b7bbd7..9b07f999f005 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index e451d47db058..365a3aa16290 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,5 +1,5 @@
 DIST libimagequant-2.11.4.tar.gz 74117 BLAKE2B 5d42dc876c77694a1d4576e633d2e3aa1e531061aa849a683542cf11b14333f65125bbae699f927bf42896a934ade6d745aa517d6cbc4b7097d96c7579532ec9 SHA512 e9d2aaac2f37968dc93ba0da7d03f0fcf60b3f17d9a0b9edfd6930eade25844dd603de74492d8e1de8dc2da4e7f3e47959a558b5a67588d71e9e1db035eca1cc
 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
 EBUILD libimagequant-2.11.4.ebuild 1175 BLAKE2B 45ebfb632526601318788fded0c26678026dd518e4168213a523e7baba7a46742fae05cb7db89fa8bca4f7687bdb5faff62da218d236f35c109392d90d7b93c8 SHA512 342ad821a2c7581c1fe603fdbacbe8b72d6f5ee2c3e41c56075056678a9fcaebeba79aa2b68f3c83f8115e1f2b6d2fb839842f67defd9a9fb7f35e30acb80f38
-EBUILD libimagequant-2.11.7.ebuild 1174 BLAKE2B d6aeb054e5e2c2cde94faf796a20ddc75ccfe7f1007cbe2162aab0b69df1ad3171890b9c246ce13637122bb094055a2d3eb991c8a36931a35dafb2b77ea74115 SHA512 8bf954b852f8c98db0569d7bec52b24969f6efda3db5f80bf7d55565f5871d89e0d451cc65df3948d0383852bf368ddb5335bff3db09c6d93fa114f7618ce168
+EBUILD libimagequant-2.11.7.ebuild 1181 BLAKE2B 40eb12d77b6aed2a0e727331a543757d9f0d6462504f6c295cccb456229002bcca03b15d97f31a95fdb9005f67fbcdb6e08f72c66049cb928d465a10a5563e54 SHA512 eea74b7ac603264697c395f51379cebc7a250765aad0f899e1e71ea7f0b37dc2dbad2af35114e6ab75ec5a487dd679392ba73b4a109ce99c87736c036094a590
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
index 67f0e32593a6..1c7d79aad139 100644
--- a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index f09447431246..1ac3b220a9f5 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -7,5 +7,6 @@ DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786b
 EBUILD mypaint-1.1.0-r2.ebuild 1927 BLAKE2B e0d4354567a619e5d259fcb50820186fc8b6f4f6f7108c0676059da9a3065830b504b68a2f9e575032fb30e0b5b6e8e71de23d4e4f778cc28bb0d8e3220282ae SHA512 356a6bef73fb283b0e7953be068bdd8feec0d92a3e06a1fdf0fbe1d80fe6225a777cf95c6ae198afa40269bad9d25f8762c9ac318a8b2e4a3763912b40127477
 EBUILD mypaint-1.2.0.ebuild 1738 BLAKE2B e81f01dd6cafee8337c2d6c7d967a02341d9ca4cab1fc8815b2eee71bcf186c32d6ebcc9655038e33f46018342a85be807dd05ba046c26932f67a4f332469ca8 SHA512 d00e0825a85be9e5129fd7895c9b08d91037a1c291d50a8bf2e425eca235d527386013092898061e173855af3c3c2c9c6ab93cef7c5309e028683bb7841217e4
 EBUILD mypaint-1.2.1-r1.ebuild 1742 BLAKE2B cddbca3b26a6f941fe684b05a9633aac0603f36a241701635d3fbb84a219ab357ed6346d047fa661450be64eaf48386e1f2eafe63e879028e63a5c08d8fa98ae SHA512 22c95f69ac1a55f986a969b5153db3d0c1d98479ef026f7ef902eeb6a249089c141674b38525a34b697306158cc4010a5d260e0229bb0ae855c9a8f7224f0d93
+EBUILD mypaint-1.2.1-r2.ebuild 1798 BLAKE2B 3d417928f99d11fbc942c16194faf94769164e0e4f2c99fe9a18aece385ff98fde3e71ecbb4057ad6598fcf4c71fe3fd2336d2c76c9b2ad4a20aa5b5916a3c07 SHA512 bad5e79ddca06cc0d37d161752cca100d903a652e88570363722c603cf927516b2c03af58c7d7d57143186c1e1264d24ab74cd8dd5787bd763111a9e5b46c7b6
 EBUILD mypaint-1.2.1.ebuild 1881 BLAKE2B 62c4152f2763737e6709fe5425aaab71c2bd69a3560c8acfab36997270d2e1690bb113ed15cbdaa464e8fed828249386cdb547621a1de7cc5e0c39318ab4379c SHA512 900af1c50c8d860b9e0551f7c12abe9ee3df5e21b900b78a92c17e7b9abf57968d6c1a895eb56869e9a45e2132bab40b3a9de6f49990f67577786904e8dccffd
 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
diff --git a/media-gfx/mypaint/mypaint-1.2.1-r2.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..6dc9afe61a5e
--- /dev/null
+++ b/media-gfx/mypaint/mypaint-1.2.1-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic fdo-mime gnome2-utils scons-utils toolchain-funcs python-single-r1
+
+DESCRIPTION="fast and easy graphics application for digital painters"
+HOMEPAGE="http://mypaint.org/"
+SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
+
+RDEPEND="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	>=dev-libs/json-c-0.11:=
+	media-libs/lcms:2
+	>=media-libs/libmypaint-1.3.0
+	media-libs/libpng:0=
+	gnome-base/librsvg
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	virtual/pkgconfig"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_compile() {
+	#workaround scons bug with locales. Bug #352700
+	export LANG="en_US.UTF-8"
+	tc-export CC CXX
+	strip-flags  # scons upstream issue #3017
+	escons
+}
+
+src_install () {
+	escons prefix="${D}/usr" install
+	newicon pixmaps/${PN}_logo.png ${PN}.png
+	for x in ${LANGS}; do
+		if ! has ${x} ${LINGUAS}; then
+			rm -rf "${ED}"/usr/share/locale/${x} || die
+		fi
+	done
+
+	python_optimize "${D}"usr/share/${PN}
+	# not used and broken
+	rm -r "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die
+	# already provided by system-libmypaint
+	rm "${ED}"/usr/share/locale/*/LC_MESSAGES/libmypaint* || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index f0655a923e05..7702508cd94b 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -3,5 +3,5 @@ AUX opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch 1469 BLAKE2B cb25eaa0b3e4
 DIST opentoonz-1.1.2.tar.gz 36777909 BLAKE2B d822218c5ea1843a50da8d799bd9edf6998bd424ec2b65600371a0ae9f69aaea0d1c45aa53c3a0287c67459b8101a82bc0c339510859f4fbac3a116c9671df08 SHA512 800a741cb40e7dede79ef92705fc8fe3a23524c8a4397c30f80a81a7513c98606fb1bb5574188969ba08cfe8995d679f9fc5ecb696a6ac14c48aa2646a2c871e
 DIST opentoonz-1.2.1.tar.gz 39843446 BLAKE2B f9035bab5c6fa1d86459b401ca94acbffe8e38a2f5ec2bc97f303c7e829b9f6695480e7ab7a7560909f6ce45109ca1704d5020ff774964b5ed72b1b01588e93b SHA512 3eaf5983b5ec7424338e25975228b9bf6e9da61b2699c52377528966ecf07971868426bda0a64c780c2876cc1f0e4adb63c46767e8099fbfe32a8d1586c13f44
 EBUILD opentoonz-1.1.2.ebuild 2152 BLAKE2B bbad89bf0799119e05e7ec8e900e786f28e51d4609874e7b676922ab8cc8ecb4506652f836e40778d3963eaea2cf9ec58c8da8fde68393455e60f82868ae3913 SHA512 62ca55a27d0e4ca42f274747b530221e003e67774fb822969f1b7e4e77eb80b961894a6362c45633c642dcbb1e35572ca77056d7cf43fede9f632789bb53aa35
-EBUILD opentoonz-1.2.1.ebuild 2253 BLAKE2B b620d793a36f917b97fbd0e6910da5af293e47c602f2216eccfac294c4f65c124288336cbe84cbde3257436b4196bff11111ca62f1883e58937e58f032ea87f9 SHA512 b715e69ad8e8b013493c25c10cdcdf01c9a3de5bb70f689cf3ef971d3259874f040a3b977741957f645190b49f3da0dff171e6b05ca17bf85c8575befcc04be7
+EBUILD opentoonz-1.2.1-r1.ebuild 2186 BLAKE2B cbd057c9b0cc2830f4168a5e044abd28d59e9395b51341463f204837c0e7a91f0c3a12905a34e06368b4d7f328a743c68808062754dba85d331d69b992970e2b SHA512 0ab9b5ec34212e2ded9a7b80efa8150b2bf4197d43dea613529f782bb1c2470b34beebb244bb38a79e4634e742ff67a9b482c4922d3f78432ae7c81b0dcdfe24
 MISC metadata.xml 453 BLAKE2B 5bcdb89e0cab891a18531065af9dc5d65510905f8c21178d62125901d0d65d0522b8e4a5ab94f92d09ed0085a0cfae6701c04001dc29bc5e138b12b888cf71ec SHA512 227ed636186b559a5c4fe8728bc8ad2fa519177451f61c6cc67e20be3f8b071715fe38c274956cc987c3c2a49a25b7c7ca61280608871861c0007c558c016d6f
diff --git a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..bcb59bf1a284
--- /dev/null
+++ b/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="An open-source full-featured 2D animation creation software"
+HOMEPAGE="https://github.com/opentoonz/opentoonz"
+SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD libtiff"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-arch/lz4:=
+	>=dev-libs/boost-1.55.0:=
+	dev-libs/lzo:2=
+	>=dev-qt/qtcore-5.9:5
+	>=dev-qt/qtgui-5.9:5
+	>=dev-qt/qtmultimedia-5.9:5[widgets]
+	>=dev-qt/qtnetwork-5.9:5
+	>=dev-qt/qtopengl-5.9:5
+	>=dev-qt/qtprintsupport-5.9:5
+	>=dev-qt/qtscript-5.9:5
+	>=dev-qt/qtsvg-5.9:5
+	>=dev-qt/qtwidgets-5.9:5
+	>=dev-qt/qtxml-5.9:5
+	media-libs/freeglut:=
+	media-libs/freetype:2=
+	media-libs/glew:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libmypaint-1.3.0
+	media-libs/libpng:=
+	media-libs/libsdl2:=
+	sci-libs/cblas-reference:=
+	>=sci-libs/superlu-4.1:=
+	sys-libs/zlib:=
+	virtual/libusb:=
+	virtual/opengl
+"
+DEPEND="
+	$RDEPEND
+	virtual/pkgconfig
+	dev-qt/linguist-tools:5
+"
+
+CMAKE_USE_DIR="${S}"/toonz/sources
+
+src_configure()
+{
+	local mycmakeargs=(
+		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	# The upstream uses their own modified libtiff
+	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
+	cd thirdparty/tiff-4.0.3 || die
+	econf \
+		--with-pic \
+		--disable-jbig \
+		--enable-static \
+		--disable-shared
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cd "${S}"/thirdparty/tiff-4.0.3 || die
+	emake
+
+	cmake-utils_src_compile
+}
+
+pkg_postinst()
+{
+	elog "It is supposedly optional but some files are"
+	elog "actually required to run the executable properly."
+	elog
+	elog "The .config/OpenToonz/ directory in your home folder"
+	elog "will contain your settings, work and other files."
+	elog
+	elog "We need to create it from the command-line:"
+	elog
+	elog "$ mkdir -p \$HOME/.config/OpenToonz"
+	elog "$ cp -r /usr/share/opentoonz/stuff/ \$HOME/.config/OpenToonz/"
+}
diff --git a/media-gfx/opentoonz/opentoonz-1.2.1.ebuild b/media-gfx/opentoonz/opentoonz-1.2.1.ebuild
deleted file mode 100644
index 84389a579e27..000000000000
--- a/media-gfx/opentoonz/opentoonz-1.2.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An open-source full-featured 2D animation creation software"
-HOMEPAGE="https://github.com/opentoonz/opentoonz"
-SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD libtiff"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-arch/lz4:=
-	>=dev-libs/boost-1.55.0:=
-	dev-libs/lzo:2=
-	>=dev-qt/qtcore-5.9:5
-	>=dev-qt/qtgui-5.9:5
-	>=dev-qt/qtmultimedia-5.9:5[widgets]
-	>=dev-qt/qtnetwork-5.9:5
-	>=dev-qt/qtopengl-5.9:5
-	>=dev-qt/qtprintsupport-5.9:5
-	>=dev-qt/qtscript-5.9:5
-	>=dev-qt/qtsvg-5.9:5
-	>=dev-qt/qtwidgets-5.9:5
-	>=dev-qt/qtxml-5.9:5
-	media-libs/freeglut:=
-	media-libs/freetype:2=
-	media-libs/glew:=
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libmypaint-1.3.0
-	media-libs/libpng:=
-	media-libs/libsdl2:=
-	sci-libs/cblas-reference:=
-	>=sci-libs/superlu-4.1:=
-	sys-libs/zlib:=
-	virtual/libusb:=
-	virtual/opengl
-"
-DEPEND="
-	$RDEPEND
-	virtual/pkgconfig
-	dev-qt/linguist-tools:5
-"
-
-CMAKE_USE_DIR="${S}"/toonz/sources
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6-no-throw-in-destructors.patch )
-
-src_configure()
-{
-	local mycmakeargs=(
-		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	# The upstream uses their own modified libtiff
-	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
-	cd thirdparty/tiff-4.0.3 || die
-	econf \
-		--with-pic \
-		--disable-jbig \
-		--enable-static \
-		--disable-shared
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${S}"/thirdparty/tiff-4.0.3 || die
-	emake
-
-	cmake-utils_src_compile
-}
-
-pkg_postinst()
-{
-	elog "It is supposedly optional but some files are"
-	elog "actually required to run the executable properly."
-	elog
-	elog "The .config/OpenToonz/ directory in your home folder"
-	elog "will contain your settings, work and other files."
-	elog
-	elog "We need to create it from the command-line:"
-	elog
-	elog "$ mkdir -p \$HOME/.config/OpenToonz"
-	elog "$ cp -r /usr/share/opentoonz/stuff/ \$HOME/.config/OpenToonz/"
-}
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index a10917c78d09..bdb4846cc28e 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,14 +1,6 @@
-AUX openvdb-3.2.0-fix-build-system.patch 10122 BLAKE2B 4ae0390eb98f8c3bc87a959c65885b08ba58389f9d20136a968f37c70b769f2dfb2b3271a10d510c9a24274ce18953223d47423572d05b2ae834f25a03d6aed0 SHA512 15bcce34e0020a229b499aef81ecca496ce4a59fee7a03a47590aaee3491cb6a1bfe44bcc5d2282ac2025f989b3c97b12663442f29bb907a4f5762c59c71618b
-AUX openvdb-3.2.0-numpy-fix.patch 449 BLAKE2B 70e829b571897c534e461982377ad343efab951b65e254bf669469f3f20d40fcebbc2365cafb13a2e4b71ed9d1ea4fe9a8074f8c5b2bffac098ec80a61232420 SHA512 3ef31ebe30b849f20e8380096fa0306be8df25c9fc807b74cbacfcedcab21d67b56674a5bd7c896c0fd2453ab165b254d5f3780fce893a4d57f1fc9b99f60cc7
-AUX openvdb-4.0.0-build-docs-once.patch 1318 BLAKE2B bcaf010edb967a040ca7c7cadd4c066e4a7170dd61e974fd9a756f1d9805395041bdfdad746e2d21f82507d23761f6413a2eac26fecbe5ac30cc64a658fd54be SHA512 7255881f72fc718e34318a1e7f5e11305d27a733a914a8b6d7f74a41d356ede04d18cd40e0b483e170b20a2837c29b4b1fcf5c1510b210428783e2458a6fe60a
-AUX openvdb-4.0.0-make-docs-optional.patch 2950 BLAKE2B cd9aec39fcc9eed4a3076ea24705b6ddb1d6985ea322cef2e0cbcd0f6b245f214e5f4a67951c69bca802f93b69d8d87acf13060808478445d3d3bb34abb34fc9 SHA512 95d90b3f5c428dd13cac3d382da5950c0bba4d0a1c4722d553e14b6ec6243d3774ac99d9eca770a22c2b90c0c9b4e49351268fcd760cffbb38b64cd4fb2a881f
-AUX openvdb-4.0.0-namespace-fixes.patch 4335 BLAKE2B a1330e3024c123f09e26a1760ab9158b17d608f021a308c9a65cf2c7f7d7886b9e3aca52dcb593d170a060469b2a7d29eeada1fedc32ec26392f1cb704bb21b7 SHA512 20808d035b2e7fd07081a430ba97ab97931014665668bf823782615c9d6e29dfed96592f623259c848d3df5e62106fc09d43b89d47e8d0e63f89a3defe089b80
-AUX openvdb-4.0.0-python-module-install-dir-fix.patch 824 BLAKE2B e5ea542f3505c1cf73c6657a18d16812e54ff4c80bfa5e5285c050a2fa6d5747da7f276b6429ba7aa46459d89b11619843dd0c57ada0b43c1d9d292b2efb5be8 SHA512 55786fb82fd5293200c088bf3617d85f73fff380b1ecca569e68d60346c649925e43647f46eff0897047c7b803ab59f6d78a9441b8be8152155ca0ef026fd39b
-DIST openvdb-3.2.0.tar.gz 1368870 BLAKE2B 062afa0c3209e30c73310accd84daa6747defc583d003e65e9fbcbc0c2381e78132874b8bdd6f2602d526071761b5fd9d19760d557bdbbe5a39f81b19b3f2c6a SHA512 df9a4895b219aae3b5a9616c34eb846d565877ff76648405691f0c903507f6faba94e8eba9173423b50cb5cef80f3ec500a9f70977cb7161701d39fd105abc91
-DIST openvdb-4.0.0.tar.gz 1545221 BLAKE2B b418c5a1b51b6deb73867fe0a352d3afb4466dde31734cd1da9a83231f0589880ca3cbf2577389cfa08d419216166504abc8e58848b9fd01dbaea46a3d5470f4 SHA512 138e23408d725f153f5545c8083cd16f6b3e5cf80308e080d5e463f74f947759cdf5f9d818137ebffaf8b2de77bffa8f38ef0d20758a1418aea1c71702c0001d
+AUX openvdb-4.0.2-findboost-fix.patch 502 BLAKE2B 3840a5f267c27535654c890d877d050618f2263ada690eb7a0549589dfbf9236cae0b4e04abcad9f1bcfed902ec7d742f81b8ac5d9f60dbf1d0fea07c3b9ba13 SHA512 1e7cd905ee941c8713cf527d6c349127e98b7901c9e853c22abfa8ed691b46780c3817ed61815defaa41c1aa7c4f9895de8d08c3bef847c479af30a4b5f137e6
 DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a0608cfa776c1d4472cb4b25e4dad20d3c9648a952deef87ed0e24ce5f7c927c02da8cca76c829eafe1e2bb47fca061541668b3 SHA512 e9399d245d5e2b4130576d688691ac965f031b957df7803b8859f863634b27987c33aabadc5fb463b9d3eec333be84b89cb619dce5bc81c0390d8fb19da830c3
 DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
-EBUILD openvdb-3.2.0.ebuild 4011 BLAKE2B ec6225fcd8d9aa3a17c3286765ceb082f134468fb8e436dc627af0ef74ffea4e462fabf3126f8e0e25d5c89638563f9c8ad8d808fc79fffdcda51cd715936ec9 SHA512 c84c3022dad66f313415e01d35db4c9ce28b5a0863a0e5fd8cb20f7c07537dfd06022d9ba688e0e6469224ca2777891c2d812758e53d649d750022463a14abc6
-EBUILD openvdb-4.0.0.ebuild 1927 BLAKE2B 04de68eb7803c116db62397e227b6f56acb4e81f9208f4c615d3c20753fe6252a2ae2ba414b18a96e2c1015fb0d5623cca86f6b8e967c90de9cac50b4e201766 SHA512 dfffa4cb7393df8683df085935acd528683fc7596132cb49cea3c962772f89d732d9a36081403203a3e11470d258c24ee7c509caed2ae56f156ba2298cc9774e
+EBUILD openvdb-4.0.2-r1.ebuild 2002 BLAKE2B 1c1d4ea08177f3d78790501742ab3c6ef41192256cc9f1b99eafa19a66990889e50caac4c66c43834b65fa85e7dcee871c90fa8f0d774c2c3d39bb6745395672 SHA512 c67cb1576bf56eccaee692de2f46bc9998ac4b8c1000fd0f4ce2004b8dd05ae15f46a4a020cf221b9cf25a7fc17cdec8244c501b3617174ef7a8f5b7c053cdab
 EBUILD openvdb-4.0.2.ebuild 1953 BLAKE2B 52acb99e6a74fd2cd0ad7b96518b08acc7ed9fce91c1f0a50947cc9624e3663f44284e1def469870efe3f1b368dad2b036de1c7b4ad25c360f057023c6ca4c3e SHA512 b7a1da36eabbdce27090902769c80d9c72f97353e58b30802274a89553268b7916c2895356fa4563cc25829968c1c4dde83a972fdc863aae75bb724d556fd919
-MISC metadata.xml 1250 BLAKE2B 17d651b364b0c114b299c16a71755bda7a4d59a44d5bf6c72b651d65fb504248c36821e1f58c5cf0f3f80b41961369d701feb29a49116d7182450a23458b8c55 SHA512 0f89a03fc29a06e46e4b4960fbe42c304a5c9d3052e823bd4b5b58090b439e873fa9b915243bf905e187d766724df93b75ca57abf3c567070ab84bd26315cecc
+MISC metadata.xml 1049 BLAKE2B ecb29e1aa1c1e507ee1dbd22b736c252f4013f100e6d47400e130335f2ab37877fa9439ddc73d3a585b44a453f125db37693c251424e92adb6dcf9b965d73d96 SHA512 74cf497d6517b8a9d2e0bf59ed642353a58810bab7727ed07192b3aa125d593a86d95399981e2bb9a5fda858428cc1d79f431d02d974da66001f814dbb9b3c08
diff --git a/media-gfx/openvdb/files/openvdb-3.2.0-fix-build-system.patch b/media-gfx/openvdb/files/openvdb-3.2.0-fix-build-system.patch
deleted file mode 100644
index 66112af75daf..000000000000
--- a/media-gfx/openvdb/files/openvdb-3.2.0-fix-build-system.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-* Make build system honour the proper ABI library directory.
-* Replace -isystem arguments with -I, as the former causes issues with GCC 6.
-  See also:
-  https://bugs.gentoo.org/show_bug.cgi?id=597866
-  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
-
---- a/doxygen-config
-+++ b/doxygen-config
-@@ -2257,7 +2257,7 @@
- # The default value is: png.
- # This tag requires that the tag HAVE_DOT is set to YES.
- 
--DOT_IMAGE_FORMAT       = png
-+DOT_IMAGE_FORMAT       = svg
- 
- # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
- # enable generation of interactive SVG images that allow zooming and panning.
---- a/Makefile
-+++ b/Makefile
-@@ -82,6 +82,7 @@
- 
- # The directory into which to install libraries, executables and header files
- DESTDIR := /tmp/OpenVDB
-+libdir = lib
- 
- # The parent directory of the boost/ header directory
- BOOST_INCL_DIR := $(HT)/include
-@@ -158,6 +159,9 @@
- # The directory containing libpython
- PYTHON_LIB_DIR := $(HFS)/python/lib
- PYTHON_LIB := -lpython$(PYTHON_VERSION)
-+# The Directory to install the python module and includes to.
-+PYTHON_INSTALL_INCL_DIR := $(DESTDIR)/python/include/python$(PYTHON_VERSION)
-+PYTHON_INSTALL_LIB_DIR := $(DESTDIR)/python/lib/python$(PYTHON_VERSION)
- # The directory containing libboost_python
- BOOST_PYTHON_LIB_DIR := /rel/depot/third_party_build/boost/rhel6-1.46.1-0/lib
- BOOST_PYTHON_LIB := -lboost_python-gcc41-mt-python26-1_46_1
-@@ -179,7 +183,6 @@
- # (leave blank if Doxygen is unavailable)
- DOXYGEN := doxygen
- 
--
- #
- # Ideally, users shouldn't need to change anything below this line.
- #
-@@ -207,11 +210,7 @@
-     endif
- endif
- 
--ifeq (yes,$(strip $(debug)))
--    OPTIMIZE := -g
--else
--    OPTIMIZE := -O3 -DNDEBUG
--endif
-+OPTIMIZE := -DNDEBUG
- 
- ifeq (yes,$(strip $(verbose)))
-     QUIET :=
-@@ -242,12 +241,12 @@
-     has_python := yes
- endif
- 
--INCLDIRS := -I . -I .. -isystem $(BOOST_INCL_DIR) -isystem $(ILMBASE_INCL_DIR) -isystem $(TBB_INCL_DIR)
-+INCLDIRS := -I. -I.. -I$(BOOST_INCL_DIR) -I$(ILMBASE_INCL_DIR) -I$(TBB_INCL_DIR)
- ifeq (yes,$(has_blosc))
--    INCLDIRS += -isystem $(BLOSC_INCL_DIR)
-+    INCLDIRS += -I$(BLOSC_INCL_DIR)
- endif
- ifeq (yes,$(has_log4cplus))
--    INCLDIRS += -isystem $(LOG4CPLUS_INCL_DIR)
-+    INCLDIRS += -I$(LOG4CPLUS_INCL_DIR)
- endif
- 
- CXXFLAGS += -std=c++0x
-@@ -565,9 +564,9 @@
-     python/pyTransform.cc \
-     python/pyVec3Grid.cc \
- #
--PYCXXFLAGS := -fPIC -isystem python -isystem $(PYTHON_INCL_DIR) -isystem $(PYCONFIG_INCL_DIR)
-+PYCXXFLAGS := -fPIC -Ipython -I$(PYTHON_INCL_DIR) -I$(PYCONFIG_INCL_DIR)
- ifneq (,$(strip $(NUMPY_INCL_DIR)))
--PYCXXFLAGS += -isystem $(NUMPY_INCL_DIR) -DPY_OPENVDB_USE_NUMPY
-+PYCXXFLAGS += -I$(NUMPY_INCL_DIR) -DPY_OPENVDB_USE_NUMPY
- endif
- ifneq (no,$(strip $(PYTHON_WRAP_ALL_GRID_TYPES)))
- PYCXXFLAGS += -DPY_OPENVDB_WRAP_ALL_GRID_TYPES
-@@ -678,7 +677,7 @@
- 	@echo "Building $@ because of $(call list_deps)"
- 	$(CXX) -c $(CXXFLAGS) -fPIC -o $@ $<
- 
--all: lib python vdb_print vdb_render vdb_test depend
-+all: lib python vdb_print vdb_render vdb_view vdb_test depend
- 
- $(OBJ_NAMES): %.o: %.cc
- 	@echo "Building $@ because of $(call list_deps)"
-@@ -719,8 +718,13 @@
- 	@echo "Generating documentation because of $(list_deps)"
- 	echo -e 'OUTPUT_DIRECTORY=./doc\nGENERATE_LATEX=YES\nGENERATE_HTML=NO' \
- 	    | cat doxygen-config - | $(DOXYGEN) - $(QUIET) \
--	    && cd ./doc/latex && make refman.pdf $(QUIET) \
-+	    && cd ./doc/latex && $(MAKE) refman.pdf $(QUIET) \
- 	    && echo 'Created doc/latex/refman.pdf'
-+	@#
-+	    mkdir -p $(DESTDIR)/share/doc/openvdb/pdf; \
-+	    echo "Created $(DESTDIR)/share/doc/openvdb/pdf"; \
-+	    cp -r -f doc/latex/refman.pdf $(DESTDIR)/share/doc/openvdb/pdf/; \
-+	    echo "Copied documentation to $(DESTDIR)/share/doc/openvdb/pdf/"; \
- 
- ifneq (,$(strip $(DOXYGEN)))
- doc: $(DOC_INDEX)
-@@ -734,14 +738,14 @@
- 
- vdb_print: $(LIBOPENVDB) cmd/openvdb_print/main.cc
- 	@echo "Building $@ because of $(list_deps)"
--	$(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_print/main.cc -I . \
-+	$(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_print/main.cc -I. \
- 	    $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \
- 	    $(LIBS_RPATH) $(CONCURRENT_MALLOC_LIB)
- 
- vdb_render: $(LIBOPENVDB) cmd/openvdb_render/main.cc
- 	@echo "Building $@ because of $(list_deps)"
--	$(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_render/main.cc -I . \
--	    -isystem $(EXR_INCL_DIR) -isystem $(ILMBASE_INCL_DIR) \
-+	$(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_render/main.cc -I. \
-+	    -I$(EXR_INCL_DIR) -I$(ILMBASE_INCL_DIR) \
- 	    -Wl,-rpath,$(EXR_LIB_DIR) -L$(EXR_LIB_DIR) $(EXR_LIB) \
- 	    -Wl,-rpath,$(ILMBASE_LIB_DIR) -L$(ILMBASE_LIB_DIR) $(ILMBASE_LIB) \
- 	    $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \
-@@ -761,12 +765,12 @@
- $(LIBVIEWER_OBJ_NAMES): $(LIBVIEWER_INCLUDE_NAMES)
- $(LIBVIEWER_OBJ_NAMES): %.o: %.cc
- 	@echo "Building $@ because of $(list_deps)"
--	$(CXX) -c $(CXXFLAGS) -I . -isystem $(GLFW_INCL_DIR) -DGL_GLEXT_PROTOTYPES=1 -fPIC -o $@ $<
-+	$(CXX) -c $(CXXFLAGS) -I. -I$(GLFW_INCL_DIR) -DGL_GLEXT_PROTOTYPES=1 -fPIC -o $@ $<
- 
- vdb_view: $(LIBOPENVDB) $(LIBVIEWER_OBJ_NAMES) cmd/openvdb_view/main.cc
- 	@echo "Building $@ because of $(list_deps)"
- 	$(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_view/main.cc $(LIBVIEWER_OBJ_NAMES) \
--	    -I . -Wl,-rpath,$(GLFW_LIB_DIR) -L$(GLFW_LIB_DIR) $(GLFW_LIB) \
-+	    -I. -Wl,-rpath,$(GLFW_LIB_DIR) -L$(GLFW_LIB_DIR) $(GLFW_LIB) \
- 	    $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \
- 	    $(LIBVIEWER_FLAGS) $(LIBS_RPATH) $(BOOST_THREAD_LIB) $(CONCURRENT_MALLOC_LIB)
- endif
-@@ -776,7 +780,7 @@
- $(PYTHON_OBJ_NAMES): $(PYTHON_INCLUDE_NAMES)
- $(PYTHON_OBJ_NAMES): %.o: %.cc
- 	@echo "Building $@ because of $(list_deps)"
--	$(CXX) -c $(CXXFLAGS) -I . $(PYCXXFLAGS) -o $@ $<
-+	$(CXX) -c $(CXXFLAGS) -I. $(PYCXXFLAGS) -o $@ $<
- $(PYTHON_MODULE): $(LIBOPENVDB) $(PYTHON_OBJ_NAMES)
- 	@echo "Building $@ because of $(list_deps)"
- 	$(CXX) $(CXXFLAGS) $(PYCXXFLAGS) -shared $(PYTHON_SONAME_FLAGS) -o $@ $(PYTHON_OBJ_NAMES) \
-@@ -784,6 +788,22 @@
- 	    -Wl,-rpath,$(BOOST_PYTHON_LIB_DIR) -L$(BOOST_PYTHON_LIB_DIR) $(BOOST_PYTHON_LIB) \
- 	    $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \
- 	    $(LIBS_RPATH) $(CONCURRENT_MALLOC_LIB)
-+	@echo "Installing the python module and includes"
-+	@#
-+	    mkdir -p $(PYTHON_INSTALL_INCL_DIR); \
-+	    echo "Created $(PYTHON_INSTALL_INCL_DIR)"; \
-+	    cp -f $(PYTHON_PUBLIC_INCLUDE_NAMES) $(PYTHON_INSTALL_INCL_DIR)/; \
-+	    echo "Copied Python header files to $(PYTHON_INSTALL_INCL_DIR)"; \
-+	    mkdir -p $(PYTHON_INSTALL_LIB_DIR); \
-+	    echo "Created $(PYTHON_INSTALL_LIB_DIR)"; \
-+	    cp -f $(PYTHON_MODULE) $(PYTHON_INSTALL_LIB_DIR)/; \
-+	    pushd $(PYTHON_INSTALL_LIB_DIR) > /dev/null; \
-+	    ln -f -s $(PYTHON_MODULE) $(PYTHON_SONAME); \
-+	    popd > /dev/null; \
-+	    echo "Copied Python module to $(PYTHON_INSTALL_LIB_DIR)"
-+	@echo "Clean the Python modules so the next one will compile"
-+	@#
-+	    $(RM) $(PYTHON_OBJ_NAMES)
- 
- ifeq (yes,$(has_python))
- ifneq (,$(strip $(EPYDOC)))
-@@ -794,7 +814,7 @@
- 	echo "Created $${pydocdir}"; \
- 	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$(CURDIR); \
- 	export PYTHONPATH=${PYTHONPATH}:$(CURDIR); \
--	    $(EPYDOC) --html -o $${pydocdir} $(PYTHON_MODULE_NAME) $(QUIET)
-+	    $(EPYDOC) --html --html-dir $${pydocdir} $(PYTHON_MODULE_NAME) $(QUIET)
- else
- pydoc:
- 	@echo "$@"': $$EPYDOC is undefined'
-@@ -815,7 +835,7 @@
- 
- $(UNITTEST_OBJ_NAMES): %.o: %.cc
- 	@echo "Building $@ because of $(list_deps)"
--	$(CXX) -c $(CXXFLAGS) -isystem $(CPPUNIT_INCL_DIR) -fPIC -o $@ $<
-+	$(CXX) -c $(CXXFLAGS) -I$(CPPUNIT_INCL_DIR) -fPIC -o $@ $<
- 
- ifneq (,$(strip $(CPPUNIT_INCL_DIR)))
- vdb_test: $(LIBOPENVDB) $(UNITTEST_OBJ_NAMES)
-@@ -835,7 +855,7 @@
- 	@echo "$@"': $$(CPPUNIT_INCL_DIR) is undefined'
- endif
- 
--install: lib python vdb_print vdb_render vdb_view doc pydoc
-+install: lib vdb_print vdb_render vdb_view doc pydoc
- 	mkdir -p $(DESTDIR)/include/openvdb
- 	@echo "Created $(DESTDIR)/include/openvdb"
- 	pushd $(DESTDIR)/include/openvdb > /dev/null; \
-@@ -851,42 +871,25 @@
- 	fi
- 	@echo "Copied header files to $(DESTDIR)/include"
- 	@#
--	mkdir -p $(DESTDIR)/lib
--	@echo "Created $(DESTDIR)/lib/"
--	cp -f $(LIBOPENVDB) $(DESTDIR)/lib
--	pushd $(DESTDIR)/lib > /dev/null; \
-+	mkdir -p $(DESTDIR)/$(libdir)
-+	@echo "Created $(DESTDIR)/$(libdir)/"
-+	cp -f $(LIBOPENVDB) $(DESTDIR)/$(libdir)
-+	pushd $(DESTDIR)/$(libdir) > /dev/null; \
- 	    if [ -f $(LIBOPENVDB_SHARED) ]; then \
- 	        ln -f -s $(LIBOPENVDB_SHARED) $(LIBOPENVDB_SHARED_NAME); \
- 	        ln -f -s $(LIBOPENVDB_SHARED) $(LIBOPENVDB_SONAME); \
- 	    fi; \
- 	    popd > /dev/null
--	@echo "Copied libopenvdb to $(DESTDIR)/lib/"
-+	@echo "Copied libopenvdb to $(DESTDIR)/$(libdir)/"
- 	@#
- 	if [ -f $(LIBVIEWER) ]; \
- 	then \
--	    cp -f $(LIBVIEWER) $(DESTDIR)/lib; \
--	    pushd $(DESTDIR)/lib > /dev/null; \
-+	    cp -f $(LIBVIEWER) $(DESTDIR)/$(libdir); \
-+	    pushd $(DESTDIR)/$(libdir) > /dev/null; \
- 	        if [ -f $(LIBVIEWER_SHARED) ]; then \
- 	            ln -f -s $(LIBVIEWER_SHARED) $(LIBVIEWER_SHARED_NAME); fi; \
- 	        popd > /dev/null; \
--	    echo "Copied libopenvdb_viewer to $(DESTDIR)/lib/"; \
--	fi
--	@#
--	if [ -f $(PYTHON_MODULE) ]; \
--	then \
--	    installdir=$(DESTDIR)/python/include/python$(PYTHON_VERSION); \
--	    mkdir -p $${installdir}; \
--	    echo "Created $${installdir}"; \
--	    cp -f $(PYTHON_PUBLIC_INCLUDE_NAMES) $${installdir}/; \
--	    echo "Copied Python header files to $${installdir}"; \
--	    installdir=$(DESTDIR)/python/lib/python$(PYTHON_VERSION); \
--	    mkdir -p $${installdir}; \
--	    echo "Created $${installdir}"; \
--	    cp -f $(PYTHON_MODULE) $${installdir}/; \
--	    pushd $${installdir} > /dev/null; \
--	    ln -f -s $(PYTHON_MODULE) $(PYTHON_SONAME); \
--	    popd > /dev/null; \
--	    echo "Copied Python module to $${installdir}"; \
-+	    echo "Copied libopenvdb_viewer to $(DESTDIR)/$(libdir)/"; \
- 	fi
- 	@#
- 	mkdir -p $(DESTDIR)/bin
-@@ -924,7 +927,7 @@
- 	    for f in $(UNITTEST_SRC_NAMES); \
- 	        do $(CXX) $(CXXFLAGS) -O0 \
- 	            -MM $$f -MT `echo $$f | sed 's%\.[^.]*%.o%'` \
--	            -isystem $(CPPUNIT_INCL_DIR) >> $(DEPEND); \
-+	            -I$(CPPUNIT_INCL_DIR) >> $(DEPEND); \
- 	    done; \
- 	fi
- 
diff --git a/media-gfx/openvdb/files/openvdb-3.2.0-numpy-fix.patch b/media-gfx/openvdb/files/openvdb-3.2.0-numpy-fix.patch
deleted file mode 100644
index bef10240477c..000000000000
--- a/media-gfx/openvdb/files/openvdb-3.2.0-numpy-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/python/pyOpenVDBModule.cc b/openvdb/python/pyOpenVDBModule.cc
-index 508c787..dd069e0 100644
---- a/python/pyOpenVDBModule.cc
-+++ b/python/pyOpenVDBModule.cc
-@@ -592,8 +592,12 @@ BOOST_PYTHON_MODULE(PY_OPENVDB_MODULE_NAME)
- 
- #ifdef PY_OPENVDB_USE_NUMPY
-     // Initialize NumPy.
-+#if PY_MAJOR_VERSION >= 3
-+    if (_import_array()) { };
-+#else
-     import_array();
- #endif
-+#endif
- 
-     using namespace openvdb::OPENVDB_VERSION_NAME;
- 
diff --git a/media-gfx/openvdb/files/openvdb-4.0.0-build-docs-once.patch b/media-gfx/openvdb/files/openvdb-4.0.0-build-docs-once.patch
deleted file mode 100644
index 5a8baee0f260..000000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.0-build-docs-once.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5bb7bc424b09f93417a1d447f2d4f3081394f964 Mon Sep 17 00:00:00 2001
-From: Nicholas Yue <yue.nicholas@gmail.com>
-Date: Thu, 17 Nov 2016 16:59:47 -0800
-Subject: [PATCH] Refine Doxygen run so that it is done only once and only
- during the installation phase
-
----
- openvdb/CMakeLists.txt | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
-index aa1a080..88e46ca 100644
---- a/openvdb/CMakeLists.txt
-+++ b/openvdb/CMakeLists.txt
-@@ -443,13 +443,15 @@ IF (OPENVDB_BUILD_DOCS)
-   FILE ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config ${DOXYGEN_CONFIG_CONTENT} )
-   FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config "OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/doc\n" )
-   
--  ADD_CUSTOM_TARGET ( doc ALL
-+  ADD_CUSTOM_TARGET ( doc
-     ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config
-     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-     COMMENT "Generating API documentation with Doxygen" VERBATIM
-     )
-   
--  INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html/ DESTINATION doc)
-+  INSTALL ( CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build  \"${PROJECT_BINARY_DIR}\" --target doc)")
-+  INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION docs)
-+
- ENDIF ()
- 
- # Installation
diff --git a/media-gfx/openvdb/files/openvdb-4.0.0-make-docs-optional.patch b/media-gfx/openvdb/files/openvdb-4.0.0-make-docs-optional.patch
deleted file mode 100644
index 92c4fa320596..000000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.0-make-docs-optional.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 3c7f3247e443620658a5cb7b4e9cdea488c450d9 Mon Sep 17 00:00:00 2001
-From: Nicholas Yue <yue.nicholas@gmail.com>
-Date: Thu, 17 Nov 2016 03:58:58 -0800
-Subject: [PATCH] Fix the Doxygen generation problem but current solution is
- not very elegant as there was a regeneration run of Doxygen. Committing this
- for now so that at least it will work for the initial 4.0.0 release.
- Introduce a CMake option variable to toggle the generation and installation
- of doxygen
-
----
- CMakeLists.txt         |  1 +
- openvdb/CMakeLists.txt | 27 +++++++++++++++------------
- 2 files changed, 16 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 739d57f..32f82d2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,6 +33,7 @@ PROJECT ( OpenVDB )
- ENABLE_TESTING()
- 
- OPTION ( OPENVDB_BUILD_UNITTESTS "Build the OpenVDB unit tests" ON )
-+OPTION ( OPENVDB_BUILD_DOCS "Build the OpenVDB documentation" OFF )
- OPTION ( OPENVDB_BUILD_PYTHON_MODULE "Build the pyopenvdb Python module" ON )
- OPTION ( OPENVDB_BUILD_HOUDINI_SOPS "Build the Houdini SOPs" OFF )
- OPTION ( OPENVDB_BUILD_MAYA_PLUGIN "Build the Maya plugin" OFF )
-diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
-index f86b306..aa1a080 100644
---- a/openvdb/CMakeLists.txt
-+++ b/openvdb/CMakeLists.txt
-@@ -97,7 +97,9 @@ FIND_PACKAGE ( ZLIB REQUIRED )
- FIND_PACKAGE ( ILMBase REQUIRED )
- FIND_PACKAGE ( OpenEXR REQUIRED )
- FIND_PACKAGE ( OpenGL REQUIRED )
--FIND_PACKAGE ( Doxygen REQUIRED )
-+IF (OPENVDB_BUILD_DOCS)
-+  FIND_PACKAGE ( Doxygen REQUIRED )
-+ENDIF ()
- IF (OPENVDB_BUILD_UNITTESTS)
-   FIND_PACKAGE ( CPPUnit REQUIRED )
- ENDIF ()
-@@ -435,17 +437,18 @@ IF ( OPENVDB_BUILD_PYTHON_MODULE )
- ENDIF ( OPENVDB_BUILD_PYTHON_MODULE )
- 
- # Doxygen docmentation
--FILE ( READ ${CMAKE_CURRENT_SOURCE_DIR}/doxygen-config DOXYGEN_CONFIG_CONTENT )
--FILE ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config ${DOXYGEN_CONFIG_CONTENT} )
--FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config "OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/doc\n" )
--
--ADD_CUSTOM_TARGET ( doc
--  ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config
--  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
--  COMMENT "Generating API documentation with Doxygen" VERBATIM
--)
--
--IF ( EXISTS ${CMAKE_CURRENT_BINARY_DIR}/doc/html )
-+IF (OPENVDB_BUILD_DOCS)
-+
-+  FILE ( READ ${CMAKE_CURRENT_SOURCE_DIR}/doxygen-config DOXYGEN_CONFIG_CONTENT )
-+  FILE ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config ${DOXYGEN_CONFIG_CONTENT} )
-+  FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config "OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/doc\n" )
-+  
-+  ADD_CUSTOM_TARGET ( doc ALL
-+    ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config
-+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-+    COMMENT "Generating API documentation with Doxygen" VERBATIM
-+    )
-+  
-   INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html/ DESTINATION doc)
- ENDIF ()
- 
diff --git a/media-gfx/openvdb/files/openvdb-4.0.0-namespace-fixes.patch b/media-gfx/openvdb/files/openvdb-4.0.0-namespace-fixes.patch
deleted file mode 100644
index 913c6079a081..000000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.0-namespace-fixes.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -purN a/cmake/FindILMBase.cmake b/cmake/FindILMBase.cmake
---- a/cmake/FindILMBase.cmake	2016-11-16 20:24:17.000000000 +0000
-+++ b/cmake/FindILMBase.cmake	2017-01-05 09:28:43.941910625 +0000
-@@ -57,15 +57,15 @@ OPTION ( ILMBASE_NAMESPACE_VERSIONING "N
- 
- IF ( ILMBASE_FOUND )
- 
--  FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR ")
--  STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" "" _ilmbase_version_major_unstrip "${_ilmbase_version_major_string}")
--  STRING ( STRIP ${_ilmbase_version_major_unstrip} ILMBASE_VERSION_MAJOR )
-+  IF ( ILMBASE_NAMESPACE_VERSIONING )
-+	FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR ")
-+	STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" "" _ilmbase_version_major_unstrip "${_ilmbase_version_major_string}")
-+	STRING ( STRIP ${_ilmbase_version_major_unstrip} ILMBASE_VERSION_MAJOR )
- 
--  FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR ")
--  STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MINOR" "" _ilmbase_version_minor_unstrip "${_ilmbase_version_minor_string}")
--  STRING ( STRIP ${_ilmbase_version_minor_unstrip} ILMBASE_VERSION_MINOR )
-+	FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR ")
-+	STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MINOR" "" _ilmbase_version_minor_unstrip "${_ilmbase_version_minor_string}")
-+	STRING ( STRIP ${_ilmbase_version_minor_unstrip} ILMBASE_VERSION_MINOR )
- 
--  IF ( ILMBASE_NAMESPACE_VERSIONING )
- 	SET ( IEX_LIBRARY_NAME       Iex-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR}       )
- 	SET ( IEXMATH_LIBRARY_NAME   IexMath-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR}   )
- 	SET ( ILMTHREAD_LIBRARY_NAME IlmThread-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} )
-diff -purN a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake
---- a/cmake/FindOpenEXR.cmake	2016-11-16 20:24:17.000000000 +0000
-+++ b/cmake/FindOpenEXR.cmake	2017-01-05 09:34:51.167736304 +0000
-@@ -52,22 +52,24 @@ OPTION ( OPENEXR_NAMESPACE_VERSIONING "N
- 
- IF ( OPENEXR_FOUND )
- 
--  FILE ( STRINGS "${OPENEXR_LOCATION}/include/OpenEXR/OpenEXRConfig.h" _openexr_version_major_string REGEX "#define OPENEXR_VERSION_MAJOR ")
--  STRING ( REGEX REPLACE "#define OPENEXR_VERSION_MAJOR" "" _openexr_version_major_unstrip "${_openexr_version_major_string}")
--  STRING ( STRIP ${_openexr_version_major_unstrip} OPENEXR_VERSION_MAJOR )
--
--  FILE ( STRINGS "${OPENEXR_LOCATION}/include/OpenEXR/OpenEXRConfig.h" _openexr_version_minor_string REGEX "#define OPENEXR_VERSION_MINOR ")
--  STRING ( REGEX REPLACE "#define OPENEXR_VERSION_MINOR" "" _openexr_version_minor_unstrip "${_openexr_version_minor_string}")
--  STRING ( STRIP ${_openexr_version_minor_unstrip} OPENEXR_VERSION_MINOR )
--  
--  MESSAGE ( STATUS "Found OpenEXR v${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR} at ${OPENEXR_LOCATION}" )
--
-   IF ( OPENEXR_NAMESPACE_VERSIONING )
-+	FILE ( STRINGS "${OPENEXR_LOCATION}/include/OpenEXR/OpenEXRConfig.h" _openexr_version_major_string REGEX "#define OPENEXR_VERSION_MAJOR ")
-+	STRING ( REGEX REPLACE "#define OPENEXR_VERSION_MAJOR" "" _openexr_version_major_unstrip "${_openexr_version_major_string}")
-+	STRING ( STRIP ${_openexr_version_major_unstrip} OPENEXR_VERSION_MAJOR )
-+
-+	FILE ( STRINGS "${OPENEXR_LOCATION}/include/OpenEXR/OpenEXRConfig.h" _openexr_version_minor_string REGEX "#define OPENEXR_VERSION_MINOR ")
-+	STRING ( REGEX REPLACE "#define OPENEXR_VERSION_MINOR" "" _openexr_version_minor_unstrip "${_openexr_version_minor_string}")
-+	STRING ( STRIP ${_openexr_version_minor_unstrip} OPENEXR_VERSION_MINOR )
-+
-+	MESSAGE ( STATUS "Found OpenEXR v${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR} at ${OPENEXR_LOCATION}" )
-+
- 	SET ( ILMIMF_LIBRARY_NAME IlmImf-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR} )
-   ELSE ( OPENEXR_NAMESPACE_VERSIONING )
-+	MESSAGE ( STATUS "Found OpenEXR at ${OPENEXR_LOCATION}" )
-+
- 	SET ( ILMIMF_LIBRARY_NAME IlmImf )
-   ENDIF ( OPENEXR_NAMESPACE_VERSIONING )
--	
-+
-   SET ( OPENEXR_INCLUDE_DIRS
-     ${OPENEXR_LOCATION}/include
-     ${OPENEXR_LOCATION}/include/OpenEXR
diff --git a/media-gfx/openvdb/files/openvdb-4.0.0-python-module-install-dir-fix.patch b/media-gfx/openvdb/files/openvdb-4.0.0-python-module-install-dir-fix.patch
deleted file mode 100644
index 34c6c76ea9da..000000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.0-python-module-install-dir-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -purN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt	2016-11-16 20:24:17.000000000 +0000
-+++ b/openvdb/CMakeLists.txt	2017-01-09 13:46:00.000000000 +0000
-@@ -426,10 +426,11 @@ IF ( OPENVDB_BUILD_PYTHON_MODULE )
-   ADD_TEST ( pytest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/python/test/TestOpenVDB.py )
-   SET_TESTS_PROPERTIES ( pytest PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}")
- 
-+  SET ( PYOENVDB_INSTALL_DIRECTORY  lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR} CACHE STRING "The directory to install the pyopenvdb.so module.")
-   INSTALL ( TARGETS
- 	pyopenvdb
- 	DESTINATION
--	lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR}
-+	${PYOENVDB_INSTALL_DIRECTORY}
- 	)
- 
- ENDIF ( OPENVDB_BUILD_PYTHON_MODULE )
diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch b/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
new file mode 100644
index 000000000000..12245be3e466
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
@@ -0,0 +1,11 @@
+--- openvdb-4.0.2/openvdb/python/CMakeLists.txt.orig	2018-07-12 20:29:50.745624805 +0200
++++ openvdb-4.0.2/openvdb/python/CMakeLists.txt	2018-07-12 20:30:10.452305180 +0200
+@@ -3,7 +3,7 @@
+ 
+ FIND_PACKAGE ( PythonInterp REQUIRED )
+ FIND_PACKAGE ( PythonLibs REQUIRED )
+-FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python )
++FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} )
+ 
+ 
+ IF ( NOT OPENVDB_BUILD_CORE )
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index 453013e59bea..806981efae06 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -23,11 +23,6 @@
 			Enables compatibility with the old 3.x ABI.
 			enabled by dfault.
 		</flag>
-		<flag restrict="&lt;=media-gfx/openvdb-3.2.0" name="openvdb-compression">
-			Adds enhanced compression to files through
-			<pkg>dev-libs/c-blosc</pkg>. Very useful so
-			enabled by dfault.
-		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">dreamworksanimation/openvdb</remote-id>
diff --git a/media-gfx/openvdb/openvdb-3.2.0.ebuild b/media-gfx/openvdb/openvdb-3.2.0.ebuild
deleted file mode 100644
index bdd39bb6e1f4..000000000000
--- a/media-gfx/openvdb/openvdb-3.2.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit eutils python-r1 toolchain-funcs
-
-DESCRIPTION="Libs for the efficient manipulation of volumetric data"
-HOMEPAGE="http://www.openvdb.org"
-
-SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+openvdb-compression doc python X"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	>=dev-libs/boost-1.62:=[${PYTHON_USEDEP}]
-	media-libs/openexr
-	dev-util/cppunit
-	X? ( media-libs/glfw )
-	dev-libs/jemalloc
-	python? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	openvdb-compression? ( >=dev-libs/c-blosc-1.5.0 )
-	dev-libs/log4cplus"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	 ${COMMON_DEPEND}"
-
-DEPEND="${RDEPEND}
-	dev-cpp/tbb
-	doc? (
-		app-doc/doxygen
-		python? ( dev-python/pdoc[${PYTHON_USEDEP}] )
-	)
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-numpy-fix.patch
-	"${FILESDIR}"/${P}-fix-build-system.patch
-)
-
-python_module_compile() {
-	mypythonargs=(
-		PYTHON_VERSION=${EPYTHON/python/}
-		PYTHON_INCL_DIR="$(python_get_includedir)"
-		PYCONFIG_INCL_DIR="$(python_get_includedir)"
-		PYTHON_LIB_DIR="$(python_get_library_path)"
-		PYTHON_LIB="$(python_get_LIBS)"
-		PYTHON_INSTALL_INCL_DIR="${D%/}$(python_get_includedir)"
-		PYTHON_INSTALL_LIB_DIR="${D%/}$(python_get_sitedir)"
-		NUMPY_INCL_DIR="$(python_get_sitedir)"/numpy/core/include/numpy
-		BOOST_PYTHON_LIB_DIR="${myprefixlibdir}"
-		BOOST_PYTHON_LIB=-lboost_python-${EPYTHON/python/}
-	)
-
-	einfo "Compiling module for ${EPYTHON}."
-	emake python "${myemakeargs[@]}" "${mypythonargs[@]}" EPYDOC="" CXX="$(tc-getCXX)"
-
-	# This is so the correct version of pdoc is used
-	mypyscriptdir=$(python_get_scriptdir)
-}
-
-src_compile() {
-	# The build system is designed to compile and install all
-	# in one go, so doing each phase separately would be be
-	# impossible and the functions would all overlap anyways.
-	# Do nothing
-	return
-}
-
-src_install() {
-	local myprefix="${EPREFIX}"/usr
-	local myprefixlibdir="${myprefix}"/"$(get_libdir)"
-	local mypyscriptdir
-
-	# So individule targets can be called without duplication
-	# Common depends:
-	local myemakeargs=(
-		rpath=no
-		shared=yes
-		libdir="$(get_libdir)"
-		LIBOPENVDB_RPATH=
-		DESTDIR="${D}"
-		HFS="${myprefix}"
-		HT="${myprefix}"
-		HDSO="${myprefixlibdir}"
-		CPPUNIT_INCL_DIR="${myprefix}"/include/cppunit
-		CPPUNIT_LIB_DIR="${myprefixlibdir}"
-		LOG4CPLUS_INCL_DIR="${myprefix}"/include/log4cplus
-		LOG4CPLUS_LIB_DIR="${myprefixlibdir}"
-	)
-
-	# Create python list here for use during install phase:
-	# - If python is used, then the last used module will trigger
-	#   document install phase. It's the same doc, so build once.
-	# - If no python used, then this will remail blanked out to
-	#   disable pydoc.
-	# - pydoc will be called if doc and python use flags are set.
-	local mypythonargs=(
-		PYTHON_VERSION=
-		PYTHON_INCL_DIR=
-		PYCONFIG_INCL_DIR=
-		PYTHON_LIB_DIR=
-		PYTHON_LIB=
-		PYTHON_INSTALL_INCL_DIR=
-		PYTHON_INSTALL_LIB_DIR=
-		NUMPY_INCL_DIR=
-		BOOST_PYTHON_LIB_DIR=
-		BOOST_PYTHON_LIB=
-	)
-
-	# Optional depends:
-	if use X; then
-		myemakeargs+=(
-			GLFW_INCL_DIR="${myprefixlibdir}"
-			GLFW_LIB_DIR="${myprefixlibdir}"
-		)
-	else
-		myemakeargs+=(
-			GLFW_INCL_DIR=
-			GLFW_LIB_DIR=
-			GLFW_LIB=
-			GLFW_MAJOR_VERSION=
-		)
-	fi
-
-	if use openvdb-compression; then
-		myemakeargs+=(
-			BLOSC_INCL_DIR="${myprefix}"/include
-			BLOSC_LIB_DIR="${myprefixlibdir}"
-		)
-	else
-		myemakeargs+=(
-			BLOSC_INCL_DIR=
-			BLOSC_LIB_DIR=
-		)
-	fi
-
-	use doc || myemakeargs+=( DOXYGEN= )
-
-	# Create python modules for each version selected
-	use python && python_foreach_impl python_module_compile
-
-	if use python && use doc; then
-		mypythonargs+=( EPYDOC="${mypyscriptdir}"/pdoc )
-	else
-		mypythonargs+=( EPYDOC="" )
-	fi
-
-	einfo "Compiling the main components."
-	emake install "${myemakeargs[@]}" "${mypythonargs[@]}" CXX="$(tc-getCXX)"
-}
diff --git a/media-gfx/openvdb/openvdb-4.0.0.ebuild b/media-gfx/openvdb/openvdb-4.0.0.ebuild
deleted file mode 100644
index f3168eb1ec2e..000000000000
--- a/media-gfx/openvdb/openvdb-4.0.0.ebuild
+++ /dev/null
@@ -1,77 +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} )
-
-inherit eutils flag-o-matic cmake-utils python-single-r1
-
-DESCRIPTION="Libs for the efficient manipulation of volumetric data"
-HOMEPAGE="http://www.openvdb.org"
-
-SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+abi3-compat doc python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}]
-	>=dev-libs/c-blosc-1.5.0
-	dev-libs/jemalloc
-	dev-libs/log4cplus
-	media-libs/glfw:=
-	media-libs/openexr:=
-	sys-libs/zlib
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXinerama
-	x11-libs/libXcursor
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-cpp/tbb
-	doc? (
-		app-doc/doxygen
-		python? ( dev-python/pdoc[${PYTHON_USEDEP}] )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-make-docs-optional.patch
-	"${FILESDIR}"/${P}-build-docs-once.patch
-	"${FILESDIR}"/${P}-namespace-fixes.patch
-	"${FILESDIR}"/${P}-python-module-install-dir-fix.patch
-)
-
-src_configure() {
-	local myprefix="${EPREFIX}"/usr/
-
-	# To stay in sync with Boost
-	append-cxxflags -std=c++14
-
-	# Enable unit tests later in 4.0.1
-	local mycmakeargs=(
-		-DOPENVDB_BUILD_UNITTESTS=OFF
-		-DOPENVDB_BUILD_DOCS=$(usex doc)
-		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
-		-DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat)
-		-DBLOSC_LOCATION="${myprefix}"
-		-DGLEW_LOCATION="${myprefix}"
-		-DUSE_GLFW3=ON
-		-DGLFW3_LOCATION="${myprefix}"
-		-DILMBASE_LOCATION="${myprefix}"
-		-DILMBASE_NAMESPACE_VERSIONING=OFF
-		-DOPENEXR_LOCATION="${myprefix}"
-		-DOPENEXR_NAMESPACE_VERSIONING=OFF
-		-DTBB_LOCATION="${myprefix}"
-	)
-
-	use python && mycmakeargs+=( -DPYOENVDB_INSTALL_DIRECTORY=$(python_get_sitedir) )
-
-	cmake-utils_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r1.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..82941626ec77
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-4.0.2-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 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 cmake-utils flag-o-matic python-single-r1
+
+DESCRIPTION="Libs for the efficient manipulation of volumetric data"
+HOMEPAGE="http://www.openvdb.org"
+SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/dracwyrm/gentoo-patches/raw/master/${PN}/${P}-patchset-01.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+abi3-compat doc python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}]
+	>=dev-libs/c-blosc-1.5.0
+	dev-libs/jemalloc
+	dev-libs/log4cplus
+	media-libs/glfw:=
+	media-libs/openexr:=
+	sys-libs/zlib:=
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)"
+
+DEPEND="${RDEPEND}
+	dev-cpp/tbb
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[latex] )"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${WORKDIR}/0001-Change-hardcoded-paths-to-GNUInstallDirs-variables.patch"
+	"${WORKDIR}/0002-Use-PkgConfig-to-find-IlmBase-and-OpenEXR.patch"
+	"${WORKDIR}/0003-Boost-1.65-NumPy-support.patch"
+	"${FILESDIR}/${P}-findboost-fix.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myprefix="${EPREFIX}/usr/"
+
+	# To stay in sync with Boost
+	append-cxxflags -std=c++14
+
+	local mycmakeargs=(
+		-DBLOSC_LOCATION="${myprefix}"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DGLEW_LOCATION="${myprefix}"
+		-DGLFW3_LOCATION="${myprefix}"
+		-DOPENVDB_BUILD_DOCS=$(usex doc)
+		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
+		-DOPENVDB_BUILD_UNITTESTS=OFF
+		-DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat)
+		-DOPENVDB_ENABLE_RPATH=OFF
+		-DTBB_LOCATION="${myprefix}"
+		-DUSE_GLFW3=ON
+	)
+
+	use python && mycmakeargs+=( -DPYOENVDB_INSTALL_DIRECTORY=${python_get_sitedir} )
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index dd3591cc7041..d5b38cdd9287 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/SoQt/Manifest b/media-libs/SoQt/Manifest
deleted file mode 100644
index fc7f3e4c8bbf..000000000000
--- a/media-libs/SoQt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX SoQt-1.5.0-pkgconfig-partial.patch 454 BLAKE2B 902850d61d5366393d4199dad4436ed5715361e5918d68251f45b279abac6d15bd8780378c6d4daefe5314fe9dfd9276e8af24b3ffb80956a380d10da408b342 SHA512 a1ca69c0db287bbed67e928ca485f636983d4324cac525ee3d6b99395a6dd1f5d32c02315607f9d5dcd3449340cec427b67515060b320bd6bcc69ab975ed429a
-DIST SoQt-1.5.0.tar.gz 1515230 BLAKE2B bd7723ce41361cdc90e143595d3f0f680fcba212ba842b868366c60ba0daf0c3730897f2194ed6947f9d2b4bf04f442bce83a6542ed596788a97579023151d12 SHA512 e65596bf466b56aa0d7c4f367b250ba3a77094cf1a529c1e2a199b8b91106ab8954873ddfc9f9cd7ff359c0f82e6bbf32d30e78e3fb92733490937e477890a0b
-EBUILD SoQt-1.5.0-r1.ebuild 1215 BLAKE2B 8369f47d36e575f0a5f9e85cf6ec57f0341805bc9e073a4ca8131b2bcb0ce763d105e8f94734ac54b31f86974c191e9a9212aaba6401b069d2cc9a5d3f00176b SHA512 fb041cd237fc2461286a5081b92481c6cdbf1797cc2423059decb5040905ff273d1484f948b26b92e642d83bd973962c5725fed370e549a8adbd9b7311a53133
-MISC metadata.xml 306 BLAKE2B 2872c277731357c76b547876eb52ec3be49c4ed168150855f5fda99f30d8992c372d7e044464ba1257e11ccfede88c113b783209eb4a389acba57c3b6fabfab2 SHA512 2ad9118c4ba9aacce51b710b34ce8ae0d307def6444a926f8f8bb162806ff1fc1420a1e4eca6fa6c8e5893edade928d3866c47e9d81a48a497fc34abe10fc0bb
diff --git a/media-libs/SoQt/SoQt-1.5.0-r1.ebuild b/media-libs/SoQt/SoQt-1.5.0-r1.ebuild
deleted file mode 100644
index 95494b3c4008..000000000000
--- a/media-libs/SoQt/SoQt-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="The glue between Coin3D and Qt"
-HOMEPAGE="https://bitbucket.org/Coin3D/soqt"
-SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 PEL )"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="debug doc static-libs"
-
-RDEPEND="
-	>=media-libs/coin-3.1.3
-	virtual/opengl
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.0-pkgconfig-partial.patch"
-)
-
-DOCS=(AUTHORS ChangeLog FAQ HACKING NEWS README)
-
-src_configure() {
-	local myeconfargs=(
-		htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		--disable-compact
-		--disable-html-help
-		--disable-loadlibrary
-		--disable-man
-		--enable-pkgconfig
-		--includedir="${EPREFIX}/usr/include/coin"
-		--with-coin
-		$(use_enable debug)
-		$(use_enable debug symbols)
-		$(use_enable doc html)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	# Remove SoQt from Libs.private
-	sed -e '/Libs.private/s/ -lSoQt//' -i "${BUILD_DIR}"/SoQt.pc || die
-
-	autotools-utils_src_install
-}
diff --git a/media-libs/SoQt/files/SoQt-1.5.0-pkgconfig-partial.patch b/media-libs/SoQt/files/SoQt-1.5.0-pkgconfig-partial.patch
deleted file mode 100644
index ff55a03aed4b..000000000000
--- a/media-libs/SoQt/files/SoQt-1.5.0-pkgconfig-partial.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN SoQt-1.5.0/SoQt.pc.in my/SoQt.pc.in
---- SoQt-1.5.0/SoQt.pc.in	2010-03-02 23:57:41.000000000 +0100
-+++ my/SoQt.pc.in	2013-05-28 01:14:13.083619183 +0200
-@@ -10,7 +10,8 @@
- Version: @SOQT_VERSION@
- Requires: Coin
- Conflicts:
--Libs: -L${libdir} @SOGUI_EXTRA_LDFLAGS@ @SOGUI_EXTRA_LIBS@
-+Libs: -L${libdir} -lSoQt
-+Libs.private: -L${libdir} @SOGUI_EXTRA_LIBS@
- Cflags: -I${includedir} @SOGUI_EXTRA_CFLAGS@ @SOGUI_EXTRA_CPPFLAGS@
- 
- soqt_host=@host@
diff --git a/media-libs/SoQt/metadata.xml b/media-libs/SoQt/metadata.xml
deleted file mode 100644
index ba799f44a2a0..000000000000
--- a/media-libs/SoQt/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>reavertm@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="bitbucket">Coin3D/coin</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-libs/emfengine/Manifest b/media-libs/emfengine/Manifest
deleted file mode 100644
index 86a4aaab414a..000000000000
--- a/media-libs/emfengine/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 0.7-config.patch 333 BLAKE2B ce5fadc27a408b6f52f685c93ed0a43355717c7aeebf8bd738ec080367479058e6970bb499c4726e1d72ef3d33ff606dfd811a2f67874b34c4743b6e19807e1e SHA512 0eec68028b080b9dc61df5a13d804de80223c9ffa86fa3f782b71b7f1b39402a42f8a0d5bdde45e57058de53e8a57987085fb431744f27ac655f7873a6439289
-AUX 0.7-header.patch 275 BLAKE2B 660c27528bb457bb5f4923c84c29e1d2a09814534a7d4c37d8a008a6f4706959bede673c8f999d90ab4dc8fba2710cfa1651beac436246a39a9ddff00f20b0d4 SHA512 5ea50c0f79af9ebf7d930b03adc4266fbd530117f836973eafd9c534069fa9558a8b328624ceba3558d6a31389b4a409537a8a9aea24d08214d9962ee936376a
-AUX 0.8-example.patch 247 BLAKE2B 35a684b19efa88b29e9187c9801f3d631b2bfe085c37e0926e0ee597c6139714e552e38e3a3c366ab2bf31ba10ba3bdf2c20423a5c59946b9ffe6e430c022a98 SHA512 989ab4f1be5a26295b08fd49845b8adcb26395663b6efffc655788ef755e5d6e710d4b47da115aed686ff99fa768e9fc5f9c94a063ccc9b36c9504b800c4b9d1
-DIST EmfEngine-0.8-opensource.zip 37494 BLAKE2B 0d107acc45a87156df24fbb86333571a6ba61b24143bced768c4fe090be6d9d2601c95aa43214bf4646f21fc16dac4e43aa8bdff62f353d216f21f862e2130e8 SHA512 70f8c122520b3053032d9ca36a40cdb3ab647a8e51b6570e40c0855fe478e953fec3a66f99c7fd217cf91c963c031efb7cbaeb10f4a8ca7860752799950fc7ba
-EBUILD emfengine-0.8.ebuild 1013 BLAKE2B 955b9bcc26536bdc17673979f9d35bb74b9905c0ceee28581da8ccd52e3f68de5e9ebb9f2df90bbfa47ed91c6d8973b573c9b2c80cec9cbdbab399a2b0b2ba81 SHA512 be8ee674d14c5d88f4653909540d76cf0b9fea156ac59d75e923b101051ce8b7655a5597ef60580375a8a1fcc8faaa609d93890c2d7568b303395b8d97ba7659
-MISC metadata.xml 219 BLAKE2B a36027db1fafb2a6fb4952ec04a882494f6f5d3543a1dd71bad734ad49a47a17ac7ebb843960e2b82b0fd2322d71fd76a3d9266e85c82fa66e21770b9030753e SHA512 2d421746cac7e5e6a59e81fdc273cda856245e88c88a489118c94a58c9db3ddde6497be6a8c076309f895c1c0280fe77514332ddcfd5cb884fc255016f66b5b7
diff --git a/media-libs/emfengine/emfengine-0.8.ebuild b/media-libs/emfengine/emfengine-0.8.ebuild
deleted file mode 100644
index 0861ce1104ac..000000000000
--- a/media-libs/emfengine/emfengine-0.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils
-
-MY_PN="EmfEngine"
-
-DESCRIPTION="Native vector graphics file format on Windows"
-HOMEPAGE="http://soft.proindependent.com/emf/index.html"
-SRC_URI="https://dev.gentoo.org/~jelc/distfiles/${MY_PN}-${PV}-opensource.zip"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	media-libs/libemf
-	media-libs/libpng:0
-	"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"/${MY_PN}
-
-PATCHES=(
-	"${FILESDIR}/0.7-config.patch"
-	"${FILESDIR}/0.7-header.patch"
-	"${FILESDIR}"/${PV}-example.patch
-)
-
-src_prepare() {
-	edos2unix EmfEngine.pro
-	epatch "${PATCHES[@]}"
-	sed \
-		-e "s:/usr/local/lib/libEMF.a:-lEMF:g" \
-		-e "s:/usr/local/include:${EPREFIX}/usr/include/:g" \
-		-i src/src.pro example/example.pro || die
-}
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	dolib.so libEmfEngine.so*
-	doheader src/*.h*
-}
diff --git a/media-libs/emfengine/files/0.7-config.patch b/media-libs/emfengine/files/0.7-config.patch
deleted file mode 100644
index 709663aa3c8a..000000000000
--- a/media-libs/emfengine/files/0.7-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config.pri b/config.pri
-index 97854bc..db7e20f 100644
---- a/config.pri
-+++ b/config.pri
-@@ -8,7 +8,7 @@ win32:CONFIG += HAVE_GDI_PLUS
- #DEFINES     += HAVE_ANTIALIASED_TEXT

- 

- # Comment the following line if you want to build EmfEngine statically

--#CONFIG      += EmfEngineDll

-+CONFIG      += EmfEngineDll

- 

- 

- 

diff --git a/media-libs/emfengine/files/0.7-header.patch b/media-libs/emfengine/files/0.7-header.patch
deleted file mode 100644
index 4d5964fc6806..000000000000
--- a/media-libs/emfengine/files/0.7-header.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/EmfEngine.h b/src/EmfEngine.h
-index 12b1e5b..0573083 100644
---- a/src/EmfEngine.h
-+++ b/src/EmfEngine.h
-@@ -52,7 +52,7 @@
- 	using namespace Gdiplus;

- #else

- 	#ifdef Q_WS_X11

--		#include <emf.h>

-+		#include <libEMF/emf.h>

- 	#endif

- 

- 	#ifdef Q_WS_MAC

diff --git a/media-libs/emfengine/files/0.8-example.patch b/media-libs/emfengine/files/0.8-example.patch
deleted file mode 100644
index 251419663c0f..000000000000
--- a/media-libs/emfengine/files/0.8-example.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/EmfEngine.pro b/EmfEngine.pro
-index 4615ffa..032c8b9 100644
---- a/EmfEngine.pro
-+++ b/EmfEngine.pro
-@@ -3,5 +3,4 @@ include( config.pri )
- TEMPLATE = subdirs
- 
- SUBDIRS = \
--    src \
--    example
-\ No newline at end of file
-+    src
diff --git a/media-libs/emfengine/metadata.xml b/media-libs/emfengine/metadata.xml
deleted file mode 100644
index 4028bdb661a0..000000000000
--- a/media-libs/emfengine/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 0bd5eeb32b1b..df13e8af6c26 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,3 +1,3 @@
 DIST graphene-1.8.2.tar.xz 127436 BLAKE2B a22251db7cf4719c8a6cde49e6feb0a998d1ec7296fee549a4797d72fa575d4266e48fb5a6d9ebd204b93954a6278b4fa88dc56e5f86d7cf8625a5edc685a09b SHA512 8d250dccac345251081419f4ad7079c8035cb6225e10b23d25799386b067288831c23be667d608228ef44a2f6107ac47fc86bb495eda7881b1336598d6c43234
-EBUILD graphene-1.8.2.ebuild 1718 BLAKE2B 49370ceb307b6276db57a423b96e3faa87fd24d05fde0b11369618d9f77686dac8ee68e6d3097f877078610ce4dc88d4b18498484a73b54047ae286d3e3b6fbe SHA512 23fd811f8db072a9fc1cde7ae87702e137f09007dc91b248e8f47d674d716886aa57054d6c5987cbcea1a7b0bc3ea8a85290b9f77b442484c77834ddb1a299c4
+EBUILD graphene-1.8.2.ebuild 1725 BLAKE2B 020be7ad4a7e0dd3a6c9e82e5a42ccb352daff10f5dafd7b9152108d0c754cf527e5bf66cb4af1d87d5497eea105a255b88ffb8add072b769c00b356bb1d5b86 SHA512 e679ea177a5d1da629774b6ebeeb1af8ee9baa0bf6db6f37e2f5f56bc97454bf00033d2597536e0de29d37cf5c9abd6b643a7ebc63511b33c1ecf84777465a80
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.8.2.ebuild b/media-libs/graphene/graphene-1.8.2.ebuild
index b2b8f26d888b..bbf2a99bcb73 100644
--- a/media-libs/graphene/graphene-1.8.2.ebuild
+++ b/media-libs/graphene/graphene-1.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 06c2096cd1ab..1b18d622cbdc 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -7,6 +7,6 @@ DIST gst-plugins-base-1.14.2.tar.xz 3693856 BLAKE2B 7ed05718bfd1dcb15e05e5a2c875
 EBUILD gst-plugins-base-0.10.36-r2.ebuild 2120 BLAKE2B 5e670a72e651af6a8ef1e4992fc42a7a444e9a77e708b86cdf5d373d96cc549c2953df5da5b001479938f77498eb09de861e89e705ce555618cd45227209a769 SHA512 bc9f491322b473f7ae2a55a7fab8315584b1ef3f71f94ec4968705fb1063d72e6dd2dd80342bd85b7abb29315abb26adbe3002c94c7a7ec27517c8edcf32eafb
 EBUILD gst-plugins-base-1.12.4.ebuild 2635 BLAKE2B 135ac9f8423f4d994fc90320871716c18bc37afef01fdd8fbadb25b1b37addd05aaf9efe915850a64d041f3d1cb52231cf64af87021cb4cc24205e4618d85536 SHA512 01ccfae2d189a9506ae1261f15126aee3967bf76e91808d88b0d2214083e19d628ceba84e44b6a1f47ef673137d42dcecf13ba7750e4f279dbc4a605948e3f76
 EBUILD gst-plugins-base-1.14.1.ebuild 6101 BLAKE2B 59b7553bf67e3f8c293cd45c2db84e5012babbef8bd026bba645500c9f723dde58bff6b0f0d796c1ce680f858263009af2718ab084ba03322097d5416228f6e4 SHA512 4527760fb7655f9cc0f796f992a4a936e63f3bc5573a0407736b93e78dbef4e1f289738c15cc98841b4cdf2de38927d99fb1a338b01d8a90fc24bf66b4b0053a
-EBUILD gst-plugins-base-1.14.2-r1.ebuild 5864 BLAKE2B 9599c02678f4fa2d819a63913ee1e2e184a0f6e025c2942b30318636d36c197d9900117c78fbbe10bd561080a70b4f49ac4a16ffa8c523821291812b4ec5ea7e SHA512 0f13e35bc2e3009d0907807f53dbdcb6d3c317e53cc0a2e1d07c0c3126db6f4b6904d6be5a1be0e6bbc644fbb69e5d5ca966b88b136a72e6138a5fde6651f73e
+EBUILD gst-plugins-base-1.14.2-r1.ebuild 5871 BLAKE2B 14318c1c40d5da489606863972191acf5115b2a4b555d987d50d999971a56c153a2d5a21c8efe7db17fc61dd01082ce70e8dead077d5276dd3879db8c2519bc2 SHA512 9630c3d23684689edbc9ab9bcfb0b981fa54df3769b394101bc96932bf8d591c62e010190f810fa5f94dd2c8d5f5baa617fdea81233cf07a1f292352dfe782d4
 EBUILD gst-plugins-base-1.14.2.ebuild 6045 BLAKE2B 2b3b0519874526c0780d01380259a0a4986e613af7a4491941e85e504134c505a343812086f128fe251ec912ff528926d96e9f845a524f73162b78b4682e626b SHA512 e88bab789aeedb188724faaa92f39364219b1e512ce1279c2ad617b8302bea1372bea4a1ff57060e12008e81e8627c3d102ed46b2f89b461fa8c01ecd3afcf3b
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.2-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.2-r1.ebuild
index 98fe3b98dd5d..d35af17af666 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.2-r1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.2-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 1804672aa61f..300f13af937f 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -15,5 +15,5 @@ AUX mlt-6.6.0-vorbis-ffmpeg-3.4.patch 1297 BLAKE2B 65b39a7ecfd4d26b3a18b044b95c2
 DIST mlt-6.4.1.tar.gz 1344030 BLAKE2B 835561eac31a44d292c5915567338eb43110b3474778327af282403b43e3e89eaec407e5920f81a774c03968b4c08a496b0ef6c3e6d0970c17353613e7f4d051 SHA512 b082274e2184a0496f496517ddbcae33bab44cd1f50c1708942b7a24e5861ba97cae9fa21ec41ea21d662cbf56e2e2e66caa707a100077ef6e13aa7140f7a9fb
 DIST mlt-6.6.0.tar.gz 1365768 BLAKE2B e2e6919d603560dac3d809740a3be2989a3b52a4e933fa67927c5c26796a5c9b35da1aedb54caa4c87133dc682d5f41455900594ebdfd6ec1516ff02d477d58f SHA512 06e553d2deb36deddd9e0f2269ee0529bf768e73d2160ee16a4cd36ed3fba5be145165f0b21278623afece046351264269509ff05f24fbbb2f163be1f4d48845
 EBUILD mlt-6.4.1-r6.ebuild 5685 BLAKE2B 9785e64a795bfa740e4e70b4c4941b2be9ef3ceeb936c112137e137c19e814cbca10b168498e1da4e5e63010589c98f21c0cc06d23a60870fd645d0229679293 SHA512 f77ba0383dc88fb9f5d473fee589995a8b8a77d433b691e54e165c3785adcdc0d8dc2c6af34f7eb4e17d866769cf85e1e3f8066acacf27d3b70460ec382d19d3
-EBUILD mlt-6.6.0-r1.ebuild 5911 BLAKE2B 92396167dc5cf147c644eec7f03dca94029b6296a527ccf17f0cdf6d5152295900ab8b98d402bd9b3fc4d93c3618c40155168a539046d1a99638c9ba65eb8e7e SHA512 b5990e8e9969d8f4450b5b3e69dc0c22eb9b7238909f042cb71a5078306547fc7b83f94f9299b85485b8660cab9be29013959af7237fca46aef73629c3e95564
+EBUILD mlt-6.6.0-r1.ebuild 5960 BLAKE2B 1fd26d86d6107d2b0231615c677922184390fa8cee8ebcad80eea72ca9cdcebbcf60442716a2e8e958638fe0b19ba12e7a7d4e69e0af4712baa3c1eca1d22678 SHA512 46eaad177bc728cde05985ddb93780a33d941fe32d4d40c99383490843a9b56ff9521ed6f92ba575654da147ab3e592563d7227186ad83e4c7843afb1785c99d
 MISC metadata.xml 1571 BLAKE2B d048070896ee31a768268cef47e8b051d24a7a48a0728a82045f8a1cccc361378945cb6d84dadb31a7c664e5f57fe15dde85e08fc579fe8f839ce5c3e64e75cc SHA512 6dbfe8206f62d5c8801e2f3a71ab409a3f3072f600d6fc935b1dbb0cc4cb67f3a0ed221a3c6a76977b3fbea60c7fb7bbf2047e55ef5a7a5aacc8bf60252fcc01
diff --git a/media-libs/mlt/mlt-6.6.0-r1.ebuild b/media-libs/mlt/mlt-6.6.0-r1.ebuild
index 075ddb77dc01..ba5ab74a1c2e 100644
--- a/media-libs/mlt/mlt-6.6.0-r1.ebuild
+++ b/media-libs/mlt/mlt-6.6.0-r1.ebuild
@@ -173,6 +173,8 @@ src_configure() {
 		else
 			myconf+=( --enable-sdl --disable-sdl2 )
 		fi
+	else
+		myconf+=( --disable-sdl --disable-sdl2 )
 	fi
 
 	if use x86 || use amd64 ; then
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 780dddefc0a2..ecf3b1392b48 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,7 +1,10 @@
 AUX opencollada-1.6.62-cmake-fixes.patch 4823 BLAKE2B 84805e591bb8212e0cfce78fa8c7b6c03684d2d54dc16644b2211768ecdf0868fa77f4836f5a24280f9bd7f0fe47b7715f70f06f48db1c6bf90efb6a23e05632 SHA512 db5c2389aa45d0924371e93b0006052d6a83f1fba2727c86c23093fa2e21194586fcaaec361828343676cf170aea30a5bfefb7126f1f19fb1c966257165743eb
+AUX opencollada-1.6.63-pcre-fix.patch 530 BLAKE2B c0f96d1f3d93570f49670d5dc63f6faa4f164a21a8e1b840a0d54c596049f29a7e94cbe6297343fa323dacebc1831ed6871d7e82ac12fe3026ab75823d07670c SHA512 8ea88344ebc345e4a996ebe39852e5d52806cba76ce433253c67f8840de6ce082515d2bec571d49bddfe3ec620912b3de0674c522c10203bbc590bd6df80fc55
 AUX opencollada-build-fixes-v3.patch 2571 BLAKE2B 013f45412ced572d9fbc29764942d7dac7c2320aa661b567d34e76beaa46d57386898cedcb817458da20146a72d657ae0866acf70034bf3063210d742301be5d SHA512 6c92e1d442543116fee6b0031c0330c497cf69a7bb1efd9bb9dfd6b37a07761ac6e4eca7939514fb7c96774743d215fc0f9ef678e0c3e0fea903773d7666de01
 DIST opencollada-1.6.58.tar.gz 12088428 BLAKE2B ef5da3eae1c7f4ffd5abf4f93fd9ae1399d7eb3d470ebf4d3c042562d654b6dbcab3010d64250ff9701bd2b1e310178ab2430ed59b3f774a610619e723786961 SHA512 122b841de28f82408bc6fe9d363894ab8f9033cfed949f8028b7a35445e3361f0df583d8b18f7198eaa9dbf3ad33b52dbe5fe6a7e652494789850effcbbf22c9
 DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 6cd0ec893fc212bf3e8f166ad9c51c894dc298a3627e65dd41ece850a5638d91b8839830d5456bf3ba072a0b23f8c01247d8c676cc79d98464cdf0c1b55fd3c5 SHA512 bd39406b9a833409303ef7cd4e93beee0675fa57c267af95a34699348a81650d50ae042dbb1837cd41c72433533a3a9b827a44e9775a5b06c7c4f1a351146574
+DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17 SHA512 e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01
 EBUILD opencollada-1.6.58.ebuild 1756 BLAKE2B dd0eb47c8da3470ab5f7c7f4eaf94cb2f2405e587ba32e00f096c09138a8e15a31d0f5ddd45d5037a01fa6a972cf2ce7aa4e6dd2b63ad9113fca7cbbed7a0a1f SHA512 facbf116dfd17a324f4add1c008d5f48b677c0cd7a29a44831a283d0a44d982fa8b9aae53588ef352394b90611486fb66edd7d2c27c74a658e0334c587a39358
-EBUILD opencollada-1.6.62.ebuild 1621 BLAKE2B 74c22f0325db9fee95d8960af7eae538f3272df294229aef5d77e8d5d86a5cd859640acfea6358ce4478a36e6daacf0b178703cd4027d7c9d14b1a063bbc10ce SHA512 383cd3e0591d9e616a1666a9e61a76818c65ebb97ec82459190dc50007feea63f8adc611ef45e415fe77b3d5d87150ccbc3e8073ad9de039bd2b43b7ce88c5af
+EBUILD opencollada-1.6.62.ebuild 1628 BLAKE2B a29e1f0236cc8f4abc7a486b03b6e67e04e07022ea14e93e39b8835fe40da5d8b75c683264beb8b96158b114bcf33ee7ec9ee216f74e1cbed38e4e5325c4639c SHA512 0cb788227b1eb0581239463b7ce3af50c5bb4928a8377ae2bdeb37065535da5096fa35df67a3fda9f06e48d14ef232920dcdd22a758ed2cd4a7938372f036fae
+EBUILD opencollada-1.6.63.ebuild 1657 BLAKE2B a35b086ac9651e4360df3913b31aa8ff41ba7cdbabe325c1d712c561e93002b03989c6cd5c84d7f2bf0c9b227ede1313daa8da04485f44e97f6c92abed7cc040 SHA512 6719a2a2fcedd078474304a0aa357c6d09aa090a6ca50764e5b954c1b4afdae6262fc913d544020d7836d1cc03f2fac0690a5e108d6c21166070c2438cc28a1c
 MISC metadata.xml 340 BLAKE2B c4ce9d18d941b1c878c35600ec1323b21ee1d929210a9fa4c3121bac8b191a7c648933c5d7e50e4b5bfa88c99f73ffb7f43d5d47972de9f19402f68ee7e984eb SHA512 3e362593a8e284c0eb7ac86a3d7e8b2ba6ddc4a3c88478815517b1d12f1f03f05da4e8929ecad8f78bb7b8c40bc29020124f1ef1539302e3866fb7effe60fb75
diff --git a/media-libs/opencollada/files/opencollada-1.6.63-pcre-fix.patch b/media-libs/opencollada/files/opencollada-1.6.63-pcre-fix.patch
new file mode 100644
index 000000000000..2d4077446dea
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.6.63-pcre-fix.patch
@@ -0,0 +1,14 @@
+diff -purN a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
+--- a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h	2018-07-19 01:10:56.000000000 +0100
++++ b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h	2018-08-07 12:12:59.209871432 +0100
+@@ -12,9 +12,7 @@
+ #define __COLLADABU_PCRECOMPILEDPATTERN_H__

+ 

+ #include "COLLADABUPrerequisites.h"

+-

+-struct real_pcre;
+-typedef struct real_pcre pcre;
++#include <pcre.h>

+ 

+ 

+ namespace COLLADABU

diff --git a/media-libs/opencollada/opencollada-1.6.62.ebuild b/media-libs/opencollada/opencollada-1.6.62.ebuild
index 554964a4b879..a0c55233ca38 100644
--- a/media-libs/opencollada/opencollada-1.6.62.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.62.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils flag-o-matic versionator
+inherit cmake-utils flag-o-matic
 
 DESCRIPTION="Stream based read/write library for COLLADA files"
 HOMEPAGE="http://www.opencollada.org/"
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
 IUSE="static-libs"
 
-RDEPEND="dev-libs/libpcre
+# bug 651756
+RDEPEND="<dev-libs/libpcre-8.42
 	dev-libs/zziplib
 	media-libs/lib3ds
 	sys-libs/zlib
diff --git a/media-libs/opencollada/opencollada-1.6.63.ebuild b/media-libs/opencollada/opencollada-1.6.63.ebuild
new file mode 100644
index 000000000000..ad9d4681dfa8
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.6.63.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Stream based read/write library for COLLADA files"
+HOMEPAGE="http://www.opencollada.org/"
+SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/zziplib
+	media-libs/lib3ds
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/OpenCOLLADA-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.62-cmake-fixes.patch"
+	"${FILESDIR}/${P}-pcre-fix.patch"
+)
+
+src_prepare() {
+	edos2unix CMakeLists.txt
+
+	cmake-utils_src_prepare
+
+	# Remove bundled depends that have portage equivalents
+	rm -rv Externals/{expat,lib3ds,LibXML,pcre,zziplib} || die
+
+	# Remove unused build systems
+	rm -v Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
+	find "${S}" -name SConscript -delete || die
+}
+
+src_configure() {
+	# bug 619670
+	append-cxxflags -std=c++14
+
+	local mycmakeargs=(
+		-DUSE_SHARED=ON
+		-DUSE_STATIC=$(usex static-libs)
+		-DUSE_LIBXML=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	echo "LDPATH=/usr/$(get_libdir)/opencollada" > "${T}"/99${PN} || die "echo failed"
+	doenvd "${T}"/99${PN}
+
+	dobin "${BUILD_DIR}/bin/DAEValidator"
+	dobin "${BUILD_DIR}/bin/OpenCOLLADAValidator"
+	# Need to be in same directory as above binaries
+	docinto "/usr/bin"
+	dodoc "${BUILD_DIR}/bin/COLLADAPhysX3Schema.xsd"
+	dodoc "${BUILD_DIR}/bin/collada_schema_1_4_1.xsd"
+	dodoc "${BUILD_DIR}/bin/collada_schema_1_5.xsd"
+}
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index e5840ed24fa9..37342493932e 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -2,5 +2,7 @@ AUX opensubdiv-3.3.0-add-CUDA9-compatibility.patch 897 BLAKE2B 528eaabdbe1613e6f
 AUX opensubdiv-3.3.0-fix-quotes.patch 432 BLAKE2B e2b80762392cfe6b9ddb714780adbfffed3eb05feb5072c4b1856164eb01896eb9298723aac4bc032e0aaba8ec55d84bb1dfa6664f1def32af2bd93b553c396b SHA512 89eca174bf991920f71fd278e61f04bb90d143491ec05575507013215c92bca18f0274b6084d61750a66f877d928f01f0e779d08dd3b2372d8119aecaa8b58a9
 AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82948be891654923adae6a2e4f870857e357478f92cb9a239c282f0d09f75f6f2a58682c50d8f437989859710668071b46b1cde499424 SHA512 4f463fbea3e94e93711888a077faa375054aae193abfbe4c600081fae43efa4adf5dc5687ceb7c59795c20ae97ec158ce4035e72dfdb0c89ee5943e41e58bdef
 DIST opensubdiv-3.3.0.tar.gz 19263469 BLAKE2B f169b5c58877d1dd4ea45cb04d52567803da7c2d11edab072e2b65583109c7c2d52abe07f5bd2b03cba215cdb524a0468900419d8381e95c35eb2f3f4bebe02b SHA512 7c17d847187d46182d08fbee9396fd8793ac04591821084d40da475c9d25560d01575282946e1a30252bba12db9ea06cbf50ff649f91adce72f6127ad6a36418
-EBUILD opensubdiv-3.3.0.ebuild 1656 BLAKE2B f7fb85a987b15e23a4342d053b65da1b8e862ebee1f0d8435c91a4cc635f92be10ba2de6783110220ab617584b82fda46441affc6f7c6102317360c0da057819 SHA512 905e0290ab10dcb017e46e22963f015ee62731bd195f69e5ae7fcd032a5838a2e001a8f6d8abc2655e589ca98d9f9ee7506eaa18d9b2f5b6a60f23981989acfb
+DIST opensubdiv-3.3.3.tar.gz 19286806 BLAKE2B 05e25f28a6f2194122d9d4e5299e6d68e236c1e78b4e8494a70191dfb37e45da30968322719bbb784a15d698206fea9e26e92d4689668592bc9ec9bccbc0201d SHA512 65cd72b4240eeb3fdb6d52497a2daa2fc68e10c25c41ffa0cf81449ebcb860e303539043c672265916267a0115f250566570b5705fd5da54f46abe7b9f7baf81
+EBUILD opensubdiv-3.3.0.ebuild 1642 BLAKE2B 934fe6e9f491dbb4ba0e36bacba6ad2bfae774e33099ef3b966573288e1479452bb769ad9c6619b4e859feba89963348d56cd45aa5aa761399dadc485895bc7e SHA512 0bae40e658414b4cf94750fa2b680069be3e63b9a03880a01454db0eef78094ee2d726f12bb967de33003814d6c0241c832158fef7f32402ecceb7adb8bba189
+EBUILD opensubdiv-3.3.3.ebuild 1602 BLAKE2B 5c4758c2b2c89ac6c10f0bf07a32a20b4ee9ff6bfc0d4de292e3d32dfe06103cb5a8fbbdbc86f61096f9d946292b4c4b827ec2285242ffe9110bcd794773b3a5 SHA512 ade1a653e9d368b35bbc1b2ffeb0ae85c4bbb7c057911b2e6fe19899ec8907bb4b36e21077cd3615431d0e3ecbd1d2515cc44d5bf37dd8fd8d918e15fe365b58
 MISC metadata.xml 1233 BLAKE2B a5508cb0e3c44cdfa63d01b709a47f974eb8a97028cfc0aeee184854623ab41fc7b1419df5a755423bbbc3156175d9a0021b42db198b290cc89fce92944f7cb0 SHA512 b225ff89ab0e2c45bfc68a1932d567b474e8f44573cf2d256445600a5ffa205f210ab63eecd4dcdefa68913babe5c21255dc6f75812f76430b8484c36322797a
diff --git a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
index 31007283c41f..fc3580b365e6 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
@@ -45,7 +45,6 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DNO_MAYA=1
 		-DNO_CLEW=1
 		-DNO_DOC=$(usex !doc)
 		-DNO_TBB=$(usex !tbb)
diff --git a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
new file mode 100644
index 000000000000..043b810269d4
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs eapi7-ver
+
+MY_PV="$(ver_rs "1-3" '_')"
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="http://graphics.pixar.com/opensubdiv/"
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuda doc opencl openmp ptex tbb"
+
+RDEPEND="media-libs/glew:=
+	media-libs/glfw:=
+	cuda? ( dev-util/nvidia-cuda-toolkit:* )
+	opencl? ( virtual/opencl )
+	ptex? ( media-libs/ptex )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/docutils
+		app-doc/doxygen
+	)
+	tbb? ( dev-cpp/tbb )"
+
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.0-fix-quotes.patch"
+	"${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
+	"${FILESDIR}/${PN}-3.3.0-add-CUDA9-compatibility.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_CLEW=1
+		-DNO_DOC=$(usex !doc)
+		-DNO_TBB=$(usex !tbb)
+		-DNO_PTEX=$(usex !ptex)
+		-DNO_OMP=$(usex !openmp)
+		-DNO_OPENCL=$(usex !opencl)
+		-DNO_CUDA=$(usex !cuda)
+		-DNO_REGRESSION=1 # They don't work with certain settings
+		-DNO_EXAMPLES=1 # Not needed.
+		-DNO_TUTORIALS=1 # They install illegally. Need to find a better solution.
+		-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
+		-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index 1949c2ea1a89..f77e0c0e408f 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -1,5 +1,7 @@
 AUX partio-1.1.0-Rename-partconv.patch 2459 BLAKE2B d811f5174dd2c5e158e7985e8fdea520faeb248249b88c8ebec37dc91f50312ed44d39563142cb3a28fa07ce9b6907824835484881782ceac9b8894978bcb061 SHA512 1965a236f43092c05c940c0f2b33d9c77066ed5fbf3b1753bcf5d9b13c8e5a6e60ef41ba13c9471d1d26d1dc74fead52d0ef1c18f04b1f942345fd1412b0c932
 DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448dc4d5d0a8d6b72bdb58793dd3c97d86739b25e582bdff41160599489a2835ad8e68676012cb70ef8edff062df3205ab209 SHA512 daedb23ae2b89d3f2ef36ef13afc624a663b3fab91c22f9a454439ff3bc194b78a87e37c9133f6948567ab3b183eff960bb51951b0427cff8c1c29099b6578d6
+DIST partio-1.5.0.tar.gz 291604 BLAKE2B d0d6eab4ef541e61fe4498b4cdd8b9c60e62545a040d3f26b8a7b2d8adaa36c45f28c8a05df24c47dc504ec1dd4fb7bfec1fe5b08f6a035a0b3fdcdceacc46fc SHA512 10db9cfe691fd2341e2613132ad7f8d363007a62a5b5cb6226c53360e2e47d1be77c4d87ae31bd7537790cc8ba8bac7eef229c21fcd8227d98d2ab2154aac559
 EBUILD partio-1.1.0_p20170829.ebuild 1060 BLAKE2B b235d53fa705d5e6d515ee983203ac0349c23a7b10f09093980fba0aaef4d770fcb469a0f357bf4a15f07c1017cc19b933fa0f0df6d6207def91a12677bc9bf7 SHA512 c80ff6fcc5e52201819b6477c735a51e94c72e63992c404a24e7c10ebe05955d542fce76ac4e21ff1f8e7192f5c42a968988be2cee2a9cdc4a07720bf15e9ce4
+EBUILD partio-1.5.0.ebuild 910 BLAKE2B 9191869a46ffb5971ec8afecd4aa2f703e855a34112a8eb34a5152ff25dd3efd5e5e542f93e31017f688c8a5aa9c42d49c766bf0d04bb146492c8b9c956bfbdf SHA512 3d50ed2fb8b808d78d2cc733be166d5b481388754b26740eb2f338bdd1209520a5fed34a2c24b55eac06991f01d3c43e8088660b4024dc67e73f997d5c21e3bf
 EBUILD partio-9999.ebuild 1120 BLAKE2B 4d5c4d89eaacf786e2f097da917b9b78bfce8e392c8ce468f9e6042e7d2f01ff39f73b4960d3459ef834b21a98b2af984b7026d4ba94ea6ce731a09892ebcdca SHA512 f6ca5099221bdafce8704328f5f879d2a9ad569970e5618185dc95fa3c115d3a16f06ea420d8d4ff82f28fd3dab689f51f6936de91ffdaada38c7f68062bc6ba
 MISC metadata.xml 640 BLAKE2B 3b2c33cb14c466bd4641cc04781d1de05d01170ccc591b3caae40356f934944c4c969834bad5ccdcf9f5390d203270055863b08feb7321492a27d4d7575aced5 SHA512 7116217ccc87ab80d8cb4ee0ea20089ea1c0a5b4ea9b3f666548b37422c01a8917516a5db565fc55f779bb19613fbfb515cfae0b9f87f010f5034c14d27ed8e0
diff --git a/media-libs/partio/partio-1.5.0.ebuild b/media-libs/partio/partio-1.5.0.ebuild
new file mode 100644
index 000000000000..2aaed0b7b0be
--- /dev/null
+++ b/media-libs/partio/partio-1.5.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils python-single-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wdas/partio.git"
+else
+	SRC_URI="https://github.com/wdas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A library for particle IO and manipulation"
+HOMEPAGE="https://www.disneyanimation.com/technology/partio.html"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	media-libs/freeglut
+	sys-libs/zlib:=
+	virtual/opengl
+"
+
+DEPEND="${RDEPEND}
+	dev-lang/swig:*
+	doc? ( app-doc/doxygen[latex] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package doc Doxygen)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/quarter/Manifest b/media-libs/quarter/Manifest
deleted file mode 100644
index 7e8e3c2b1589..000000000000
--- a/media-libs/quarter/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX quarter-1.0.0-gcc44.patch 359 BLAKE2B ba34e4056db281b6340eeac3af10f66e67ea9f183962b295fea1448d1deebe354c28f0480426a13abdf6ed0ff4491e9ab2b2f23c89ff07bdcc4328c9b3837f65 SHA512 67805e87cff20da92f6ec2141fadc3a407677aa33f8f48a3c892a34158c8b175c4f4021c300215ce3ca5690824279f982d5aebfaca387fbeea332c97ee2a7673
-DIST Quarter-1.0.0.tar.gz 617534 BLAKE2B b227acbaf1c020a242b9bcd66529946d6e0714be8c3165df284ec2c0ca0ba75542ae4d21cc7105e5edac124b0b43a8116440d6871f6e9d00edd64c9130530ed1 SHA512 ab7828889b612425c6341f69abaf6bc5c02ed5f918a5ad631ad9e0a6ecb9fd5800e08d091fd39bb05141e0db521d305471f66a3d14f149928add3f1d776e497b
-EBUILD quarter-1.0.0-r1.ebuild 992 BLAKE2B ba27c3b0f1223cd288ac07c42d947113c836ab5ab63de988488df83a65b9a790bcac76e4f5e54a2eb0239ec5ea352f7d1247a0c67bfce40d27bcfb3de9cdcc4a SHA512 7a470cddd97fb701e9eb0c2f4cd423884c592cc6d8c14d6a362e97341748ab31a0733e57b6b5f59d0d36359539816960293f40c6b0edbed9c7eedfa4bc317054
-MISC metadata.xml 247 BLAKE2B 317f906045f70ecc77ab85491b683c74618c027d768a499226ea0c46d214b783ff308f6bcb79c1edfaf3c4a01821afd529786bf5ad2cf73e0570aac56177d36e SHA512 4ae39ceedf573357554a383ccfab1d716abb7265c3a1eb407d1dc4bf3b38fc91b5cdeec8ba0bad84efb2595aebb6d115ade1575e12812079e47797b7dcd3fa7a
diff --git a/media-libs/quarter/files/quarter-1.0.0-gcc44.patch b/media-libs/quarter/files/quarter-1.0.0-gcc44.patch
deleted file mode 100644
index e0f422b4cd36..000000000000
--- a/media-libs/quarter/files/quarter-1.0.0-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN Quarter-1.0.0/src/Quarter/Quarter.cpp my/src/Quarter/Quarter.cpp
---- Quarter-1.0.0/src/Quarter/Quarter.cpp	2009-01-26 22:47:07.000000000 +0100
-+++ my/src/Quarter/Quarter.cpp	2014-08-14 01:48:45.019728780 +0200
-@@ -123,6 +123,7 @@
-   \subpage examiner
- */
- 
-+#include <stdio.h>
- 
- #include <Inventor/SoDB.h>
- #include <Inventor/nodekits/SoNodeKit.h>
diff --git a/media-libs/quarter/metadata.xml b/media-libs/quarter/metadata.xml
deleted file mode 100644
index 62f8df43d2e1..000000000000
--- a/media-libs/quarter/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>reavertm@gentoo.org</email>
-	<name>Maciej Mrozowski</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-libs/quarter/quarter-1.0.0-r1.ebuild b/media-libs/quarter/quarter-1.0.0-r1.ebuild
deleted file mode 100644
index 48b626a3fbb1..000000000000
--- a/media-libs/quarter/quarter-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils flag-o-matic
-
-MY_P="${P/q/Q}"
-
-DESCRIPTION="A glue between Nokia Qt4 and Coin3D"
-HOMEPAGE="http://www.coin3d.org/lib/quarter"
-SRC_URI="ftp://ftp.coin3d.org/pub/coin/src/all/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc static-libs"
-
-RDEPEND="
-	>=media-libs/coin-3.0.0[javascript]
-	dev-qt/designer:4
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc44.patch"
-)
-
-DOCS=(AUTHORS NEWS README)
-
-src_configure() {
-	append-libs -lGL #369967, library calls glEnable()
-
-	local myeconfargs=(
-		htmldir="${ROOT}usr/share/doc/${PF}/html"
-		--enable-pkgconfig
-		--with-coin
-		$(use_enable debug)
-		$(use_enable debug symbols)
-		$(use_enable doc html)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 74826d250d42..3488ffe7b205 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-chromaprint/Manifest b/media-plugins/gst-plugins-chromaprint/Manifest
index f6fa778d671c..b4dcc26ef87f 100644
--- a/media-plugins/gst-plugins-chromaprint/Manifest
+++ b/media-plugins/gst-plugins-chromaprint/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.1.tar.xz 4651852 BLAKE2B 915798f9d07e18b445cae818978def1356299034d14ca2cba8f07df93d5dcf5ed257290bf111298c4f8063b32ceee38dd78c02eae508f6e88956b132740bfa36 SHA512 6969b6c91279fb96bc28acde0284ce980b3982ae0c77820284a903beee61dffa863554dcfadb55de1987404b59c3c7c421372e65dc7b4014fe64a0c91d4ce729
 DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017ad997c4d0ef136845a7ad34d15745d5f1abf4486dda7a226feb5ff6c7c65c8788cd39eb5e9901f3f15a426d79bf2b81e78c SHA512 7282c8941f1eabf7141362bb8e61097b3b26ef39410ae767712c34d7e40779fc22f6ea97a950009fdb6d62175f9a153d435ead8f663cf66cc6af5aac7f2a73db
-EBUILD gst-plugins-chromaprint-1.14.1.ebuild 342 BLAKE2B 8d5e8216614f59842c5e3d92ea998c693eb08240d23efc4b782f23207ae9d29162ff5ec97bc31d060ef8fc22c6cb1be509a0f8eb29c0a3702bf59fea124e950e SHA512 d048d8ae35e7cd10b3c032e52103ca7eeb4248345bfb1a91fd4503c85f162d14480ac68776489947cb4baca90f7e7b0cf167fb264ca7f5260c7c9bde562b59fa
-EBUILD gst-plugins-chromaprint-1.14.2.ebuild 342 BLAKE2B 8d5e8216614f59842c5e3d92ea998c693eb08240d23efc4b782f23207ae9d29162ff5ec97bc31d060ef8fc22c6cb1be509a0f8eb29c0a3702bf59fea124e950e SHA512 d048d8ae35e7cd10b3c032e52103ca7eeb4248345bfb1a91fd4503c85f162d14480ac68776489947cb4baca90f7e7b0cf167fb264ca7f5260c7c9bde562b59fa
+EBUILD gst-plugins-chromaprint-1.14.1.ebuild 349 BLAKE2B 98a00ff19b0c8421b4b0d282e868ead461f03f72c0d716228f39f008c4c6a03375609a1ee8c293c8adb9e8eb7153952081149b75f170c07586685c830c200d58 SHA512 26d0189d1464139f48531e983207dd95b3f8259578c988764f7d845aa82bb1c6e82a31aee4f2b8e142da26876d563c4e7283a4e6a2de675659c4945f4aa12764
+EBUILD gst-plugins-chromaprint-1.14.2.ebuild 349 BLAKE2B 98a00ff19b0c8421b4b0d282e868ead461f03f72c0d716228f39f008c4c6a03375609a1ee8c293c8adb9e8eb7153952081149b75f170c07586685c830c200d58 SHA512 26d0189d1464139f48531e983207dd95b3f8259578c988764f7d845aa82bb1c6e82a31aee4f2b8e142da26876d563c4e7283a4e6a2de675659c4945f4aa12764
 MISC metadata.xml 493 BLAKE2B 2a86d0343178b353fec290f550a1442e2e1492e1e5bfb3bbbbc24a9f18cad04c12c582f5fb3deb5c845dd7633c2b6d0c30566ff86c68bd60635c49d0b46a8058 SHA512 2eba41dd2cd60d1101e79a68553188fd8d6a43711de3121e7ce230c1b09e598d3123aa2b1e65a415af80182848cc0ea17433a39b34d6d6cbeb8aa3f8644eee4c
diff --git a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.1.ebuild b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.1.ebuild
index 34955bf81699..5645ad4bd6f3 100644
--- a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.1.ebuild
+++ b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.1.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.2.ebuild b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.2.ebuild
index 34955bf81699..5645ad4bd6f3 100644
--- a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.2.ebuild
+++ b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/kodi-inputstream-rtmp/Manifest b/media-plugins/kodi-inputstream-rtmp/Manifest
index 5ed004215991..88a13fe31052 100644
--- a/media-plugins/kodi-inputstream-rtmp/Manifest
+++ b/media-plugins/kodi-inputstream-rtmp/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-inputstream-rtmp-1.0.4.tar.gz 7271 BLAKE2B c76b46fc1ba1bbe45084071ee0521b8f421a87886723abce3103867f8c542dbee364c9cb64a3e7237c59cfcc9afd910bb4ba5b749d5e1f6efa4ac215b1ced26d SHA512 659990b2cbe6e9119c650e151aaae0ccd33f8b9f5d6efd1436f4cb6c78beb51c8fae528b844278348066e1b10fe2a7fa6c05e32b54be82f5a750a5a14c8bd9d2
+DIST kodi-inputstream-rtmp-1.0.5.tar.gz 7271 BLAKE2B dfc7a80684d0c872761baf4e8603b491b6530cb0e8a5aad782f18165cb15ec54aaf7557b877eab74c87a46d68481aefecde2f0b15fc748c5a7800593f9033a45 SHA512 7a58ec265586fc0ffc8b1021aa1529d171c8ea14202f80b443d51dbfbfd8f0424a2b5f94687d302a3681e2931ac268e89e8d2e82635ac5b792cc8c9bd8f020af
 EBUILD kodi-inputstream-rtmp-1.0.4.ebuild 659 BLAKE2B a2b0e2a99fa914ae03ab14db0f6d0aea5ef561c1bcf4d8885751096d0df4f99250388168066c391c24df2b56c60275c55045e1fb0a35d9484201c21c8079ef01 SHA512 4877df994ca70060b38976fa956ce5e8bfc196dc17c08c79e8c437468a7885fdab7752e9c6a550b861a84322b82d25d186d462f5ef7c613bc5f7fc931bac935b
+EBUILD kodi-inputstream-rtmp-1.0.5.ebuild 659 BLAKE2B a24a3762a845bfcf1f4096962c2fdd4d69101cda354ae3ff8436ccaa965cf203b6d5b102771112468cd86bca6b722ac909c73e2571a3d2d496d2e95ffa9109cc SHA512 956a5fefa57ad78b53e7ff85ee65e581e8abaa37c3e15ea3dcfd67c23fe0d5d2bda887e9e1c0a17d42e0a6e71e5117ae19689c7d1ec3ba1a5812d01f118c14d6
 EBUILD kodi-inputstream-rtmp-9999.ebuild 660 BLAKE2B c9d2990e123ae0b476a4d833bd3829f6d2f6f19e9fb5f2b039cf4ab48cbf4a329d211ee0f2e87cb1469fd982fa404ed4097ff90af6da9deec644761e255ec9d1 SHA512 2c7ae4993e870fe31b414e5015b501dfb242bb7f57dbfd8f107dab88511be575e9fd5f5e3134066d023c61a87dc10d31002bfd28976cd38c7efb114c235240f4
 MISC metadata.xml 437 BLAKE2B ee8cee756e2afa1a07e2bba7bf68d6b22fa8fce79860b79a215db68a2f39f84e8d42dd49146941c4ea4c419f6928b30e097963e825253523b969c159a87f645b SHA512 fc9a96c9a2889e0f4edd80638ba0dd50c4272660f3724ff170c4b34ac71824e8e2b32829826bef8efc2327f6aaa1b694a73049103cd2e772f17324eb05b565ff
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-1.0.5.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-1.0.5.ebuild
new file mode 100644
index 000000000000..c3055b7ab919
--- /dev/null
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-1.0.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's RTMP inputstream addon"
+HOMEPAGE="https://github.com/notspiff/inputstream.rtmp"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/inputstream.rtmp.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/inputstream.rtmp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.rtmp-${PV}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-17*
+	media-video/rtmpdump
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 407c957281ab..30dce2b5e07a 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 71251e426e58..c50f7314ffc4 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,5 +1,2 @@
-AUX mumble-1.2.4-speech-dispatcher.patch 1289 BLAKE2B 674312376997a2ee7f70886f8a7ec13731f46bc25870c1af239d6814ef66192999f89d644caf63eb98a3ad4fa3460c16fbfb2acb35c845c181cf08943d142c3b SHA512 32b83ba846fbda3529c222df2cf6fa0f615dabdd7e211051119fb9ed53bdc3e8e11aaa1b132bbdfcedffd72b1e19666aaf083799f7ebbbf60f536a9f9a0c6a2a
-DIST mumble-1.2.19.tar.gz 3210865 BLAKE2B 7ce466ab9d5ca761308d08633abf8efb6105b3097b7fde0a886f957dff4a16442d1f12c93123bd0291b37d14b412e0087b89f781d0f63a5182bd6ca2d3f2d3fe SHA512 f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4
-EBUILD mumble-1.2.19.ebuild 3048 BLAKE2B e925f6df26dd6a0da4241f90d2ced7d095029a292484028fedf332008d7e9a7ac755f14a72cd8a358ec7b2bc527c82eae59da6746d38879fa2827afd6bcccbd7 SHA512 9b5a99ae4ca3ccddc03e50044289fefae4cc41baa0db018316df809f56f893d8e676ee5e6c35d8e783c621fec848c54fa0be5471567909ebd1e0486924fffdbc
 EBUILD mumble-9999.ebuild 2938 BLAKE2B 7dd09916803c64271aefdea74382bfc8a3a700fce6eb07bc00f08d4cc337dede346bd836380f71f690e20493e3d98bc594eace985df6fae572d8827aefc3ff61 SHA512 c434b208665e4a74cd19c326727ad02fddb90ac26353eabce996a9c90df22d8e8011e74c4470e3e4150d15b0909d1c5e2df9cd467ce154d8ccdc89bf47e50626
 MISC metadata.xml 843 BLAKE2B 5048f202061b73223ef1d8c7beb20e5fbeb3726c0f1d8039bf4385e111e221dcc52ed309356311f3ba885f306c4d7c074caf9c785c86d8fda924c4ebf69475ae SHA512 0037f9510526f803d2abfe97c2b8712ff626b93d12457d5111f23b20787505168789cd86f9a3b4dad845634f584faa9e30e02777f4d0a7a8bd34f9fc9e1ca40f
diff --git a/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch b/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch
deleted file mode 100644
index 3a2c21675a56..000000000000
--- a/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 22d18212acec9e97231a13a6dc02a0c451df9b89 Mon Sep 17 00:00:00 2001
-From: Mikkel Krautz <mikkel@krautz.dk>
-Date: Thu, 6 Jun 2013 22:17:31 +0200
-Subject: [PATCH] mumble.pro: add speech-dispatcher 0.8 compatibiltiy.
-
-Based on initial patch by Timo Gurr <timo.gurr@gmail.com>
----
- src/mumble/TextToSpeech_unix.cpp | 6 +++++-
- src/mumble/mumble.pro            | 7 ++++++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/src/mumble/TextToSpeech_unix.cpp b/src/mumble/TextToSpeech_unix.cpp
-index d0fbb82..6443c07 100644
---- a/src/mumble/TextToSpeech_unix.cpp
-+++ b/src/mumble/TextToSpeech_unix.cpp
-@@ -33,7 +33,11 @@
- #include "TextToSpeech.h"
- 
- #ifdef USE_SPEECHD
--#include <libspeechd.h>
-+# ifdef USE_SPEECHD_PKGCONFIG
-+#  include <speech-dispatcher/libspeechd.h>
-+# else
-+#  include <libspeechd.h>
-+# endif
- #endif
- 
- #include "Global.h"
-diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro
-index 04f5a36..ff3c02f 100644
---- a/src/mumble/mumble.pro
-+++ b/src/mumble/mumble.pro
-@@ -279,7 +279,12 @@ dbus {
- 
- speechd {
- 	DEFINES *= USE_SPEECHD
--	LIBS *= -lspeechd
-+	system(pkg-config --atleast-version=0.8 speech-dispatcher) {
-+		DEFINES *= USE_SPEECHD_PKGCONFIG
-+		PKGCONFIG *= speech-dispatcher
-+	} else {
-+		LIBS *= -lspeechd
-+	}
- }
- 
- directsound {
--- 
-1.8.1.6
-
diff --git a/media-sound/mumble/mumble-1.2.19.ebuild b/media-sound/mumble/mumble-1.2.19.ebuild
deleted file mode 100644
index 381385109b57..000000000000
--- a/media-sound/mumble/mumble-1.2.19.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib qmake-utils
-
-MY_P="${PN}-${PV/_/~}"
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech zeroconf"
-
-RDEPEND=">=dev-libs/boost-1.41.0
-	!libressl? ( >=dev-libs/openssl-1.0.0b:0 )
-	libressl? ( dev-libs/libressl )
-	>=dev-libs/protobuf-2.2.0:=
-	>=media-libs/libsndfile-1.0.20[-minimal]
-	>=media-libs/opus-1.0.1
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	dev-qt/qtcore:4[ssl]
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtsvg:4
-	dev-qt/qtxmlpatterns:4
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:4 )
-	g15? ( app-misc/g15daemon )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( app-accessibility/speech-dispatcher )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local conf_add
-
-	if has_version '<=sys-devel/gcc-4.2'; then
-		conf_add="${conf_add} no-pch"
-	else
-		use pch || conf_add="${conf_add} no-pch"
-	fi
-
-	use alsa || conf_add="${conf_add} no-alsa"
-	use dbus || conf_add="${conf_add} no-dbus"
-	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
-	use g15 || conf_add="${conf_add} no-g15"
-	use oss || conf_add="${conf_add} no-oss"
-	use portaudio || conf_add="${conf_add} no-portaudio"
-	use pulseaudio || conf_add="${conf_add} no-pulseaudio"
-	use speech || conf_add="${conf_add} no-speechd"
-	use zeroconf || conf_add="${conf_add} no-bonjour"
-
-	eqmake4 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add} \
-			bundled-celt \
-			no-bundled-opus \
-			no-bundled-speex \
-			no-embed-qt-translations \
-			no-server \
-			no-update" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-src_install() {
-	newdoc README.Linux README
-	dodoc CHANGES
-
-	local dir
-	if use debug; then
-		dir=debug
-	else
-		dir=release
-	fi
-
-	dobin "${dir}"/mumble
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	insinto /usr/share/icons/hicolor/scalable/apps
-	doins icons/mumble.svg
-
-	doman man/mumble-overlay.1
-	doman man/mumble.1
-
-	insopts -o root -g root -m 0755
-	insinto "/usr/$(get_libdir)/mumble"
-	doins "${dir}"/libmumble.so.${PV}
-	dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1
-	doins "${dir}"/libcelt0.so.0.{7,11}.0
-	doins "${dir}"/plugins/lib*.so*
-}
-
-pkg_postinst() {
-	echo
-	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
-	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
-	echo
-}
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 6529fc0160de..6afa0057445f 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -1,11 +1,8 @@
-AUX murmur-1.2.17-ice-3.6.3-compat.patch 847 BLAKE2B 9ac5b76dade920275c0446824fcd9971444d19d1085fc886eeca79b6e594ca25f65b1a5aa03f34b29fbee05308001439bb6c68a7eca6ac4f956ea41f9c43fffb SHA512 26e6c03ae9b34f7533239f5ebc99c2f99611538e7bbbe1126b955ea033c97f1c936704b8d323f0ea57489183f416d5d956f65e30e9260eae9d68acb610e9b234
 AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137f645fbbd69f0991b510c35bad81ac739c868ce128f4de0c6b4e4095edcd977d3822fac622524c SHA512 4a05e2a640abf3f7a74c63b47ab87774718ad4e86f985c5308a2ba3167d816abedd9c35b07b8572f7789309ba91fa37bc0c1938493cc8d78844ecdeed7bd4171
 AUX murmur.initd-r1 503 BLAKE2B fab0c9c97effb35098470664e381be19b85f9224bab21cfeb4a5f6b4d2a000839de48314436ec48c96cdb8554c22a5079b0329f4832ce27d576330567cf854c2 SHA512 e841a8bc275cea5fe7306566977a15388dfea1fc70ca681c9f222f762aa5a08e42c40240c34eeaff8af2ca427a2acb2a37cd553752eed5ac842ab1c80a74e66c
 AUX murmur.logrotate 127 BLAKE2B eadd1ac994ff194a160ec609c4781d4b69c23eff405abc38fd9786f82cd2c1574759a5b11e7265bd5658e9f48fd0012746659facff7a8790ff6aed47a54ec04a SHA512 89f105c11da6da67d5e84faac2124840e0c447df492a80b71c277a2e3c9197d747bc31de0a26c80b79384838f1e0a20811fe1ffa66c74f3192eec1164f3f1911
 AUX murmurd-dbus.service 297 BLAKE2B 30ca5427de360cacab404cfff42d8e2355f14def67156039ceff85cbdf77a89cde03f6c096eba0b9d0cce52283f039ea222298e3aa9a8eead7fb8b638ee5aa8c SHA512 e81031efa7cc2736748d5a5fdd001e28cf81430cf25f9f83b9aa8b94714dc787842e76c17c00e3b7a26192d8b4932f1e14bfdde207ee89680f2a696d4f9990a6
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
 AUX murmurd-no-dbus.service 222 BLAKE2B 11fc296fd5d5445347f077ff9d4aaea3364176dff9c28d06b6b2d0b4a8d0ff8ccd559c68a0fadddbc8363349d9c599c9ebd6da8e0055a680b18aa282e72875a5 SHA512 d58c04dde0286b07a494c99fff8b94cdf1c47f6fcacbb5552445b7e19421f2a9862186e7309886590bc33ae3c64c0c840a9a93c55b35ca600b7a8f9ec53dbab2
-DIST mumble-1.2.19.tar.gz 3210865 BLAKE2B 7ce466ab9d5ca761308d08633abf8efb6105b3097b7fde0a886f957dff4a16442d1f12c93123bd0291b37d14b412e0087b89f781d0f63a5182bd6ca2d3f2d3fe SHA512 f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4
-EBUILD murmur-1.2.19.ebuild 3056 BLAKE2B 87464662ba4230636288d5ac644316ed37585539354adee1910dd3708e265548108ebf04a6cd07f3e59a28cf778cbc5b1c05b0a72d5966ffd44b7468d6729bbc SHA512 8ab6d2a3dfc944aa5ad7a602fb6233586a6918589a8fd685481cb3609550a0bea87ae99c1ef650162af084c77cd8559fe488f7948f6a91d525c27955d4fa0192
 EBUILD murmur-9999.ebuild 3102 BLAKE2B bb0f7e6afda49ada86cc9af65b48e34dec8f32d40a7ea9223a810956e87d41669280e1ea6dd7ec0464c0b0f4c1002d160e61db19934141ef34f860b585532b1d SHA512 4d33855e55ce7cc2fe611eb3b4a19873d723390339faa18fdf241c570a6111d04bc86afc168c335a71e31636e930336500c5ff47b2afeede2913c0e32fd574dc
 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
diff --git a/media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch b/media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch
deleted file mode 100644
index a8ad91e44939..000000000000
--- a/media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mumble-1.2.17/src/murmur/murmur.pro	2016-09-24 14:37:47.000000000 +0200
-+++ mumble-1.2.17.new/src/murmur/murmur.pro	2016-10-21 13:52:31.470049513 +0200
-@@ -74,7 +74,7 @@
- 	win32 {
- 		slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" ${QMAKE_FILE_NAME}
- 	} else {
--		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ ${QMAKE_FILE_NAME}
-+		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ -I/usr/share/Ice-3.5.1/slice/ -I/usr/share/Ice-3.6.3/slice/ ${QMAKE_FILE_NAME}
- 	}
- 	slice.input = SLICEFILES
- 	slice.CONFIG *= no_link explicit_dependencies
diff --git a/media-sound/murmur/murmur-1.2.19.ebuild b/media-sound/murmur/murmur-1.2.19.ebuild
deleted file mode 100644
index 6f1603e98939..000000000000
--- a/media-sound/murmur/murmur-1.2.19.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 eutils qmake-utils systemd user readme.gentoo-r1
-
-MY_P="mumble-${PV/_/~}"
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+dbus debug +ice pch zeroconf"
-
-RDEPEND=">=dev-libs/openssl-1.0.0b:0=
-	>=dev-libs/protobuf-2.2.0:=
-	sys-apps/lsb-release
-	>=sys-libs/libcap-2.15
-	dev-qt/qtcore:4[ssl]
-	|| ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] )
-	dev-qt/qtxmlpatterns:4
-	dbus? ( dev-qt/qtdbus:4 )
-	ice? ( dev-libs/Ice:= )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.17-ice-3.6.3-compat.patch
-)
-
-DOC_CONTENTS="
-	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
-	Please execute:\n
-	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
-	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
-	to set the build-in 'SuperUser' password before starting murmur.
-	Please restart dbus before starting murmur, or else dbus
-	registration will fail.
-"
-
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur -1 -1 /var/lib/murmur murmur
-}
-
-src_prepare() {
-	default
-
-	sed \
-		-e 's:mumble-server:murmur:g' \
-		-e 's:/var/run:/run:g' \
-		-i "${S}"/scripts/murmur.{conf,ini.system} || die
-}
-
-src_configure() {
-	local conf_add
-
-	use dbus || conf_add="${conf_add} no-dbus"
-	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
-	use ice || conf_add="${conf_add} no-ice"
-	use pch || conf_add="${conf_add} no-pch"
-	use zeroconf || conf_add="${conf_add} no-bonjour"
-
-	eqmake4 main.pro -recursive \
-		CONFIG+="${conf_add} no-client"
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	docinto scripts
-	dodoc scripts/*.php scripts/*.pl
-
-	local dir
-	if use debug; then
-		dir=debug
-	else
-		dir=release
-	fi
-
-	dobin "${dir}"/murmurd
-
-	insinto /etc/murmur/
-	newins scripts/murmur.ini.system murmur.ini
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/murmur.logrotate murmur
-
-	insinto /etc/dbus-1/system.d/
-	doins scripts/murmur.conf
-
-	insinto /usr/share/murmur/
-	doins src/murmur/Murmur.ice
-
-	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-
-	if use dbus; then
-		systemd_newunit "${FILESDIR}"/murmurd-dbus.service "${PN}".service
-		systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-	else
-		systemd_newunit "${FILESDIR}"/murmurd-no-dbus.service "${PN}".service
-	fi
-
-	keepdir /var/lib/murmur /var/log/murmur
-	fowners -R murmur /var/lib/murmur /var/log/murmur
-	fperms 750 /var/lib/murmur /var/log/murmur
-
-	# Fix permissions on config file as it might contain passwords.
-	# (bug #559362)
-	fowners root:murmur /etc/murmur/murmur.ini
-	fperms 640 /etc/murmur/murmur.ini
-
-	doman man/murmurd.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 0f0f42ecbfef..13d74723ca28 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -9,6 +9,5 @@ AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f90
 DIST pulseaudio-11.1.tar.xz 1648924 BLAKE2B eea767efb6529436a6c2aa7d5ccaccdbda2338ad8db639ad333598b1589d259acf71ef34e904a240710f5343864fa868789eaa7f7cae1b07902ebd989fe83e12 SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a
 DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
 EBUILD pulseaudio-11.1-r1.ebuild 10988 BLAKE2B 891673695478f3296371fad34b7e77dadf9fe21f228961ce30a08e50f4f5d2acd0888e7a78ed4194253d6eb3bf3ddf86ceff485cf215fcbd4b88672610dea5a7 SHA512 bb1e952c43c219b26cbe19fdec6df394bc407cfc829d9b78e4ad2c08535296dd890173f3afb6bb7c0dabd4be1ca384837ea8faa72efd37b082705afc328371be
-EBUILD pulseaudio-11.1.ebuild 10850 BLAKE2B 7c4423b125ba27e84d4af9b0ae99d31c5672490aed122a71887746ac9ca4554a96cddaf7eec8ae9b7ed91b3fa72a1caab541c95fe53a7117b4a93e8d9c982274 SHA512 88584bc0f38e6bb559d913d92fa5b06370590f43eaa11ac59af4ea07739d6f6870165e0801655982a11ff4f42e44de1b58962e5123f3d657cfcdf4727f04b0d0
 EBUILD pulseaudio-12.2.ebuild 11122 BLAKE2B 9e08ab99e4eff95a16e905e4cef66d55a3cc91fa651e2fb965e3a239605fbc5612d679def64401e6ee07ea97b3dea77349214fe620af341c9d676fe3ffad6420 SHA512 782d235efbc4ca48deab1b987918efc41db4f704bb145d8bfb5f55ddc2e77fabb0f1a348a2d77fbbebdfb296391eb880dd982aefed0c2a3886563f065f5db837
 MISC metadata.xml 3739 BLAKE2B da9e8c870669921600e4c2e3377dbabde19bd8e177741478b72da7f58a985c001268686e941b2dbcf557ac301056c0c9ff3dddc952ea3f12acd43cee955962b1 SHA512 673b98d8140d2b0ba0253d09e9066c7dddcc5a6d3ab4342579c4aba09cc1b0c3345c26dfa7e14868a0a3c1b1783e96971ccd56ebfe8105122bd9dc25d72d64c0
diff --git a/media-sound/pulseaudio/pulseaudio-11.1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1.ebuild
deleted file mode 100644
index 05a7ad3d1780..000000000000
--- a/media-sound/pulseaudio/pulseaudio-11.1.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-# qpaeq equalizer pyqt GUI frontend is AGPL-3+
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
-gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
-+orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
-+webrtc-aec +X zeroconf"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ofono-headset? ( bluetooth )
-	native-headset? ( bluetooth )
-	udev? ( || ( alsa oss ) )
-"
-
-# libpcre needed in some cases, bug #472228
-RDEPEND="
-	|| (
-		elibc_glibc? ( virtual/libc )
-		elibc_uclibc? ( virtual/libc )
-		dev-libs/libpcre
-	)
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libICE[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-	)
-	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( virtual/jack )
-	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:3 )
-	gnome? ( >=gnome-base/gconf-2.4.0 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		>=sys-apps/dbus-1.0.0
-		media-libs/sbc
-	)
-	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	realtime? ( sys-auth/rtkit )
-	equalizer? ( sci-libs/fftw:3.0 )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	gdbm? ( sys-libs/gdbm:= )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
-	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
-	dev-libs/libltdl:0
-	selinux? ( sec-policy/selinux-pulseaudio )
-"
-# it's a valid RDEPEND, libltdl.so is used for native abi
-
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-libs/check-0.9.10 )
-	X? (
-		x11-base/xorg-proto
-		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
-	)
-	dev-libs/libatomic_ops
-	virtual/pkgconfig
-	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
-	dev-util/intltool
-	>=sys-devel/gettext-0.18.1
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt4 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
-	equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-5 )
-	)
-"
-
-pkg_pretend() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
-	check_extra_config
-
-	if linux_config_exists; then
-		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
-		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
-			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
-			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	gnome2_environment_reset #543364
-
-	enewgroup audio 18 # Just make sure it exists
-
-	if use system-wide; then
-		enewgroup pulse-access
-		enewgroup pulse
-		enewuser pulse -1 -1 /var/run/pulse pulse,audio
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Skip test that cannot work with sandbox, bug #501846
-	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	if use gdbm; then
-		myconf+=( --with-database=gdbm )
-	else
-		myconf+=( --with-database=simple )
-	fi
-
-	if use bluetooth; then
-		if multilib_is_native_abi; then
-			myconf+=( --enable-bluez5 --disable-bluez4
-				$(use_enable native-headset bluez5-native-headset)
-				$(use_enable ofono-headset bluez5-ofono-headset) )
-		fi
-	else
-		myconf+=( --disable-bluez5 --disable-bluez4 )
-	fi
-
-	myconf+=(
-		--enable-largefile
-		$(use_enable glib glib2)
-		--disable-solaris
-		$(use_enable asyncns)
-		$(use_enable oss oss-output)
-		$(use_enable alsa)
-		$(use_enable lirc)
-		$(use_enable neon neon-opt)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable jack)
-		$(use_enable zeroconf avahi)
-		$(use_enable dbus)
-		$(use_enable gnome gconf)
-		$(use_enable gtk gtk3)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable orc)
-		$(use_enable X x11)
-		$(use_enable test default-build-tests)
-		$(use_enable udev)
-		$(use_with sox soxr)
-		$(use_enable systemd systemd-daemon)
-		$(use_enable systemd systemd-login)
-		$(use_enable systemd systemd-journal)
-		$(use_enable ipv6)
-		$(use_enable ssl openssl)
-		$(use_enable webrtc-aec)
-		$(use_with caps)
-		$(use_with equalizer fftw)
-		--disable-adrian-aec
-		--disable-esound
-		--localstatedir="${EPREFIX}"/var
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-	)
-
-	if ! multilib_is_native_abi; then
-		# disable all the modules and stuff
-		myconf+=(
-			--disable-oss-output
-			--disable-alsa
-			--disable-lirc
-			--disable-jack
-			--disable-avahi
-			--disable-gconf
-			--disable-gtk3
-			--disable-samplerate
-			--disable-bluez4
-			--disable-bluez5
-			--disable-udev
-			--disable-openssl
-			--disable-orc
-			--disable-webrtc-aec
-			--without-fftw
-			--without-soxr
-
-			# tests involve random modules, so just do them for the native
-			--disable-default-build-tests
-
-			# hack around unnecessary checks
-			# (results don't matter, we're not building anything using it)
-			ac_cv_lib_ltdl_lt_dladvise_init=yes
-			--with-database=simple
-			LIBSPEEX_CFLAGS=' '
-			LIBSPEEX_LIBS=' '
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-		use doc && emake doxygen
-	else
-		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake -C src ${targets[*]}
-	fi
-}
-
-multilib_src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	if multilib_is_native_abi; then
-		emake -C src check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
-		use doc && dohtml -r doxygen/html/
-	else
-		local targets=( libpulse.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C src \
-			install-libLTLIBRARIES \
-			install-padsplibLTLIBRARIES \
-			lib_LTLIBRARIES="${targets[*]}" \
-			install-pulseincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	# Drop the script entirely if X is disabled
-	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
-
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-
-		systemd_dounit "${FILESDIR}/${PN}.service"
-	fi
-
-	use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
-
-	dodoc NEWS README todo
-
-	# Create the state directory
-	use prefix || diropts -o pulse -g pulse -m0755
-
-	# We need /var/run/pulse, bug #442852
-	use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-
-	# Prevent warnings when system-wide is not used, bug #447694
-	use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use system-wide; then
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-		if use gnome ; then
-			elog
-			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
-			elog "that you might need to remove the gnome USE flag or disable the"
-			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
-			elog "with a system-wide instance."
-		fi
-	fi
-
-	if use equalizer && ! use qt4; then
-		elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
-		elog "This will build the equalizer module, but the 'qpaeq' tool"
-		elog "which is required to set equalizer levels will not work."
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-	fi
-
-	if use libsamplerate; then
-		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
-		elog "particular advantage over speex. Upstream suggests disabling them."
-	fi
-}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index acc75b5a599d..d0c30ad6aeef 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,8 +1,8 @@
 DIST pulseeffects-3.1.6.tar.gz 614441 BLAKE2B bb7461532785cd0ab79d0f506b5b9bcfc006779776e25870ce92b4af4e7cb0f7b3bcfe9c58180e52bdb9b9be20a14644ed8622fd3cc578dd3bdf9ff173c091b6 SHA512 efd9871c57f4b7152e4528927c7371e225980a09acacf4fcf939c468c7cb01b94b1bbb3c94cbd8879a6b41c7c4794ed5f45035a2b185b0a09b31515c964d4722
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
-DIST pulseeffects-4.2.3.tar.gz 982490 BLAKE2B 6c38d42147515ac918659eead60002f8863cd2c498be53fae125c4c7593fd7515e717f5997bef0ca9bbd343119c96462fae1c22dd0dd945fdecd1f6b9b610d1b SHA512 86fc1d64c0ff0c05d432f413de4bc6158341a5a49c9ce027123f0029e94b7c1bf2ee1da253742e19761e2654fd1a6149c6ca3a67e8c31efd878cca0102367f9a
+DIST pulseeffects-4.2.4.tar.gz 983386 BLAKE2B 784c8c3504ca755bed7ec813f5e8a0fbd0efee6fe8402c944f755f88b9bc4600cbc3509e766bec85d34cda88f554f844125c05c814c64bc0a710e641d4de29b1 SHA512 9c3f0d46e926f349d9c87f70c0aee68e38042bded9690c875e9b11e9a72bd2868bca32a3684adc607402a22e626419f38eee6da2aee91a16ce4137acc8faab3a
 EBUILD pulseeffects-3.1.6.ebuild 1474 BLAKE2B c37c8cc5b72e9ea384d7e34fe107a9d8a22fbf45309328dd49f99cca01cf85629497399fa388eb94b1a31dceb1dcd5ab5544abf73eddba81edecb1ba749e5a87 SHA512 34755ef7a7b27df191a9044e34f68bef3807a50b5e691adcaba156014244c8f89bed6583fb1684f586e45058eb6ffca0aa1f0af26266884ee32920131b8379de
 EBUILD pulseeffects-3.2.3.ebuild 1492 BLAKE2B 959ccbff4ddd3376895dd833d7a36ba81b8b2d46381a7cc14aa73ab2701d01910fcc340fffe0058099f31e80332670182671c3c737d0b41746af5a386b2e6182 SHA512 281ff12ecc62b6c75db6ffaa290517ab24c8110db4333c54221d87f2283feab60a5ff2e0e02ead2193bafcb7d4a8c6b990e67cd1925e9afa5ee16aa5b49decd2
-EBUILD pulseeffects-4.2.3.ebuild 1556 BLAKE2B 4916a47b76b4206d9f8b285916dbdfe13684c8feb6bb707a212a2a4844972f18370aba90719d982a8c2f8af452519ee25b225515d038dfef89167d514a9ba6b6 SHA512 7b22ee540afbcb64ac52bab63c430c69744513279153a6c5f7d277b9e3cb3a94576b037bd8e8d2b8b52837b10cd958d1af62e731e7904dbcc0d13f087f6f33ef
+EBUILD pulseeffects-4.2.4.ebuild 1556 BLAKE2B 4916a47b76b4206d9f8b285916dbdfe13684c8feb6bb707a212a2a4844972f18370aba90719d982a8c2f8af452519ee25b225515d038dfef89167d514a9ba6b6 SHA512 7b22ee540afbcb64ac52bab63c430c69744513279153a6c5f7d277b9e3cb3a94576b037bd8e8d2b8b52837b10cd958d1af62e731e7904dbcc0d13f087f6f33ef
 EBUILD pulseeffects-9999.ebuild 1556 BLAKE2B 4916a47b76b4206d9f8b285916dbdfe13684c8feb6bb707a212a2a4844972f18370aba90719d982a8c2f8af452519ee25b225515d038dfef89167d514a9ba6b6 SHA512 7b22ee540afbcb64ac52bab63c430c69744513279153a6c5f7d277b9e3cb3a94576b037bd8e8d2b8b52837b10cd958d1af62e731e7904dbcc0d13f087f6f33ef
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.2.3.ebuild b/media-sound/pulseeffects/pulseeffects-4.2.4.ebuild
index 90b1ffc99215..90b1ffc99215 100644
--- a/media-sound/pulseeffects/pulseeffects-4.2.3.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.2.4.ebuild
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index ed63092d3c6c..b0f91e989208 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -9,6 +9,6 @@ AUX sox-14.4.2-CVE-2017-15642.patch 852 BLAKE2B b6d32a2d7909b601953f0603caa678e6
 AUX sox-14.4.2-CVE-2017-18189.patch 1109 BLAKE2B 1014eb9427b4735e08da68707e108a0c04b89ec75c91440a0ce833327af0ed152a1eba1ef46402f198f6394c1787ae899ee1ffc9748d1ec91544fe8f127cecb6 SHA512 dd4023a6bc98f510c2256537e747a20c9b3b8ec35e0f98d19d188a3973f1774566c5d70f8de6cd9083547ade69670d34d10b848836d0724896993e1e56c85c75
 AUX sox-14.4.2-wavpack-chk-errors-on-init.patch 1328 BLAKE2B 0a1f6c0ef96d5508f11901b28b57feda0be79f0af6ead0af51eb97db7a3a97497aa446389904bc9457efd8dc4f9738f5482841caa096d3449d3b1ab5d77b746a SHA512 ae95d810f489efb749f808c6e46b0412f4cfd6ee60fce0289c0c1d689bb599fd2516a79fcd24ac9ddd30fab6f0437a6876dccfb61db2f6c612fe680f6eff13b5
 DIST sox-14.4.2.tar.gz 1134299 BLAKE2B 9fae987d421fc733b84746f8dc8f09ced1c3ce066643a426d7c64c4ed4ceeb18e5d00165108b39065a4ce40ff39e9d020fc6e734ff1121ee39bfeed4ad822bc5 SHA512 b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca
-EBUILD sox-14.4.2-r1.ebuild 2622 BLAKE2B 63710ce09d8eea6117f7851b709bf98a304535ef827df23cad86a9402e141f4d1de1292601c5344705ab40d9b17a2d5b45c93c33d970aff90b31017fbec9cc9a SHA512 980f2a62047118431b1c0452cec7c36cccd5b0d5ee9cf6b1203235fa6a06f28abd685af961e44f62bff663c51b20382d91c029646c5722c3ce1ae10d3f3bacf9
+EBUILD sox-14.4.2-r1.ebuild 2621 BLAKE2B 15db996f6aea42581d1c2d8744c7a06769e08366d4c017ea1683ad50a0b94ddabed7b3d9f47e69dafaf7df662533e3fa1492724dcace92c054f058286f711884 SHA512 b82bd81d5c58f1d56416ea4a0de453831b8a199d99a59fdbbc79934898f2a33b77ed86870ea26091df91df5ae8211c62b410e14ea7f0d30d8a3fdb9dd1f4f87f
 EBUILD sox-14.4.2.ebuild 2162 BLAKE2B acf1642bd7003f6d19bc454196f4b6cf6fe9e7088363b3c3b530a973d874a3261faca50c26fc6d4e076064ebf10a87d39a5d647e4feccacc49d8c4cc052a1d62 SHA512 8bacb2ece8bc4808ad1b5db0a854e3c4c7eb4febaabdc18675bec344c8454243ba0d5530d87c6ae7b0b8416bf726a1d392cc8d6f0ef936dbd4fea01fe02ef825
 MISC metadata.xml 640 BLAKE2B f02bbb657d1f43a5c9394cca0f74a88d56163cbeabccdc481651e52abfb0ddaa00750c1578a6ff7c697848357c9382a537044a4364c9c5dfc35906f665011bec SHA512 0c7363b16df0333f4496a8e2ecb8c267cd1b23b1d946964fd2ff096a98313384f4f9d94e30791464076fe318d6bf7e5f1d4ef6f6a41a020ef1c197988c811862
diff --git a/media-sound/sox/sox-14.4.2-r1.ebuild b/media-sound/sox/sox-14.4.2-r1.ebuild
index 8f7f7227ebc1..71356a701013 100644
--- a/media-sound/sox/sox-14.4.2-r1.ebuild
+++ b/media-sound/sox/sox-14.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
 
 RDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d8b4bf7c9a73..1ca7e3ac9445 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 0254be2da60c..f3153b7795dd 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 04 Aug 2018 07:08:35 +0000
+Wed, 08 Aug 2018 18:38:37 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 12934beaeb3a..83ffe63df2bc 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 427414 BLAKE2B 03f31e82901c67c54c9e2a393ac3d0d1d25bb342aa53f12ef4cda3b8ecae5db556d030b733bc4f3fdba54171e0a9a96a6e0e3c4ab9239061ea537618ba745ce1 SHA512 01f241123b41771420b69c122806bf7c9c1b4f6f77886ed4e9a9737364198dc0d9cc296f967c056f28a2af511a8d2680a7991527b5ca7723fbd12dcffe525a32
-TIMESTAMP 2018-08-04T07:08:39Z
+TIMESTAMP 2018-08-08T18:38:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltlUPdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltrOLBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDqmA/9EldPuI7gKEfkvqQ/3Ev33JZPxI9bzlXNJDvuQkpfXxlN3smXxkklQHLD
-ELay1kHbZVWjEGeOxGn4XidRBIk63s9eQxgGBfCkydMSyJF//zceHlMxUDAsSR74
-BeNPmsScuj88RFpXwiKvRH+jsUxIfpSVZiL4BgCx3loZEQC3RLsRj0fBgAX/Mjid
-q9y7x5rGNfK06vaaKEXvax0uHRA19OWaaA476R/AK6VEnB3wxXe5HE3pn4usxS1I
-RBUR5LLgSkbsimJB8XA/xhabeUnWu39CBIdWFTSjilbm1aVrnZfX+gnAe1AS7uQR
-oOVUEO8Tlmoe89KfSRQGonC1qQSl6ROv4biSN/4NSFNoH9tMIFiV/WZsraO3qc5F
-sVIP1Um+bB+l/OhVwFf1eWDgYiIj3opDKgb3E3JeBwmAR7wZ/cxRiDjq6LyutjR+
-KcWQ7yt0CENXm//I2zs17QjL0Cbr6O8nKUBD8FVPmck9VBk6Mi4jsdHk+WNOefYB
-OF51OqST9wbNjbDH9ViBED2kb9b9TTkrcb8kawSTWj03YdkqIsGJU9+FW2auvYuQ
-A1ly42q2CG0dCkhiSLhO26UaOy5EeXqOYDIVni9gz3Cn8o145XzGVaWLQv1hXJX6
-ErSxolVQb+2uukprBNLfKdeUy1vt1poQ7K/aHq88O+XidEanozs=
-=3s3j
+klBIiA/7B0Kq2a//F1vld40LQCkhQ02yjnaSWUdXKpatlC01adwhPwzgxKyLvnAa
+oJbiL/EiV/E9A2f/vpWyoniVE4sTVorByCUBPxiCQIFtlfSMOC5HUnRRLQDEzHRH
+C4eDK6ou6Lz+QgSXsVGQMIX7Q73RyQrFTqfs/h7TBmVeFMrfpO7OVt1WtEs+E07G
+EZ5uCzuxD8Fz/q2MZtNlirWE8dLEcx8eQUsUqrCl9b4kLuEsfyx/h+orD+s9ycpM
+2+zAey7fx2SCofUuMLf9xrfo59r60L4u4gFQCRqBIxogH3CCRn8cmdoQf3SWsQWz
+d3KURvegWSSoHG5CS73l+KdFLu4UO4F9jotPp4/tt/+4KfgvCerkUUNZ1RxijRIh
+J2uvBxA5ZQ/W0/BSuDffmhRyfZTLvMXzqxiOYa70V+EXs0Io25PfwlNd0qZyyPTu
+zszFcFasXlHuCTxLZU3Fqu6z9F6ZglfDWeCyeK92rpL/In+QMC5yXge3tzjApgwB
+JM79PGicyjN9K84dI1LehHIvEvW5mP0StAwf5y2VI+1PAE4lHQIIhQU/5gbGwsS2
+44WMBlZcSUiZJi4YB+oHqUlNO1qyzzSA133jKevFOdtohE9Q4X4i0oOOY0b7/mOy
+I0m7YqhG4PXdCjdfcC5qmEarg0QJHBaB0svGkcWGU1MUOJB4bBE=
+=jVji
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 0254be2da60c..f3153b7795dd 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 04 Aug 2018 07:08:35 +0000
+Wed, 08 Aug 2018 18:38:37 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index f599c958c126..e64ceceee3aa 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index e63e8242a071..8fff070a0c64 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/brltty-5.2-r1 b/metadata/md5-cache/app-accessibility/brltty-5.2-r1
index 97bb63fd0978..60ba2b541933 100644
--- a/metadata/md5-cache/app-accessibility/brltty-5.2-r1
+++ b/metadata/md5-cache/app-accessibility/brltty-5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=s
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) tcl? ( api )
 SLOT=0
 SRC_URI=http://brltty.com/archive/brltty-5.2.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	findlib	45d6030075064a68da8d7143726a1150	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	findlib	45d6030075064a68da8d7143726a1150	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=f6b794eb1f8cafc347672c7025f51fe6
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index ec5c46d7e4d8..bb0bf11c130a 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-lint-3.4.23 b/metadata/md5-cache/app-admin/ansible-lint-3.4.23
new file mode 100644
index 000000000000..c740970f0dc9
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-lint-3.4.23
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/flake8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wheel[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-admin/ansible[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[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(-)]
+DESCRIPTION=Checks ansible playbooks for practices and behaviour that can be improved
+EAPI=6
+HOMEPAGE=https://github.com/willthames/ansible-lint
+IUSE=test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-admin/ansible[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/willthames/ansible-lint/archive/v3.4.23.tar.gz -> ansible-lint-3.4.23.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3108d1e3f1a3c9b28175b260651caa35
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.34 b/metadata/md5-cache/app-admin/apache-tools-2.4.34
index 3978708fcaf3..a637992dc1a7 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.34
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.34
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=7
 HOMEPAGE=https://httpd.apache.org/
 IUSE=libressl ssl
-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 ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.34.tar.bz2
 _eclasses_=eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=7017fa6d30cee91f72b7b7ceb966216e
+_md5_=0ffb3852fceb3c09e260f7a127ed5185
diff --git a/metadata/md5-cache/app-admin/dio-1.5.2 b/metadata/md5-cache/app-admin/dio-1.5.2
deleted file mode 100644
index 35d16c4badbd..000000000000
--- a/metadata/md5-cache/app-admin/dio-1.5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-libs/ncurses:0
-DESCRIPTION=dio - Device I/O monitoring tool
-EAPI=5
-HOMEPAGE=https://github.com/donaldmcintosh/dio
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=sys-libs/ncurses:0
-SLOT=0
-SRC_URI=https://github.com/donaldmcintosh/dio/archive/1.5.2.tar.gz -> dio-1.5.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=16661dff8ed172332db22c2b58a13cf7
diff --git a/metadata/md5-cache/app-admin/dio-1.5.2-r1 b/metadata/md5-cache/app-admin/dio-1.5.2-r1
new file mode 100644
index 000000000000..8687fc39a67a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/dio-1.5.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=A device I/O monitoring tool
+EAPI=7
+HOMEPAGE=https://github.com/donaldmcintosh/dio
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=https://github.com/donaldmcintosh/dio/archive/1.5.2.tar.gz -> dio-1.5.2.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=edbd23b87580a24c49211139f858c2c7
diff --git a/metadata/md5-cache/app-admin/helm-2.10.0_rc1 b/metadata/md5-cache/app-admin/helm-2.10.0_rc1
deleted file mode 100644
index fab2969f3706..000000000000
--- a/metadata/md5-cache/app-admin/helm-2.10.0_rc1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Package Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/helm https://helm.sh
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/helm/archive/v2.10.0-rc.1.tar.gz -> helm-2.10.0_rc1.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/aokoli/goutils/archive/9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz -> github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/Azure/go-ansiterm/archive/19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz -> github.com-Azure-go-ansiterm-19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz https://github.com/Azure/go-autorest/archive/d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz -> github.com-Azure-go-autorest-d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/cpuguy83/go-md2man/archive/71acacd42f85e5e82f70a55327789582a5200a90.tar.gz -> github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz https://github.com/cyphar/filepath-securejoin/archive/06bda8370f45268db985f7af15732444d94ed51c.tar.gz -> github.com-cyphar-filepath-securejoin-06bda8370f45268db985f7af15732444d94ed51c.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz -> github.com-docker-docker-4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/evanphx/json-patch/archive/94e38aa1586e8a6c8a75770bddf5ff84c48a106b.tar.gz -> github.com-evanphx-json-patch-94e38aa1586e8a6c8a75770bddf5ff84c48a106b.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/camelcase/archive/f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz -> github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz -> github.com-go-openapi-spec-1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz https://github.com/go-openapi/swag/archive/f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz -> github.com-go-openapi-swag-f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz -> github.com-golang-protobuf-1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/google/uuid/archive/064e2069ce9c359c118179501254f67d7d37ba24.tar.gz -> github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/6da026c32e2d622cc242d32984259c77237aefe1.tar.gz -> github.com-gophercloud-gophercloud-6da026c32e2d622cc242d32984259c77237aefe1.tar.gz https://github.com/gosuri/uitable/archive/36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz -> github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/huandu/xstrings/archive/3959339b333561bf62a38b424fd41517c2c90f40.tar.gz -> github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/json-iterator/go/archive/13f86432b882000a51c6e610c620974462691a97.tar.gz -> github.com-json-iterator-go-13f86432b882000a51c6e610c620974462691a97.tar.gz https://github.com/mailru/easyjson/archive/2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz -> github.com-mailru-easyjson-2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz https://github.com/MakeNowJust/heredoc/archive/bb23615498cded5e105af4ce27de75b089cbe851.tar.gz -> github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz https://github.com/Masterminds/semver/archive/517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz -> github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz https://github.com/Masterminds/sprig/archive/6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c.tar.gz -> github.com-Masterminds-sprig-6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c.tar.gz https://github.com/Masterminds/vcs/archive/3084677c2c188840777bff30054f2b553729d329.tar.gz -> github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz https://github.com/mattn/go-runewidth/archive/d6bea18f789704b5f83375793155289da36a3c7f.tar.gz -> github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mitchellh/go-wordwrap/archive/ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz -> github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/opencontainers/image-spec/archive/372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz -> github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/pkg/errors/archive/645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz -> github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/russross/blackfriday/archive/300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz -> github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz -> github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz https://github.com/sirupsen/logrus/archive/89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz -> github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz https://github.com/spf13/cobra/archive/f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz -> github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/technosophos/moniker/archive/a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz -> github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz https://github.com/golang/crypto/archive/81e90905daefcd6fd217b62423c0908922eadb30.tar.gz -> github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/43eea11bc92608addb41b8a406b0407495c106f6.tar.gz -> github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/time/archive/f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz -> github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz https://github.com/golang/appengine/archive/12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz -> github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz -> github.com-grpc-grpc-go-5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/square/go-jose/archive/f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz -> github.com-square-go-jose-f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz https://github.com/go-yaml/yaml/archive/670d4cfef0544295bc27a114dbac37980d83185a.tar.gz -> github.com-go-yaml-yaml-670d4cfef0544295bc27a114dbac37980d83185a.tar.gz https://github.com/kubernetes/api/archive/8b7507fac302640dd5f1efbf9643199952cc58db.tar.gz -> github.com-kubernetes-api-8b7507fac302640dd5f1efbf9643199952cc58db.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz -> github.com-kubernetes-apiextensions-apiserver-898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz https://github.com/kubernetes/apimachinery/archive/f6313580a4d36c7c74a3d845dda6e116642c4f90.tar.gz -> github.com-kubernetes-apimachinery-f6313580a4d36c7c74a3d845dda6e116642c4f90.tar.gz https://github.com/kubernetes/apiserver/archive/f7914ed3085badf66a1b6f3a5218ada28f7bd084.tar.gz -> github.com-kubernetes-apiserver-f7914ed3085badf66a1b6f3a5218ada28f7bd084.tar.gz https://github.com/kubernetes/client-go/archive/23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz -> github.com-kubernetes-client-go-23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz https://github.com/kubernetes/kube-openapi/archive/39cb288412c48cb533ba4be5d6c28620b9a0c1b4.tar.gz -> github.com-kubernetes-kube-openapi-39cb288412c48cb533ba4be5d6c28620b9a0c1b4.tar.gz https://github.com/kubernetes/kubernetes/archive/32ac1c9073b132b8ba18aa830f46b77dcceb0723.tar.gz -> github.com-kubernetes-kubernetes-32ac1c9073b132b8ba18aa830f46b77dcceb0723.tar.gz https://github.com/kubernetes/utils/archive/aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz -> github.com-kubernetes-utils-aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz https://github.com/fvbommel/util/archive/db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz -> github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=dad99d0394e206a5de5922bd9d922080
diff --git a/metadata/md5-cache/app-admin/logstash-bin-6.3.2 b/metadata/md5-cache/app-admin/logstash-bin-6.3.2
new file mode 100644
index 000000000000..bbf8d86c50c1
--- /dev/null
+++ b/metadata/md5-cache/app-admin/logstash-bin-6.3.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=x-pack elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT x-pack? ( Elastic )
+RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-6.3.2.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-6.3.2.tar.gz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e7b109041bf388386408ac4425bfb569
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.37.0 b/metadata/md5-cache/app-admin/rsyslog-8.37.0
new file mode 100644
index 000000000000..28ea561bd9d0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.37.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
+EAPI=6
+HOMEPAGE=https://www.rsyslog.com/
+IUSE=curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql normalize omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+LICENSE=GPL-3 LGPL-3 Apache-2.0
+RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 )
+REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.37.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.37.0.tar.gz )
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5313a66945057476f4228653626e9f41
diff --git a/metadata/md5-cache/app-admin/spectre-meltdown-checker-0.38 b/metadata/md5-cache/app-admin/spectre-meltdown-checker-0.38
new file mode 100644
index 000000000000..4ce3edb106a5
--- /dev/null
+++ b/metadata/md5-cache/app-admin/spectre-meltdown-checker-0.38
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Spectre & Meltdown vulnerability/mitigation checker for Linux
+EAPI=7
+HOMEPAGE=https://github.com/speed47/spectre-meltdown-checker
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://github.com/speed47/spectre-meltdown-checker/archive/v0.38.tar.gz -> spectre-meltdown-checker-0.38.tar.gz
+_md5_=3079831aa528c3427b1fc452281cde02
diff --git a/metadata/md5-cache/app-admin/spectre-meltdown-checker-9999 b/metadata/md5-cache/app-admin/spectre-meltdown-checker-9999
index abcee830a108..33921cde157d 100644
--- a/metadata/md5-cache/app-admin/spectre-meltdown-checker-9999
+++ b/metadata/md5-cache/app-admin/spectre-meltdown-checker-9999
@@ -6,4 +6,4 @@ HOMEPAGE=https://github.com/speed47/spectre-meltdown-checker
 LICENSE=GPL-3+
 SLOT=0
 _eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
-_md5_=c9924620f801acd947defab9bd27128f
+_md5_=3079831aa528c3427b1fc452281cde02
diff --git a/metadata/md5-cache/app-admin/sysstat-11.6.3 b/metadata/md5-cache/app-admin/sysstat-11.6.3
deleted file mode 100644
index 85c2e427c97a..000000000000
--- a/metadata/md5-cache/app-admin/sysstat-11.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=System performance tools for Linux
-EAPI=6
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.6.3.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=933ab29b17cc1914e51b80aa503da485
diff --git a/metadata/md5-cache/app-admin/sysstat-11.6.5 b/metadata/md5-cache/app-admin/sysstat-11.6.5
new file mode 100644
index 000000000000..94b310ee7ab7
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sysstat-11.6.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=System performance tools for Linux
+EAPI=6
+HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
+IUSE=debug nls lm_sensors selinux static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
+SLOT=0
+SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.6.5.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=933ab29b17cc1914e51b80aa503da485
diff --git a/metadata/md5-cache/app-admin/sysstat-11.7.3 b/metadata/md5-cache/app-admin/sysstat-11.7.3
deleted file mode 100644
index dc8bdc4f91e2..000000000000
--- a/metadata/md5-cache/app-admin/sysstat-11.7.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=System performance tools for Linux
-EAPI=6
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.7.3.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ca29918b76d1748279cf3fefcaeb5a68
diff --git a/metadata/md5-cache/app-admin/sysstat-11.7.4 b/metadata/md5-cache/app-admin/sysstat-11.7.4
deleted file mode 100644
index df731fad6cd5..000000000000
--- a/metadata/md5-cache/app-admin/sysstat-11.7.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=System performance tools for Linux
-EAPI=6
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.7.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ca29918b76d1748279cf3fefcaeb5a68
diff --git a/metadata/md5-cache/app-admin/sysstat-12.0.1 b/metadata/md5-cache/app-admin/sysstat-12.0.1
new file mode 100644
index 000000000000..ba92eb03e19f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sysstat-12.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=System performance tools for Linux
+EAPI=6
+HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
+IUSE=debug nls lm_sensors selinux static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
+SLOT=0
+SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-12.0.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ca29918b76d1748279cf3fefcaeb5a68
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 291d7627ca98..43685975a735 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/file-roller-3.26.2 b/metadata/md5-cache/app-arch/file-roller-3.26.2
new file mode 100644
index 000000000000..1b1e0bfe70e1
--- /dev/null
+++ b/metadata/md5-cache/app-arch/file-roller-3.26.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-2.22.2 ) packagekit? ( app-admin/packagekit-base ) dev-libs/libxml2:2 >=dev-util/intltool-0.50.1 dev-util/itstool sys-devel/gettext 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=Archive manager for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
+IUSE=libnotify nautilus packagekit
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-2.22.2 ) packagekit? ( app-admin/packagekit-base )
+SLOT=0
+SRC_URI=mirror://gnome/sources/file-roller/3.26/file-roller-3.26.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=873f4a8a5d4cd5b9864cc1b90b0709cc
diff --git a/metadata/md5-cache/app-arch/upx-bin-3.91 b/metadata/md5-cache/app-arch/upx-bin-3.91
index 4335d2a56437..f00af7f067bd 100644
--- a/metadata/md5-cache/app-arch/upx-bin-3.91
+++ b/metadata/md5-cache/app-arch/upx-bin-3.91
@@ -8,5 +8,5 @@ RDEPEND=!app-arch/upx-ucl
 RESTRICT=strip
 SLOT=0
 SRC_URI=x86? ( http://upx.sourceforge.net/download/upx-3.91-i386_linux.tar.bz2 ) amd64? ( http://upx.sourceforge.net/download/upx-3.91-amd64_linux.tar.bz2 ) ppc? ( http://upx.sourceforge.net/download/upx-3.91-powerpc_linux.tar.bz2 ) arm? ( http://upx.sourceforge.net/download/upx-3.91-armeb_linux.tar.bz2 ) mips? ( http://upx.sourceforge.net/download/upx-3.91-mipsel_linux.tar.bz2 )
-_eclasses_=pax-utils	b963274a93e76570a88168c1f1db4cd7
+_eclasses_=pax-utils	e85f015e815dd463b0c206d781ef45a5
 _md5_=901c44952b92f2f98eae87a5f67788c0
diff --git a/metadata/md5-cache/app-arch/wimlib-1.12.0 b/metadata/md5-cache/app-arch/wimlib-1.12.0
index f320064bd460..acc34ce7ec47 100644
--- a/metadata/md5-cache/app-arch/wimlib-1.12.0
+++ b/metadata/md5-cache/app-arch/wimlib-1.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=cpu_flags_x86_ssse3? ( !openssl )
 RESTRICT=primaryuri
 SLOT=0
 SRC_URI=https://wimlib.net/downloads/wimlib-1.12.0.tar.gz -> wimlib-1.12.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
 _md5_=098cd8647d41ddcdf445006797258847
diff --git a/metadata/md5-cache/app-arch/zpaq-7.15 b/metadata/md5-cache/app-arch/zpaq-7.15
index f5ccb427a5ce..fc08a0c78e3c 100644
--- a/metadata/md5-cache/app-arch/zpaq-7.15
+++ b/metadata/md5-cache/app-arch/zpaq-7.15
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Unlicense
 SLOT=0
 SRC_URI=http://mattmahoney.net/dc/zpaq715.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f16f69019a0c500a213d6ca36baa565c
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 811f65c98d29..af598428e2e8 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/bacula-9.0.6-r3 b/metadata/md5-cache/app-backup/bacula-9.0.6-r3
index 99b3d38f6a99..d2322a63773d 100644
--- a/metadata/md5-cache/app-backup/bacula-9.0.6-r3
+++ b/metadata/md5-cache/app-backup/bacula-9.0.6-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacu
 SLOT=0
 SRC_URI=mirror://sourceforge/bacula/bacula-9.0.6.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=629e81b96f275772fdbad9659c5a01ca
+_md5_=66e233559c748499ac7725d75108ee2c
diff --git a/metadata/md5-cache/app-backup/bacula-9.0.8 b/metadata/md5-cache/app-backup/bacula-9.0.8
new file mode 100644
index 000000000000..97d17c258923
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bacula-9.0.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt5? ( dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=6
+HOMEPAGE=http://www.bacula.org/
+IUSE=acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt5? ( dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) !bacula-clientonly? ( !bacula-nosd? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
+SLOT=0
+SRC_URI=mirror://sourceforge/bacula/bacula-9.0.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=9ba131d4f1def5e786d52948d0cad330
diff --git a/metadata/md5-cache/app-backup/rdedup-1.0.2 b/metadata/md5-cache/app-backup/rdedup-1.0.2
index 23f3fab978a3..9131e86dce1b 100644
--- a/metadata/md5-cache/app-backup/rdedup-1.0.2
+++ b/metadata/md5-cache/app-backup/rdedup-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-libs/libsodium-1.0.11 >=dev-util/cargo-0.13.0
+DEPEND=>=dev-libs/libsodium-1.0.11
 DESCRIPTION=data deduplication with compression and public key encryption
 EAPI=6
 HOMEPAGE=https://github.com/dpc/rdedup
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RDEPEND=>=dev-libs/libsodium-1.0.11
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/argparse/0.2.1/download -> argparse-0.2.1.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/flate2/0.2.17/download -> flate2-0.2.17.crate https://crates.io/api/v1/crates/fs2/0.2.5/download -> fs2-0.2.5.crate https://crates.io/api/v1/crates/gcc/0.3.43/download -> gcc-0.3.43.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.20/download -> libc-0.2.20.crate https://crates.io/api/v1/crates/libsodium-sys/0.0.12/download -> libsodium-sys-0.0.12.crate https://crates.io/api/v1/crates/log/0.3.6/download -> log-0.3.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/miniz-sys/0.1.9/download -> miniz-sys-0.1.9.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/rdedup-lib/1.0.2/download -> rdedup-lib-1.0.2.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/rollsum/0.2.1/download -> rollsum-0.2.1.crate https://crates.io/api/v1/crates/rpassword/0.2.3/download -> rpassword-0.2.3.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.22/download -> rustc-serialize-0.3.22.crate https://crates.io/api/v1/crates/serde/0.7.15/download -> serde-0.7.15.crate https://crates.io/api/v1/crates/sodiumoxide/0.0.12/download -> sodiumoxide-0.0.12.crate https://crates.io/api/v1/crates/termios/0.2.2/download -> termios-0.2.2.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/time/0.1.36/download -> time-0.1.36.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.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 https://crates.io/api/v1/crates/rdedup/1.0.2/download -> rdedup-1.0.2.crate https://crates.io/api/v1/crates/rdedup-lib/1.0.2/download -> rdedup-lib-1.0.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.16/download -> redox_syscall-0.1.16.crate
-_eclasses_=cargo	959846e2836f8244430c9582dd6493af	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	3e38275395b24dfed9849a57ba58a486	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=958dc843c0bb13509bff3a0c563d4bea
diff --git a/metadata/md5-cache/app-backup/tsm-7.1.4.4-r2 b/metadata/md5-cache/app-backup/tsm-7.1.4.4-r2
index db48d8e75117..34e5b03c17f0 100644
--- a/metadata/md5-cache/app-backup/tsm-7.1.4.4-r2
+++ b/metadata/md5-cache/app-backup/tsm-7.1.4.4-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/libxml2 =sys-fs/fuse-2* acl? ( sys-apps/acl ) ja
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/patches/client/v7r1/Linux/LinuxX86/BA/v714/7.1.4.4-TIV-TSMBAC-LinuxX86.tar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=bb79ca89a58583ab0a48630c3b7c2c93
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 0e5b45db72d0..e37e16d798e2 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.10 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.10
index e7ba1b254f7f..0ac8b4d66690 100644
--- a/metadata/md5-cache/app-benchmarks/sysbench-1.0.10
+++ b/metadata/md5-cache/app-benchmarks/sysbench-1.0.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
 SLOT=0
 SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.10.tar.gz -> sysbench-1.0.10.tar.gz
-_eclasses_=pax-utils	b963274a93e76570a88168c1f1db4cd7
+_eclasses_=pax-utils	e85f015e815dd463b0c206d781ef45a5
 _md5_=c7fb8543cea5e2966d7a12862fec839f
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.15 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.15
index 8bb527c6fc80..96bd8138bb61 100644
--- a/metadata/md5-cache/app-benchmarks/sysbench-1.0.15
+++ b/metadata/md5-cache/app-benchmarks/sysbench-1.0.15
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
 SLOT=0
 SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.15.tar.gz -> sysbench-1.0.15.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=4e28de46a98ce64ec8c334d97efba211
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 287076954b4f..4ec59efa45f3 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/acr38u-1.7.11-r3 b/metadata/md5-cache/app-crypt/acr38u-1.7.11-r3
index 0fdbb94034aa..5d3913aa5f10 100644
--- a/metadata/md5-cache/app-crypt/acr38u-1.7.11-r3
+++ b/metadata/md5-cache/app-crypt/acr38u-1.7.11-r3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/pcsc-lite-1.6.4 virtual/libusb:0
 SLOT=0
 SRC_URI=https://www.linuxunderground.be/ACR38_LINUX_100711_P.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=f67053d770658fd55736ba830be53a2c
diff --git a/metadata/md5-cache/app-crypt/asekey-3.7 b/metadata/md5-cache/app-crypt/asekey-3.7
index 5c240b265ccc..6329b06b4372 100644
--- a/metadata/md5-cache/app-crypt/asekey-3.7
+++ b/metadata/md5-cache/app-crypt/asekey-3.7
@@ -8,5 +8,5 @@ LICENSE=BSD LGPL-2.1
 RDEPEND=sys-apps/pcsc-lite[udev] virtual/libusb:0
 SLOT=0
 SRC_URI=http://www.athena-scs.com//docs/reader-drivers/asekey-3-7-tar.bz2 -> asekey-3.7.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=0290adbc85b83606ec7185142d125284
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.27 b/metadata/md5-cache/app-crypt/ccid-1.4.27
index 751fd40752bf..2c7671f17e97 100644
--- a/metadata/md5-cache/app-crypt/ccid-1.4.27
+++ b/metadata/md5-cache/app-crypt/ccid-1.4.27
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
 SLOT=0
 SRC_URI=https://ccid.apdu.fr/files/ccid-1.4.27.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=1d8069d1fd9bac81f116d75166549513
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.29 b/metadata/md5-cache/app-crypt/ccid-1.4.29
index 6ac6a1f0ea39..2df262118763 100644
--- a/metadata/md5-cache/app-crypt/ccid-1.4.29
+++ b/metadata/md5-cache/app-crypt/ccid-1.4.29
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
 SLOT=0
 SRC_URI=https://ccid.apdu.fr/files/ccid-1.4.29.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=2a93a1d1f9643a2e950da47486b1a05b
diff --git a/metadata/md5-cache/app-crypt/ekeyd-1.1.4-r2 b/metadata/md5-cache/app-crypt/ekeyd-1.1.4-r2
index d9e67a58dbbd..0098121a5d95 100644
--- a/metadata/md5-cache/app-crypt/ekeyd-1.1.4-r2
+++ b/metadata/md5-cache/app-crypt/ekeyd-1.1.4-r2
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( dev-lang/lua usb? ( virtual/libusb:0 ) dev-lua/luasocket ker
 REQUIRED_USE=minimal? ( !munin !usb )
 SLOT=0
 SRC_URI=http://www.entropykey.co.uk/res/download/ekeyd-1.1.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e40ad0dd489383040576c38f1b449860
diff --git a/metadata/md5-cache/app-crypt/ekeyd-1.1.5 b/metadata/md5-cache/app-crypt/ekeyd-1.1.5
index 111c7675aa4c..a4a6ed768ef2 100644
--- a/metadata/md5-cache/app-crypt/ekeyd-1.1.5
+++ b/metadata/md5-cache/app-crypt/ekeyd-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( dev-lang/lua dev-lua/luasocket kernel_linux? ( virtual/udev
 REQUIRED_USE=minimal? ( !munin )
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_1.1.5.orig.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fa6826ad0a375a1eb18214ff83571967
diff --git a/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1 b/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1
index 7a92cfd2bd17..17cf1f30e3c0 100644
--- a/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1
+++ b/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( dev-lang/lua dev-lua/luasocket kernel_linux? ( virtual/udev
 REQUIRED_USE=minimal? ( !munin )
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_1.1.5.orig.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4ab23db1c80ae14668711bdc8c633f99
diff --git a/metadata/md5-cache/app-crypt/hashcat-4.1.0 b/metadata/md5-cache/app-crypt/hashcat-4.1.0
index 74a7072bbd50..2c456a2899a7 100644
--- a/metadata/md5-cache/app-crypt/hashcat-4.1.0
+++ b/metadata/md5-cache/app-crypt/hashcat-4.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=virtual/opencl
 SLOT=0
 SRC_URI=https://github.com/hashcat/hashcat/archive/v4.1.0.tar.gz -> hashcat-4.1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=adfe992a356b0c90f73658bc714a3509
diff --git a/metadata/md5-cache/app-crypt/hashcat-4.2.0 b/metadata/md5-cache/app-crypt/hashcat-4.2.0
index 09b62a0187c1..ca8219f60fb5 100644
--- a/metadata/md5-cache/app-crypt/hashcat-4.2.0
+++ b/metadata/md5-cache/app-crypt/hashcat-4.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=virtual/opencl video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )
 SLOT=0
 SRC_URI=https://github.com/hashcat/hashcat/archive/v4.2.0.tar.gz -> hashcat-4.2.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b5e2288379b9003da70fb4b11e3f0d78
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r10 b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r10
index e46397ac29e4..5e5b1897af9a 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r10
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r10
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !minimal? ( !libressl? ( dev-libs/openssl:0= ) libressl? (
 REQUIRED_USE=openmp? ( !minimal ) mpi? ( !minimal ) cuda? ( !minimal ) opencl? ( !minimal ) mozilla? ( !minimal )
 SLOT=0
 SRC_URI=http://www.openwall.com/john/g/john-1.7.9.tar.bz2 !minimal? ( http://www.openwall.com/john/g/john-1.7.9-jumbo-7.diff.gz )
-_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=f0cce98648753b0d3eb4ca9c1ed83c06
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r11 b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r11
index 5857f35108ea..a3c43eb66d57 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r11
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r11
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !minimal? ( !libressl? ( dev-libs/openssl:0= ) libressl? (
 REQUIRED_USE=openmp? ( !minimal ) mpi? ( !minimal ) cuda? ( !minimal ) opencl? ( !minimal ) mozilla? ( !minimal )
 SLOT=0
 SRC_URI=http://www.openwall.com/john/g/john-1.7.9.tar.bz2 !minimal? ( http://www.openwall.com/john/g/john-1.7.9-jumbo-7.diff.gz )
-_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=4f7f4dc46dd529e13cbd0bd0601002d0
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6 b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
index a7ec32d75b76..10ac7b88ae2e 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !minimal? ( >=dev-libs/openssl-0.9.7:0 ) mpi? ( virtual/mp
 REQUIRED_USE=openmp? ( !minimal ) mpi? ( !minimal ) cuda? ( !minimal ) opencl? ( !minimal )
 SLOT=0
 SRC_URI=http://www.openwall.com/john/g/john-1.7.9.tar.bz2 !minimal? ( http://www.openwall.com/john/g/john-1.7.9-jumbo-7.diff.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c6caf12db82e5edcd44689ffa315eede
diff --git a/metadata/md5-cache/app-crypt/kbfs-2.5.0 b/metadata/md5-cache/app-crypt/kbfs-2.5.0
new file mode 100644
index 000000000000..36d02ea3225a
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/kbfs-2.5.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=Keybase Filesystem (KBFS)
+EAPI=6
+HOMEPAGE=https://keybase.io/docs/kbfs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-crypt/gnupg sys-fs/fuse
+SLOT=0
+SRC_URI=https://github.com/keybase/kbfs/archive/v2.5.0.tar.gz -> kbfs-2.5.0.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5e538935350926e5bb89502a451f59c1
diff --git a/metadata/md5-cache/app-crypt/kbfs-9999 b/metadata/md5-cache/app-crypt/kbfs-9999
index 4ab7277cb6df..c06c22c2ac06 100644
--- a/metadata/md5-cache/app-crypt/kbfs-9999
+++ b/metadata/md5-cache/app-crypt/kbfs-9999
@@ -8,4 +8,4 @@ LICENSE=BSD
 RDEPEND=app-crypt/gnupg sys-fs/fuse
 SLOT=0
 _eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a48cab71135d8b1a2a79247256b95b7a
+_md5_=6073ebd151be1987d5e32ab0ca5c5ccb
diff --git a/metadata/md5-cache/app-crypt/keybase-2.5.0 b/metadata/md5-cache/app-crypt/keybase-2.5.0
new file mode 100644
index 000000000000..72050e1585c7
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/keybase-2.5.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst test unpack
+DEPEND=~app-crypt/kbfs-2.5.0 >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=Client for keybase.io
+EAPI=6
+HOMEPAGE=https://keybase.io/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-crypt/gnupg
+SLOT=0
+SRC_URI=https://github.com/keybase/client/archive/v2.5.0.tar.gz -> keybase-2.5.0.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=d5a2e45ce025305721218573f76e1cea
diff --git a/metadata/md5-cache/app-crypt/libnitrokey-3.3 b/metadata/md5-cache/app-crypt/libnitrokey-3.3
index eaac9c717e93..1bf26c62ba9e 100644
--- a/metadata/md5-cache/app-crypt/libnitrokey-3.3
+++ b/metadata/md5-cache/app-crypt/libnitrokey-3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/hidapi:= virtual/udev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Nitrokey/libnitrokey/archive/v3.3.tar.gz -> libnitrokey-3.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=167b4440d5c1743588c6d2c4def9994b
diff --git a/metadata/md5-cache/app-crypt/libnitrokey-9999 b/metadata/md5-cache/app-crypt/libnitrokey-9999
index 46e926bbf31c..07e94d92a416 100644
--- a/metadata/md5-cache/app-crypt/libnitrokey-9999
+++ b/metadata/md5-cache/app-crypt/libnitrokey-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/hidapi:= virtual/udev
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=167b4440d5c1743588c6d2c4def9994b
diff --git a/metadata/md5-cache/app-crypt/libu2f-host-1.1.1 b/metadata/md5-cache/app-crypt/libu2f-host-1.1.1
index fdcdd8438afa..befe60a4947e 100644
--- a/metadata/md5-cache/app-crypt/libu2f-host-1.1.1
+++ b/metadata/md5-cache/app-crypt/libu2f-host-1.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/hidapi dev-libs/json-c:= systemd? ( sys-apps/systemd[acl] )
 SLOT=0
 SRC_URI=https://developers.yubico.com/libu2f-host/Releases/libu2f-host-1.1.1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3262a9d96900598c6820399ebc328b5d
diff --git a/metadata/md5-cache/app-crypt/libu2f-host-1.1.3 b/metadata/md5-cache/app-crypt/libu2f-host-1.1.3
index 88e32b88a728..eaf582274a6f 100644
--- a/metadata/md5-cache/app-crypt/libu2f-host-1.1.3
+++ b/metadata/md5-cache/app-crypt/libu2f-host-1.1.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/hidapi dev-libs/json-c:= systemd? ( sys-apps/systemd[acl] )
 SLOT=0
 SRC_URI=https://developers.yubico.com/libu2f-host/Releases/libu2f-host-1.1.3.tar.xz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=27957a18a9af7f21c08c8bd67de6b033
diff --git a/metadata/md5-cache/app-crypt/libykneomgr-0.1.8 b/metadata/md5-cache/app-crypt/libykneomgr-0.1.8
index 638554f80a53..166ce1564f72 100644
--- a/metadata/md5-cache/app-crypt/libykneomgr-0.1.8
+++ b/metadata/md5-cache/app-crypt/libykneomgr-0.1.8
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=sys-apps/pcsc-lite dev-libs/libzip >=app-crypt/ccid-1.4.18[usb]
 SLOT=0
 SRC_URI=https://developers.yubico.com/libykneomgr/Releases/libykneomgr-0.1.8.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=ef81bad2fca3a99648ec280feec0d385
diff --git a/metadata/md5-cache/app-crypt/moolticute-0.18.1 b/metadata/md5-cache/app-crypt/moolticute-0.18.1
index 9db026c470f8..a4e4b5ff82a0 100644
--- a/metadata/md5-cache/app-crypt/moolticute-0.18.1
+++ b/metadata/md5-cache/app-crypt/moolticute-0.18.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/libusb-1.0.20 dev-qt/qtcore: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.18.1.tar.gz -> moolticute-0.18.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e18b831bbaccfbc5746f7c210949d7db
diff --git a/metadata/md5-cache/app-crypt/moolticute-9999 b/metadata/md5-cache/app-crypt/moolticute-9999
index 0fb38520292d..bf4c2cd56b3c 100644
--- a/metadata/md5-cache/app-crypt/moolticute-9999
+++ b/metadata/md5-cache/app-crypt/moolticute-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/mooltipass/moolticute
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/libusb-1.0.20 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e18b831bbaccfbc5746f7c210949d7db
diff --git a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.4-r1 b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.4-r1
index aa8211357e7a..065518762d0d 100644
--- a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.4-r1
+++ b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/tpm-emulator/tpm_emulator-0.7.4.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=396d5e96e98f54026c7c10fd459644e1
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.14-r1 b/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
index 8b2e159f9bfe..5be5340dd4dc 100644
--- a/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 GPL-2
 RDEPEND=>=dev-libs/glib-2 !libressl? ( >=dev-libs/openssl-0.9.7:0 ) libressl? ( dev-libs/libressl ) selinux? ( sec-policy/selinux-tcsd )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/trousers/trousers-0.3.14.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=2b30b563ddde3b8eedd2fe6aa8c36b52
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.19 b/metadata/md5-cache/app-crypt/veracrypt-1.19
index c72fa28f3694..59ee5b97f997 100644
--- a/metadata/md5-cache/app-crypt/veracrypt-1.19
+++ b/metadata/md5-cache/app-crypt/veracrypt-1.19
@@ -10,5 +10,5 @@ RDEPEND=sys-fs/lvm2 sys-fs/fuse x11-libs/wxGTK:3.0[X?] app-admin/sudo dev-libs/p
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.19.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
 _md5_=a3a3368901287391d5b11eb4bf52020b
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.21 b/metadata/md5-cache/app-crypt/veracrypt-1.21
index 77c5bc7f20eb..aec0110ff033 100644
--- a/metadata/md5-cache/app-crypt/veracrypt-1.21
+++ b/metadata/md5-cache/app-crypt/veracrypt-1.21
@@ -10,5 +10,5 @@ RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0[X?] app-admin/sudo dev-libs
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.21.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
 _md5_=9bd7101b0f2b609caa7997622da74126
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.22 b/metadata/md5-cache/app-crypt/veracrypt-1.22
index 92acbb090357..d8b1d015c8e8 100644
--- a/metadata/md5-cache/app-crypt/veracrypt-1.22
+++ b/metadata/md5-cache/app-crypt/veracrypt-1.22
@@ -10,5 +10,5 @@ RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0[X?] app-admin/sudo dev-libs
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.22.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
 _md5_=b629e6d3b51ab0f09d06c5a2909956ca
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 2b0daeb9cea2..ad4d42fd56f4 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-18.59-r11 b/metadata/md5-cache/app-editors/emacs-18.59-r11
deleted file mode 100644
index eb55995d1b76..000000000000
--- a/metadata/md5-cache/app-editors/emacs-18.59-r11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-eselect/eselect-emacs-1.16 sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) virtual/pkgconfig
-DESCRIPTION=The extensible self-documenting text editor
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=abi_x86_x32
-KEYWORDS=amd64 x86
-LICENSE=GPL-1+ GPL-2+ BSD
-RDEPEND=>=app-eselect/eselect-emacs-1.16 sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) )
-SLOT=18
-SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/emacs-18.59.tar.gz ftp://ftp.splode.com/pub/users/friedman/emacs/emacs-18.59-linux22x-elf-glibc21.diff.gz https://dev.gentoo.org/~ulm/emacs/emacs-18.59-patches-10.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2a8494a80bcfadb52b4261131afb77f8
diff --git a/metadata/md5-cache/app-editors/emacs-18.59-r12 b/metadata/md5-cache/app-editors/emacs-18.59-r12
index fc67e63ca995..6326c5583461 100644
--- a/metadata/md5-cache/app-editors/emacs-18.59-r12
+++ b/metadata/md5-cache/app-editors/emacs-18.59-r12
@@ -5,10 +5,10 @@ DESCRIPTION=The extensible self-documenting text editor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=abi_x86_x32 X
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-1+ GPL-2+ BSD HPND
 RDEPEND=>=app-eselect/eselect-emacs-1.16 sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) X? ( x11-libs/libX11 )
 SLOT=18
 SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/emacs-18.59.tar.gz ftp://ftp.splode.com/pub/users/friedman/emacs/emacs-18.59-linux22x-elf-glibc21.diff.gz https://dev.gentoo.org/~ulm/emacs/emacs-18.59-patches-11.tar.xz
 _eclasses_=eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8a3d76a0249e37e04b9720a661d61f18
+_md5_=3b225bd63c3ba841eeef0ceb66103263
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-26.1.9999 b/metadata/md5-cache/app-editors/emacs-vcs-26.1.9999
index 021723440024..93bea2f73c4e 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-26.1.9999
+++ b/metadata/md5-cache/app-editors/emacs-vcs-26.1.9999
@@ -8,6 +8,7 @@ IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm g
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) )
 REQUIRED_USE=?? ( aqua X )
+RESTRICT=test
 SLOT=26
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=291363fa34c5d34b1e71b724e2c3dc92
+_md5_=eb3925265a536e7b0d2733bcd74fefeb
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-27.0.50_pre20180731 b/metadata/md5-cache/app-editors/emacs-vcs-27.0.50_pre20180731
new file mode 100644
index 000000000000..63b86c8567a7
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-vcs-27.0.50_pre20180731
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) )
+REQUIRED_USE=?? ( aqua X )
+RESTRICT=test
+SLOT=27
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-27.0.50_pre20180731.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-27.0.50_pre20180731.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a62f184e60d11ce2d464dda1e09117b2
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999 b/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999
index 4adf969ba993..4402ae126f06 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999
@@ -1,13 +1,14 @@
 BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto ) sys-apps/texinfo >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto ) sys-apps/texinfo >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) )
+RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) )
 REQUIRED_USE=?? ( aqua X )
+RESTRICT=test
 SLOT=27
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=76f99ee124c836a56998c2414a0ffa6f
+_md5_=a62f184e60d11ce2d464dda1e09117b2
diff --git a/metadata/md5-cache/app-editors/gedit-3.28.1 b/metadata/md5-cache/app-editors/gedit-3.28.1
new file mode 100644
index 000000000000..32c8d41c7085
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gedit-3.28.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] >=x11-libs/gtk+-3.22.0:3[introspection?] >=x11-libs/gtksourceview-3.22.0:3.0[introspection?] >=dev-libs/libpeas-1.14.1[gtk] gnome-base/gsettings-desktop-schemas gnome-base/gvfs x11-libs/libX11 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) python? ( python_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_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3:3[cairo,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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/libpeas[python,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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( >=app-text/gspell-0.2.5:0= ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.50.1 >=sys-devel/gettext-0.18 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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A text editor for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gedit
+IUSE=+introspection +python spell vala python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] >=x11-libs/gtk+-3.22.0:3[introspection?] >=x11-libs/gtksourceview-3.22.0:3.0[introspection?] >=dev-libs/libpeas-1.14.1[gtk] gnome-base/gsettings-desktop-schemas gnome-base/gvfs x11-libs/libX11 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) python? ( python_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_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3:3[cairo,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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/libpeas[python,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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( >=app-text/gspell-0.2.5:0= ) x11-themes/adwaita-icon-theme
+REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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=0
+SRC_URI=mirror://gnome/sources/gedit/3.28/gedit-3.28.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9168b8d12be95c1dfcc6de062e539183
diff --git a/metadata/md5-cache/app-editors/okteta-0.25.2 b/metadata/md5-cache/app-editors/okteta-0.25.2
new file mode 100644
index 000000000000..c4f794be458f
--- /dev/null
+++ b/metadata/md5-cache/app-editors/okteta-0.25.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Hex editor by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/okteta https://utils.kde.org/projects/okteta
+IUSE=crypt designer test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/okteta/0.25.2/src/okteta-0.25.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bd59eb01dc544aca2208054374321931
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 044504942d4f..4e718fff1d41 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/buildah-1.1 b/metadata/md5-cache/app-emulation/buildah-1.1
deleted file mode 100644
index e3ac23d39782..000000000000
--- a/metadata/md5-cache/app-emulation/buildah-1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= ) >=dev-lang/go-1.9
-DESCRIPTION=A tool that facilitates building OCI images
-EAPI=6
-HOMEPAGE=https://github.com/projectatomic/buildah
-IUSE=ostree selinux
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
-REQUIRED_USE=!selinux? ( !ostree )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/projectatomic/buildah/archive/v1.1.tar.gz -> buildah-1.1.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3ad35d375e3b0174685ed9a4ab036b1b
diff --git a/metadata/md5-cache/app-emulation/buildah-1.3 b/metadata/md5-cache/app-emulation/buildah-1.3
new file mode 100644
index 000000000000..2a9eca2d2e2f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/buildah-1.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= ) >=dev-lang/go-1.9
+DESCRIPTION=A tool that facilitates building OCI images
+EAPI=6
+HOMEPAGE=https://github.com/projectatomic/buildah
+IUSE=ostree selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
+REQUIRED_USE=!selinux? ( !ostree )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/projectatomic/buildah/archive/v1.3.tar.gz -> buildah-1.3.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5a703b2b00d59cdeec50035fef3af7a3
diff --git a/metadata/md5-cache/app-emulation/docker-18.03.1 b/metadata/md5-cache/app-emulation/docker-18.03.1
index 6359a388c5f0..75fa7d06b7bd 100644
--- a/metadata/md5-cache/app-emulation/docker-18.03.1
+++ b/metadata/md5-cache/app-emulation/docker-18.03.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v18.03.1-ce.tar.gz -> docker-18.03.1.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=22198cd8e8200f61174fc6be6585e169
diff --git a/metadata/md5-cache/app-emulation/docker-18.06.0 b/metadata/md5-cache/app-emulation/docker-18.06.0
index 3f9d7a23c704..0e70aec54b52 100644
--- a/metadata/md5-cache/app-emulation/docker-18.06.0
+++ b/metadata/md5-cache/app-emulation/docker-18.06.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v18.06.0-ce.tar.gz -> docker-18.06.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=957a2e552db0a4bf0f5bc95eeda832bd
diff --git a/metadata/md5-cache/app-emulation/docker-9999 b/metadata/md5-cache/app-emulation/docker-9999
index 98c5912ab254..be5a9cb0c975 100644
--- a/metadata/md5-cache/app-emulation/docker-9999
+++ b/metadata/md5-cache/app-emulation/docker-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >=app-emulation/containerd-1.0.0 app-emulation/runc[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.13.0[static] )
 RESTRICT=installsources strip
 SLOT=0
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	git-r3	8f6de46b0aa318aea0e8cac62ece098b	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	git-r3	8f6de46b0aa318aea0e8cac62ece098b	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=facc44632d7c791e3fc9944228968cbb
diff --git a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5 b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
index 96256f1f38fc..045985bcda3c 100644
--- a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
+++ b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXau x11-libs/libXext x11-libs/libXdmcp x11-apps/xset x11-apps/xlsfonts x11-apps/bdftopcf x11-apps/mkfontdir ) svga? ( media-libs/svgalib ) gpm? ( sys-libs/gpm ) alsa? ( media-libs/alsa-lib ) sndfile? ( media-libs/libsndfile ) fluidsynth? ( media-sound/fluidsynth media-sound/fluid-soundfont ) media-libs/libsdl >=sys-libs/slang-1.4
 SLOT=0
 SRC_URI=mirror://sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz https://sourceforge.net/code-snapshots/git/d/do/dosemu/code.git/dosemu-code-15cfb41ff20a052769d753c3262c57ecb050ad71.zip -> dosemu-1.4.1_pre20130107.zip
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=97cbe682647ddf342b101d0acdecf383
diff --git a/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3 b/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3
index c49aa492eada..0c3b0f66e643 100644
--- a/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3
+++ b/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libXt x11-libs/libxkbfile x11-libs/libXext x11-misc/xkeyboard-config dga? ( x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !X? ( sdl? ( media-libs/libsdl ) !sdl? ( sys-libs/ncurses:0= ) ) alsa? ( media-libs/alsa-lib ) !alsa? ( sdl-sound? ( media-libs/sdl-sound ) ) capslib? ( >=games-emulation/caps-20060612 ) sys-libs/zlib virtual/cdrtools
 SLOT=0
 SRC_URI=http://www.rcdrummond.net/uae/e-uae-0.8.29-WIP4/e-uae-0.8.29-WIP4.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=00be1672c758d81b383a1b75c3338284
diff --git a/metadata/md5-cache/app-emulation/genymotion-bin-2.11.0 b/metadata/md5-cache/app-emulation/genymotion-bin-2.11.0
index d684ff9faf11..9ef8866b8029 100644
--- a/metadata/md5-cache/app-emulation/genymotion-bin-2.11.0
+++ b/metadata/md5-cache/app-emulation/genymotion-bin-2.11.0
@@ -8,5 +8,5 @@ RDEPEND=|| ( >=app-emulation/virtualbox-5.0.28 >=app-emulation/virtualbox-bin-5.
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=genymotion-2.11.0-linux_x64.bin
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d64c69f90e116b93de5d1c7952e5237b
diff --git a/metadata/md5-cache/app-emulation/lxc-2.1.1-r1 b/metadata/md5-cache/app-emulation/lxc-2.1.1-r1
new file mode 100644
index 000000000000..10f223e102cc
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxc-2.1.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=net-libs/gnutls sys-libs/libcap cgmanager? ( app-admin/cgmanager ) lua? ( >=dev-lang/lua-5.1:= ) python? ( 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(-)] ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) app-text/docbook-sgml-utils >=sys-kernel/linux-headers-3.2 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=LinuX Containers userspace utilities
+EAPI=6
+HOMEPAGE=https://linuxcontainers.org/
+IUSE=cgmanager examples lua python seccomp selinux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+LICENSE=LGPL-3
+RDEPEND=net-libs/gnutls sys-libs/libcap cgmanager? ( app-admin/cgmanager ) lua? ( >=dev-lang/lua-5.1:= ) python? ( 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(-)] ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) sys-apps/util-linux app-misc/pax-utils virtual/awk
+REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-2.1.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7e65a7a3777362b9a2dcb7d749295685
diff --git a/metadata/md5-cache/app-emulation/lxc-3.0.1-r1 b/metadata/md5-cache/app-emulation/lxc-3.0.1-r1
new file mode 100644
index 000000000000..7fa87564c24f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxc-3.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=net-libs/gnutls sys-libs/libcap pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) >=app-text/docbook-sgml-utils-0.6.14-r2 >=sys-kernel/linux-headers-3.2 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=LinuX Containers userspace utilities
+EAPI=6
+HOMEPAGE=https://linuxcontainers.org/
+IUSE=examples pam python seccomp selinux +templates kernel_linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+LICENSE=LGPL-3
+PDEPEND=templates? ( app-emulation/lxc-templates ) python? ( dev-python/python3-lxc )
+RDEPEND=net-libs/gnutls sys-libs/libcap pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) sys-apps/util-linux app-misc/pax-utils virtual/awk
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-3.0.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ae6f2bb5b4186c6db8512123afef67ea
diff --git a/metadata/md5-cache/app-emulation/qemu-2.11.1-r2 b/metadata/md5-cache/app-emulation/qemu-2.11.1-r2
index cd036e15e5bc..dc3149b349c5 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.11.1-r2
+++ b/metadata/md5-cache/app-emulation/qemu-2.11.1-r2
@@ -10,5 +10,5 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.11.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.11.1-patches-r1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e27eb18af8c87347174df1727f0ea84e
diff --git a/metadata/md5-cache/app-emulation/qemu-2.12.0-r3 b/metadata/md5-cache/app-emulation/qemu-2.12.0-r3
index fb9f31f09c31..0a7eceadf2bd 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.12.0-r3
+++ b/metadata/md5-cache/app-emulation/qemu-2.12.0-r3
@@ -10,5 +10,5 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.12.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.12.0-patches-r5.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=82fa2aaa819849f0d54dd3871fcca827
diff --git a/metadata/md5-cache/app-emulation/qemu-2.12.0-r4 b/metadata/md5-cache/app-emulation/qemu-2.12.0-r4
index 2202b8a07265..d7f0139a67f0 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.12.0-r4
+++ b/metadata/md5-cache/app-emulation/qemu-2.12.0-r4
@@ -10,5 +10,5 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.12.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.12.0-patches-r5.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b5ecf4931758ac23243c00e79bfea1ba
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index aa7fba5220a4..3c41f4b8c28a 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) >=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(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=51d8d7aa7c440ad7c18cb2f448f9f534
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.11.1 b/metadata/md5-cache/app-emulation/qemu-guest-agent-2.11.1
index 5c0c247c4ca0..4766a0cb441a 100644
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.11.1
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-2.11.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 BSD-2
 RDEPEND=dev-libs/glib x11-libs/pixman
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-2.11.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=72a81c64958338949bbcce342fbf506f
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.12.0-r1 b/metadata/md5-cache/app-emulation/qemu-guest-agent-2.12.0-r1
index 8c5b82e21c5b..3922ecc3aa81 100644
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.12.0-r1
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-2.12.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 BSD-2
 RDEPEND=dev-libs/glib
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-2.12.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0f35aa135db7a86acd4ed312093c77c1
diff --git a/metadata/md5-cache/app-emulation/reg-0.15.4-r2 b/metadata/md5-cache/app-emulation/reg-0.15.4-r2
new file mode 100644
index 000000000000..578205b958ae
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/reg-0.15.4-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Docker registry v2 command line client
+EAPI=6
+HOMEPAGE=https://github.com/genuinetools/reg
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/genuinetools/reg/archive/v0.15.4.tar.gz -> reg-0.15.4.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=b39c3a2a95e109fb7e423fd8417d4ab5
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.1.36 b/metadata/md5-cache/app-emulation/virtualbox-5.1.36
index 81bd6f088d1e..c3cd6faafdd5 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.1.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.1.36
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.36 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.1.36/VirtualBox-5.1.36.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4d8b6f9f1373a10da6bf7b63b2eefeea
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.1.38 b/metadata/md5-cache/app-emulation/virtualbox-5.1.38
index 491b3336959c..9917dce9ceb2 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.1.38
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.1.38
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.38 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.1.38/VirtualBox-5.1.38.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ca6583917c24fd507005d48884e92946
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.14-r1 b/metadata/md5-cache/app-emulation/virtualbox-5.2.14-r1
index 79c01f9270fb..6818b2632a50 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.14-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.14-r1
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.14 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.2.14/VirtualBox-5.2.14.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.12-patches-01.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=db02e69860e34af9adf55edf95f72413
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.16 b/metadata/md5-cache/app-emulation/virtualbox-5.2.16
index df5a0899d251..c260eacaff4b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.16
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.16
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.16 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.2.16/VirtualBox-5.2.16.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=78ed3706e6a1523751423f22b2becca1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.36.122089 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.36.122089
index f67d1f35c260..46af4ff0d4ae 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.36.122089
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.36.122089
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.1.36/VirtualBox-5.1.36-122089-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.1.36/VirtualBox-5.1.36-122089-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.1.36/Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.1.36/VirtualBoxSDK-5.1.36-122089.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cd2c915f805e4f7998048f0d6fe7c488
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.38.122592 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.38.122592
index 0255e605ed2b..16275aa230ad 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.38.122592
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.38.122592
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.1.38/VirtualBox-5.1.38-122592-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.1.38/VirtualBox-5.1.38-122592-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.1.38/Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.1.38/VirtualBoxSDK-5.1.38-122592.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6040cbe2623647c024ca24a36c9701dc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.14.123301 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.14.123301
index 5a9d255e6762..c8bc5d8d1c6a 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.14.123301
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.14.123301
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.14/VirtualBox-5.2.14-123301-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.14/VirtualBox-5.2.14-123301-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.14/Oracle_VM_VirtualBox_Extension_Pack-5.2.14-123301.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.14-123301.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.14/VirtualBoxSDK-5.2.14-123301.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=eb778bac753476545c9050c0db9d8257
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.16.123759 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.16.123759
index 811a1815a59d..b298f03a21ed 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.16.123759
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.16.123759
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.16/VirtualBox-5.2.16-123759-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.16/VirtualBox-5.2.16-123759-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.16/Oracle_VM_VirtualBox_Extension_Pack-5.2.16-123759.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.16-123759.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.16/VirtualBoxSDK-5.2.16-123759.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=42d5dd5d7511d69dda21fc60b81c5eaf
diff --git a/metadata/md5-cache/app-emulation/wine-any-2.0-r1 b/metadata/md5-cache/app-emulation/wine-any-2.0-r1
index e7cade4e04e6..48ab41fe0405 100644
--- a/metadata/md5-cache/app-emulation/wine-any-2.0-r1
+++ b/metadata/md5-cache/app-emulation/wine-any-2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=2.0
 SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.0.tar.gz -> wine-staging-2.0.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.0.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ec7e8d04045e41ee5ea7fd586e1d6f61
diff --git a/metadata/md5-cache/app-emulation/wine-any-3.11 b/metadata/md5-cache/app-emulation/wine-any-3.11
index aa818bf8f8da..61ec504cc6cf 100644
--- a/metadata/md5-cache/app-emulation/wine-any-3.11
+++ b/metadata/md5-cache/app-emulation/wine-any-3.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.11
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.11.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v3.11.tar.gz -> wine-staging-3.11.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-3.11.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5161fed15ee6e8e1e8ffc9ad21873e01
diff --git a/metadata/md5-cache/app-emulation/wine-any-3.12 b/metadata/md5-cache/app-emulation/wine-any-3.12
index 5ac95545e48a..a8fc8c11ac43 100644
--- a/metadata/md5-cache/app-emulation/wine-any-3.12
+++ b/metadata/md5-cache/app-emulation/wine-any-3.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.12
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.12.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v3.12.tar.gz -> wine-staging-3.12.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-3.12.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c5ef3e1f7bf63bba7fc5812b0f73e37b
diff --git a/metadata/md5-cache/app-emulation/wine-any-3.13 b/metadata/md5-cache/app-emulation/wine-any-3.13
index 68484ee053aa..0a44461a938b 100644
--- a/metadata/md5-cache/app-emulation/wine-any-3.13
+++ b/metadata/md5-cache/app-emulation/wine-any-3.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.13
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v3.13.tar.gz -> wine-staging-3.13.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-3.13.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c5ef3e1f7bf63bba7fc5812b0f73e37b
diff --git a/metadata/md5-cache/app-emulation/wine-any-3.13-r1 b/metadata/md5-cache/app-emulation/wine-any-3.13-r1
index 45fca4b4c68f..2849681c7b91 100644
--- a/metadata/md5-cache/app-emulation/wine-any-3.13-r1
+++ b/metadata/md5-cache/app-emulation/wine-any-3.13-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.13
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v3.13.tar.gz -> wine-staging-3.13.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-3.13.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b74da0b9bee6835cacef6bf5a9827557
diff --git a/metadata/md5-cache/app-emulation/wine-any-9999 b/metadata/md5-cache/app-emulation/wine-any-9999
index 39782b91ceeb..28f75968354b 100644
--- a/metadata/md5-cache/app-emulation/wine-any-9999
+++ b/metadata/md5-cache/app-emulation/wine-any-9999
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b74da0b9bee6835cacef6bf5a9827557
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1 b/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1
index e0600b0e4fc3..2352ab6325d2 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=2.0
 SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.0.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=220ffa093c4acc4be3a36472044e3198
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-3.11 b/metadata/md5-cache/app-emulation/wine-d3d9-3.11
index 858ed803e74a..14ac044fdb50 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-3.11
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-3.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.11
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.11.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-3.11.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=55144b2b02729b9b5a2b6e51c73ad62b
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-3.12 b/metadata/md5-cache/app-emulation/wine-d3d9-3.12
index 0a13e3d1daa2..b925cfb575b5 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-3.12
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-3.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.12
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.12.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-3.12.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=55144b2b02729b9b5a2b6e51c73ad62b
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-3.13 b/metadata/md5-cache/app-emulation/wine-d3d9-3.13
index f1003b4c4e7a..0ff704c289e4 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-3.13
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-3.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.13
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-3.13.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=55144b2b02729b9b5a2b6e51c73ad62b
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-3.13-r1 b/metadata/md5-cache/app-emulation/wine-d3d9-3.13-r1
index 96bb66245c0f..7454e3022bca 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-3.13-r1
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-3.13-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.13
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-3.13.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f4709cfe5e5355b88b3da3526690100c
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-9999 b/metadata/md5-cache/app-emulation/wine-d3d9-9999
index f81782692f20..c8747288f25b 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-9999
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-9999
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f4709cfe5e5355b88b3da3526690100c
diff --git a/metadata/md5-cache/app-emulation/wine-staging-2.0-r1 b/metadata/md5-cache/app-emulation/wine-staging-2.0-r1
index 29ef49e2b342..78e72d6c4cc2 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-2.0-r1
+++ b/metadata/md5-cache/app-emulation/wine-staging-2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=2.0
 SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.0.tar.gz -> wine-staging-2.0.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d28fdb3298c6122272b9861157b59c85
diff --git a/metadata/md5-cache/app-emulation/wine-staging-3.11 b/metadata/md5-cache/app-emulation/wine-staging-3.11
index 1128d5676e02..a49fd917d585 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-3.11
+++ b/metadata/md5-cache/app-emulation/wine-staging-3.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.11
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.11.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v3.11.tar.gz -> wine-staging-3.11.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=69e53a908851ce07a0f78528516532dc
diff --git a/metadata/md5-cache/app-emulation/wine-staging-3.12 b/metadata/md5-cache/app-emulation/wine-staging-3.12
index f4a393f5d941..b6caf0adc1a5 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-3.12
+++ b/metadata/md5-cache/app-emulation/wine-staging-3.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.12
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.12.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v3.12.tar.gz -> wine-staging-3.12.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=287a431a150dc974e608a633611db313
diff --git a/metadata/md5-cache/app-emulation/wine-staging-3.13 b/metadata/md5-cache/app-emulation/wine-staging-3.13
index 7f7b22a83d66..87d09cfcf5e8 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-3.13
+++ b/metadata/md5-cache/app-emulation/wine-staging-3.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.13
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v3.13.tar.gz -> wine-staging-3.13.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=287a431a150dc974e608a633611db313
diff --git a/metadata/md5-cache/app-emulation/wine-staging-3.13-r1 b/metadata/md5-cache/app-emulation/wine-staging-3.13-r1
index 534fdd6b589e..6d06a782bb67 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-3.13-r1
+++ b/metadata/md5-cache/app-emulation/wine-staging-3.13-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.13
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v3.13.tar.gz -> wine-staging-3.13.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d56de0579c7b211ce87ea6b5e4a6eac1
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index 8feb5d8faf3e..45a05d466702 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d56de0579c7b211ce87ea6b5e4a6eac1
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-3.0.1 b/metadata/md5-cache/app-emulation/wine-vanilla-3.0.1
index adc3d3fdc6e0..b14e0a85a1ce 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.0.1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.0.1
 SRC_URI=https://dl.winehq.org/wine/source/3.0/wine-3.0.1.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5ddf679eda0af24ed344182feacbb517
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-3.0.2 b/metadata/md5-cache/app-emulation/wine-vanilla-3.0.2
index 6dc94af90224..3b6239b7aac6 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.0.2
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.0.2
 SRC_URI=https://dl.winehq.org/wine/source/3.0/wine-3.0.2.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e76a30cbe37e3ade2e61a5575f892cbc
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-3.11 b/metadata/md5-cache/app-emulation/wine-vanilla-3.11
index 20e0b49f6e3e..d38c00ff47ea 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.11
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.11
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.11.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5c1b2fe7c98265c1c0a99ab0b699c553
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-3.12 b/metadata/md5-cache/app-emulation/wine-vanilla-3.12
index 31c18cce2220..43f155536ebb 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.12
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.12
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.12.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5c1b2fe7c98265c1c0a99ab0b699c553
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-3.13 b/metadata/md5-cache/app-emulation/wine-vanilla-3.13
index 6ef91efdd997..305f6e3a1877 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.13
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.13
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5c1b2fe7c98265c1c0a99ab0b699c553
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-3.13-r1 b/metadata/md5-cache/app-emulation/wine-vanilla-3.13-r1
index ad90ece1a0fb..dc41746456e8 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.13-r1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.13-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.13
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e93f78b4224436ec6ce99f7f2f42b33d
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index bc0ce4493bdc..6c8bb895c9f5 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e93f78b4224436ec6ce99f7f2f42b33d
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 697930fbb60c..5c966bdfcd5a 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-qtgraphicssystem-1.1.1 b/metadata/md5-cache/app-eselect/eselect-qtgraphicssystem-1.1.1
deleted file mode 100644
index b57cfba2dfc2..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-qtgraphicssystem-1.1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Utility to change the active Qt Graphics System
-EAPI=4
-HOMEPAGE=https://github.com/gentoo/eselect-qtgraphicssystem
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.4
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~wired/distfiles/eselect-qtgraphicssystem-1.1.1.tar.bz2
-_md5_=6daead9ccbda3f2582c92743b49d59d9
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 285b6b73c056..388dc65ffc54 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/volatility-2.4.1 b/metadata/md5-cache/app-forensics/volatility-2.4.1
index 6a4f1178eef1..67eb684489a2 100644
--- a/metadata/md5-cache/app-forensics/volatility-2.4.1
+++ b/metadata/md5-cache/app-forensics/volatility-2.4.1
@@ -2,7 +2,7 @@ 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(-)]
 DESCRIPTION=Framework for analyzing volatile memory
 EAPI=5
-HOMEPAGE=http://www.volatilityfoundation.org/
+HOMEPAGE=https://www.volatilityfoundation.org/
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/volatility-2.4.1.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d766bf9e1b213d6b7ffd13520798d72c
+_md5_=edf3f59929f673df6f212dc36f536f8d
diff --git a/metadata/md5-cache/app-forensics/volatility-2.6 b/metadata/md5-cache/app-forensics/volatility-2.6
index 2c8c9ae966c9..cac2d5a459af 100644
--- a/metadata/md5-cache/app-forensics/volatility-2.6
+++ b/metadata/md5-cache/app-forensics/volatility-2.6
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Framework for analyzing volatile memory
 EAPI=5
-HOMEPAGE=http://www.volatilityfoundation.org/
+HOMEPAGE=https://www.volatilityfoundation.org/
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/distorm64-3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libpcre || ( dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=http://downloads.volatilityfoundation.org/releases/2.6/volatility-2.6.zip
+SRC_URI=https://downloads.volatilityfoundation.org/releases/2.6/volatility-2.6.zip
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c80525f74d3e9e7d9ad8c6defd5e36e
+_md5_=bcffdae60a4c4a1ce35cc822ec85b40b
diff --git a/metadata/md5-cache/app-forensics/volatility-2.6-r1 b/metadata/md5-cache/app-forensics/volatility-2.6-r1
new file mode 100644
index 000000000000..e761cebe3f67
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/volatility-2.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/unzip
+DESCRIPTION=Framework for analyzing volatile memory
+EAPI=7
+HOMEPAGE=https://www.volatilityfoundation.org/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/distorm64-3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libpcre || ( dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://downloads.volatilityfoundation.org/releases/2.6/volatility-2.6.zip
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9b75a3bbc691af99014a3648bb11d154
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index f84f6455cb04..3131faac9dc2 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.12 b/metadata/md5-cache/app-i18n/ibus-1.5.12
index 4228f9f95d47..a68d5d853a37 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.12
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.12
@@ -7,8 +7,8 @@ IUSE=+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland
 KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) 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/pygobject: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(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
-REQUIRED_USE=gtk2? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk introspection ) test? ( gtk ) vala? ( introspection )
+REQUIRED_USE=gtk2? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) introspection ) test? ( gtk ) vala? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.12/ibus-1.5.12.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4b0ee9b42b4c8f34d904e56499ef51bd
+_md5_=80b31cd2dc00e355f95eff5394c52718
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.16 b/metadata/md5-cache/app-i18n/ibus-1.5.16
index 77bb08c516b6..03dc48019e0d 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.16
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.16
@@ -7,8 +7,8 @@ IUSE=+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test v
 KEYWORDS=~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) 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/pygobject: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(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
-REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk introspection ) test? ( gtk ) vala? ( introspection )
+REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) introspection ) test? ( gtk ) vala? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.16/ibus-1.5.16.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f3ac7af1be54e0273ceb6ce4870a069
+_md5_=255963a8c9792367dc1232b7d242071a
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.17 b/metadata/md5-cache/app-i18n/ibus-1.5.17
deleted file mode 100644
index d3993b02de8b..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-1.5.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) 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/pygobject: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(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) dev-util/intltool virtual/pkgconfig emoji? ( app-i18n/unicode-cldr app-i18n/unicode-emoji ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) 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/pygobject: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(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
-REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk introspection ) test? ( gtk ) vala? ( introspection )
-SLOT=0
-SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.17/ibus-1.5.17.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b0c9965df52abffd8371ff55cd329fc8
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.18 b/metadata/md5-cache/app-i18n/ibus-1.5.18
index 669df53257ce..2a01af27f07e 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.18
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.18
@@ -7,8 +7,8 @@ IUSE=+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) 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/pygobject: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(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
-REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk introspection ) test? ( gtk ) vala? ( introspection )
+REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) introspection ) test? ( gtk ) vala? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.18/ibus-1.5.18.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=72c3bc189a5ab3b4e57a8c86f00051b8
+_md5_=5e910734ecd4b011a670543ef1e0c0aa
diff --git a/metadata/md5-cache/app-i18n/ibus-qt-1.3.3 b/metadata/md5-cache/app-i18n/ibus-qt-1.3.3
deleted file mode 100644
index 7d7a06e88a32..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-qt-1.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-i18n/ibus dev-libs/icu:= dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 sys-apps/dbus x11-libs/libX11 virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt IBus library and Qt input method plugin
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=doc
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=app-i18n/ibus dev-libs/icu:= dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 sys-apps/dbus x11-libs/libX11
-SLOT=0
-SRC_URI=https://github.com/ibus/ibus-qt/archive/1.3.3.tar.gz -> ibus-qt-1.3.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=66cf905bfdc5d8f26912373bd24e5c9e
diff --git a/metadata/md5-cache/app-i18n/poedit-2.0.9 b/metadata/md5-cache/app-i18n/poedit-2.0.9
index f5eb41308140..7df1ad5036b1 100644
--- a/metadata/md5-cache/app-i18n/poedit-2.0.9
+++ b/metadata/md5-cache/app-i18n/poedit-2.0.9
@@ -3,10 +3,10 @@ DEPEND=app-text/gtkspell:3 x11-libs/gtk+:3 >=dev-cpp/lucene++-3.0.5 dev-libs/boo
 DESCRIPTION=GUI gettext translations editor
 EAPI=6
 HOMEPAGE=https://poedit.net
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=app-text/gtkspell:3 x11-libs/gtk+:3 >=dev-cpp/lucene++-3.0.5 dev-libs/boost:=[nls] dev-libs/icu:= >=x11-libs/wxGTK-3.0.3:3.0-gtk3[X]
 SLOT=0
 SRC_URI=https://github.com/vslavik/poedit/releases/download/v2.0.9-oss/poedit-2.0.9.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=21f9fe8a3b97480bfb284cdb7e6d2683
+_md5_=fc6e45806c782a5b9f9c750346201137
diff --git a/metadata/md5-cache/app-i18n/poedit-2.1.1 b/metadata/md5-cache/app-i18n/poedit-2.1.1
new file mode 100644
index 000000000000..4dede1f332fe
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/poedit-2.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=app-text/gtkspell:3 x11-libs/gtk+:3 >=dev-cpp/lucene++-3.0.5 >=dev-libs/pugixml-1.9 dev-libs/boost:=[nls] dev-libs/icu:= >=x11-libs/wxGTK-3.0.3:3.0-gtk3[X] virtual/pkgconfig >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GUI gettext translations editor
+EAPI=6
+HOMEPAGE=https://poedit.net
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=app-text/gtkspell:3 x11-libs/gtk+:3 >=dev-cpp/lucene++-3.0.5 >=dev-libs/pugixml-1.9 dev-libs/boost:=[nls] dev-libs/icu:= >=x11-libs/wxGTK-3.0.3:3.0-gtk3[X]
+SLOT=0
+SRC_URI=https://github.com/vslavik/poedit/releases/download/v2.1.1-oss/poedit-2.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7eb9439af9eb394aa0eb1bb81a285de5
diff --git a/metadata/md5-cache/app-i18n/qimhangul-0.2.0 b/metadata/md5-cache/app-i18n/qimhangul-0.2.0
deleted file mode 100644
index c5b2765c176e..000000000000
--- a/metadata/md5-cache/app-i18n/qimhangul-0.2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=app-i18n/libhangul-0.0.12 dev-qt/qtgui:4
-DESCRIPTION=a qt-based imhangul
-EAPI=5
-HOMEPAGE=https://code.google.com/p/qimhangul/
-KEYWORDS=amd64
-LICENSE=LGPL-3
-RDEPEND=>=app-i18n/libhangul-0.0.12 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=https://qimhangul.googlecode.com/files/qimhangul-0.2.0.tar.gz
-_md5_=7ad337ff0860bff7846b7e119167e902
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-2.0.3-r2 b/metadata/md5-cache/app-i18n/sunpinyin-2.0.3-r2
index 9c8e1009aa98..2844c89d400d 100644
--- a/metadata/md5-cache/app-i18n/sunpinyin-2.0.3-r2
+++ b/metadata/md5-cache/app-i18n/sunpinyin-2.0.3-r2
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=dev-db/sqlite:3 virtual/pkgconfig dev-util/scons[python_targets_python2_7]
-DESCRIPTION=SunPinyin is a SLM (Statistical Language Model) based IME
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=dev-db/sqlite:3 || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+DESCRIPTION=A Statistical Language Model based Chinese input method library
 EAPI=6
-HOMEPAGE=https://sunpinyin.googlecode.com
+HOMEPAGE=https://github.com/sunpinyin/sunpinyin
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1 CDDL
 RDEPEND=dev-db/sqlite:3
 SLOT=0
-SRC_URI=https://sunpinyin.googlecode.com/files/sunpinyin-2.0.3.tar.gz https://open-gram.googlecode.com/files/dict.utf8.tar.bz2 https://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2bc2feae2591f1a3d75b15a6557db977
+SRC_URI=https://github.com/sunpinyin/sunpinyin/files/sunpinyin-2.0.3.tar.gz https://open-gram.googlecode.com/files/dict.utf8.tar.bz2 https://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=d7f064862289002e9262ad0c969c20aa
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r1 b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r1
deleted file mode 100644
index 32386a242713..000000000000
--- a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-db/sqlite:3 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
-DESCRIPTION=A Statistical Language Model based Chinese input method library
-EAPI=5
-HOMEPAGE=https://github.com/sunpinyin/sunpinyin
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=LGPL-2.1 CDDL
-PDEPEND=app-i18n/sunpinyin-data
-RDEPEND=dev-db/sqlite:3
-SLOT=0/3
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a7c3d933ec98bb16ed0f40a6ef77efa4
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r2 b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r2
new file mode 100644
index 000000000000..5005ee8d1563
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=dev-db/sqlite:3 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+DESCRIPTION=A Statistical Language Model based Chinese input method library
+EAPI=6
+HOMEPAGE=https://github.com/sunpinyin/sunpinyin
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=LGPL-2.1 CDDL
+PDEPEND=<=app-i18n/sunpinyin-data-20130220
+RDEPEND=dev-db/sqlite:3
+SLOT=0/3
+SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ac18fb42b59ec8f3da03fd93da131ab7
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-3.0.0_rc1 b/metadata/md5-cache/app-i18n/sunpinyin-3.0.0_rc1
new file mode 100644
index 000000000000..3d03e90b76ab
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/sunpinyin-3.0.0_rc1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup unpack
+DEPEND=dev-db/sqlite:3 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+DESCRIPTION=A Statistical Language Model based Chinese input method library
+EAPI=6
+HOMEPAGE=https://github.com/sunpinyin/sunpinyin
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1 CDDL
+PDEPEND=>=app-i18n/sunpinyin-data-20140820
+RDEPEND=dev-db/sqlite:3
+SLOT=0/3
+SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/v3.0.0-rc1.tar.gz -> sunpinyin-3.0.0_rc1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=9c40c2b5ebd033e2b80a734d6aac8d78
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-data-20121025 b/metadata/md5-cache/app-i18n/sunpinyin-data-20121025
deleted file mode 100644
index a55aeee46758..000000000000
--- a/metadata/md5-cache/app-i18n/sunpinyin-data-20121025
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=app-i18n/sunpinyin-2.0.4_pre20130108
-DESCRIPTION=Data sets for Sunpinyin
-EAPI=5
-HOMEPAGE=https://open-gram.googlecode.com/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-i18n/sunpinyin-2.0.4_pre20130108
-SLOT=0
-SRC_URI=https://open-gram.googlecode.com/files/dict.utf8-20120830.tar.bz2 https://open-gram.googlecode.com/files/lm_sc.t3g.arpa-20121025.tar.bz2
-_md5_=336d71b67754c47137f5c68285c38ccd
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-data-20130220 b/metadata/md5-cache/app-i18n/sunpinyin-data-20130220
index 169d896c0429..aa6f7808240e 100644
--- a/metadata/md5-cache/app-i18n/sunpinyin-data-20130220
+++ b/metadata/md5-cache/app-i18n/sunpinyin-data-20130220
@@ -1,11 +1,10 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=app-i18n/sunpinyin-2.0.4_pre20130108
+DEPEND==app-i18n/sunpinyin-2.0.4*
 DESCRIPTION=Data sets for Sunpinyin
-EAPI=5
-HOMEPAGE=https://open-gram.googlecode.com/
+EAPI=6
+HOMEPAGE=https://github.com/sunpinyin/open-gram
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=app-i18n/sunpinyin-2.0.4_pre20130108
 SLOT=0
-SRC_URI=https://open-gram.googlecode.com/files/dict.utf8-20130220.tar.bz2 https://open-gram.googlecode.com/files/lm_sc.t3g.arpa-20121025.tar.bz2
-_md5_=131352b6881617936496c5ac38045a95
+SRC_URI=mirror://sourceforge/open-gram/dict.utf8-20130220.tar.bz2 mirror://sourceforge/open-gram/lm_sc.t3g.arpa-20121025.tar.bz2
+_md5_=e26fe08952941c24c3854514f1bcae97
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-data-20140820 b/metadata/md5-cache/app-i18n/sunpinyin-data-20140820
new file mode 100644
index 000000000000..4916fa5ac507
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/sunpinyin-data-20140820
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install unpack
+DEPEND==app-i18n/sunpinyin-3*
+DESCRIPTION=Data sets for Sunpinyin
+EAPI=6
+HOMEPAGE=https://github.com/sunpinyin/open-gram
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=mirror://sourceforge/open-gram/dict.utf8-20131214.tar.bz2 mirror://sourceforge/open-gram/lm_sc.3gm.arpa-20140820.tar.bz2
+_md5_=e87860e3422d8c4246a6c21176dd809c
diff --git a/metadata/md5-cache/app-i18n/tagainijisho-1.0.3-r1 b/metadata/md5-cache/app-i18n/tagainijisho-1.0.3-r1
deleted file mode 100644
index 4a83a9f545b5..000000000000
--- a/metadata/md5-cache/app-i18n/tagainijisho-1.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 >=dev-db/sqlite-3.11:3 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Open-source Japanese dictionary and kanji lookup tool
-EAPI=5
-HOMEPAGE=https://www.tagaini.net/
-IUSE=l10n_ar l10n_cs l10n_de l10n_es l10n_fa l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_nb l10n_nl l10n_pl l10n_pt l10n_ru l10n_sv l10n_th l10n_tr l10n_vi
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ public-domain
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 >=dev-db/sqlite-3.11:3
-SLOT=0
-SRC_URI=https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=26aa96ede0e3ca622fd66c7cedb6b8b2
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.8 b/metadata/md5-cache/app-i18n/uim-1.8.8
index e08263d51ce0..97049c53f011 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.8
+++ b/metadata/md5-cache/app-i18n/uim-1.8.8
@@ -4,12 +4,12 @@ DESCRIPTION=A multilingual input method framework
 EAPI=6
 HOMEPAGE=https://github.com/uim/uim
 IUSE=X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ppc64 x86
 LICENSE=BSD GPL-2 LGPL-2.1
 RDEPEND=!dev-scheme/sigscheme X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) anthy? ( app-i18n/anthy ) canna? ( app-i18n/canna ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) expat? ( dev-libs/expat ) libffi? ( virtual/libffi ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) libedit? ( dev-libs/libedit ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtx11extras:5 ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) X? ( media-fonts/font-sony-misc l10n_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) l10n_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) l10n_zh-CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) l10n_zh-TW? ( media-fonts/intlfonts ) )
 REQUIRED_USE=gtk? ( X ) gtk2? ( X ) qt5? ( X ) xft? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/uim/uim/releases/download/1.8.8/uim-1.8.8.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a97e9825c8ff6133231aa11fd115c505
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7dc0de16652f3addb450961567044660
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 997e8f15103b..2fa1050ed264 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2 b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2
index 6fa3c9f77ba7..572b312b05c4 100644
--- a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2
+++ b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/iproute2 sys-apps/ethtool sys-apps/which acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) bluetooth? ( net-wireless/bluez:= )
 SLOT=0
 SRC_URI=https://github.com/rickysarraf/laptop-mode-tools/releases/download/1.72.2/laptop-mode-tools_1.72.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=cb99138b2565fb1459746ba0863c0982
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index e12a8185c7fe..b3be9894d3ee 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.8.4 b/metadata/md5-cache/app-misc/ddcutil-0.8.4
index 7309c021bb62..59161ff993bf 100644
--- a/metadata/md5-cache/app-misc/ddcutil-0.8.4
+++ b/metadata/md5-cache/app-misc/ddcutil-0.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXrandr x11-libs/libX11 dev-libs/glib:2 sys-apps/i2c-tools virtual/udev usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils )
 SLOT=0
 SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.8.4.tar.gz -> ddcutil-0.8.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c0c476c90eff701544c725271effb6d0
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.8.6 b/metadata/md5-cache/app-misc/ddcutil-0.8.6
index 26b060eff2db..8081f0a92d0a 100644
--- a/metadata/md5-cache/app-misc/ddcutil-0.8.6
+++ b/metadata/md5-cache/app-misc/ddcutil-0.8.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm )
 REQUIRED_USE=drm? ( X )
 SLOT=0
 SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.8.6.tar.gz -> ddcutil-0.8.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1db6c0c81e273f9e91b42a4acd7d6c30
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.8.6-r1 b/metadata/md5-cache/app-misc/ddcutil-0.8.6-r1
index d603ce428974..b0e0c1af852e 100644
--- a/metadata/md5-cache/app-misc/ddcutil-0.8.6-r1
+++ b/metadata/md5-cache/app-misc/ddcutil-0.8.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm )
 REQUIRED_USE=drm? ( X )
 SLOT=0
 SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.8.6.tar.gz -> ddcutil-0.8.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f14d2f6e7eb06a525e52611cc8157cc9
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.9.1 b/metadata/md5-cache/app-misc/ddcutil-0.9.1
new file mode 100644
index 000000000000..2e51e0761811
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ddcutil-0.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare pretend setup
+DEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm ) usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils ) X? ( x11-libs/libXrandr x11-libs/libX11 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Program for querying and changing monitor settings
+EAPI=6
+HOMEPAGE=http://www.ddcutil.com/
+IUSE=drm usb-monitor user-permissions video_cards_nvidia X kernel_linux
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm ) usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils ) X? ( x11-libs/libXrandr x11-libs/libX11 )
+REQUIRED_USE=drm? ( X )
+SLOT=0
+SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.9.1.tar.gz -> ddcutil-0.9.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1669443a1ff788ba80064f995d31262a
diff --git a/metadata/md5-cache/app-misc/elasticsearch-6.3.2 b/metadata/md5-cache/app-misc/elasticsearch-6.3.2
new file mode 100644
index 000000000000..64743a62c5fe
--- /dev/null
+++ b/metadata/md5-cache/app-misc/elasticsearch-6.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
+EAPI=6
+HOMEPAGE=https://www.elastic.co/products/elasticsearch
+IUSE=x-pack
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )
+RDEPEND=virtual/jre:1.8
+SLOT=0
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.3.2.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.3.2.tar.gz )
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=8c4ae55e7f52eb524388a08f4d8da88d
diff --git a/metadata/md5-cache/app-misc/flirc-3.11.6 b/metadata/md5-cache/app-misc/flirc-3.11.6
index 447e9ca41658..b401c18a7a96 100644
--- a/metadata/md5-cache/app-misc/flirc-3.11.6
+++ b/metadata/md5-cache/app-misc/flirc-3.11.6
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 d
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://packagecloud.io/Flirc/repo/packages/ubuntu/artful/flirc_3.11.6_amd64.deb/download.deb -> flirc-3.11.6_amd64.deb ) arm? ( https://packagecloud.io/Flirc/repo/packages/debian/stretch/flirc_3.11.6_armhf.deb/download.deb -> flirc-3.11.6_armhf.deb )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44
 _md5_=bfaf6c6aca5976790a5c289f9acb7656
diff --git a/metadata/md5-cache/app-misc/go-jira-1.0.20 b/metadata/md5-cache/app-misc/go-jira-1.0.20
new file mode 100644
index 000000000000..f87262b84097
--- /dev/null
+++ b/metadata/md5-cache/app-misc/go-jira-1.0.20
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=A simple JIRA commandline client in Go
+EAPI=6
+HOMEPAGE=https://github.com/Netflix-Skunkworks/go-jira
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/Netflix-Skunkworks/go-jira/archive/v1.0.20.tar.gz -> go-jira-1.0.20.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=7eafcb0cff1e4d238f62af7168915da2
diff --git a/metadata/md5-cache/app-misc/kryoflux-dtc-2.6 b/metadata/md5-cache/app-misc/kryoflux-dtc-2.6
index d41ad07addcd..76f465de2db4 100644
--- a/metadata/md5-cache/app-misc/kryoflux-dtc-2.6
+++ b/metadata/md5-cache/app-misc/kryoflux-dtc-2.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/spsdeclib virtual/libusb:1 virtual/udev gui? ( virtual/jre )
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://www.kryoflux.com/download/kryoflux_2.6_linux.tar.bz2 gui? ( https://www.kryoflux.com/kryoflux-ui.jar )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=13d5ae8bebccc43974d0fc4b5cd8944c
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1 b/metadata/md5-cache/app-misc/lirc-0.10.1
index b3a5b4a5f169..263e960ca2d2 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.1
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=decode and send infra-red signals of many commonly used remote contr
 EAPI=6
 HOMEPAGE=http://www.lirc.org/
 IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X kernel_linux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(+)?,python_single_target_python3_7(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(+)?,python_single_target_python3_7(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] dev-python/pygobject[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(+)?,python_single_target_python3_7(+)?] ) inputlirc? ( app-misc/inputlircd )
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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 ) python_single_target_python3_7? ( python_targets_python3_7 ) gtk? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.10.1.tar.bz2
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f3466cbe0faff9c17c58384bbb194361
+_md5_=b81bd0179a12f5a4d2bc590348b0737e
diff --git a/metadata/md5-cache/app-misc/ltunify-0.2-r1 b/metadata/md5-cache/app-misc/ltunify-0.2-r1
index 24fafb64078b..b07a94a983ff 100644
--- a/metadata/md5-cache/app-misc/ltunify-0.2-r1
+++ b/metadata/md5-cache/app-misc/ltunify-0.2-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://git.lekensteyn.nl/ltunify/snapshot/ltunify-0.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=17df96437174feeb249047a216f1633c
diff --git a/metadata/md5-cache/app-misc/prog-express-3.7.8 b/metadata/md5-cache/app-misc/prog-express-3.7.8
index 1357946ea738..f321f8e82583 100644
--- a/metadata/md5-cache/app-misc/prog-express-3.7.8
+++ b/metadata/md5-cache/app-misc/prog-express-3.7.8
@@ -8,5 +8,5 @@ LICENSE=prog-express
 RDEPEND=dev-db/sqlite:3 dev-dotnet/gtk-sharp:2 dev-dotnet/libgdiplus dev-lang/mono dev-lang/mono-basic virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=amd64? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.7.8-1.amd64.deb ) x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.7.8-1.i386.deb )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44
 _md5_=b5dcaab2c00936280c7b11b3bfecb944
diff --git a/metadata/md5-cache/app-misc/qlcplus-4.11.1 b/metadata/md5-cache/app-misc/qlcplus-4.11.1
index 18cfff666863..3ea264a7507f 100644
--- a/metadata/md5-cache/app-misc/qlcplus-4.11.1
+++ b/metadata/md5-cache/app-misc/qlcplus-4.11.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=|| ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 ) dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/libmad media-libs/libsndfile sci-libs/fftw:3.0 virtual/libusb:0 virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=https://github.com/mcallegari/qlcplus/archive/QLC+_4.11.1.tar.gz -> qlcplus-4.11.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1ef981a0b4f069198f49ec2663e36fca
diff --git a/metadata/md5-cache/app-misc/rq-0.10.4 b/metadata/md5-cache/app-misc/rq-0.10.4
index fa2b04305d95..5d7a585b2842 100644
--- a/metadata/md5-cache/app-misc/rq-0.10.4
+++ b/metadata/md5-cache/app-misc/rq-0.10.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=sys-devel/clang >=dev-util/cargo-0.13.0
+DEPEND=sys-devel/clang
 DESCRIPTION=record query - a tool for doing record analysis and transformation
 EAPI=6
 HOMEPAGE=https://github.com/dflemstr/rq
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/dflemstr/rq/archive/v0.10.4.tar.gz -> rq-0.10.4.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/aho-corasick/0.6.2/download -> aho-corasick-0.6.2.crate https://crates.io/api/v1/crates/ansi_term/0.9.0/download -> ansi_term-0.9.0.crate https://crates.io/api/v1/crates/aster/0.38.0/download -> aster-0.38.0.crate https://crates.io/api/v1/crates/atty/0.2.2/download -> atty-0.2.2.crate https://crates.io/api/v1/crates/backtrace/0.3.0/download -> backtrace-0.3.0.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.10/download -> backtrace-sys-0.1.10.crate https://crates.io/api/v1/crates/bindgen/0.22.1/download -> bindgen-0.22.1.crate https://crates.io/api/v1/crates/bitflags/0.4.0/download -> bitflags-0.4.0.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/bitflags/0.8.0/download -> bitflags-0.8.0.crate https://crates.io/api/v1/crates/byteorder/1.0.0/download -> byteorder-1.0.0.crate https://crates.io/api/v1/crates/cexpr/0.2.0/download -> cexpr-0.2.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.0/download -> cfg-if-0.1.0.crate https://crates.io/api/v1/crates/clang/0.15.0/download -> clang-0.15.0.crate https://crates.io/api/v1/crates/clang-sys/0.14.0/download -> clang-sys-0.14.0.crate https://crates.io/api/v1/crates/clap/2.21.1/download -> clap-2.21.1.crate https://crates.io/api/v1/crates/crc/1.4.0/download -> crc-1.4.0.crate https://crates.io/api/v1/crates/dbghelp-sys/0.2.0/download -> dbghelp-sys-0.2.0.crate https://crates.io/api/v1/crates/docopt/0.7.0/download -> docopt-0.7.0.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.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/env_logger/0.4.2/download -> env_logger-0.4.2.crate https://crates.io/api/v1/crates/error-chain/0.9.0/download -> error-chain-0.9.0.crate https://crates.io/api/v1/crates/flate2/0.2.17/download -> flate2-0.2.17.crate https://crates.io/api/v1/crates/gcc/0.3.43/download -> gcc-0.3.43.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.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/lazy_static/0.2.4/download -> lazy_static-0.2.4.crate https://crates.io/api/v1/crates/libc/0.2.21/download -> libc-0.2.21.crate https://crates.io/api/v1/crates/libloading/0.3.2/download -> libloading-0.3.2.crate https://crates.io/api/v1/crates/linked-hash-map/0.3.0/download -> linked-hash-map-0.3.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.4.1/download -> linked-hash-map-0.4.1.crate https://crates.io/api/v1/crates/log/0.3.7/download -> log-0.3.7.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/memchr/1.0.1/download -> memchr-1.0.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.9/download -> miniz-sys-0.1.9.crate https://crates.io/api/v1/crates/nix/0.7.0/download -> nix-0.7.0.crate https://crates.io/api/v1/crates/nom/1.2.4/download -> nom-1.2.4.crate https://crates.io/api/v1/crates/num-traits/0.1.37/download -> num-traits-0.1.37.crate https://crates.io/api/v1/crates/num_cpus/1.3.0/download -> num_cpus-1.3.0.crate https://crates.io/api/v1/crates/ordered-float/0.4.0/download -> ordered-float-0.4.0.crate https://crates.io/api/v1/crates/pest/0.4.1/download -> pest-0.4.1.crate https://crates.io/api/v1/crates/phf/0.7.21/download -> phf-0.7.21.crate https://crates.io/api/v1/crates/phf_codegen/0.7.21/download -> phf_codegen-0.7.21.crate https://crates.io/api/v1/crates/phf_generator/0.7.21/download -> phf_generator-0.7.21.crate https://crates.io/api/v1/crates/phf_shared/0.7.21/download -> phf_shared-0.7.21.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/protobuf/1.2.2/download -> protobuf-1.2.2.crate https://crates.io/api/v1/crates/quasi/0.29.0/download -> quasi-0.29.0.crate https://crates.io/api/v1/crates/quasi_codegen/0.29.0/download -> quasi_codegen-0.29.0.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.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex/0.2.1/download -> regex-0.2.1.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.4.0/download -> regex-syntax-0.4.0.crate https://crates.io/api/v1/crates/rmp/0.8.5/download -> rmp-0.8.5.crate https://crates.io/api/v1/crates/rmpv/0.2.0/download -> rmpv-0.2.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.4/download -> rustc-demangle-0.1.4.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.22/download -> rustc-serialize-0.3.22.crate https://crates.io/api/v1/crates/rustc_version/0.1.7/download -> rustc_version-0.1.7.crate https://crates.io/api/v1/crates/semver/0.1.20/download -> semver-0.1.20.crate https://crates.io/api/v1/crates/serde/0.8.23/download -> serde-0.8.23.crate https://crates.io/api/v1/crates/serde/0.9.11/download -> serde-0.9.11.crate https://crates.io/api/v1/crates/serde-hjson/0.8.1/download -> serde-hjson-0.8.1.crate https://crates.io/api/v1/crates/serde-value/0.4.0/download -> serde-value-0.4.0.crate https://crates.io/api/v1/crates/serde_cbor/0.5.2/download -> serde_cbor-0.5.2.crate https://crates.io/api/v1/crates/serde_codegen_internals/0.14.1/download -> serde_codegen_internals-0.14.1.crate https://crates.io/api/v1/crates/serde_derive/0.9.11/download -> serde_derive-0.9.11.crate https://crates.io/api/v1/crates/serde_json/0.9.9/download -> serde_json-0.9.9.crate https://crates.io/api/v1/crates/serde_test/0.8.23/download -> serde_test-0.8.23.crate https://crates.io/api/v1/crates/serde_yaml/0.6.2/download -> serde_yaml-0.6.2.crate https://crates.io/api/v1/crates/siphasher/0.2.1/download -> siphasher-0.2.1.crate https://crates.io/api/v1/crates/snap/0.2.1/download -> snap-0.2.1.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/syn/0.11.9/download -> syn-0.11.9.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/syntex/0.54.0/download -> syntex-0.54.0.crate https://crates.io/api/v1/crates/syntex_errors/0.54.0/download -> syntex_errors-0.54.0.crate https://crates.io/api/v1/crates/syntex_pos/0.54.0/download -> syntex_pos-0.54.0.crate https://crates.io/api/v1/crates/syntex_syntax/0.54.0/download -> syntex_syntax-0.54.0.crate https://crates.io/api/v1/crates/target_build_utils/0.3.0/download -> target_build_utils-0.3.0.crate https://crates.io/api/v1/crates/term/0.4.5/download -> term-0.4.5.crate https://crates.io/api/v1/crates/term_size/0.2.3/download -> term_size-0.2.3.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread-id/3.0.0/download -> thread-id-3.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.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.3.1/download -> toml-0.3.1.crate https://crates.io/api/v1/crates/unicode-segmentation/1.1.0/download -> unicode-segmentation-1.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.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/unreachable/0.1.1/download -> unreachable-0.1.1.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.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/v8/0.9.6/download -> v8-0.9.6.crate https://crates.io/api/v1/crates/v8-api/0.7.3/download -> v8-api-0.7.3.crate https://crates.io/api/v1/crates/v8-sys/0.14.7/download -> v8-sys-0.14.7.crate https://crates.io/api/v1/crates/vec_map/0.7.0/download -> vec_map-0.7.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 https://crates.io/api/v1/crates/xdg-basedir/1.0.0/download -> xdg-basedir-1.0.0.crate https://crates.io/api/v1/crates/yaml-rust/0.3.5/download -> yaml-rust-0.3.5.crate amd64? ( https://s3-eu-west-1.amazonaws.com/record-query/v8/x86_64-unknown-linux-gnu/5.6.222/v8-build.tar.gz -> rq-v8-5.6.222-x86_64-build.tar.gz ) x86? ( https://s3-eu-west-1.amazonaws.com/record-query/v8/i686-unknown-linux-gnu/5.6.222/v8-build.tar.gz -> rq-v8-5.6.222-i686-build.tar.gz )
-_eclasses_=cargo	959846e2836f8244430c9582dd6493af	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	3e38275395b24dfed9849a57ba58a486	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=c7c9f90ed7ffdff91bdb5ba8e4d8c42b
diff --git a/metadata/md5-cache/app-misc/skim-0.3.2 b/metadata/md5-cache/app-misc/skim-0.3.2
index 9b386bfe977d..0d455c0aed7b 100644
--- a/metadata/md5-cache/app-misc/skim-0.3.2
+++ b/metadata/md5-cache/app-misc/skim-0.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=virtual/rust >=dev-util/cargo-0.13.0
+DEPEND=virtual/rust
 DESCRIPTION=a command-line fuzzy finder
 EAPI=6
 HOMEPAGE=https://github.com/lotabout/skim
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/ansi_term/0.10.2/download -> ansi_term-0.10.2.crate https://crates.io/api/v1/crates/atty/0.2.3/download -> atty-0.2.3.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/clap/2.28.0/download -> clap-2.28.0.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/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/libc/0.2.34/download -> libc-0.2.34.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.32/download -> redox_syscall-0.1.32.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.3/download -> regex-0.2.3.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/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/skim/0.3.2/download -> skim-0.3.2.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/thread_local/0.3.4/download -> thread_local-0.3.4.crate https://crates.io/api/v1/crates/time/0.1.38/download -> time-0.1.38.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.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/utf8parse/0.1.0/download -> utf8parse-0.1.0.crate https://crates.io/api/v1/crates/vec_map/0.8.0/download -> vec_map-0.8.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
+_eclasses_=cargo	3e38275395b24dfed9849a57ba58a486	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=3985c69fa55da23e1eea0313beab50e2
diff --git a/metadata/md5-cache/app-misc/skim-0.5.1 b/metadata/md5-cache/app-misc/skim-0.5.1
index b727098b9ff7..6e70e0d09a39 100644
--- a/metadata/md5-cache/app-misc/skim-0.5.1
+++ b/metadata/md5-cache/app-misc/skim-0.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=virtual/rust >=dev-util/cargo-0.13.0
+DEPEND=virtual/rust
 DESCRIPTION=a command-line fuzzy finder
 EAPI=6
 HOMEPAGE=https://github.com/lotabout/skim
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/lotabout/skim/archive/v0.5.1.tar.gz -> skim-0.5.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/ansi_term/0.10.2/download -> ansi_term-0.10.2.crate https://crates.io/api/v1/crates/atty/0.2.3/download -> atty-0.2.3.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/byteorder/1.2.3/download -> byteorder-1.2.3.crate https://crates.io/api/v1/crates/bytes/0.4.8/download -> bytes-0.4.8.crate https://crates.io/api/v1/crates/cfg-if/0.1.3/download -> cfg-if-0.1.3.crate https://crates.io/api/v1/crates/clap/2.28.0/download -> clap-2.28.0.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/gcc/0.3.54/download -> gcc-0.3.54.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.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/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/libc/0.2.42/download -> libc-0.2.42.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/nix/0.10.0/download -> nix-0.10.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.32/download -> redox_syscall-0.1.32.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.3/download -> regex-0.2.3.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/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/thread_local/0.3.4/download -> thread_local-0.3.4.crate https://crates.io/api/v1/crates/time/0.1.38/download -> time-0.1.38.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.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/vec_map/0.8.0/download -> vec_map-0.8.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
+_eclasses_=cargo	3e38275395b24dfed9849a57ba58a486	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=6893e78fc0b934fa2ff3d2165dd15715
diff --git a/metadata/md5-cache/app-misc/solaar-0.9.2-r3 b/metadata/md5-cache/app-misc/solaar-0.9.2-r3
index 5bd00e319bc7..d1dd8028237b 100644
--- a/metadata/md5-cache/app-misc/solaar-0.9.2-r3
+++ b/metadata/md5-cache/app-misc/solaar-0.9.2-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyudev-0.13[python_targets_python2_7(-)?,python_targets_pyt
 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/pwr/Solaar/archive/0.9.2.tar.gz -> solaar-0.9.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=93c649bb9d87f764248e10900af21dff
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.5-r5 b/metadata/md5-cache/app-misc/spacenavd-0.5-r5
index 62bfe59d1b41..16d9d73ca5d8 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.5-r5
+++ b/metadata/md5-cache/app-misc/spacenavd-0.5-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20daemon/spacenavd%200.5/spacenavd-0.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=13321087eb56f24ea9b07719f4171a13
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.5-r6 b/metadata/md5-cache/app-misc/spacenavd-0.5-r6
index 40e69bc5ddda..19b1ca5d8613 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.5-r6
+++ b/metadata/md5-cache/app-misc/spacenavd-0.5-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20daemon/spacenavd%200.5/spacenavd-0.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=287314a7a951831a4b076abbd81bfd9e
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.6 b/metadata/md5-cache/app-misc/spacenavd-0.6
index 837688f4760a..e3d6c01c72a9 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.6
+++ b/metadata/md5-cache/app-misc/spacenavd-0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20daemon/spacenavd%200.6/spacenavd-0.6.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=acd4fce33880461ffc6a6000f75c54c5
diff --git a/metadata/md5-cache/app-misc/tek-1.3.0 b/metadata/md5-cache/app-misc/tek-1.3.0
index f4ed1e21bd59..262236df7661 100644
--- a/metadata/md5-cache/app-misc/tek-1.3.0
+++ b/metadata/md5-cache/app-misc/tek-1.3.0
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/wxGTK:3.0=[X] virtual/libusb:1 virtual/udev
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/m-ou-se/tek/archive/v1.3.0.tar.gz -> tek-1.3.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
 _md5_=1bc1e7a9846ac66cf79d57e2ab9fc0ff
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index ec3669cf2be6..cf767aa108aa 100644
--- a/metadata/md5-cache/app-mobilephone/Manifest.gz
+++ b/metadata/md5-cache/app-mobilephone/Manifest.gz
diff --git a/metadata/md5-cache/app-mobilephone/heimdall-1.4.2 b/metadata/md5-cache/app-mobilephone/heimdall-1.4.2
index 8868d96a10e0..4a58297527f3 100644
--- a/metadata/md5-cache/app-mobilephone/heimdall-1.4.2
+++ b/metadata/md5-cache/app-mobilephone/heimdall-1.4.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libusb-1.0.18:1= qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= ) sys-libs/zlib
 SLOT=0
 SRC_URI=https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v1.4.2/Heimdall-v1.4.2.tar.gz -> heimdall-1.4.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=91cf1956f60d9c0ac7d5a52f9772e1a4
diff --git a/metadata/md5-cache/app-mobilephone/heimdall-9999 b/metadata/md5-cache/app-mobilephone/heimdall-9999
index 828fe335d94e..3cdfffaec0e7 100644
--- a/metadata/md5-cache/app-mobilephone/heimdall-9999
+++ b/metadata/md5-cache/app-mobilephone/heimdall-9999
@@ -7,5 +7,5 @@ IUSE=qt5
 LICENSE=MIT
 RDEPEND=>=dev-libs/libusb-1.0.18:1= qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= ) sys-libs/zlib
 SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=91cf1956f60d9c0ac7d5a52f9772e1a4
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 5361f95cc2c0..b6e245a21ad9 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.3.2 b/metadata/md5-cache/app-office/libreoffice-6.0.3.2
index 8e6cb2e30194..bb1eb1d12aa3 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.3.2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 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 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.3.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.3.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.3//libreoffice-6.0.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.3//libreoffice-help-6.0.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.3.2/src/libreoffice-6.0.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.3.2/src/libreoffice-help-6.0.3.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=19be265842375245a16f2418cfc8e6d2
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.5.2-r1 b/metadata/md5-cache/app-office/libreoffice-6.0.5.2-r1
index c1c7057748eb..872ed40f06f4 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.5.2-r1
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.5.2-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 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 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.5.2-patchset-02.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.5.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.5//libreoffice-6.0.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.5//libreoffice-help-6.0.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.5.2/src/libreoffice-6.0.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.5.2/src/libreoffice-help-6.0.5.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b7c74c64de9c35cd795418c50e6d444a
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.6.2 b/metadata/md5-cache/app-office/libreoffice-6.0.6.2
new file mode 100644
index 000000000000..8f40be7ffd30
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.6.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.3:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite
+EAPI=6
+HOMEPAGE=https://www.libreoffice.org
+IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java 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 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-6.0*
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
+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 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+SLOT=0
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.5.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.6.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.6//libreoffice-6.0.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.6//libreoffice-help-6.0.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.6.2/src/libreoffice-6.0.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.6.2/src/libreoffice-help-6.0.6.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c215b0886de183e6842c7ef7537f5810
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.9999 b/metadata/md5-cache/app-office/libreoffice-6.0.9999
index 111b3927ec57..a62f24c399de 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.9999
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.9999
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 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 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.5.2-patchset-01.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c215b0886de183e6842c7ef7537f5810
diff --git a/metadata/md5-cache/app-office/libreoffice-6.1.9999 b/metadata/md5-cache/app-office/libreoffice-6.1.9999
index 34bb42555471..5df5b9ae9011 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.1.9999
+++ b/metadata/md5-cache/app-office/libreoffice-6.1.9999
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 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 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ae31c5d700e1cbd734d0649a82089aea
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index 34bb42555471..5df5b9ae9011 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 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 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ae31c5d700e1cbd734d0649a82089aea
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-6.0.3.2 b/metadata/md5-cache/app-office/libreoffice-bin-6.0.3.2
index 93000d8a8554..58c9e0011dd4 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-6.0.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-6.0.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) python_targets_python3_5
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-6.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-6.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-6.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-6.0.3.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-6.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-6.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-6.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-6.0.3.2.xd3 ) ) ) )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=18a3a9cf97347a1a8cb4ec36fc7faccf
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.0.6.2 b/metadata/md5-cache/app-office/libreoffice-l10n-6.0.6.2
new file mode 100644
index 000000000000..a4d5f116fd57
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-6.0.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Translations for the Libreoffice suite
+EAPI=6
+HOMEPAGE=https://www.libreoffice.org
+IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+RDEPEND=app-text/hunspell
+RESTRICT=strip
+SLOT=0
+SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.6/rpm/x86/LibreOffice_6.0.6_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.6/rpm/x86/LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_zu.tar.gz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0d724f652b383a9e5ea19e984af7be96
diff --git a/metadata/md5-cache/app-office/openoffice-bin-4.1.4 b/metadata/md5-cache/app-office/openoffice-bin-4.1.4
index 3affcc1efb55..27f5877dc30a 100644
--- a/metadata/md5-cache/app-office/openoffice-bin-4.1.4
+++ b/metadata/md5-cache/app-office/openoffice-bin-4.1.4
@@ -11,5 +11,5 @@ RDEPEND=!app-office/openoffice !prefix? ( sys-libs/glibc ) app-arch/unzip app-ar
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_install-rpm_en-US.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_install-rpm_en-US.tar.gz ) l10n_ast? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_ast.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_ast.tar.gz ) ) l10n_eu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_eu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_eu.tar.gz ) ) l10n_bg? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_bg.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_bg.tar.gz ) ) l10n_ca? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_ca.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_ca.tar.gz ) ) l10n_ca-valencia? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_ca-XV.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_ca-XV.tar.gz ) ) l10n_zh-CN? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_zh-CN.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_zh-CN.tar.gz ) ) l10n_zh-TW? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_zh-TW.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_zh-TW.tar.gz ) ) l10n_cs? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_cs.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_cs.tar.gz ) ) l10n_da? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_da.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_da.tar.gz ) ) l10n_nl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_nl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_nl.tar.gz ) ) l10n_en-GB? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_en-GB.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_en-GB.tar.gz ) ) l10n_fi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_fi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_fi.tar.gz ) ) l10n_fr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_fr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_fr.tar.gz ) ) l10n_gd? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_gd.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_gd.tar.gz ) ) l10n_gl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_gl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_gl.tar.gz ) ) l10n_de? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_de.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_de.tar.gz ) ) l10n_el? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_el.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_el.tar.gz ) ) l10n_he? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_he.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_he.tar.gz ) ) l10n_hi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_hi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_hi.tar.gz ) ) l10n_hu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_hu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_hu.tar.gz ) ) l10n_it? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_it.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_it.tar.gz ) ) l10n_ja? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_ja.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_ja.tar.gz ) ) l10n_km? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_km.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_km.tar.gz ) ) l10n_ko? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_ko.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_ko.tar.gz ) ) l10n_lt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_lt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_lt.tar.gz ) ) l10n_nb? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_nb.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_nb.tar.gz ) ) l10n_pl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_pl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_pl.tar.gz ) ) l10n_pt-BR? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_pt-BR.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_pt-BR.tar.gz ) ) l10n_pt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_pt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_pt.tar.gz ) ) l10n_ru? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_ru.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_ru.tar.gz ) ) l10n_sr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_sr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_sr.tar.gz ) ) l10n_sk? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_sk.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_sk.tar.gz ) ) l10n_sl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_sl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_sl.tar.gz ) ) l10n_es? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_es.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_es.tar.gz ) ) l10n_sv? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_sv.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_sv.tar.gz ) ) l10n_ta? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_ta.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_ta.tar.gz ) ) l10n_th? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_th.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_th.tar.gz ) ) l10n_tr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_tr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_tr.tar.gz ) ) l10n_vi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_vi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_vi.tar.gz ) )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=14ae7a5baf07f3561519bee185d8fb2c
diff --git a/metadata/md5-cache/app-office/openoffice-bin-4.1.5 b/metadata/md5-cache/app-office/openoffice-bin-4.1.5
index c7a6da80a2e0..485d300285cf 100644
--- a/metadata/md5-cache/app-office/openoffice-bin-4.1.5
+++ b/metadata/md5-cache/app-office/openoffice-bin-4.1.5
@@ -11,5 +11,5 @@ RDEPEND=!app-office/openoffice !prefix? ( sys-libs/glibc ) app-arch/unzip app-ar
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_install-rpm_en-US.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_install-rpm_en-US.tar.gz ) l10n_ast? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ast.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ast.tar.gz ) ) l10n_eu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_eu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_eu.tar.gz ) ) l10n_bg? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_bg.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_bg.tar.gz ) ) l10n_ca? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ca.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ca.tar.gz ) ) l10n_ca-valencia? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ca-XV.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ca-XV.tar.gz ) ) l10n_zh-CN? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_zh-CN.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_zh-CN.tar.gz ) ) l10n_zh-TW? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_zh-TW.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_zh-TW.tar.gz ) ) l10n_cs? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_cs.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_cs.tar.gz ) ) l10n_da? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_da.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_da.tar.gz ) ) l10n_nl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_nl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_nl.tar.gz ) ) l10n_en-GB? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_en-GB.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_en-GB.tar.gz ) ) l10n_fi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_fi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_fi.tar.gz ) ) l10n_fr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_fr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_fr.tar.gz ) ) l10n_gd? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_gd.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_gd.tar.gz ) ) l10n_gl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_gl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_gl.tar.gz ) ) l10n_de? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_de.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_de.tar.gz ) ) l10n_el? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_el.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_el.tar.gz ) ) l10n_he? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_he.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_he.tar.gz ) ) l10n_hi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_hi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_hi.tar.gz ) ) l10n_hu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_hu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_hu.tar.gz ) ) l10n_it? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_it.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_it.tar.gz ) ) l10n_ja? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ja.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ja.tar.gz ) ) l10n_km? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_km.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_km.tar.gz ) ) l10n_ko? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ko.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ko.tar.gz ) ) l10n_lt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_lt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_lt.tar.gz ) ) l10n_nb? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_nb.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_nb.tar.gz ) ) l10n_pl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_pl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_pl.tar.gz ) ) l10n_pt-BR? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_pt-BR.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_pt-BR.tar.gz ) ) l10n_pt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_pt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_pt.tar.gz ) ) l10n_ru? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ru.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ru.tar.gz ) ) l10n_sr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sr.tar.gz ) ) l10n_sk? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sk.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sk.tar.gz ) ) l10n_sl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sl.tar.gz ) ) l10n_es? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_es.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_es.tar.gz ) ) l10n_sv? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sv.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sv.tar.gz ) ) l10n_ta? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ta.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ta.tar.gz ) ) l10n_th? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_th.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_th.tar.gz ) ) l10n_tr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_tr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_tr.tar.gz ) ) l10n_vi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_vi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_vi.tar.gz ) )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=49baaacefcf7a03235b9ba5dad87706b
diff --git a/metadata/md5-cache/app-office/upwork-4.1.134 b/metadata/md5-cache/app-office/upwork-4.1.134
index df15efc8648d..bfaea029818b 100644
--- a/metadata/md5-cache/app-office/upwork-4.1.134
+++ b/metadata/md5-cache/app-office/upwork-4.1.134
@@ -8,5 +8,5 @@ LICENSE=ODESK
 RDEPEND=dev-libs/libgcrypt:11 gnome-base/gconf media-libs/alsa-lib sys-libs/libcap virtual/udev x11-libs/gtk+:2 x11-libs/gtkglext
 SLOT=0
 SRC_URI=amd64? ( http://updates.team.odesk.com/binaries/v4_1_314_0_0bo6g5kfbj07y2x4/upwork_x86_64.rpm -> upwork-4.1.134_x86_64.rpm ) x86? ( http://updates.team.odesk.com/binaries/v4_1_314_0_0bo6g5kfbj07y2x4/upwork_i386.rpm -> upwork-4.1.134_i386.rpm )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=be4ed9d734b71f494b91e2fbc6fa82f9
diff --git a/metadata/md5-cache/app-office/upwork-4.2.153 b/metadata/md5-cache/app-office/upwork-4.2.153
index 10b62f4e3a3a..9a69080a05a0 100644
--- a/metadata/md5-cache/app-office/upwork-4.2.153
+++ b/metadata/md5-cache/app-office/upwork-4.2.153
@@ -8,5 +8,5 @@ LICENSE=ODESK
 RDEPEND=dev-libs/libgcrypt:11 gnome-base/gconf media-libs/alsa-lib net-print/cups sys-libs/libcap x11-libs/gtk+:2 x11-libs/gtkglext
 SLOT=0
 SRC_URI=amd64? ( https://updates-desktopapp.upwork.com/binaries/v4_2_153_0_tkzkho5lhz15j08q/upwork_x86_64.rpm -> upwork-4.2.153_x86_64.rpm ) x86? ( https://updates-desktopapp.upwork.com/binaries/v4_2_153_0_tkzkho5lhz15j08q/upwork_i386.rpm -> upwork-4.2.153_i386.rpm )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=28d555a1a78e67b9894a61367300ba16
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index f441dbadf755..8020314073d2 100644
--- a/metadata/md5-cache/app-pda/Manifest.gz
+++ b/metadata/md5-cache/app-pda/Manifest.gz
diff --git a/metadata/md5-cache/app-pda/barry-0.18.3 b/metadata/md5-cache/app-pda/barry-0.18.3
index 00737b46e291..5c3c9f55e98f 100644
--- a/metadata/md5-cache/app-pda/barry-0.18.3
+++ b/metadata/md5-cache/app-pda/barry-0.18.3
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0 GPL-2
 RDEPEND=>=dev-cpp/libxmlpp-2.6:2.6 dev-libs/glib:2 >=dev-libs/libtar-1.2.11-r2 >=media-libs/libsdl-1.2 >=sys-fs/fuse-2.5:= sys-libs/zlib virtual/libusb:1 boost? ( >=dev-libs/boost-1.33 ) gui? ( dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libglademm:2.4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/barry/barry-0.18.3.tar.bz2
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e685e5c3ab37849b5e9a74076f9a1db8
diff --git a/metadata/md5-cache/app-pda/usbmuxd-1.0.8_p20140530 b/metadata/md5-cache/app-pda/usbmuxd-1.0.8_p20140530
index adfddeb69e52..1ff51a28a36a 100644
--- a/metadata/md5-cache/app-pda/usbmuxd-1.0.8_p20140530
+++ b/metadata/md5-cache/app-pda/usbmuxd-1.0.8_p20140530
@@ -8,5 +8,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1+
 RDEPEND=>=app-pda/libimobiledevice-1.1.6 >=app-pda/libplist-1.11 virtual/libusb:1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ssuominen/usbmuxd-1.0.8_p20140530.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=30e44ef4f89a3e160982750e70a2c0b6
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 41e609c576c7..4f5c83db1af2 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.0 b/metadata/md5-cache/app-portage/gentoolkit-0.4.0
index 02ece92fd4c5..6f5f7e4a5177 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.0
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst prepare test
+DEFINED_PHASES=compile configure install postinst preinst prepare test
 DEPEND=sys-apps/portage[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=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),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=Collection of administration scripts for Gentoo
 EAPI=6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/gentoolkit/gentoolkit-0.4.0.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dbf75d013ea52a505b912ea95e530e0a
+_md5_=c439aa97237cb2a1058a62e919e1bad9
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.1 b/metadata/md5-cache/app-portage/gentoolkit-0.4.1
index 40308ff96104..e262a82ab9cc 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.1
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst prepare test
+DEFINED_PHASES=compile configure install postinst preinst prepare test
 DEPEND=sys-apps/portage[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=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),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=Collection of administration scripts for Gentoo
 EAPI=6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fuzzyray/releases/gentoolkit/gentoolkit-0.4.1.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d93c94a1e8601e29951774b4e0dd9827
+_md5_=67ead4d90fd10e60b691329f63a96d65
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1 b/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1
index f99b0524007a..a237cc0cac18 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst prepare test
+DEFINED_PHASES=compile configure install postinst preinst prepare test
 DEPEND=|| ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),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_targets_python3_7(-)?,-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_single_target_python3_7(-)]
 DESCRIPTION=Collection of administration scripts for Gentoo
 EAPI=6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/gentoolkit-0.4.2.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=28f3ab8cf91f9431527c1171cbcc9cf6
+_md5_=d5c979bcff93e3b60135fe56066623ec
diff --git a/metadata/md5-cache/app-portage/portpeek-2.1.27 b/metadata/md5-cache/app-portage/portpeek-2.1.27
new file mode 100644
index 000000000000..6232c5256134
--- /dev/null
+++ b/metadata/md5-cache/app-portage/portpeek-2.1.27
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=A helper program for maintaining the package.keyword and package.unmask files
+EAPI=6
+HOMEPAGE=http://www.mpagano.com/blog/?page_id=3
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-portage/gentoolkit-0.4.0 || ( >=sys-apps/portage-2.3.19-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=http://www.mpagano.com/downloads/portpeek-2.1.27.tar.gz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=851512deab6137d3d14c7daa7b86ba3e
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.0-r1 b/metadata/md5-cache/app-portage/repoman-2.3.0-r1
index 2cfa143f8c3b..6d8db762a5f1 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.0-r1
+++ b/metadata/md5-cache/app-portage/repoman-2.3.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://gentoo/repoman-2.3.0.tar.bz2 https://dev.gentoo.org/~dolsen/releases/repoman/repoman-2.3.0.tar.bz2 https://gitweb.gentoo.org/proj/portage.git/patch/?id=ef33db45a0c1d462411d4ced1857a322c0ab28f6 -> repoman-2.3.0-bug-586864.patch
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af57b41fb7eb0b192ca445de1e0cb1d4
+_md5_=777bd01c93e961ba48abeadfeb0f700a
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.10 b/metadata/md5-cache/app-portage/repoman-2.3.10
index d5d6a1cff84d..04a714a4e2e2 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.10
+++ b/metadata/md5-cache/app-portage/repoman-2.3.10
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.10.tar.bz2
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f5ca30dd66b1a3a337a8f56d40968927
+_md5_=8e8a8b3760931fcc505dbebadd550a30
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.6 b/metadata/md5-cache/app-portage/repoman-2.3.6
index 62d09bdefcbd..930e977e6ba4 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.6
+++ b/metadata/md5-cache/app-portage/repoman-2.3.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.6.tar.bz2
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bdbc2e64f77d8e287b8f35829b4f2e9a
+_md5_=c6b40bb11c2be417e480d30788aa8833
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.9 b/metadata/md5-cache/app-portage/repoman-2.3.9
index d5196555e628..5bc104954ec9 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.9
+++ b/metadata/md5-cache/app-portage/repoman-2.3.9
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.9.tar.bz2
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=667890313bb9380e6ffd8fd41222abea
+_md5_=e94c450a217129067656fbbe5bbe7554
diff --git a/metadata/md5-cache/app-portage/repoman-9999 b/metadata/md5-cache/app-portage/repoman-9999
index 01d8cfcb02a3..1c2b8084d4bd 100644
--- a/metadata/md5-cache/app-portage/repoman-9999
+++ b/metadata/md5-cache/app-portage/repoman-9999
@@ -9,4 +9,4 @@ RDEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d84729243979d3b72572635dabb72a93
+_md5_=03fceec18420043e152b54563aadd647
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 34530c52c471..c09ba7e8f204 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/dvisvgm-2.5 b/metadata/md5-cache/app-text/dvisvgm-2.5
new file mode 100644
index 000000000000..15d63a2a4316
--- /dev/null
+++ b/metadata/md5-cache/app-text/dvisvgm-2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure
+DEPEND=virtual/tex-base >=app-arch/brotli-1.0.5 app-text/ghostscript-gpl dev-libs/kpathsea:= >=dev-libs/xxhash-0.6.5 >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 >=media-libs/woff2-1.0.2 dev-libs/kpathsea sys-libs/zlib app-text/xmlto app-text/asciidoc dev-libs/libxslt virtual/pkgconfig test? ( dev-cpp/gtest )
+DESCRIPTION=Converts DVI files to SVG
+EAPI=6
+HOMEPAGE=http://dvisvgm.bplaced.net/
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~hppa ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=virtual/tex-base >=app-arch/brotli-1.0.5 app-text/ghostscript-gpl dev-libs/kpathsea:= >=dev-libs/xxhash-0.6.5 >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 >=media-libs/woff2-1.0.2 dev-libs/kpathsea sys-libs/zlib
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mgieseki/dvisvgm/releases/download/2.5/dvisvgm-2.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a42965de9b1605cc8a6faed95968a69f
diff --git a/metadata/md5-cache/app-text/evince-3.28.2 b/metadata/md5-cache/app-text/evince-3.28.2
new file mode 100644
index 000000000000..255b962ccb8e
--- /dev/null
+++ b/metadata/md5-cache/app-text/evince-3.28.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.36.5:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.33[cairo] >=app-arch/libarchive-3.2.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) app-text/docbook-xml-dtd:4.3 app-text/yelp-tools dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.35 dev-util/itstool sys-devel/gettext 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 virtual/pkgconfig
+DESCRIPTION=Simple document viewer for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Evince
+IUSE=djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.36.5:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.33[cairo] >=app-arch/libarchive-3.2.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
+SLOT=0/evd3.4-evv3.3
+SRC_URI=mirror://gnome/sources/evince/3.28/evince-3.28.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e47f6735e02ce13b02b53c6f920fe3ba
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-4.3.61 b/metadata/md5-cache/app-text/master-pdf-editor-4.3.61
deleted file mode 100644
index 99256f956fb6..000000000000
--- a/metadata/md5-cache/app-text/master-pdf-editor-4.3.61
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Master PDF Editor is a complete solution for viewing and editing PDF files
-EAPI=6
-HOMEPAGE=https://code-industry.net/free-pdf-editor/
-KEYWORDS=~amd64
-LICENSE=master-pdf-editor
-RDEPEND=app-arch/bzip2 dev-libs/double-conversion dev-libs/glib dev-libs/icu dev-libs/openssl media-gfx/graphite2 media-gfx/sane-backends media-libs/freetype media-libs/harfbuzz media-libs/libjpeg-turbo media-libs/libpng media-libs/tiff x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdmcp x11-libs/libXext >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://get.code-industry.net/public/master-pdf-editor-4.3.61_qt5.amd64.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bfc83461c95605b36797433ff812f8c4
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-4.3.82 b/metadata/md5-cache/app-text/master-pdf-editor-4.3.82
index 5bb301971013..d57808d9e87b 100644
--- a/metadata/md5-cache/app-text/master-pdf-editor-4.3.82
+++ b/metadata/md5-cache/app-text/master-pdf-editor-4.3.82
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Master PDF Editor is a complete solution for viewing and editing PDF files
+DESCRIPTION=A complete solution for viewing and editing PDF files
 EAPI=6
 HOMEPAGE=https://code-industry.net/free-pdf-editor/
 KEYWORDS=~amd64
@@ -9,4 +9,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://get.code-industry.net/public/master-pdf-editor-4.3.82_qt5.amd64.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0491a6959b432ce7072f5c2d60b53d38
+_md5_=bec57aff877ff6b42c1fe17e3bffb810
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.0.15 b/metadata/md5-cache/app-text/master-pdf-editor-5.0.15
deleted file mode 100644
index a824084b0108..000000000000
--- a/metadata/md5-cache/app-text/master-pdf-editor-5.0.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Master PDF Editor is a complete solution for viewing and editing PDF files
-EAPI=6
-HOMEPAGE=https://code-industry.net/free-pdf-editor/
-KEYWORDS=~amd64
-LICENSE=master-pdf-editor
-RDEPEND=>=media-gfx/sane-backends-1.0 >=dev-qt/qtsvg-5.4.1:5 >=dev-qt/qtnetwork-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtprintsupport-5.4.1:5
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://code-industry.net/public/master-pdf-editor-5.0.15_qt5.amd64.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5e49e752aac76a25e1ca62a3d5b81ec7
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.0.36 b/metadata/md5-cache/app-text/master-pdf-editor-5.0.36
new file mode 100644
index 000000000000..ab2fd6ef8d3c
--- /dev/null
+++ b/metadata/md5-cache/app-text/master-pdf-editor-5.0.36
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=A complete solution for viewing and editing PDF files
+EAPI=6
+HOMEPAGE=https://code-industry.net/free-pdf-editor/
+KEYWORDS=~amd64
+LICENSE=master-pdf-editor
+RDEPEND=>=media-gfx/sane-backends-1.0 >=dev-qt/qtsvg-5.4.1:5 >=dev-qt/qtnetwork-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtprintsupport-5.4.1:5
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://code-industry.net/public/master-pdf-editor-5.0.36_qt5.amd64.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7c155540314f815f89882b4bf1a5dad5
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.1.00 b/metadata/md5-cache/app-text/master-pdf-editor-5.1.00
new file mode 100644
index 000000000000..8372073c44c9
--- /dev/null
+++ b/metadata/md5-cache/app-text/master-pdf-editor-5.1.00
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=A complete solution for viewing and editing PDF files
+EAPI=6
+HOMEPAGE=https://code-industry.net/free-pdf-editor/
+KEYWORDS=~amd64
+LICENSE=master-pdf-editor
+RDEPEND=>=media-gfx/sane-backends-1.0 >=dev-qt/qtsvg-5.4.1:5 >=dev-qt/qtnetwork-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtprintsupport-5.4.1:5
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://code-industry.net/public/master-pdf-editor-5.1.00_qt5.amd64.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7c155540314f815f89882b4bf1a5dad5
diff --git a/metadata/md5-cache/app-xemacs/Manifest.gz b/metadata/md5-cache/app-xemacs/Manifest.gz
index 9e887c3aebc3..e0151dd0b78d 100644
--- a/metadata/md5-cache/app-xemacs/Manifest.gz
+++ b/metadata/md5-cache/app-xemacs/Manifest.gz
diff --git a/metadata/md5-cache/app-xemacs/ada-1.16 b/metadata/md5-cache/app-xemacs/ada-1.16
new file mode 100644
index 000000000000..f3eafb0a2f22
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/ada-1.16
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Ada language support
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ada-1.16-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=a1462c5af18c0c6e11641971664bdfce
diff --git a/metadata/md5-cache/app-xemacs/apel-1.36 b/metadata/md5-cache/app-xemacs/apel-1.36
new file mode 100644
index 000000000000..aca4bf590c63
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/apel-1.36
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=A Portable Emacs Library. Used by XEmacs MIME support
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/apel-1.36-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=228e68b98d3410a967d05228975a3833
diff --git a/metadata/md5-cache/app-xemacs/auctex-1.58 b/metadata/md5-cache/app-xemacs/auctex-1.58
new file mode 100644
index 000000000000..a6a9bd700c82
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/auctex-1.58
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Basic TeX/LaTeX support
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-xemacs/texinfo app-xemacs/fsf-compat app-xemacs/mail-lib app-xemacs/edit-utils app-xemacs/xemacs-ispell app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/auctex-1.58-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=22a9ea60dc55d70376d53e5c4aa2c248
diff --git a/metadata/md5-cache/app-xemacs/bbdb-1.34 b/metadata/md5-cache/app-xemacs/bbdb-1.34
new file mode 100644
index 000000000000..4d4bafcab2f9
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/bbdb-1.34
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=The Big Brother Data Base
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/edit-utils app-xemacs/gnus app-xemacs/mh-e app-xemacs/rmail app-xemacs/supercite app-xemacs/vm app-xemacs/tm app-xemacs/apel app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/w3 app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/os-utils app-xemacs/ecrypto app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/bbdb-1.34-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=2f90d8a13c680c4acd56baaace1fabc8
diff --git a/metadata/md5-cache/app-xemacs/build-1.18 b/metadata/md5-cache/app-xemacs/build-1.18
new file mode 100644
index 000000000000..14654b5bfb38
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/build-1.18
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Build XEmacs from within (UNIX, Windows)
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-xemacs/pcl-cvs app-xemacs/dired app-xemacs/w3 app-xemacs/prog-modes app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/build-1.18-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=6bb8639de8fffd9207cdab658cfa3843
diff --git a/metadata/md5-cache/app-xemacs/c-support-1.24 b/metadata/md5-cache/app-xemacs/c-support-1.24
new file mode 100644
index 000000000000..41d74975a974
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/c-support-1.24
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Basic single-file add-ons for editing C code
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/cc-mode app-xemacs/xemacs-base app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/c-support-1.24-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=abad0b749e22eed425d265905a7d74b0
diff --git a/metadata/md5-cache/app-xemacs/calc-1.28 b/metadata/md5-cache/app-xemacs/calc-1.28
new file mode 100644
index 000000000000..911cef1a5246
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/calc-1.28
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Emacs calculator
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/calc-1.28-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=829f6a56ed4e6e650eff22281bd319b6
diff --git a/metadata/md5-cache/app-xemacs/calendar-1.41 b/metadata/md5-cache/app-xemacs/calendar-1.41
new file mode 100644
index 000000000000..a1dd93d1571f
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/calendar-1.41
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Calendar and diary support
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-xemacs/fsf-compat app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/calendar-1.41-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=e9eed6175569210eece0e12feab7aeb8
diff --git a/metadata/md5-cache/app-xemacs/cc-mode-1.99 b/metadata/md5-cache/app-xemacs/cc-mode-1.99
new file mode 100644
index 000000000000..ca5d1fb32708
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/cc-mode-1.99
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=C, C++ and Java language support
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/cc-mode-1.99-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=8ae69822d30ec3e057015dbc7f1a27f1
diff --git a/metadata/md5-cache/app-xemacs/cedet-common-1.03 b/metadata/md5-cache/app-xemacs/cedet-common-1.03
new file mode 100644
index 000000000000..f09d3f4f2b1f
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/cedet-common-1.03
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Common files for CEDET development environment
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-xemacs/edebug app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/cedet-common-1.03-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=65c2d40bc11660561b54e8381702a14c
diff --git a/metadata/md5-cache/app-xemacs/clearcase-1.12 b/metadata/md5-cache/app-xemacs/clearcase-1.12
new file mode 100644
index 000000000000..27d88c0a1e72
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/clearcase-1.12
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=New Clearcase Version Control for XEmacs (UNIX, Windows)
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/dired app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/sh-script app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/clearcase-1.12-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=e6c23a5bbcd30dcf63b1d9d3b56128ca
diff --git a/metadata/md5-cache/app-xemacs/cogre-1.04 b/metadata/md5-cache/app-xemacs/cogre-1.04
new file mode 100644
index 000000000000..e83cc5a478df
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/cogre-1.04
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Graph editing mode
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/edebug app-xemacs/cedet-common app-xemacs/eieio app-xemacs/semantic app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/cogre-1.04-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=bafff429684926d84a0a54a292580bf3
diff --git a/metadata/md5-cache/app-xemacs/cookie-1.17 b/metadata/md5-cache/app-xemacs/cookie-1.17
new file mode 100644
index 000000000000..0e6a2f9e3c2d
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/cookie-1.17
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Spook and Yow (Zippy quotes)
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/cookie-1.17-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=74b25ff482a35941d01962842296a22a
diff --git a/metadata/md5-cache/app-xemacs/crisp-1.17 b/metadata/md5-cache/app-xemacs/crisp-1.17
new file mode 100644
index 000000000000..d4fc6bdef454
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/crisp-1.17
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Crisp/Brief emulation
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/crisp-1.17-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=79c5fd3f44b3ac631ecd8daafe760e7c
diff --git a/metadata/md5-cache/app-xemacs/debug-1.20 b/metadata/md5-cache/app-xemacs/debug-1.20
new file mode 100644
index 000000000000..7cf0f2ee4093
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/debug-1.20
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=GUD, gdb, dbx debugging support
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/debug-1.20-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=5d596fba525c6ce817c62b51223e923b
diff --git a/metadata/md5-cache/app-xemacs/dictionary-1.18 b/metadata/md5-cache/app-xemacs/dictionary-1.18
new file mode 100644
index 000000000000..e8c169a0797b
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/dictionary-1.18
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Interface to RFC2229 dictionary servers
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/dictionary-1.18-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=41fe09de5bb59a4650f5b15d28eb5d9a
diff --git a/metadata/md5-cache/app-xemacs/dired-1.22 b/metadata/md5-cache/app-xemacs/dired-1.22
new file mode 100644
index 000000000000..3f93b0c96724
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/dired-1.22
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Manage file systems
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-xemacs/prog-modes app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/dired-1.22-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=5945e80b5f3f87a0d6d5c9dd572f3b02
diff --git a/metadata/md5-cache/app-xemacs/docbookide-0.10 b/metadata/md5-cache/app-xemacs/docbookide-0.10
new file mode 100644
index 000000000000..daff7d4d049c
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/docbookide-0.10
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=DocBook editing support
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-ispell app-xemacs/mail-lib app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/docbookide-0.10-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=ebbe078428dd4439c56d99d037a53012
diff --git a/metadata/md5-cache/app-xemacs/easypg-1.05 b/metadata/md5-cache/app-xemacs/easypg-1.05
new file mode 100644
index 000000000000..a39ad0e67038
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/easypg-1.05
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=GnuPG interface for Emacs
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-xemacs/dired app-xemacs/mail-lib app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/easypg-1.05-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=83a511bb6d2590867c460bdb79bc3ef9
diff --git a/metadata/md5-cache/app-xemacs/ecb-1.25 b/metadata/md5-cache/app-xemacs/ecb-1.25
new file mode 100644
index 000000000000..2a4d790e7e53
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/ecb-1.25
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Emacs source code browser
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-xemacs/semantic app-xemacs/cedet-common app-xemacs/eieio app-xemacs/fsf-compat app-xemacs/edit-utils app-xemacs/jde app-xemacs/mail-lib app-xemacs/eshell app-xemacs/ediff app-xemacs/xemacs-devel app-xemacs/speedbar app-xemacs/c-support app-xemacs/os-utils app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ecb-1.25-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=e3fb1ab181585040b010dea1786ef992
diff --git a/metadata/md5-cache/app-xemacs/ecrypto-0.23 b/metadata/md5-cache/app-xemacs/ecrypto-0.23
new file mode 100644
index 000000000000..cf612e694f14
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/ecrypto-0.23
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Crypto functionality in Emacs Lisp
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ecrypto-0.23-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=a3e668ace49b5c0cadd95f0a6b9f4a10
diff --git a/metadata/md5-cache/app-xemacs/ede-1.07 b/metadata/md5-cache/app-xemacs/ede-1.07
new file mode 100644
index 000000000000..693fd6123693
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/ede-1.07
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Emacs Development Environment
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ede-1.07-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=677aedda822a8794fd34709b2d0a5837
diff --git a/metadata/md5-cache/app-xemacs/edebug-1.24 b/metadata/md5-cache/app-xemacs/edebug-1.24
new file mode 100644
index 000000000000..45a58e58013b
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/edebug-1.24
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=An Emacs Lisp debugger
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-devel app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edebug-1.24-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=8aef9d532ba870d42a08d35ff61c68b4
diff --git a/metadata/md5-cache/app-xemacs/edict-1.19 b/metadata/md5-cache/app-xemacs/edict-1.19
new file mode 100644
index 000000000000..33306fc88fcf
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/edict-1.19
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=MULE: Lisp Interface to EDICT, Kanji Dictionary
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/mule-base app-xemacs/xemacs-base app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edict-1.19-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=6c8e8fd3267af6679fdc76f201f92a49
diff --git a/metadata/md5-cache/app-xemacs/ediff-1.84 b/metadata/md5-cache/app-xemacs/ediff-1.84
new file mode 100644
index 000000000000..dd2b4da23a01
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/ediff-1.84
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Interface over GNU patch
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/pcl-cvs app-xemacs/elib app-xemacs/dired app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/prog-modes app-xemacs/gnus app-xemacs/tramp app-xemacs/vc app-xemacs/sh-script app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ediff-1.84-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=8dd12a0e8c8f566ebd5cc2babd2519ad
diff --git a/metadata/md5-cache/app-xemacs/edit-utils-2.58 b/metadata/md5-cache/app-xemacs/edit-utils-2.58
new file mode 100644
index 000000000000..fe044bae86db
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/edit-utils-2.58
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Miscellaneous editor extensions, you probably need this
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/fsf-compat app-xemacs/dired app-xemacs/mail-lib app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edit-utils-2.58-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=8fe542711b9b0d7c3494da58bea7e6e0
diff --git a/metadata/md5-cache/app-xemacs/edt-1.16 b/metadata/md5-cache/app-xemacs/edt-1.16
new file mode 100644
index 000000000000..513e2375ae40
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/edt-1.16
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=DEC EDIT/EDT emulation
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edt-1.16-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=7620502208dd0d2c76bfaa04e9291878
diff --git a/metadata/md5-cache/app-xemacs/efs-1.37 b/metadata/md5-cache/app-xemacs/efs-1.37
new file mode 100644
index 000000000000..7f50fb85124f
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/efs-1.37
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Treat files on remote systems the same as local files
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-xemacs/dired app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/efs-1.37-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=45fa9670774c6f6ff6fef795d5753383
diff --git a/metadata/md5-cache/app-xemacs/egg-its-1.29 b/metadata/md5-cache/app-xemacs/egg-its-1.29
new file mode 100644
index 000000000000..19db13920d69
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/egg-its-1.29
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=MULE: Wnn (4.2 and 6) support. SJ3 support
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/leim app-xemacs/mule-base app-xemacs/fsf-compat app-xemacs/xemacs-base app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/egg-its-1.29-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=e2b75e13579c24d411f90abd05134dc2
diff --git a/metadata/md5-cache/app-xemacs/eieio-1.10 b/metadata/md5-cache/app-xemacs/eieio-1.10
new file mode 100644
index 000000000000..a5d2ee451fed
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/eieio-1.10
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Enhanced Implementation of Emacs Interpreted Objects
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/cedet-common app-xemacs/speedbar app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eieio-1.10-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=204772c7b51f9ee17054953a67eeeb39
diff --git a/metadata/md5-cache/app-xemacs/elib-1.15 b/metadata/md5-cache/app-xemacs/elib-1.15
new file mode 100644
index 000000000000..7ae719f1b2b6
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/elib-1.15
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Portable Emacs Lisp utilities library
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/elib-1.15-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=2fc6a6daff446e82035fec4607ae4478
diff --git a/metadata/md5-cache/app-xemacs/emerge-1.13 b/metadata/md5-cache/app-xemacs/emerge-1.13
new file mode 100644
index 000000000000..a5d80716aa04
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/emerge-1.13
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Another interface over GNU patch
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/emerge-1.13-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=0efd02e2fb4f6b815eab269186348d90
diff --git a/metadata/md5-cache/app-xemacs/erc-0.26 b/metadata/md5-cache/app-xemacs/erc-0.26
new file mode 100644
index 000000000000..a771ddd187f8
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/erc-0.26
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=ERC - The Emacs IRC Client
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/edit-utils app-xemacs/fsf-compat app-xemacs/gnus app-xemacs/pcomplete app-xemacs/xemacs-base app-xemacs/text-modes app-xemacs/xemacs-ispell app-xemacs/viper app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/erc-0.26-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=fb3fb976415e448538a4b251b21bdd2c
diff --git a/metadata/md5-cache/app-xemacs/escreen-1.03 b/metadata/md5-cache/app-xemacs/escreen-1.03
new file mode 100644
index 000000000000..a6de03662b33
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/escreen-1.03
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Multiple editing sessions withing a single frame (like screen)..
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/escreen-1.03-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=62e30ce222249fad25655eda479e1d05
diff --git a/metadata/md5-cache/app-xemacs/eshell-1.21 b/metadata/md5-cache/app-xemacs/eshell-1.21
new file mode 100644
index 000000000000..ae26bd60b13a
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/eshell-1.21
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Command shell implemented entirely in Emacs Lisp
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-eterm app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eshell-1.21-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=da26b97a03f390f3f9be190bbb04c3fe
diff --git a/metadata/md5-cache/app-xemacs/eudc-1.43 b/metadata/md5-cache/app-xemacs/eudc-1.43
new file mode 100644
index 000000000000..e6713a700606
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/eudc-1.43
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Emacs Unified Directory Client (LDAP, PH)
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/bbdb app-xemacs/mail-lib app-xemacs/gnus app-xemacs/rmail app-xemacs/tm app-xemacs/apel app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/ecrypto app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eudc-1.43-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=d767679778cebed5e2fe35d5ea33c758
diff --git a/metadata/md5-cache/app-xemacs/jde-1.54 b/metadata/md5-cache/app-xemacs/jde-1.54
new file mode 100644
index 000000000000..9596b323eb25
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/jde-1.54
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Integrated Development Environment for Java
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/cc-mode app-xemacs/semantic app-xemacs/debug app-xemacs/speedbar app-xemacs/edit-utils app-xemacs/xemacs-eterm app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/cedet-common app-xemacs/eieio app-xemacs/elib app-xemacs/sh-script app-xemacs/fsf-compat app-xemacs/os-utils app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/jde-1.54-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=fdbf80e3f9137ef61ac648e10f16ea63
diff --git a/metadata/md5-cache/app-xemacs/semantic-1.23 b/metadata/md5-cache/app-xemacs/semantic-1.23
new file mode 100644
index 000000000000..5ab934ef6b31
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/semantic-1.23
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Semantic bovinator (Yacc/Lex for XEmacs). Includes Senator
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/ede app-xemacs/cedet-common app-xemacs/eieio app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/edit-utils app-xemacs/speedbar app-xemacs/texinfo app-xemacs/fsf-compat app-xemacs/cc-mode app-xemacs/edebug app-xemacs/sgml app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/semantic-1.23-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=3186a57ea54cb9fa9b742422dd0cfc06
diff --git a/metadata/md5-cache/app-xemacs/xetla-1.04 b/metadata/md5-cache/app-xemacs/xetla-1.04
new file mode 100644
index 000000000000..7049a3cab475
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/xetla-1.04
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Arch (tla) interface for XEmacs
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/ediff app-xemacs/xemacs-base app-xemacs/jde app-xemacs/mail-lib app-xemacs/dired app-xemacs/prog-modes app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xetla-1.04-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=aa8517187eb82754885357d24d63c2d2
diff --git a/metadata/md5-cache/app-xemacs/xslt-process-1.14 b/metadata/md5-cache/app-xemacs/xslt-process-1.14
new file mode 100644
index 000000000000..2e509d3612ba
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/xslt-process-1.14
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=XSLT processing support
+EAPI=6
+HOMEPAGE=http://xemacs.org/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-xemacs/jde app-xemacs/cc-mode app-xemacs/semantic app-xemacs/cedet-common app-xemacs/debug app-xemacs/speedbar app-xemacs/edit-utils app-xemacs/xemacs-eterm app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/elib app-xemacs/eieio app-xemacs/sh-script app-xemacs/fsf-compat app-xemacs/xemacs-devel app-xemacs/os-utils app-editors/xemacs
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xslt-process-1.14-pkg.tar.gz
+_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
+_md5_=6f618bbd9c6a7d8f2222529a003db886
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index dcff2cdfb65b..2eb07dd08a97 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/libgpr-2018 b/metadata/md5-cache/dev-ada/libgpr-2018
index 5369bb313ef2..b545d924661e 100644
--- a/metadata/md5-cache/dev-ada/libgpr-2018
+++ b/metadata/md5-cache/dev-ada/libgpr-2018
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=] dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=] !net-libs/grpc dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
 DESCRIPTION=Ada library to handle GPRbuild project files
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/
 IUSE=gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=]
+RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=] !net-libs/grpc
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68 -> gprbuild-gpl-2018-src.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=38017de925b4653f56c7572e95eb27ab
+_md5_=b680752bf425627a7cf2ac8d318547c8
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 8aa1d2c236a6..ec48ed05df3d 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.1 b/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.1
new file mode 100644
index 000000000000..337808a18fd6
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/zip sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=The ANTLR 4 C++ Runtime
+EAPI=6
+HOMEPAGE=https://www.antlr.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=4
+SRC_URI=https://www.antlr.org/download/antlr4-cpp-runtime-4.7.1-source.zip -> antlr-cpp-4.7.1.zip
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a1d16fc2a9dede422a192216aa510c5c
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 0463277ed397..1a1921c69220 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/couchdb-1.7.1 b/metadata/md5-cache/dev-db/couchdb-1.7.1
index 9d82c44a9263..c167f3f2f67a 100644
--- a/metadata/md5-cache/dev-db/couchdb-1.7.1
+++ b/metadata/md5-cache/dev-db/couchdb-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/icu-4.3.1:= <dev-lang/erlang-21.0[ssl] !libressl? ( >=dev-lib
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/couchdb/source/1.7.1/apache-couchdb-1.7.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fe2711490397999bab5fca188c35f61b
diff --git a/metadata/md5-cache/dev-db/couchdb-1.7.2 b/metadata/md5-cache/dev-db/couchdb-1.7.2
index 6150390bd1b8..118a221c3cba 100644
--- a/metadata/md5-cache/dev-db/couchdb-1.7.2
+++ b/metadata/md5-cache/dev-db/couchdb-1.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=Distributed, fault-tolerant and schema-free document-oriented databa
 EAPI=5
 HOMEPAGE=https://couchdb.apache.org/
 IUSE=libressl selinux test
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/icu-4.3.1:= <dev-lang/erlang-21.0[ssl] !libressl? ( >=dev-libs/openssl-0.9.8j:0 ) libressl? ( dev-libs/libressl ) >=net-misc/curl-7.18.2 <dev-lang/spidermonkey-1.8.7 selinux? ( sec-policy/selinux-couchdb )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/couchdb/source/1.7.2/apache-couchdb-1.7.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e33e0d03a303921110839402edcb0caa
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d3c62402a1dc01ada369b363cd5c8c95
diff --git a/metadata/md5-cache/dev-db/freetds-1.00.341 b/metadata/md5-cache/dev-db/freetds-1.00.341
index bfb5c6183808..edede7b08e22 100644
--- a/metadata/md5-cache/dev-db/freetds-1.00.341
+++ b/metadata/md5-cache/dev-db/freetds-1.00.341
@@ -1,14 +1,14 @@
-DEFINED_PHASES=configure
-DEPEND=sys-apps/sed sys-apps/grep virtual/awk gnutls? ( net-libs/gnutls ) iconv? ( virtual/libiconv ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) )
+DEFINED_PHASES=configure install
+DEPEND=sys-apps/sed sys-apps/grep virtual/awk gnutls? ( net-libs/gnutls:= ) iconv? ( virtual/libiconv ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 DESCRIPTION=Tabular Datastream Library
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.freetds.org/
-IUSE=gnutls iconv kerberos libressl mssql iodbc odbc ssl
+IUSE=gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
 LICENSE=GPL-2
-RDEPEND=sys-apps/sed sys-apps/grep virtual/awk gnutls? ( net-libs/gnutls ) iconv? ( virtual/libiconv ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) sys-devel/binutils net-dns/bind-tools
+RDEPEND=sys-apps/sed sys-apps/grep virtual/awk gnutls? ( net-libs/gnutls:= ) iconv? ( virtual/libiconv ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-devel/binutils net-dns/bind-tools
 REQUIRED_USE=?? ( iodbc odbc )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.freetds.org/pub/freetds/current/freetds-dev.1.00.341.tar.gz
-_md5_=d2cf458cc3211e7d9b8e5d28eb53c20e
+_md5_=f0bbbd2ae9e6ad7c2575fdfc43f4e6e8
diff --git a/metadata/md5-cache/dev-db/mongodb-3.0.14 b/metadata/md5-cache/dev-db/mongodb-3.0.14
index f31ef91f10f1..454af7a80dce 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.0.14
+++ b/metadata/md5-cache/dev-db/mongodb-3.0.14
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.0.14 )
 RDEPEND=app-arch/snappy >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.57[threads(+)] >=dev-libs/libpcre-8.39[cxx] dev-libs/snowball-stemmer net-libs/libpcap sys-libs/zlib mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://downloads.mongodb.org/src/mongodb-src-r3.0.14.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=c3dc23a16603633f83356d5e5bf7ffd3
diff --git a/metadata/md5-cache/dev-db/mongodb-3.0.15 b/metadata/md5-cache/dev-db/mongodb-3.0.15
index fd5b10b937c7..b47757653b06 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.0.15
+++ b/metadata/md5-cache/dev-db/mongodb-3.0.15
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.0.15 )
 RDEPEND=app-arch/snappy >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.57[threads(+)] >=dev-libs/libpcre-8.39[cxx] dev-libs/snowball-stemmer net-libs/libpcap sys-libs/zlib mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://downloads.mongodb.org/src/mongodb-src-r3.0.15.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=c1f83b405175aa40d8e8aa94633c279d
diff --git a/metadata/md5-cache/dev-db/mongodb-3.2.17 b/metadata/md5-cache/dev-db/mongodb-3.2.17
index 940dcdbb59c5..e84ed044b7c4 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.2.17
+++ b/metadata/md5-cache/dev-db/mongodb-3.2.17
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.2.17 )
 RDEPEND=>=app-arch/snappy-1.1.2 >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.57:=[threads(+)] >=dev-libs/libpcre-8.39[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.2.17.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=05db0b017fcb81d63bf3d078d8d364ce
diff --git a/metadata/md5-cache/dev-db/mongodb-3.4.10 b/metadata/md5-cache/dev-db/mongodb-3.4.10
index b521a1fe9b1e..181ddef2454a 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.4.10
+++ b/metadata/md5-cache/dev-db/mongodb-3.4.10
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.4.10 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.4.10.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=22a06b7ab80265d981020d4007964bec
diff --git a/metadata/md5-cache/dev-db/mongodb-3.4.13 b/metadata/md5-cache/dev-db/mongodb-3.4.13
index 7ec56b164349..be324e592a6c 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.4.13
+++ b/metadata/md5-cache/dev-db/mongodb-3.4.13
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.4.13 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.4.13.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=86110a70daadf078c2773bfc57b63f82
diff --git a/metadata/md5-cache/dev-db/mongodb-3.4.14 b/metadata/md5-cache/dev-db/mongodb-3.4.14
index 210439d33a97..096c3f44636a 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.4.14
+++ b/metadata/md5-cache/dev-db/mongodb-3.4.14
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.4.14 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.4.14.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=86110a70daadf078c2773bfc57b63f82
diff --git a/metadata/md5-cache/dev-db/mongodb-3.4.15 b/metadata/md5-cache/dev-db/mongodb-3.4.15
index 34f0bfd051c1..600db25e7014 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.4.15
+++ b/metadata/md5-cache/dev-db/mongodb-3.4.15
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.4.15 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.4.15.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=86110a70daadf078c2773bfc57b63f82
diff --git a/metadata/md5-cache/dev-db/mongodb-3.4.16 b/metadata/md5-cache/dev-db/mongodb-3.4.16
index 7dffabb6c0a4..e6f172a36f4b 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.4.16
+++ b/metadata/md5-cache/dev-db/mongodb-3.4.16
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.4.16 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.4.16.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1b16e289085b33bb25f5992345c2036c
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.2-r1 b/metadata/md5-cache/dev-db/mongodb-3.6.2-r1
index 1d9d789c6fba..ad1da5c30d23 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.2-r1
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.2-r1
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.2 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.2.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=22e19879758855b6f4b0b1d569b43adf
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.3-r1 b/metadata/md5-cache/dev-db/mongodb-3.6.3-r1
index 4e7a738ed8d0..f19582973146 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.3-r1
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.3-r1
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.3 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.3.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=22e19879758855b6f4b0b1d569b43adf
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.4-r1 b/metadata/md5-cache/dev-db/mongodb-3.6.4-r1
index b2d56a3a4ba0..72720d81892d 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.4-r1
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.4-r1
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.4 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.4.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=22e19879758855b6f4b0b1d569b43adf
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.5-r1 b/metadata/md5-cache/dev-db/mongodb-3.6.5-r1
index 8b246e87fd18..0463e15a2cd2 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.5-r1
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.5-r1
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.5 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.5.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=22e19879758855b6f4b0b1d569b43adf
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.6 b/metadata/md5-cache/dev-db/mongodb-3.6.6
index ef9f94822fde..7b834b679414 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.6
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.6
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.6 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.6.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=258c80efc6f1dd22940f3ec612ed9cef
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.0-r1 b/metadata/md5-cache/dev-db/mongodb-4.0.0-r1
index 23c0aabefd42..195026f30340 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.0.0-r1
+++ b/metadata/md5-cache/dev-db/mongodb-4.0.0-r1
@@ -10,5 +10,5 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-4.0.0 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.0.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=ef5984b6c1c0e5f1c207c1773b4a9399
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.60-r1 b/metadata/md5-cache/dev-db/mysql-5.5.60-r1
deleted file mode 100644
index 9a3124e28cdc..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.5.60-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( >=sys-libs/readline-4.1:0= ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An enhanced, drop-in replacement for MySQL
-EAPI=6
-HOMEPAGE=https://mysql.com/
-IUSE=bindist client-libs debug extraengine jemalloc latin1 libressl +perl profiling selinux +server static static-libs systemtap tcmalloc test yassl abi_x86_32 abi_x86_64 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
-RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( >=sys-libs/readline-4.1:0= ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes )
-REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
-RESTRICT=!bindist? ( bindist ) libressl? ( test )
-SLOT=0/18
-SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.5/mysql-5.5.60.tar.gz https://downloads.mysql.com/archives/MySQL-5.5/mysql-5.5.60.tar.gz mirror://gentoo/mysql-extras-20180628-0201Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180628-0201Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180628-0201Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180628-0201Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180628-0201Z.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c8a08b51333be326127c17435d666dc7
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.61 b/metadata/md5-cache/dev-db/mysql-5.5.61
new file mode 100644
index 000000000000..abd11afb8a80
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-5.5.61
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( >=sys-libs/readline-4.1:0= ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=6
+HOMEPAGE=https://mysql.com/
+IUSE=bindist client-libs debug extraengine jemalloc latin1 libressl +perl profiling selinux +server static static-libs systemtap tcmalloc test yassl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( >=sys-libs/readline-4.1:0= ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes )
+REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
+RESTRICT=!bindist? ( bindist ) libressl? ( test )
+SLOT=0/18
+SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.5/mysql-5.5.61.tar.gz https://downloads.mysql.com/archives/MySQL-5.5/mysql-5.5.61.tar.gz mirror://gentoo/mysql-extras-20180804-2323Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180804-2323Z.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bd22ecac4e3402af71617494b8c7b2f0
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.40-r1 b/metadata/md5-cache/dev-db/mysql-5.6.40-r1
deleted file mode 100644
index 27916f090eae..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.6.40-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
-DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) net-misc/curl >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= server? ( numa? ( sys-process/numactl ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
-EAPI=6
-HOMEPAGE=https://www.mysql.com/
-IUSE=client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux +server static static-libs systemtap tcmalloc test yassl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
-RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) net-misc/curl >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= server? ( numa? ( sys-process/numactl ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] )
-REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
-RESTRICT=libressl? ( test )
-SLOT=0/18
-SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.40.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.40.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.40.tar.gz mirror://gentoo/mysql-extras-20180628-0201Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180628-0201Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180628-0201Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180628-0201Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180628-0201Z.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8edc3c55522bc28f5eef89e32a4f9bbe
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.41 b/metadata/md5-cache/dev-db/mysql-5.6.41
new file mode 100644
index 000000000000..630de36f2fff
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-5.6.41
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
+DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) net-misc/curl >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= server? ( numa? ( sys-process/numactl ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
+EAPI=6
+HOMEPAGE=https://www.mysql.com/
+IUSE=client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux +server static static-libs systemtap tcmalloc test yassl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) net-misc/curl >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= server? ( numa? ( sys-process/numactl ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] )
+REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
+RESTRICT=libressl? ( test )
+SLOT=0/18
+SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.41.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.41.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.41.tar.gz mirror://gentoo/mysql-extras-20180804-2323Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180804-2323Z.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e3fb3606e58d8ac913cac222eabe7389
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.22 b/metadata/md5-cache/dev-db/mysql-5.7.22
deleted file mode 100644
index 02ab8ffe3259..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.7.22
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
-DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) net-misc/curl >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.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(-)?,static-libs?] ) 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(-)?,static-libs?] ) ) !client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) ) client-libs? ( >=sys-libs/zlib-1.2.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(-)?,static-libs?] ) !client-libs? ( >=sys-libs/zlib-1.2.3:0= ) sys-libs/ncurses:0= server? ( >=app-arch/lz4-0_p131:= >=dev-libs/boost-1.65.0:= numa? ( sys-process/numactl ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
-EAPI=6
-HOMEPAGE=https://www.mysql.com/
-IUSE=client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux +server static static-libs systemtap tcmalloc test yassl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
-RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) net-misc/curl >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.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(-)?,static-libs?] ) 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(-)?,static-libs?] ) ) !client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) ) client-libs? ( >=sys-libs/zlib-1.2.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(-)?,static-libs?] ) !client-libs? ( >=sys-libs/zlib-1.2.3:0= ) sys-libs/ncurses:0= server? ( >=app-arch/lz4-0_p131:= >=dev-libs/boost-1.65.0:= numa? ( sys-process/numactl ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] )
-REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
-RESTRICT=libressl? ( test )
-SLOT=0/18
-SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.22.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.22.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.22.tar.gz mirror://gentoo/mysql-extras-20180312-2011Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180312-2011Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180312-2011Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180312-2011Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180312-2011Z.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d2b10df965bc07ec2b6355b0e9b1d51e
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.23 b/metadata/md5-cache/dev-db/mysql-5.7.23
new file mode 100644
index 000000000000..310217d2983d
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-5.7.23
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
+DEPEND=virtual/yacc dev-libs/protobuf static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) net-misc/curl >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.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(-)?,static-libs?] ) 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(-)?,static-libs?] ) ) !client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) ) client-libs? ( >=sys-libs/zlib-1.2.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(-)?,static-libs?] ) !client-libs? ( >=sys-libs/zlib-1.2.3:0= ) sys-libs/ncurses:0= server? ( >=app-arch/lz4-0_p131:= >=dev-libs/boost-1.65.0:= numa? ( sys-process/numactl ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
+EAPI=6
+HOMEPAGE=https://www.mysql.com/
+IUSE=client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux +server static static-libs systemtap tcmalloc test yassl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) net-misc/curl >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.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(-)?,static-libs?] ) 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(-)?,static-libs?] ) ) !client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) ) client-libs? ( >=sys-libs/zlib-1.2.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(-)?,static-libs?] ) !client-libs? ( >=sys-libs/zlib-1.2.3:0= ) sys-libs/ncurses:0= server? ( >=app-arch/lz4-0_p131:= >=dev-libs/boost-1.65.0:= numa? ( sys-process/numactl ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] )
+REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
+RESTRICT=libressl? ( test )
+SLOT=0/18
+SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.23.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.23.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.23.tar.gz mirror://gentoo/mysql-extras-20180804-2323Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180804-2323Z.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2e61ef572f17d01560fe8db7fd37619b
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-12.1.0.2 b/metadata/md5-cache/dev-db/oracle-instantclient-12.1.0.2
index 95218de083ad..31f6c1b6b106 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-12.1.0.2
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-12.1.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libaio-0.3.109-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=fetch splitdebug
 SLOT=0/12.1
 SRC_URI=abi_x86_32? ( instantclient-basic-linux-12.1.0.2.0.zip odbc? ( instantclient-odbc-linux-12.1.0.2.0.zip ) jdbc? ( instantclient-jdbc-linux-12.1.0.2.0.zip ) !abi_x86_64? ( sdk? ( instantclient-sdk-linux-12.1.0.2.0.zip ) sqlplus? ( instantclient-sqlplus-linux-12.1.0.2.0.zip ) tools? ( instantclient-tools-linux-12.1.0.2.0.zip ) ) ) abi_x86_64? ( instantclient-basic-linux.x64-12.1.0.2.0.zip odbc? ( instantclient-odbc-linux.x64-12.1.0.2.0.zip ) jdbc? ( instantclient-jdbc-linux.x64-12.1.0.2.0.zip ) sdk? ( instantclient-sdk-linux.x64-12.1.0.2.0.zip ) sqlplus? ( instantclient-sqlplus-linux.x64-12.1.0.2.0.zip ) tools? ( instantclient-tools-linux.x64-12.1.0.2.0.zip ) )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=abba05b7b42ec4de716249eb22fe9cab
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-12.2.0.1_p2 b/metadata/md5-cache/dev-db/oracle-instantclient-12.2.0.1_p2
index 9256765c25ed..145dff064fe1 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-12.2.0.1_p2
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-12.2.0.1_p2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libaio-0.3.109-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=fetch splitdebug
 SLOT=0/12.1
 SRC_URI=abi_x86_32? ( instantclient-basic-linux-12.2.0.1.0.zip odbc? ( instantclient-odbc-linux-12.2.0.1.0-2.zip ) jdbc? ( instantclient-jdbc-linux-12.2.0.1.0.zip ) !abi_x86_64? ( sdk? ( instantclient-sdk-linux-12.2.0.1.0.zip ) sqlplus? ( instantclient-sqlplus-linux-12.2.0.1.0.zip ) tools? ( instantclient-tools-linux-12.2.0.1.0.zip ) ) ) abi_x86_64? ( instantclient-basic-linux.x64-12.2.0.1.0.zip odbc? ( instantclient-odbc-linux.x64-12.2.0.1.0-2.zip ) jdbc? ( instantclient-jdbc-linux.x64-12.2.0.1.0.zip ) sdk? ( instantclient-sdk-linux.x64-12.2.0.1.0.zip ) sqlplus? ( instantclient-sqlplus-linux.x64-12.2.0.1.0.zip ) tools? ( instantclient-tools-linux.x64-12.2.0.1.0.zip ) )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=2e44ba42a0212159362d2c134929f0c5
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.3-r1 b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.3-r1
index df5d349ef106..5820ab3625e7 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.3-r1
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.3-r1
@@ -9,5 +9,5 @@ RDEPEND=~dev-db/oracle-instantclient-basic-11.2.0.3
 RESTRICT=fetch
 SLOT=0
 SRC_URI=x86? ( instantclient-sqlplus-linux-11.2.0.3.0.zip ) amd64? ( instantclient-sqlplus-linux.x64-11.2.0.3.0.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9f83c32b93f6ba4a1f8f08c7e0723ead
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.4 b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.4
index 82929dd8bba3..b74634c41f5d 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.4
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.4
@@ -9,5 +9,5 @@ RDEPEND=~dev-db/oracle-instantclient-basic-11.2.0.4
 RESTRICT=fetch splitdebug
 SLOT=0
 SRC_URI=x86? ( instantclient-sqlplus-linux-11.2.0.4.0.zip ) amd64? ( instantclient-sqlplus-linux.x64-11.2.0.4.0.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=73a95cf7ac4ae5fa1543768dbbef3ed9
diff --git a/metadata/md5-cache/dev-db/percona-toolkit-3.0.11 b/metadata/md5-cache/dev-db/percona-toolkit-3.0.11
new file mode 100644
index 000000000000..2cb4dacfccaf
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-toolkit-3.0.11
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/DBI dev-perl/DBD-mysql virtual/perl-Time-HiRes virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Advanced command-line tools to perform a variety of MySQL and system tasks
+EAPI=6
+HOMEPAGE=https://www.percona.com/software/mysql-tools/percona-toolkit
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 Artistic )
+RDEPEND=dev-perl/DBI dev-perl/DBD-mysql virtual/perl-Time-HiRes dev-perl/JSON dev-perl/libwww-perl dev-perl/Role-Tiny virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Time-Local virtual/perl-Digest-MD5 virtual/perl-IO-Compress virtual/perl-File-Temp virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-perl/TermReadKey dev-lang/perl:=
+SLOT=0
+SRC_URI=https://www.percona.com/downloads/percona-toolkit/3.0.11/source/tarball/percona-toolkit-3.0.11.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=5a5cdb5a89bafb8283515c86c0014de4
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.10 b/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.10
deleted file mode 100644
index 6ffeab31e93c..000000000000
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.10
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases
-EAPI=6
-HOMEPAGE=https://www.percona.com/software/percona-xtrabackup
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio dev-libs/libgcrypt:0/20 dev-libs/libgpg-error dev-perl/DBD-mysql sys-libs/zlib sys-process/numactl
-SLOT=0
-SRC_URI=amd64? ( https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.10/binary/tarball/percona-xtrabackup-2.4.10-Linux-x86_64.libgcrypt20.tar.gz ) x86? ( https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.10/binary/tarball/percona-xtrabackup-2.4.10-Linux-i686.libgcrypt20.tar.gz )
-_md5_=d89f231429321b7c2adbe9314b4dd5a7
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.12 b/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.12
new file mode 100644
index 000000000000..f3b4baf43630
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.12
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst unpack
+DESCRIPTION=MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases
+EAPI=7
+HOMEPAGE=https://www.percona.com/software/percona-xtrabackup
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libaio dev-libs/libgcrypt:0/20 dev-libs/libgpg-error dev-perl/DBD-mysql sys-libs/zlib sys-process/numactl
+SLOT=0
+SRC_URI=amd64? ( https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.12/binary/tarball/percona-xtrabackup-2.4.12-Linux-x86_64.libgcrypt20.tar.gz ) x86? ( https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.12/binary/tarball/percona-xtrabackup-2.4.12-Linux-i686.libgcrypt20.tar.gz )
+_md5_=6001748e235e0514c07dba6870459b9a
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.9 b/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.9
deleted file mode 100644
index a57b54c1aa52..000000000000
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases
-EAPI=6
-HOMEPAGE=https://www.percona.com/software/percona-xtrabackup
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio dev-libs/libgcrypt:11/11 dev-libs/libgpg-error dev-perl/DBD-mysql sys-libs/zlib
-SLOT=0
-SRC_URI=amd64? ( https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.9/binary/tarball/percona-xtrabackup-2.4.9-Linux-x86_64.tar.gz ) x86? ( https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.9/binary/tarball/percona-xtrabackup-2.4.9-Linux-i686.tar.gz )
-_md5_=7863434d61f62c05fa855f5af29e2b5a
diff --git a/metadata/md5-cache/dev-db/tokumx-1.5.0-r2 b/metadata/md5-cache/dev-db/tokumx-1.5.0-r2
index 0c926c87ec7c..be1634d61b88 100644
--- a/metadata/md5-cache/dev-db/tokumx-1.5.0-r2
+++ b/metadata/md5-cache/dev-db/tokumx-1.5.0-r2
@@ -10,5 +10,5 @@ RDEPEND=!dev-db/mongodb python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/tokumx-git-tag-1.5.0.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9bcde1b23dec61f2e7ddfdecbcbe4539
diff --git a/metadata/md5-cache/dev-db/tokumx-2.0.2-r2 b/metadata/md5-cache/dev-db/tokumx-2.0.2-r2
index d553c84655b6..a92450dbf583 100644
--- a/metadata/md5-cache/dev-db/tokumx-2.0.2-r2
+++ b/metadata/md5-cache/dev-db/tokumx-2.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=!app-admin/mongo-tools !dev-db/mongodb !dev-libs/mongo-cxx-driver python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/percona-tokumx/tokumx-enterprise-2.0.2/source/tarball/tokumx-enterprise-2.0.2.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3a3cfd6de9bc2f667117fd3c054d61a0
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 9a0a224e6b5c..3a81bd712c41 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1 b/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
index 48203fffe479..b678cddf5c32 100644
--- a/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
+++ b/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=mirror://sourceforge/dfu-programmer/dfu-programmer-0.7.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=57f597ddbbbc1ebce59476187c48a590
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.10.0 b/metadata/md5-cache/dev-embedded/openocd-0.10.0
index 32ef3325ef72..a1b38907e73d 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.10.0
+++ b/metadata/md5-cache/dev-embedded/openocd-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embed
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.10.0/openocd-0.10.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e845d5286029cadaac987dad63e45f9
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.9.0 b/metadata/md5-cache/dev-embedded/openocd-0.9.0
index 755309602f29..735e052b3bd0 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.9.0
+++ b/metadata/md5-cache/dev-embedded/openocd-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) usb? ( virtual/lib
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.9.0/openocd-0.9.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f8a9fabcc8243fc76a1d77f8f138287a
diff --git a/metadata/md5-cache/dev-embedded/openocd-9999 b/metadata/md5-cache/dev-embedded/openocd-9999
index bc7d77a8a9d1..6660afcf64fe 100644
--- a/metadata/md5-cache/dev-embedded/openocd-9999
+++ b/metadata/md5-cache/dev-embedded/openocd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )
 RESTRICT=strip
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=05249801af3e0f8129b970c4394c62c7
diff --git a/metadata/md5-cache/dev-embedded/stlink-1.4.0 b/metadata/md5-cache/dev-embedded/stlink-1.4.0
index 55fd79845cf5..24bfadd3477d 100644
--- a/metadata/md5-cache/dev-embedded/stlink-1.4.0
+++ b/metadata/md5-cache/dev-embedded/stlink-1.4.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/texane/stlink/archive/1.4.0/stlink-1.4.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2d50c7976847da80ba8561a3fcf83ee2
diff --git a/metadata/md5-cache/dev-embedded/stlink-1.5.0 b/metadata/md5-cache/dev-embedded/stlink-1.5.0
index 90d928eee5df..e0c930277f1e 100644
--- a/metadata/md5-cache/dev-embedded/stlink-1.5.0
+++ b/metadata/md5-cache/dev-embedded/stlink-1.5.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/texane/stlink/archive/1.5.0/stlink-1.5.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7b8604b148d5297c50478f44cd696ced
diff --git a/metadata/md5-cache/dev-embedded/stlink-9999 b/metadata/md5-cache/dev-embedded/stlink-9999
index e716c722282f..aa007e5b908f 100644
--- a/metadata/md5-cache/dev-embedded/stlink-9999
+++ b/metadata/md5-cache/dev-embedded/stlink-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/texane/stlink
 LICENSE=BSD
 RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
 SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=75fe97e13f6219c742448206d9d6c87e
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 9447bc318ca0..b800013bdd7f 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/tiled-1.1.6 b/metadata/md5-cache/dev-games/tiled-1.1.6
new file mode 100644
index 000000000000..310b0f238b40
--- /dev/null
+++ b/metadata/md5-cache/dev-games/tiled-1.1.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib 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_python3_7(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A general purpose tile map editor
+EAPI=6
+HOMEPAGE=https://www.mapeditor.org/
+IUSE=examples python python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=BSD BSD-2 GPL-2+
+RDEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib 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_python3_7(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/bjorn/tiled/archive/v1.1.6/tiled-1.1.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2d3d90a26dacd05eb55c418fd1009cc8
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index ca9c04c3cb0a..65c2309fb544 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3 b/metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3
index f7b9f6b6eaff..24d121db3280 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3
+++ b/metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/ghc-paths:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?]
 RESTRICT=test
 SLOT=0/2.14.3.0.7.8.3
 SRC_URI=http://code.haskell.org/~slyfox/snapshots/haddock-2.14.3.0.7.8.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=cf74d6f3fd1a1a6c39ba71eb99e5b6c7
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.16.1 b/metadata/md5-cache/dev-haskell/haddock-2.16.1
index 32f932284d78..68822af0e070 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.16.1
+++ b/metadata/md5-cache/dev-haskell/haddock-2.16.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haddock/2.16.1/haddock-2.16.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=414e783393f9bd2296e401f8398a93b9
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index d6e3ed0e8333..28d77fc6a7d1 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/cssparser-0.9.26 b/metadata/md5-cache/dev-java/cssparser-0.9.26
new file mode 100644
index 000000000000..66719974c1b6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/cssparser-0.9.26
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=dev-java/sac:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=API for parsing CSS 2 in Java
+EAPI=6
+HOMEPAGE=http://cssparser.sourceforge.net/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-java/sac:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/cssparser/cssparser-0.9.26-sources.jar -> cssparser-0.9.26.jar
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=421bd6d26c71e4e83ad7401739c919f1
diff --git a/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1 b/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1
index d6869498ac91..6ac38cb3f472 100644
--- a/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1
+++ b/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-java/ecj-gcj:* dev-lang/perl ~sys-devel/gcc-5.4.0[awt?,gcj] >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 SLOT=0
-_eclasses_=java-vm-2	771452d15e0b51ec559962d22c627449	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=java-vm-2	771452d15e0b51ec559962d22c627449	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f46d2f52bd5860c1666574872420e4b3
diff --git a/metadata/md5-cache/dev-java/icedtea-3.8.0 b/metadata/md5-cache/dev-java/icedtea-3.8.0
index 463c5745af0b..99214b942dcb 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.8.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.8.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0
 REQUIRED_USE=gtk? ( !headless-awt )
 SLOT=8
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-3.8.0.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/openjdk.tar.xz -> icedtea-3.8-openjdk-499b993b345a.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/corba.tar.xz -> icedtea-3.8-corba-75fd375dd38a.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/jaxp.tar.xz -> icedtea-3.8-jaxp-2b279bb3475b.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/jaxws.tar.xz -> icedtea-3.8-jaxws-c54a27559acb.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/jdk.tar.xz -> icedtea-3.8-jdk-9c9ff65b03b6.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/hotspot.tar.xz -> icedtea-3.8-hotspot-cb5711bf53d9.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/nashorn.tar.xz -> icedtea-3.8-nashorn-bb3e3345d3ec.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/langtools.tar.xz -> icedtea-3.8-langtools-21524ad5b914.tar.xz shenandoah? ( http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/shenandoah.tar.xz -> icedtea-3.8-shenandoah-c44a9eef4985.tar.xz ) arm? ( http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/aarch32.tar.xz -> icedtea-3.8-aarch32-bd08b7f27e11.tar.xz ) http://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	java-vm-2	771452d15e0b51ec559962d22c627449	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	java-vm-2	771452d15e0b51ec559962d22c627449	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aaa27e09ffbbb9c2b8628eabf31f254e
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.7.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.7.0
index 00069fe52ee4..2f6b15f5edd4 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.7.0
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-3.7.0.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-3.7.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-arm.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-x86.tar.xz ) )
-_eclasses_=java-vm-2	771452d15e0b51ec559962d22c627449	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=java-vm-2	771452d15e0b51ec559962d22c627449	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6ed40bbe2cf4bf3dc8ebc7dcadcc1d56
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.8.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.8.0
index bff24f60a654..0e9265239630 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.8.0
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-3.8.0.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-3.8.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-arm.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-x86.tar.xz ) )
-_eclasses_=java-vm-2	771452d15e0b51ec559962d22c627449	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=java-vm-2	771452d15e0b51ec559962d22c627449	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e5cc4ff22c0df37c90740b6fcbefbc7e
diff --git a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1 b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
index d1226ea1887e..b72744db4e03 100644
--- a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
+++ b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* ) libffi? ( virtual/libffi ) ppc64? ( virtual/libffi ) sparc? ( virtual/libffi ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jamvm/jamvm-2.0.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-vm-2	771452d15e0b51ec559962d22c627449	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-vm-2	771452d15e0b51ec559962d22c627449	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=da533340fee43eee318c7b76810c59e6
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-10.0.2 b/metadata/md5-cache/dev-java/java-sdk-docs-10.0.2
new file mode 100644
index 000000000000..726b17952636
--- /dev/null
+++ b/metadata/md5-cache/dev-java/java-sdk-docs-10.0.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install nofetch
+DEPEND=app-arch/unzip
+DESCRIPTION=Oracle's documentation bundle (including API) for Java SE
+EAPI=7
+HOMEPAGE=https://docs.oracle.com/javase/10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=oracle-java-documentation-10
+RESTRICT=fetch
+SLOT=10
+SRC_URI=jdk-10.0.2_doc-all.zip
+_md5_=28a97e43dd5d9a207ba7a2a99c45d4c0
diff --git a/metadata/md5-cache/dev-java/jmh-core-1.4.1 b/metadata/md5-cache/dev-java/jmh-core-1.4.1
index accb9bd0dbe4..04bd927310e7 100644
--- a/metadata/md5-cache/dev-java/jmh-core-1.4.1
+++ b/metadata/md5-cache/dev-java/jmh-core-1.4.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 dev-java/asm:4 dev-java/commons-math:3 =dev-java/jopt-simple-4.6:0 dev-java/junit:4 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.7 dev-java/asm:4 dev-java/junit:4 dev-java/commons-math:3 dev-java/jopt-simple:4.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Harness for building, running, and analysing nano/micro/milli/macro benchmarks
 EAPI=5
 HOMEPAGE=http://openjdk.java.net/projects/code-tools/jmh
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/asm:4 dev-java/commons-math:3 =dev-java/jopt-simple-4.6:0 dev-java/junit:4 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.7 dev-java/asm:4 dev-java/junit:4 dev-java/commons-math:3 dev-java/jopt-simple:4.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://hg.openjdk.java.net/code-tools/jmh/archive/7ff584954008.tar.gz -> jmh-core-1.4.1.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=438b00ebd56266bb4fb56a2b5802019a
+_md5_=c34109d5e59e7dc2ff45cfdb36c632ab
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.6 b/metadata/md5-cache/dev-java/jopt-simple-4.6
index d0be14e9fc74..7a41957fce0f 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-4.6
+++ b/metadata/md5-cache/dev-java/jopt-simple-4.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install preinst prepare setup
 DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=A Java library for parsing command line options
-EAPI=5
+EAPI=6
 HOMEPAGE=https://pholser.github.com/jopt-simple/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
+SLOT=4.6
 SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-4.6 -> jopt-simple-4.6.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8a5dd6e40b86933032f3de2aa48fcf80
+_md5_=a2129788f03b7c810a7367cb50d36c38
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.8 b/metadata/md5-cache/dev-java/jopt-simple-4.8
deleted file mode 100644
index e837bc0c871b..000000000000
--- a/metadata/md5-cache/dev-java/jopt-simple-4.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java library for parsing command line options
-EAPI=5
-HOMEPAGE=https://pholser.github.com/jopt-simple/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-4.8 -> jopt-simple-4.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7317f527dbf058e81aefa1c7e3bffde7
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.9 b/metadata/md5-cache/dev-java/jopt-simple-4.9
deleted file mode 100644
index bb90de6569b9..000000000000
--- a/metadata/md5-cache/dev-java/jopt-simple-4.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java library for parsing command line options
-EAPI=5
-HOMEPAGE=https://pholser.github.com/jopt-simple/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-4.9 -> jopt-simple-4.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=291ff0c479e25abc37b71453ca1a1004
diff --git a/metadata/md5-cache/dev-java/jopt-simple-5.0 b/metadata/md5-cache/dev-java/jopt-simple-5.0
new file mode 100644
index 000000000000..8a668a5a5968
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jopt-simple-5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A Java library for parsing command line options
+EAPI=6
+HOMEPAGE=https://pholser.github.com/jopt-simple
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=amd64 ppc64 x86
+LICENSE=MIT
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-5.0 -> jopt-simple-5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=59b242f2fe6dd28649c847d5ac0a7f99
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.172 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.172
index 8e1a0f5c6819..01f04764bd9e 100644
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.172
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.172
@@ -11,5 +11,5 @@ REQUIRED_USE=javafx? ( alsa fontconfig )
 RESTRICT=fetch preserve-libs strip
 SLOT=1.8
 SRC_URI=amd64? ( jdk-8u172-linux-x64.tar.gz examples? ( jdk-8u172-linux-x64-demos.tar.gz ) ) arm? ( jdk-8u172-linux-arm32-vfp-hflt.tar.gz examples? ( jdk-8u172-linux-arm32-vfp-hflt-demos.tar.gz ) ) arm64? ( jdk-8u172-linux-arm64-vfp-hflt.tar.gz examples? ( jdk-8u172-linux-arm64-vfp-hflt-demos.tar.gz ) ) x86? ( jdk-8u172-linux-i586.tar.gz examples? ( jdk-8u172-linux-i586-demos.tar.gz ) ) x64-macos? ( jdk-8u172-macosx-x64.dmg examples? ( jdk-8u172-macosx-x86_64-demos.zip ) ) sparc64-solaris? ( jdk-8u172-solaris-sparcv9.tar.gz examples? ( jdk-8u172-solaris-sparcv9-demos.tar.gz ) ) x64-solaris? ( jdk-8u172-solaris-x64.tar.gz examples? ( jdk-8u172-solaris-x64-demos.tar.gz ) )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-vm-2	771452d15e0b51ec559962d22c627449	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-vm-2	771452d15e0b51ec559962d22c627449	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9cc1578dd07091766e58cfcf4237b86f
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-9.0.4-r2 b/metadata/md5-cache/dev-java/oracle-jdk-bin-9.0.4-r2
index ddd090bea1b0..0ff342eca7da 100644
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-9.0.4-r2
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-9.0.4-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )
 RESTRICT=fetch preserve-libs strip
 SLOT=9
 SRC_URI=amd64? ( jdk-9.0.4_linux-x64_bin.tar.gz ) x64-macos? ( jdk-9.0.4_osx-x64_bin.dmg ) sparc64-solaris? ( jdk-9.0.4_solaris-sparcv9_bin.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-vm-2	771452d15e0b51ec559962d22c627449	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-vm-2	771452d15e0b51ec559962d22c627449	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c2072596e6d95192bc67da39d547f24b
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.172 b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.172
index 2bbee9d08ac0..3524708ca07b 100644
--- a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.172
+++ b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.172
@@ -10,5 +10,5 @@ RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs
 RESTRICT=fetch preserve-libs strip
 SLOT=1.8
 SRC_URI=amd64? ( jre-8u172-linux-x64.tar.gz ) x86? ( jre-8u172-linux-i586.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-vm-2	771452d15e0b51ec559962d22c627449	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-vm-2	771452d15e0b51ec559962d22c627449	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fe5596c81be25f7854a6e5fe958bc6fb
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-9.0.4-r1 b/metadata/md5-cache/dev-java/oracle-jre-bin-9.0.4-r1
index 6f393b7887d6..b69e49da45bf 100644
--- a/metadata/md5-cache/dev-java/oracle-jre-bin-9.0.4-r1
+++ b/metadata/md5-cache/dev-java/oracle-jre-bin-9.0.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )
 RESTRICT=fetch preserve-libs strip
 SLOT=9
 SRC_URI=amd64? ( jre-9.0.4_linux-x64_bin.tar.gz ) x64-macos? ( jre-9.0.4_osx-x64_bin.tar.gz ) sparc64-solaris? ( jre-9.0.4_solaris-sparcv9_bin.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-vm-2	771452d15e0b51ec559962d22c627449	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-vm-2	771452d15e0b51ec559962d22c627449	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=812def0a25058ee503df09c4b6c47563
diff --git a/metadata/md5-cache/dev-java/xz-java-1.7 b/metadata/md5-cache/dev-java/xz-java-1.7
new file mode 100644
index 000000000000..1e7ace676eb6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/xz-java-1.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Implementation of xz data compression in pure java
+EAPI=6
+HOMEPAGE=https://tukaani.org/xz/java.html
+IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=public-domain
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://tukaani.org/xz/xz-java-1.7.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ce899557a2d5ac7efbb2fc37b53ec5e5
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 4926137a6e14..c6e0d5d28ef2 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/elixir-1.7.2 b/metadata/md5-cache/dev-lang/elixir-1.7.2
new file mode 100644
index 000000000000..633ee6b4ace0
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/elixir-1.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/erlang-18[ssl]
+DESCRIPTION=Elixir programming language
+EAPI=6
+HOMEPAGE=https://elixir-lang.org
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0 ErlPL-1.1
+RDEPEND=>=dev-lang/erlang-18[ssl] !!sci-biology/phylip
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.7.2.tar.gz -> elixir-1.7.2.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5c88b76e3d1795c17db88571ef0e02b2
diff --git a/metadata/md5-cache/dev-lang/erlang-20.3 b/metadata/md5-cache/dev-lang/erlang-20.3
index 221c47fac8af..67698c4fdc6f 100644
--- a/metadata/md5-cache/dev-lang/erlang-20.3
+++ b/metadata/md5-cache/dev-lang/erlang-20.3
@@ -11,4 +11,4 @@ REQUIRED_USE=dirty-schedulers? ( smp )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_20.3.tar.gz http://erlang.org/download/otp_doc_man_20.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_20.3.tar.gz )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=1d9b558c4cd4996a01333f9fa4427262
+_md5_=e8d9443120198ccb5f1beecf076dd89e
diff --git a/metadata/md5-cache/dev-lang/erlang-20.3.2 b/metadata/md5-cache/dev-lang/erlang-20.3.2
index 63697d44def1..4f065311a704 100644
--- a/metadata/md5-cache/dev-lang/erlang-20.3.2
+++ b/metadata/md5-cache/dev-lang/erlang-20.3.2
@@ -11,4 +11,4 @@ REQUIRED_USE=dirty-schedulers? ( smp )
 SLOT=0
 SRC_URI=https://github.com/erlang/otp/archive/OTP-20.3.2.tar.gz -> erlang-20.3.2.tar.gz http://erlang.org/download/otp_doc_man_20.3.tar.gz -> erlang_doc_man_20.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_20.3.tar.gz -> erlang_doc_html_20.3.tar.gz )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=f148b53221c450421f1d739e9b135781
+_md5_=0146aadee04b8e2e07096b9ba43faaba
diff --git a/metadata/md5-cache/dev-lang/erlang-20.3.8 b/metadata/md5-cache/dev-lang/erlang-20.3.8
index 443324c4e713..01842960c7c4 100644
--- a/metadata/md5-cache/dev-lang/erlang-20.3.8
+++ b/metadata/md5-cache/dev-lang/erlang-20.3.8
@@ -11,4 +11,4 @@ REQUIRED_USE=dirty-schedulers? ( smp )
 SLOT=0
 SRC_URI=https://github.com/erlang/otp/archive/OTP-20.3.8.tar.gz -> erlang-20.3.8.tar.gz http://erlang.org/download/otp_doc_man_20.3.tar.gz -> erlang_doc_man_20.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_20.3.tar.gz -> erlang_doc_html_20.3.tar.gz )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=25d6fd0b128499a5eb0ae835823e2b85
+_md5_=11e52d7f5dec841704bee9b5186b5ab9
diff --git a/metadata/md5-cache/dev-lang/erlang-21.0.2 b/metadata/md5-cache/dev-lang/erlang-21.0.2
index 3dde4a124937..6893a05a5609 100644
--- a/metadata/md5-cache/dev-lang/erlang-21.0.2
+++ b/metadata/md5-cache/dev-lang/erlang-21.0.2
@@ -11,4 +11,4 @@ REQUIRED_USE=dirty-schedulers? ( smp )
 SLOT=0
 SRC_URI=https://github.com/erlang/otp/archive/OTP-21.0.2.tar.gz -> erlang-21.0.2.tar.gz http://erlang.org/download/otp_doc_man_21.0.tar.gz -> erlang_doc_man_21.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_21.0.tar.gz -> erlang_doc_html_21.0.tar.gz )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=e3316c7f8a001ddcec82cef32fba6a2e
+_md5_=a7b1871a323babc348c4c339f679ecef
diff --git a/metadata/md5-cache/dev-lang/ghc-7.10.3 b/metadata/md5-cache/dev-lang/ghc-7.10.3
index 4f69af9e473c..7ea5cbdbb330 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.10.3
+++ b/metadata/md5-cache/dev-lang/ghc-7.10.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/gmp-5:= sys-libs/ncurses:0=[unicode] !g
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/7.10.3
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-alpha.tbz2 ) amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-amd64.tbz2 ) ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-ia64.tbz2 ) ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-ppc.tbz2 ) ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-ppc64.tbz2 ) sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-sparc.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-x86.tbz2 ) ) mirror://hackage/package/binary/binary-0.7.6.1.tar.gz mirror://hackage/package/hoopl/hoopl-3.10.2.0.tar.gz mirror://hackage/package/transformers/transformers-0.4.3.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=87dc538a2f60c924065ff54499460b98
diff --git a/metadata/md5-cache/dev-lang/ghc-7.8.4 b/metadata/md5-cache/dev-lang/ghc-7.8.4
index 02609bca375d..7c99ce065733 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.8.4
+++ b/metadata/md5-cache/dev-lang/ghc-7.8.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/gmp-5:= sys-libs/ncurses:0=[unicode] !g
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/7.8.4
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/7.8.4/ghc-7.8.4-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-alpha.tbz2 ) amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-amd64.tbz2 ) ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-ia64.tbz2 ) ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-ppc.tbz2 ) ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-ppc64.tbz2 ) sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-sparc.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-x86.tbz2 ) ) https://dev.gentoo.org/~slyfox/distfiles/ghc-7.8.4-ia64-CLOSUREs-regenerated.patch.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=fc608dca17fa889db8a5be9f45f698f1
diff --git a/metadata/md5-cache/dev-lang/ghc-8.0.2 b/metadata/md5-cache/dev-lang/ghc-8.0.2
index f6248b7b505a..d141d633838c 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.0.2
+++ b/metadata/md5-cache/dev-lang/ghc-8.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.0.2
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-src.tar.xz ) !ghcbootstrap? ( alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-alpha.tbz2 ) arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-arm64.tbz2 ) amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-x86_64-pc-linux-gnu.tbz2 ) ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ia64-unknown-linux-gnu.tbz2 ) ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ppc.tbz2 ) ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ppc64.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=a5b615e6c522f70ca09983a9ec1f9723
diff --git a/metadata/md5-cache/dev-lang/ghc-8.2.1 b/metadata/md5-cache/dev-lang/ghc-8.2.1
index 2b9af275fe20..815eec57fff4 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.2.1
+++ b/metadata/md5-cache/dev-lang/ghc-8.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.2.1
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.2.1/ghc-8.2.1-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.1-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e70e31eb35104195802dfb783b8457f9
diff --git a/metadata/md5-cache/dev-lang/ghc-8.2.2 b/metadata/md5-cache/dev-lang/ghc-8.2.2
index e115020d701b..f799288e83b7 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.2.2
+++ b/metadata/md5-cache/dev-lang/ghc-8.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.2.2
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.2-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=af30fc285821b5160788e8be56ad6829
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.1 b/metadata/md5-cache/dev-lang/ghc-8.4.1
index d5009b4a2c4e..a12718d9bb76 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.4.1
+++ b/metadata/md5-cache/dev-lang/ghc-8.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.4.1
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.4.1/ghc-8.4.1-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.1-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=6a73b2c94375d9bb29aad201c59a213a
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.2 b/metadata/md5-cache/dev-lang/ghc-8.4.2
index 8eb775315ebc..16c70026606c 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.4.2
+++ b/metadata/md5-cache/dev-lang/ghc-8.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.4.2
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.4.2/ghc-8.4.2-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.2-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=d01224da03d360b81dccfa6a8eb74148
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.3 b/metadata/md5-cache/dev-lang/ghc-8.4.3
index ba458adb9ee7..dae9324e5cf8 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.4.3
+++ b/metadata/md5-cache/dev-lang/ghc-8.4.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.4.3
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.3-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.3-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=b29c3d5fce15a1cdccbe23dfad78ecaf
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2016 b/metadata/md5-cache/dev-lang/gnat-gpl-2016
index 7e83dfebb555..d6a3999cbe62 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=983e385e2de3398dbd0183cf4028b324
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017 b/metadata/md5-cache/dev-lang/gnat-gpl-2017
index 596655417629..d78a3d8921a0 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=5682622ce85edd1070e015505e663423
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2018 b/metadata/md5-cache/dev-lang/gnat-gpl-2018
index 113b8fb5c3c8..9775db743178 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2018
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2018
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:7.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=strip
 SLOT=7.3.1
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.4.tar.bz2 http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 -> gnat-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7 -> gcc-7-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6 -> gcc-interface-7-gpl-2018-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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=39a88d38d08b2306089d70c54fd11278
diff --git a/metadata/md5-cache/dev-lang/julia-0.6.3-r1 b/metadata/md5-cache/dev-lang/julia-0.6.3-r1
index f993ee4625fe..40ad2751f3d3 100644
--- a/metadata/md5-cache/dev-lang/julia-0.6.3-r1
+++ b/metadata/md5-cache/dev-lang/julia-0.6.3-r1
@@ -9,5 +9,5 @@ RDEPEND=sys-devel/llvm:4= sys-devel/clang:4= dev-libs/double-conversion:0= dev-l
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/JuliaLang/julia/releases/download/v0.6.3/julia-0.6.3.tar.gz https://dev.gentoo.org/~tamiko/distfiles/julia-0.6.3-bundled.tar.gz
-_eclasses_=llvm	5c91ddccef25fc60a983057bf9507ead	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=llvm	5c91ddccef25fc60a983057bf9507ead	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=3962a563c0df36a8faefca701ffa7efd
diff --git a/metadata/md5-cache/dev-lang/julia-9999 b/metadata/md5-cache/dev-lang/julia-9999
index 5e9500da22b4..487048617fdd 100644
--- a/metadata/md5-cache/dev-lang/julia-9999
+++ b/metadata/md5-cache/dev-lang/julia-9999
@@ -7,5 +7,5 @@ LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-4.0.0:= >=sys-devel/clang-4.0.0:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/arpack:0= sci-libs/camd:0= sci-libs/cholmod:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= >=dev-libs/libpcre2-10.23:0=[jit] sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	llvm	5c91ddccef25fc60a983057bf9507ead	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	llvm	5c91ddccef25fc60a983057bf9507ead	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=6497ab4c788073f0752d3f014d7b5a8c
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.2 b/metadata/md5-cache/dev-lang/luajit-2.0.2
index 11e832639c33..eea2509d6027 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.2
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.2
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=5a5acb335997cadfbf28abf7161b613f
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.3 b/metadata/md5-cache/dev-lang/luajit-2.0.3
index 808d66c26970..fc5677e4fbf0 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.3
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=4dab0f515288f1975e47f0f43bfc4dcd
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.3-r1 b/metadata/md5-cache/dev-lang/luajit-2.0.3-r1
index 536d3b39ff98..b600aa3a6e31 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.3-r1
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.3-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=6fb748bcb395620d84bfa3fc7a81a610
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.4 b/metadata/md5-cache/dev-lang/luajit-2.0.4
index f352bbe903a2..9295672f8f24 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.4
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.4
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=4a0cfb66d4030f58049e1617a946b18c
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.5 b/metadata/md5-cache/dev-lang/luajit-2.0.5
index d8cf6359b55f..728b9bbe2be7 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.5
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=2007731ba7a31cb1aeac8d3e2f70667a
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.5-r1 b/metadata/md5-cache/dev-lang/luajit-2.0.5-r1
index 644527faf330..eca2aa6d0a15 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.5-r1
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.5-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.5.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e671593bbc501382f0d5148640c8c21d
diff --git a/metadata/md5-cache/dev-lang/mlton-20130715 b/metadata/md5-cache/dev-lang/mlton-20130715
index 779a4ddad26e..c6da6180b822 100644
--- a/metadata/md5-cache/dev-lang/mlton-20130715
+++ b/metadata/md5-cache/dev-lang/mlton-20130715
@@ -9,5 +9,5 @@ LICENSE=HPND MIT
 RDEPEND=dev-libs/gmp:*
 SLOT=0/20130715
 SRC_URI=!binary? ( mirror://sourceforge/mlton/mlton-20130715.src.tgz ) binary? ( amd64? ( mirror://sourceforge/mlton/mlton-20130715-1.amd64-linux.tgz ) x86? ( mirror://sourceforge/mlton/mlton-20130715-1.x86-linux.tgz ) )
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a976f4b6d4499101a152057b106cb9fd
diff --git a/metadata/md5-cache/dev-lang/mlton-20180207 b/metadata/md5-cache/dev-lang/mlton-20180207
index bae8656b636a..4afc6bcd5f35 100644
--- a/metadata/md5-cache/dev-lang/mlton-20180207
+++ b/metadata/md5-cache/dev-lang/mlton-20180207
@@ -9,5 +9,5 @@ LICENSE=HPND MIT
 RDEPEND=dev-libs/gmp:*
 SLOT=0/20180207
 SRC_URI=!binary? ( mirror://sourceforge/mlton/mlton-20180207.src.tgz ) !bootstrap-smlnj? ( amd64? ( mirror://sourceforge/mlton/mlton-20180207-1.amd64-linux.tgz ) )
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=730f246811de2c2f669af658cffd0fcc
diff --git a/metadata/md5-cache/dev-lang/mono-4.4.1.0 b/metadata/md5-cache/dev-lang/mono-4.4.1.0
index 26f664386927..c95cf2ee184e 100644
--- a/metadata/md5-cache/dev-lang/mono-4.4.1.0
+++ b/metadata/md5-cache/dev-lang/mono-4.4.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-4.4.1.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=75c2da6b8d18118e42c004ad59a2eb52
diff --git a/metadata/md5-cache/dev-lang/mono-4.6.1.5 b/metadata/md5-cache/dev-lang/mono-4.6.1.5
index aa3aab985b4e..dcce79c00d94 100644
--- a/metadata/md5-cache/dev-lang/mono-4.6.1.5
+++ b/metadata/md5-cache/dev-lang/mono-4.6.1.5
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-4.6.1.5.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=958f33215fed78cbcd1e763ba087e6c9
diff --git a/metadata/md5-cache/dev-lang/mono-4.6.1.5-r1 b/metadata/md5-cache/dev-lang/mono-4.6.1.5-r1
index 52049d43ef32..8af8e36334a4 100644
--- a/metadata/md5-cache/dev-lang/mono-4.6.1.5-r1
+++ b/metadata/md5-cache/dev-lang/mono-4.6.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-4.6.1.5.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=c5234fa44e5f2588ae17d5700c8ae8b4
diff --git a/metadata/md5-cache/dev-lang/mono-4.8.0.425 b/metadata/md5-cache/dev-lang/mono-4.8.0.425
index af4400e695cb..399e1335de30 100644
--- a/metadata/md5-cache/dev-lang/mono-4.8.0.425
+++ b/metadata/md5-cache/dev-lang/mono-4.8.0.425
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-4.8.0.425.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=b0fd626992bb567772a8d12c2c2dbc0c
diff --git a/metadata/md5-cache/dev-lang/mono-4.8.0.495 b/metadata/md5-cache/dev-lang/mono-4.8.0.495
index 5f01d5fd2f1d..1bc2b5aee1fd 100644
--- a/metadata/md5-cache/dev-lang/mono-4.8.0.495
+++ b/metadata/md5-cache/dev-lang/mono-4.8.0.495
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-4.8.0.495.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=b0fd626992bb567772a8d12c2c2dbc0c
diff --git a/metadata/md5-cache/dev-lang/mono-4.8.0.524 b/metadata/md5-cache/dev-lang/mono-4.8.0.524
index 864aa011f0ea..61cdf8cb4d87 100644
--- a/metadata/md5-cache/dev-lang/mono-4.8.0.524
+++ b/metadata/md5-cache/dev-lang/mono-4.8.0.524
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-4.8.0.524.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=da862850e39f48367106aa18d5095f06
diff --git a/metadata/md5-cache/dev-lang/mono-5.12.0.226 b/metadata/md5-cache/dev-lang/mono-5.12.0.226
index ea8cd564d941..480fe2e2a6cf 100644
--- a/metadata/md5-cache/dev-lang/mono-5.12.0.226
+++ b/metadata/md5-cache/dev-lang/mono-5.12.0.226
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono/mono-5.12.0.226.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7845c344e9c8eea2821f3341df119230
diff --git a/metadata/md5-cache/dev-lang/mono-5.4.1.6 b/metadata/md5-cache/dev-lang/mono-5.4.1.6
index a02a09aa107b..de05367899e6 100644
--- a/metadata/md5-cache/dev-lang/mono-5.4.1.6
+++ b/metadata/md5-cache/dev-lang/mono-5.4.1.6
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-5.4.1.6.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=97da6929f62ec503eed8fc3e81ed55f2
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.28-r1 b/metadata/md5-cache/dev-lang/orc-0.4.28-r1
index 44258cd1bc51..a80bdc2041c6 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.28-r1
+++ b/metadata/md5-cache/dev-lang/orc-0.4.28-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ~arm64 ~hppa ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=https://gstreamer.freedesktop.org/src/orc/orc-0.4.28.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bb71f690df119ceedd2146b603d3d582
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.1 b/metadata/md5-cache/dev-lang/polyml-5.5.1
index d12eba7c20f6..90a990968c89 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.5.1
+++ b/metadata/md5-cache/dev-lang/polyml-5.5.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
 SLOT=0/5.5.1
 SRC_URI=mirror://sourceforge/polyml/polyml.5.5.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8f2b67b5d597885fcdf7a2b0d89ae982
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.2 b/metadata/md5-cache/dev-lang/polyml-5.5.2
index bbad5e1dc8fd..6bd95e714b70 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.5.2
+++ b/metadata/md5-cache/dev-lang/polyml-5.5.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
 SLOT=0/5.5.2
 SRC_URI=mirror://sourceforge/polyml/polyml.5.5.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=db6bd08d7c7c63533e2992b347ccd85c
diff --git a/metadata/md5-cache/dev-lang/polyml-5.6 b/metadata/md5-cache/dev-lang/polyml-5.6
index 47d8b2160124..b6bb4ea6ea95 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.6
+++ b/metadata/md5-cache/dev-lang/polyml-5.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
 SLOT=0/5.6
 SRC_URI=https://codeload.github.com/polyml/polyml/tar.gz/v5.6 -> polyml-5.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=e05c9500294a4bc63ba7765ea0f58a6c
diff --git a/metadata/md5-cache/dev-lang/python-2.7.14-r1 b/metadata/md5-cache/dev-lang/python-2.7.14-r1
index f9c507e25e0e..dcb48d1d9eb7 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.14-r1
+++ b/metadata/md5-cache/dev-lang/python-2.7.14-r1
@@ -10,5 +10,5 @@ PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.14/Python-2.7.14.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.14-0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c754a811dcc2760daf74c5356ab79e12
diff --git a/metadata/md5-cache/dev-lang/python-2.7.14-r2 b/metadata/md5-cache/dev-lang/python-2.7.14-r2
index ad8f3148c0f1..b294e83d6c78 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.14-r2
+++ b/metadata/md5-cache/dev-lang/python-2.7.14-r2
@@ -10,5 +10,5 @@ PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.14/Python-2.7.14.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.14-0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5413cb89c875a32ff857380562557c48
diff --git a/metadata/md5-cache/dev-lang/python-2.7.15 b/metadata/md5-cache/dev-lang/python-2.7.15
index 819c0b386cb1..df689dee95ba 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.15
+++ b/metadata/md5-cache/dev-lang/python-2.7.15
@@ -10,5 +10,5 @@ PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.15.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=18649b290896cfe04eed22bb8fec0349
diff --git a/metadata/md5-cache/dev-lang/python-3.4.5-r1 b/metadata/md5-cache/dev-lang/python-3.4.5-r1
index 3e4cfa62c730..5ea4358ac849 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.5-r1
+++ b/metadata/md5-cache/dev-lang/python-3.4.5-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 RESTRICT=!test? ( test )
 SLOT=3.4/3.4m
 SRC_URI=https://www.python.org/ftp/python/3.4.5/Python-3.4.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.5-0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ec9ffabfab8822df8599a5f1b863cbbc
diff --git a/metadata/md5-cache/dev-lang/python-3.4.6-r1 b/metadata/md5-cache/dev-lang/python-3.4.6-r1
index 7216b05fb3fa..dc8aaefde68a 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.6-r1
+++ b/metadata/md5-cache/dev-lang/python-3.4.6-r1
@@ -10,5 +10,5 @@ PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 SLOT=3.4/3.4m
 SRC_URI=https://www.python.org/ftp/python/3.4.6/Python-3.4.6.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.6-0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b1b9f4d4f8280392da57fd43a71d1451
diff --git a/metadata/md5-cache/dev-lang/python-3.4.8 b/metadata/md5-cache/dev-lang/python-3.4.8
index 446fda7952db..d345840b430e 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.8
+++ b/metadata/md5-cache/dev-lang/python-3.4.8
@@ -10,5 +10,5 @@ PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 SLOT=3.4/3.4m
 SRC_URI=https://www.python.org/ftp/python/3.4.8/Python-3.4.8.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.6-0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e005803b0c54f6f44f934f0a85e3fc90
diff --git a/metadata/md5-cache/dev-lang/python-3.4.8-r1 b/metadata/md5-cache/dev-lang/python-3.4.8-r1
index edc4e3b4a6f2..82d37181876e 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.8-r1
+++ b/metadata/md5-cache/dev-lang/python-3.4.8-r1
@@ -10,5 +10,5 @@ PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 SLOT=3.4/3.4m
 SRC_URI=https://www.python.org/ftp/python/3.4.8/Python-3.4.8.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.6-0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fbc1f0a56e175f1fba11e685942e29ca
diff --git a/metadata/md5-cache/dev-lang/python-3.5.4-r1 b/metadata/md5-cache/dev-lang/python-3.5.4-r1
index 09b0aed128dd..b110fabd0707 100644
--- a/metadata/md5-cache/dev-lang/python-3.5.4-r1
+++ b/metadata/md5-cache/dev-lang/python-3.5.4-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 RESTRICT=!test? ( test )
 SLOT=3.5/3.5m
 SRC_URI=https://www.python.org/ftp/python/3.5.4/Python-3.5.4.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.5.4-0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9ee1cecf927554b44b850ddd7a55a95d
diff --git a/metadata/md5-cache/dev-lang/python-3.5.5 b/metadata/md5-cache/dev-lang/python-3.5.5
index 855d932e58fd..0439d05a7d12 100644
--- a/metadata/md5-cache/dev-lang/python-3.5.5
+++ b/metadata/md5-cache/dev-lang/python-3.5.5
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 RESTRICT=!test? ( test )
 SLOT=3.5/3.5m
 SRC_URI=https://www.python.org/ftp/python/3.5.5/Python-3.5.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.5.4-0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf7324beb9f1b89049463d304188440f
diff --git a/metadata/md5-cache/dev-lang/python-3.5.5-r1 b/metadata/md5-cache/dev-lang/python-3.5.5-r1
index b131f18743ec..dbc422a05ba8 100644
--- a/metadata/md5-cache/dev-lang/python-3.5.5-r1
+++ b/metadata/md5-cache/dev-lang/python-3.5.5-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 RESTRICT=!test? ( test )
 SLOT=3.5/3.5m
 SRC_URI=https://www.python.org/ftp/python/3.5.5/Python-3.5.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.5.4-0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b84bcca1e5ad0a3854b89fe3a7ae4a9e
diff --git a/metadata/md5-cache/dev-lang/python-3.6.3-r1 b/metadata/md5-cache/dev-lang/python-3.6.3-r1
index dc668cd3f8c6..1df51e358339 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.3-r1
+++ b/metadata/md5-cache/dev-lang/python-3.6.3-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.3/Python-3.6.3.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.2-0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f4096522b0cfda2ecba0f6e442896db8
diff --git a/metadata/md5-cache/dev-lang/python-3.6.4 b/metadata/md5-cache/dev-lang/python-3.6.4
index c5c2936bccdc..c58a5422f4cc 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.4
+++ b/metadata/md5-cache/dev-lang/python-3.6.4
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.4.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bb0570fb82b5d282733aa41327ce32c5
diff --git a/metadata/md5-cache/dev-lang/python-3.6.5 b/metadata/md5-cache/dev-lang/python-3.6.5
index 89f982f7a57b..18c6af6d583b 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.5
+++ b/metadata/md5-cache/dev-lang/python-3.6.5
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.5/Python-3.6.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.4.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e17dfef086bbb409c8cec446e561f64d
diff --git a/metadata/md5-cache/dev-lang/python-3.6.5-r1 b/metadata/md5-cache/dev-lang/python-3.6.5-r1
index 5594618d32ea..cb30d0dc567a 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.5-r1
+++ b/metadata/md5-cache/dev-lang/python-3.6.5-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.5/Python-3.6.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.4.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c7d7336785b45ca5dd9309a3be5b692a
diff --git a/metadata/md5-cache/dev-lang/python-3.6.6 b/metadata/md5-cache/dev-lang/python-3.6.6
index 10fa24fd3329..ae4e469a4789 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.6
+++ b/metadata/md5-cache/dev-lang/python-3.6.6
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.6/Python-3.6.6.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.6.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dc6718f67146c88860b8c5053251e368
diff --git a/metadata/md5-cache/dev-lang/python-3.7.0 b/metadata/md5-cache/dev-lang/python-3.7.0
index 89882bc9e3a5..9d238ed29f4d 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.0
+++ b/metadata/md5-cache/dev-lang/python-3.7.0
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.7.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=688d043e2279f60e7f2dae1e6cbbd731
diff --git a/metadata/md5-cache/dev-lang/rust-1.28.0 b/metadata/md5-cache/dev-lang/rust-1.28.0
new file mode 100644
index 000000000000..21ff871584dc
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.28.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt ) dev-util/cmake
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=6
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=cargo debug doc +jemalloc rls rustfmt wasm 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 ~arm64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+PDEPEND=!cargo? ( >=dev-util/cargo-0.29.0 )
+RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc )
+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 )
+SLOT=stable/1.28
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.28.0-src.tar.xz -> rustc-1.28.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.27.2-x86_64-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.27.2-i686-unknown-linux-gnu.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.27.2-aarch64-unknown-linux-gnu.tar.xz )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=40a8b9c98c17d5970c191adb0ad13121
diff --git a/metadata/md5-cache/dev-lang/rust-1.28.0-r1 b/metadata/md5-cache/dev-lang/rust-1.28.0-r1
new file mode 100644
index 000000000000..279caf521b65
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.28.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) cargo? ( sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser net-misc/curl[ssl] ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt ) dev-util/cmake
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=6
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=cargo debug doc +jemalloc libressl rls rustfmt wasm 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 ~arm64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+PDEPEND=!cargo? ( >=dev-util/cargo-0.29.0 )
+RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) cargo? ( sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser net-misc/curl[ssl] )
+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 )
+SLOT=stable/1.28
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.28.0-src.tar.xz -> rustc-1.28.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.27.2-x86_64-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.27.2-i686-unknown-linux-gnu.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.27.2-aarch64-unknown-linux-gnu.tar.xz )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=881db91e9aeb286c8d2d1774b2b08049
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.26.0 b/metadata/md5-cache/dev-lang/rust-bin-1.26.0
deleted file mode 100644
index d521df913109..000000000000
--- a/metadata/md5-cache/dev-lang/rust-bin-1.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm pretend unpack
-DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=5
-HOMEPAGE=https://www.rust-lang.org/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-PDEPEND=>=dev-util/cargo-0.27.0
-RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0
-SLOT=stable
-SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.26.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.26.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.26.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.26.0-armv7-unknown-linux-gnueabihf.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.26.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a504d13f8846a302a964a55ea96f914e
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.27.0 b/metadata/md5-cache/dev-lang/rust-bin-1.27.0
deleted file mode 100644
index e4c87969d3f8..000000000000
--- a/metadata/md5-cache/dev-lang/rust-bin-1.27.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm pretend unpack
-DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=6
-HOMEPAGE=https://www.rust-lang.org/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-PDEPEND=>=dev-util/cargo-0.28.0
-RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0
-SLOT=stable
-SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.27.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.27.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.27.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.27.0-armv7-unknown-linux-gnueabihf.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.27.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0beae862677016a616d7c2d20c9d4713
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.27.1 b/metadata/md5-cache/dev-lang/rust-bin-1.27.1
deleted file mode 100644
index 40bd716e2afc..000000000000
--- a/metadata/md5-cache/dev-lang/rust-bin-1.27.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm pretend unpack
-DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0 cargo? ( !dev-util/cargo )
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=6
-HOMEPAGE=https://www.rust-lang.org/
-IUSE=cargo doc
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-PDEPEND=>=dev-util/cargo-0.28.0
-RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0 cargo? ( !dev-util/cargo )
-SLOT=stable
-SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.27.1-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.27.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.27.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.27.1-armv7-unknown-linux-gnueabihf.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.27.1-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0e144fc8ae57d07c30229e4c957a7611
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.28.0 b/metadata/md5-cache/dev-lang/rust-bin-1.28.0
new file mode 100644
index 000000000000..b49ea00335d8
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.28.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm pretend unpack
+DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0 cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt )
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=6
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=cargo doc rustfmt
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+PDEPEND=!cargo? ( >=dev-util/cargo-0.29.0 )
+RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0 cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt )
+SLOT=stable
+SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.28.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-armv7-unknown-linux-gnueabihf.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.28.0-i686-unknown-linux-gnu.tar.xz )
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=815916dd2f68eb8ba73d276e5f68f339
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.28.0-r1 b/metadata/md5-cache/dev-lang/rust-bin-1.28.0-r1
new file mode 100644
index 000000000000..1c1811f5b7ac
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.28.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm pretend unpack
+DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0 cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt )
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=6
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=cargo doc libressl rustfmt
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+PDEPEND=!cargo? ( >=dev-util/cargo-0.29.0 )
+RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0 cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt ) cargo? ( sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser net-misc/curl[ssl] )
+SLOT=stable
+SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.28.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.28.0-aarch64-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.28.0-i686-unknown-linux-gnu.tar.xz )
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=93f341ba4fb6683f5c3cb7d9f5e9dae0
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6
index ef3792912859..fc1f773d8365 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6
@@ -9,5 +9,5 @@ LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc )
 SLOT=0/mozjs185
 SRC_URI=https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-01.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=044a7f860d6e5713b7b0940a4158d0dd
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r4 b/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r4
index cea2339437d2..03996e2a4276 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r4
+++ b/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r4
@@ -11,5 +11,5 @@ REQUIRED_USE=debug? ( jit )
 RESTRICT=ia64? ( test )
 SLOT=17
 SRC_URI=http://archive.mozilla.org/pub/js/mozjs17.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot17-patches-01.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=7b3755c321292a4872112b5ec6b261c6
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5 b/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5
index efa8cf8ed5c8..12b7536507c6 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5
+++ b/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5
@@ -11,5 +11,5 @@ REQUIRED_USE=debug? ( jit )
 RESTRICT=ia64? ( test )
 SLOT=17
 SRC_URI=http://archive.mozilla.org/pub/js/mozjs17.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot17-patches-01.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=aa8ecf92a16532e703e2187f9a0957a5
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r3 b/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r3
index 0da865be86cf..2a3ebacc2301 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r3
+++ b/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.9.4 virtual/libffi sys-libs/readline:0= >=sys-libs/zli
 RESTRICT=ia64? ( test )
 SLOT=24
 SRC_URI=https://archive.mozilla.org/pub/js/mozjs-24.2.0.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot24-patches-01.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=10b906fea1f5d272bc3d4a34a367c417
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r4 b/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r4
index 3adb126f23d0..7cfa065e0483 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r4
+++ b/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.9.4 virtual/libffi sys-libs/readline:0= >=sys-libs/zli
 RESTRICT=ia64? ( test )
 SLOT=24
 SRC_URI=https://archive.mozilla.org/pub/js/mozjs-24.2.0.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot24-patches-01.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=ae4b5ec879767de220cea7d5cfe32a5a
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-38.3.0 b/metadata/md5-cache/dev-lang/spidermonkey-38.3.0
index 57707e8ba2f8..5f3bb3007d42 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-38.3.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-38.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.10.10 virtual/libffi sys-libs/readline:0= >=sys-libs/z
 RESTRICT=ia64? ( test )
 SLOT=38
 SRC_URI=https://archive.mozilla.org/pub/spidermonkey/releases/38.3.0/mozjs-38.3.0sfink2.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot38-patches-01.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozcoreconf-v4	45c0b61c53e2dbbcf728355c62f8de3c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozcoreconf-v4	45c0b61c53e2dbbcf728355c62f8de3c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=dd64edd1746abba4e134bcda06e0e5b6
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-45.0.2 b/metadata/md5-cache/dev-lang/spidermonkey-45.0.2
index 947921706459..a1d9faf9b8b9 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-45.0.2
+++ b/metadata/md5-cache/dev-lang/spidermonkey-45.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.10.10 virtual/libffi sys-libs/readline:0= >=sys-libs/z
 RESTRICT=ia64? ( test )
 SLOT=45
 SRC_URI=https://archive.mozilla.org/pub/spidermonkey/releases/45.0.2/mozjs-45.0.2.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot45-patches-01.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozcoreconf-v4	45c0b61c53e2dbbcf728355c62f8de3c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozcoreconf-v4	45c0b61c53e2dbbcf728355c62f8de3c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e38c86344ed64a78c9b10f9fc0ca447a
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1 b/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1
index b636f6aa4120..c14f1ce91d5d 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1
+++ b/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zl
 RESTRICT=ia64? ( test )
 SLOT=52
 SRC_URI=http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.1pre1.tar.bz2 -> mozjs-52.9.1pre1.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-52.0-patches-0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=be730937ba09030e9e9d83cc966dfc91
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 2e93c6bb5e05..9fa9706c87b8 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/beignet-1.3.2-r1 b/metadata/md5-cache/dev-libs/beignet-1.3.2-r1
index 6e79618b1094..5edbd29b2598 100644
--- a/metadata/md5-cache/dev-libs/beignet-1.3.2-r1
+++ b/metadata/md5-cache/dev-libs/beignet-1.3.2-r1
@@ -10,4 +10,4 @@ RDEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/beignet-1.3.2-source.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=94466593ffa1225ff54fd6e84abf9875
+_md5_=fe065f9ded1f5170b3f6b0cbc3b54b3a
diff --git a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p03-r1 b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p03-r1
index 6f1b5cbf8633..cf55089b1d56 100644
--- a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p03-r1
+++ b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p03-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-apps/pcsc-lite virtual/libusb:1 fox? ( >=x11-libs/fox-1.6 ) xml? ( dev-libs/libxml2 ) udev? ( virtual/udev )
 SLOT=0
 SRC_URI=http://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP03/pcsc-cyberjack_3.99.5final.SP03.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e0909e29be7a32f464ab6a7a3687401c
diff --git a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p10 b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p10
index d4fa50b1f6b6..7762a888b206 100644
--- a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p10
+++ b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p10
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-apps/pcsc-lite usb? ( virtual/libusb:1 ) udev? ( virtual/udev )
 SLOT=0
 SRC_URI=http://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP10/pcsc-cyberjack-3.99.5final.SP10.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=09d17465522890d801e5357782316a9b
diff --git a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p11 b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p11
index c83d643a0e6b..076adf620cf2 100644
--- a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p11
+++ b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p11
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-apps/pcsc-lite usb? ( virtual/libusb:1 ) udev? ( virtual/udev )
 SLOT=0
 SRC_URI=http://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP11/pcsc-cyberjack-3.99.5final.SP11.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=6f84b3908d82c54ab749d209ccd24725
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10
index f72aa25c52f5..99b7d1fffd16 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup test
 DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-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(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !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(-)?] ) ) java? ( >=virtual/jdk-1.4:= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
 DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
 EAPI=5
-HOMEPAGE=http://cyrusimap.web.cmu.edu/
+HOMEPAGE=https://www.cyrusimap.org/sasl/
 IUSE=authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 elibc_FreeBSD java
 KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-with-attribution
@@ -10,4 +10,4 @@ RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/cou
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	db-use	582140d1a711279e50ce284fc7b609f5	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5bc2654eb71120f862e7846bd26bc8f7
+_md5_=cd1a2bd12915fea110a8e3baed900cba
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r11 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r11
index c2636ffaa0f5..c2d9162f1ee5 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r11
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r11
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup test
 DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-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(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !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(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
 DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
 EAPI=5
-HOMEPAGE=http://cyrusimap.web.cmu.edu/
+HOMEPAGE=https://www.cyrusimap.org/sasl/
 IUSE=authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 elibc_FreeBSD java
 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=BSD-with-attribution
@@ -10,4 +10,4 @@ RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/cou
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	db-use	582140d1a711279e50ce284fc7b609f5	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e1fa17fe5058f5b3f6e3422c3320191d
+_md5_=ecb603aae1bb8a72954b373d2b58994a
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
index 5af3d7a8175d..210ad2b5f71c 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup test
 DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-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(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=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(-)?] ) java? ( >=virtual/jdk-1.4:= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
 DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
 EAPI=5
-HOMEPAGE=http://cyrusimap.web.cmu.edu/
+HOMEPAGE=https://www.cyrusimap.org/sasl/
 IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 elibc_FreeBSD java
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-with-attribution
@@ -10,4 +10,4 @@ RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/cou
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	db-use	582140d1a711279e50ce284fc7b609f5	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f8e0eeb45ae27d5d6c8722f3483e24f0
+_md5_=1697fae2fd66f6632891a58a4ab4cb4d
diff --git a/metadata/md5-cache/dev-libs/efl-1.17.0-r1 b/metadata/md5-cache/dev-libs/efl-1.17.0-r1
index 9000d8b82f91..7933da1f29dc 100644
--- a/metadata/md5-cache/dev-libs/efl-1.17.0-r1
+++ b/metadata/md5-cache/dev-libs/efl-1.17.0-r1
@@ -10,5 +10,5 @@ RDEPEND=drm? ( >=dev-libs/libinput-0.8 media-libs/mesa[gbm] >=x11-libs/libdrm-2.
 REQUIRED_USE=pulseaudio? ( sound ) opengl? ( || ( X sdl wayland ) ) gles? ( || ( X wayland ) ) gles? ( !sdl ) gles? ( egl ) sdl? ( opengl ) wayland? ( egl !opengl gles ) xim? ( X )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.17.0.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	enlightenment	e2ebae76ba56501855712c5fd3c4c77c	epatch	9a5f039771f143195164a15a4faa41a1	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	enlightenment	e2ebae76ba56501855712c5fd3c4c77c	epatch	9a5f039771f143195164a15a4faa41a1	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ad34b554417ae23aa350e8524d3a34a8
diff --git a/metadata/md5-cache/dev-libs/efl-1.18.4-r1 b/metadata/md5-cache/dev-libs/efl-1.18.4-r1
index 4b7f48cb87c5..2577c23889cb 100644
--- a/metadata/md5-cache/dev-libs/efl-1.18.4-r1
+++ b/metadata/md5-cache/dev-libs/efl-1.18.4-r1
@@ -10,5 +10,5 @@ RDEPEND=drm? ( >=dev-libs/libinput-0.8 media-libs/mesa[gbm] >=x11-libs/libdrm-2.
 REQUIRED_USE=pulseaudio? ( sound ) opengl? ( || ( X sdl wayland ) ) gles? ( || ( X wayland ) ) gles? ( !sdl ) gles? ( egl ) sdl? ( opengl ) wayland? ( egl !opengl gles ) xim? ( X )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.18.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	enlightenment	e2ebae76ba56501855712c5fd3c4c77c	epatch	9a5f039771f143195164a15a4faa41a1	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	enlightenment	e2ebae76ba56501855712c5fd3c4c77c	epatch	9a5f039771f143195164a15a4faa41a1	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=59503ceeab6145d41a4015219813393a
diff --git a/metadata/md5-cache/dev-libs/efl-1.20.7-r1 b/metadata/md5-cache/dev-libs/efl-1.20.7-r1
index 1bf85b00162b..aeec83c7bc5c 100644
--- a/metadata/md5-cache/dev-libs/efl-1.20.7-r1
+++ b/metadata/md5-cache/dev-libs/efl-1.20.7-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= v
 REQUIRED_USE=?? ( opengl egl ) ?? ( opengl gles ) fbcon? ( !tslib ) gles? ( || ( X wayland ) !sdl egl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) vnc? ( X fbcon ) wayland? ( egl gles !opengl ) xim? ( X )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.20.7.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=83f6b6f0c3d2a3932a9a07efafbd82b3
diff --git a/metadata/md5-cache/dev-libs/ell-0.6 b/metadata/md5-cache/dev-libs/ell-0.6
index e01cc0cac12e..0127b0ffbdc8 100644
--- a/metadata/md5-cache/dev-libs/ell-0.6
+++ b/metadata/md5-cache/dev-libs/ell-0.6
@@ -4,10 +4,10 @@ DESCRIPTION=Embedded Linux Library provides core, low-level functionality for sy
 EAPI=7
 HOMEPAGE=https://01.org/ell
 IUSE=glib pie abi_x86_32 abi_x86_64 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 ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.6.tar.xz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9c2aed9a58c93f9381157030b8508285
+_md5_=3d544c9e9526c68d37b856c80784215e
diff --git a/metadata/md5-cache/dev-libs/ell-0.6-r1 b/metadata/md5-cache/dev-libs/ell-0.6-r1
index 3f0721657300..e67a74b9cb84 100644
--- a/metadata/md5-cache/dev-libs/ell-0.6-r1
+++ b/metadata/md5-cache/dev-libs/ell-0.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Embedded Linux Library provides core, low-level functionality for sy
 EAPI=7
 HOMEPAGE=https://01.org/ell
 IUSE=glib pie abi_x86_32 abi_x86_64 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 ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.6.tar.xz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ede2413e47104895994b3ad7a2122731
+_md5_=cff108aa7ce91e3e07ada3d41b74cbb2
diff --git a/metadata/md5-cache/dev-libs/gjs-1.46.0 b/metadata/md5-cache/dev-libs/gjs-1.46.0
index 177abeb49ed9..7458a1c4e9ab 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.46.0
+++ b/metadata/md5-cache/dev-libs/gjs-1.46.0
@@ -9,5 +9,5 @@ LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/gobject-introspection-1.41.4:= sys-libs/readline:0 dev-lang/spidermonkey:24 virtual/libffi cairo? ( x11-libs/cairo[X] ) gtk? ( x11-libs/gtk+:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.46/gjs-1.46.0.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c703289be07c85402ee67fb4635968f2
diff --git a/metadata/md5-cache/dev-libs/gjs-1.48.7 b/metadata/md5-cache/dev-libs/gjs-1.48.7
index 35967664dad2..f76f43cfcf75 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.48.7
+++ b/metadata/md5-cache/dev-libs/gjs-1.48.7
@@ -9,5 +9,5 @@ LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=>=dev-libs/glib-2.52.1 >=dev-libs/gobject-introspection-1.52.1:= sys-libs/readline:0= dev-lang/spidermonkey:38 virtual/libffi cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.48/gjs-1.48.7.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f5fa7192fb2c88ec90f53a7b4c9c97b0
diff --git a/metadata/md5-cache/dev-libs/glib-2.52.3 b/metadata/md5-cache/dev-libs/glib-2.52.3
index b1f975d7a127..ba92a923fc18 100644
--- a/metadata/md5-cache/dev-libs/glib-2.52.3
+++ b/metadata/md5-cache/dev-libs/glib-2.52.3
@@ -11,5 +11,5 @@ RDEPEND=!<dev-util/gdbus-codegen-2.52.3 >=dev-libs/libpcre-8.13:3[abi_x86_32(-)?
 REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.52/glib-2.52.3.tar.xz https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=007afb7bb5aaab0ad061f0bb319ea9e0
diff --git a/metadata/md5-cache/dev-libs/glib-2.54.3-r6 b/metadata/md5-cache/dev-libs/glib-2.54.3-r6
index 5a0f48572073..1b06f79bb953 100644
--- a/metadata/md5-cache/dev-libs/glib-2.54.3-r6
+++ b/metadata/md5-cache/dev-libs/glib-2.54.3-r6
@@ -11,5 +11,5 @@ RDEPEND=!<dev-util/gdbus-codegen-2.54.3 >=dev-libs/libpcre-8.13:3[abi_x86_32(-)?
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) test? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.54/glib-2.54.3.tar.xz https://dev.gentoo.org/~leio/distfiles/glib-2.54.3-patchset.tar.xz https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ad6bf99f0681a8f5699ce1f9afb657c9
diff --git a/metadata/md5-cache/dev-libs/legousbtower-0.5.4-r1 b/metadata/md5-cache/dev-libs/legousbtower-0.5.4-r1
index 1e9335b8e226..76e1a9a8d62f 100644
--- a/metadata/md5-cache/dev-libs/legousbtower-0.5.4-r1
+++ b/metadata/md5-cache/dev-libs/legousbtower-0.5.4-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=MPL-1.0
 SLOT=0
 SRC_URI=mirror://sourceforge/legousb/legousbtower-0.5.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=e92a99341038a7857aace614775d1bae
diff --git a/metadata/md5-cache/dev-libs/libbytesize-1.2-r1 b/metadata/md5-cache/dev-libs/libbytesize-1.2-r1
index 47e5b8714383..46c93c600952 100644
--- a/metadata/md5-cache/dev-libs/libbytesize-1.2-r1
+++ b/metadata/md5-cache/dev-libs/libbytesize-1.2-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/libbytesize/archive/1.2.tar.gz -> libbytesize-1.2.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5d529ad92a908d02d45e306fe61f78ec
+_md5_=c9a03f4a8472e3858fa56f3a88497384
diff --git a/metadata/md5-cache/dev-libs/libbytesize-1.3-r1 b/metadata/md5-cache/dev-libs/libbytesize-1.3-r1
index 0b8a4eca6022..153e512bd018 100644
--- a/metadata/md5-cache/dev-libs/libbytesize-1.3-r1
+++ b/metadata/md5-cache/dev-libs/libbytesize-1.3-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/libbytesize/archive/1.3.tar.gz -> libbytesize-1.3.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b234ccc37a1c3b037daa87394b57a0ef
+_md5_=20f5c87d87394a512fc2a714bab9b9ae
diff --git a/metadata/md5-cache/dev-libs/libbytesize-1.4 b/metadata/md5-cache/dev-libs/libbytesize-1.4
new file mode 100644
index 000000000000..9ea77cc6438a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libbytesize-1.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/gmp:0= dev-libs/mpfr:= >=dev-libs/libpcre-8.32 sys-devel/gettext doc? ( dev-util/gtk-doc ) test? ( dev-python/pocketlint dev-python/polib ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Tiny library providing a C "class" for working with arbitrary big sizes in bytes
+EAPI=7
+HOMEPAGE=https://github.com/storaged-project/libbytesize
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/gmp:0= dev-libs/mpfr:= >=dev-libs/libpcre-8.32
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/storaged-project/libbytesize/archive/1.4.tar.gz -> libbytesize-1.4.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=1dae58456b43188d4293ab72cbda1ba1
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.12.3 b/metadata/md5-cache/dev-libs/libfilezilla-0.12.3
index 66808db7d75b..162b90dc26ec 100644
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.12.3
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.12.3
@@ -4,9 +4,9 @@ DESCRIPTION=C++ library offering some basic functionality for platform-independe
 EAPI=7
 HOMEPAGE=https://lib.filezilla-project.org/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://sourceforge/filezilla/libfilezilla-0.12.3.tar.bz2 http://download.filezilla-project.org/libfilezilla/libfilezilla-0.12.3.tar.bz2
 _eclasses_=eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=212e8a4b817ee8bcaa831ec209fa90a4
+_md5_=5e48f918ead258a3946d23a53f39329a
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.26.5 b/metadata/md5-cache/dev-libs/libgit2-0.26.5
deleted file mode 100644
index 9446d0a47dfc..000000000000
--- a/metadata/md5-cache/dev-libs/libgit2-0.26.5
+++ /dev/null
@@ -1,13 +0,0 @@
-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.9.6
-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.5.tar.gz -> libgit2-0.26.5.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8aa58509baeda2937e238362846318d4
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.26.6 b/metadata/md5-cache/dev-libs/libgit2-0.26.6
new file mode 100644
index 000000000000..f93f866c0b12
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-0.26.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup 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 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+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.6.tar.gz -> libgit2-0.26.6.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=251d423291fb0b578e77b60d84ae2ea7
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.27.3 b/metadata/md5-cache/dev-libs/libgit2-0.27.3
deleted file mode 100644
index 26ac18ab995b..000000000000
--- a/metadata/md5-cache/dev-libs/libgit2-0.27.3
+++ /dev/null
@@ -1,13 +0,0 @@
-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.9.6
-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/27
-SRC_URI=https://github.com/libgit2/libgit2/archive/v0.27.3.tar.gz -> libgit2-0.27.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=419f420e2e9f4433d93922a45ee92543
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.27.4 b/metadata/md5-cache/dev-libs/libgit2-0.27.4
new file mode 100644
index 000000000000..cca74345a0af
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-0.27.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup 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 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+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/27
+SRC_URI=https://github.com/libgit2/libgit2/archive/v0.27.4.tar.gz -> libgit2-0.27.4.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5c4a0073c710a813be5aa9314f57bc24
diff --git a/metadata/md5-cache/dev-libs/libgit2-9999 b/metadata/md5-cache/dev-libs/libgit2-9999
index 9d099a8c04c2..41e8de415216 100644
--- a/metadata/md5-cache/dev-libs/libgit2-9999
+++ b/metadata/md5-cache/dev-libs/libgit2-9999
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-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.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+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 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A linkable library for Git
 EAPI=6
 HOMEPAGE=https://libgit2.github.com/
@@ -7,5 +7,5 @@ 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: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/27
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=419f420e2e9f4433d93922a45ee92543
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5c4a0073c710a813be5aa9314f57bc24
diff --git a/metadata/md5-cache/dev-libs/libinput-1.10.6 b/metadata/md5-cache/dev-libs/libinput-1.10.6
index 250a9daa9de1..a7868e73bdc9 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.10.6
+++ b/metadata/md5-cache/dev-libs/libinput-1.10.6
@@ -10,5 +10,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.10.6.tar.xz
-_eclasses_=meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=29649723d266f913bf622481a28cc7e3
diff --git a/metadata/md5-cache/dev-libs/libinput-1.10.7 b/metadata/md5-cache/dev-libs/libinput-1.10.7
index a7e26419b052..569375dc7432 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.10.7
+++ b/metadata/md5-cache/dev-libs/libinput-1.10.7
@@ -10,5 +10,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.10.7.tar.xz
-_eclasses_=meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=a2941358f10673cbe99ccece72b205fe
diff --git a/metadata/md5-cache/dev-libs/libinput-1.11.2 b/metadata/md5-cache/dev-libs/libinput-1.11.2
index 214ab688b8ca..a3fc1b6f48ea 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.11.2
+++ b/metadata/md5-cache/dev-libs/libinput-1.11.2
@@ -10,5 +10,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.11.2.tar.xz
-_eclasses_=meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=e30d3b13a58a029a72a80a477f79f658
diff --git a/metadata/md5-cache/dev-libs/libinput-1.11.3 b/metadata/md5-cache/dev-libs/libinput-1.11.3
index b89524cdc106..d63b0bf38142 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.11.3
+++ b/metadata/md5-cache/dev-libs/libinput-1.11.3
@@ -10,5 +10,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.11.3.tar.xz
-_eclasses_=meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=e30d3b13a58a029a72a80a477f79f658
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.9 b/metadata/md5-cache/dev-libs/libratbag-0.9
index 8dde577a0f57..7ae50207273e 100644
--- a/metadata/md5-cache/dev-libs/libratbag-0.9
+++ b/metadata/md5-cache/dev-libs/libratbag-0.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libevdev virtual/libudev
 SLOT=0
 SRC_URI=https://github.com/libratbag/libratbag/archive/v0.9.tar.gz -> libratbag-0.9.tar.gz
-_eclasses_=meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=44850f6152995a59cceb90d025aaa2c5
diff --git a/metadata/md5-cache/dev-libs/librelp-1.2.15 b/metadata/md5-cache/dev-libs/librelp-1.2.15
deleted file mode 100644
index 629e4a1f3c1d..000000000000
--- a/metadata/md5-cache/dev-libs/librelp-1.2.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ssl? ( >=net-libs/gnutls-3.3.17.1:0= ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An easy to use library for the RELP protocol
-EAPI=6
-HOMEPAGE=http://www.librelp.com/
-IUSE=debug doc +ssl static-libs
-KEYWORDS=amd64 arm arm64 hppa sparc x86
-LICENSE=GPL-3+ doc? ( FDL-1.3 )
-RDEPEND=ssl? ( >=net-libs/gnutls-3.3.17.1:0= )
-SLOT=0/0.3.0
-SRC_URI=http://download.rsyslog.com/librelp/librelp-1.2.15.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=0ccdb90de79ccdd98f15916fd710dd98
diff --git a/metadata/md5-cache/dev-libs/librelp-1.2.16 b/metadata/md5-cache/dev-libs/librelp-1.2.16
index 24f72e5cd8d8..e79b7c076f0d 100644
--- a/metadata/md5-cache/dev-libs/librelp-1.2.16
+++ b/metadata/md5-cache/dev-libs/librelp-1.2.16
@@ -4,10 +4,10 @@ DESCRIPTION=An easy to use library for the RELP protocol
 EAPI=6
 HOMEPAGE=http://www.librelp.com/
 IUSE=debug doc +ssl static-libs
-KEYWORDS=amd64 arm arm64 ~hppa sparc x86
+KEYWORDS=amd64 arm arm64 hppa sparc x86
 LICENSE=GPL-3+ doc? ( FDL-1.3 )
 RDEPEND=ssl? ( >=net-libs/gnutls-3.3.17.1:0= )
 SLOT=0/0.4.0
 SRC_URI=http://download.rsyslog.com/librelp/librelp-1.2.16.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=57b43a4605463454d47119118632407b
+_md5_=ccde59e9783f1c5979b0b724db6d7d15
diff --git a/metadata/md5-cache/dev-libs/librelp-1.2.17 b/metadata/md5-cache/dev-libs/librelp-1.2.17
new file mode 100644
index 000000000000..670cd88f2feb
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/librelp-1.2.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=An easy to use library for the RELP protocol
+EAPI=7
+HOMEPAGE=http://www.librelp.com/
+IUSE=debug doc +ssl +gnutls libressl openssl static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+LICENSE=GPL-3+ doc? ( FDL-1.3 )
+RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
+REQUIRED_USE=ssl? ( ^^ ( gnutls openssl ) ) gnutls? ( ssl ) openssl? ( ssl ) libressl? ( openssl )
+SLOT=0/0.4.0
+SRC_URI=http://download.rsyslog.com/librelp/librelp-1.2.17.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=fcb0a81533af5d3a648585a118e50318
diff --git a/metadata/md5-cache/dev-libs/libressl-2.8.0 b/metadata/md5-cache/dev-libs/libressl-2.8.0
new file mode 100644
index 000000000000..4ed274875cbd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libressl-2.8.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!dev-libs/openssl:0
+DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
+EAPI=6
+HOMEPAGE=https://www.libressl.org/
+IUSE=+asm 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=ISC openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=!dev-libs/openssl:0
+REQUIRED_USE=test? ( static-libs )
+SLOT=0/45
+SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.0.tar.gz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=bc0a2b60e48776eaf2472f3c8f370d9b
diff --git a/metadata/md5-cache/dev-libs/libwacom-0.24 b/metadata/md5-cache/dev-libs/libwacom-0.24
index 54cb0d761dd9..fea189f96759 100644
--- a/metadata/md5-cache/dev-libs/libwacom-0.24
+++ b/metadata/md5-cache/dev-libs/libwacom-0.24
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2 virtual/libgudev:=
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/libwacom/libwacom-0.24.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ca4c6de157aa051d957705edbc304847
diff --git a/metadata/md5-cache/dev-libs/libwacom-0.25 b/metadata/md5-cache/dev-libs/libwacom-0.25
index b5f14e529c3a..915d077dbbcd 100644
--- a/metadata/md5-cache/dev-libs/libwacom-0.25
+++ b/metadata/md5-cache/dev-libs/libwacom-0.25
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2 virtual/libgudev:=
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/libwacom/libwacom-0.25.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2833ceb77256d6e0e17f05661f661588
diff --git a/metadata/md5-cache/dev-libs/libwacom-0.26 b/metadata/md5-cache/dev-libs/libwacom-0.26
index 3bf2e0fe304d..2598a3b48117 100644
--- a/metadata/md5-cache/dev-libs/libwacom-0.26
+++ b/metadata/md5-cache/dev-libs/libwacom-0.26
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2 virtual/libgudev:=
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/libwacom/libwacom-0.26.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d168460b7c090304916e81b3416bafc7
diff --git a/metadata/md5-cache/dev-libs/libwacom-0.30 b/metadata/md5-cache/dev-libs/libwacom-0.30
index 8e9604a72ea5..cd4128600d31 100644
--- a/metadata/md5-cache/dev-libs/libwacom-0.30
+++ b/metadata/md5-cache/dev-libs/libwacom-0.30
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2 virtual/libgudev:=
 SLOT=0
 SRC_URI=https://github.com/linuxwacom/libwacom/archive/libwacom-0.30.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=8bdda7d09067169403920d820cb5e57d
diff --git a/metadata/md5-cache/dev-libs/mini-xml-2.11 b/metadata/md5-cache/dev-libs/mini-xml-2.11
new file mode 100644
index 000000000000..e0a61cdf7478
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mini-xml-2.11
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A small XML parsing library that you can use to read XML data files or strings
+EAPI=6
+HOMEPAGE=https://github.com/michaelrsweet/mxml https://www.msweet.org/mxml/
+IUSE=static-libs test threads
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Mini-XML
+SLOT=0
+SRC_URI=https://github.com/michaelrsweet/mxml/releases/download/v2.11/mxml-2.11.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=55c374f83b644e9620915b503b39b337
diff --git a/metadata/md5-cache/dev-libs/openct-0.6.20-r4 b/metadata/md5-cache/dev-libs/openct-0.6.20-r4
index 98c819f70054..cfe592fbd57b 100644
--- a/metadata/md5-cache/dev-libs/openct-0.6.20-r4
+++ b/metadata/md5-cache/dev-libs/openct-0.6.20-r4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= ) usb? ( virtual/libusb:0 ) dev-libs/libltdl:0= udev? ( virtual/udev ) sys-apps/openrc
 SLOT=0
 SRC_URI=mirror://sourceforge/opensc/openct/openct-0.6.20.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8b7cb4b73aa76b2c42f01597f5be648f
diff --git a/metadata/md5-cache/dev-libs/openobex-1.7.1 b/metadata/md5-cache/dev-libs/openobex-1.7.1
index ddb4455c9ef0..164a4762fb65 100644
--- a/metadata/md5-cache/dev-libs/openobex-1.7.1
+++ b/metadata/md5-cache/dev-libs/openobex-1.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bluetooth? ( net-wireless/bluez:= ) usb? ( virtual/libusb:= )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/openobex/1.7.1/openobex-1.7.1-Source.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9590c4147a5c92593ac5f69bb8173625
diff --git a/metadata/md5-cache/dev-libs/openobex-1.7.2 b/metadata/md5-cache/dev-libs/openobex-1.7.2
index 0d0063a8374f..172741dd0a1a 100644
--- a/metadata/md5-cache/dev-libs/openobex-1.7.2
+++ b/metadata/md5-cache/dev-libs/openobex-1.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bluetooth? ( net-wireless/bluez:= ) usb? ( virtual/libusb:= )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/openobex/1.7.2/openobex-1.7.2-Source.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f6a9a0b9c99ce7f95e4684ad9cf20fed
diff --git a/metadata/md5-cache/dev-libs/pkcs11-helper-1.25 b/metadata/md5-cache/dev-libs/pkcs11-helper-1.25
new file mode 100644
index 000000000000..55db08099d26
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pkcs11-helper-1.25
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=!libressl? ( >=dev-libs/openssl-0.9.7:= ) libressl? ( dev-libs/libressl ) gnutls? ( >=net-libs/gnutls-1.4.4 ) nss? ( dev-libs/nss ) virtual/pkgconfig doc? ( >=app-doc/doxygen-1.4.7 )
+DESCRIPTION=PKCS#11 helper library
+EAPI=6
+HOMEPAGE=https://github.com/OpenSC/pkcs11-helper
+IUSE=doc gnutls libressl nss static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.7:= ) libressl? ( dev-libs/libressl ) gnutls? ( >=net-libs/gnutls-1.4.4 ) nss? ( dev-libs/nss )
+SLOT=0
+SRC_URI=https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-1.25/pkcs11-helper-1.25.tar.bz2
+_eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=85d8ecaa01e076a4b35803c7299ef97d
diff --git a/metadata/md5-cache/dev-libs/serdisplib-2.01 b/metadata/md5-cache/dev-libs/serdisplib-2.01
index 2363fb4b460c..67498824d977 100644
--- a/metadata/md5-cache/dev-libs/serdisplib-2.01
+++ b/metadata/md5-cache/dev-libs/serdisplib-2.01
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gd[jpeg,png,tiff] lcd_devices_acoolsdcm? ( virtual/libusb:1=
 REQUIRED_USE=|| ( lcd_devices_acoolsdcm lcd_devices_ddusbt lcd_devices_directgfx lcd_devices_displaylink lcd_devices_framebuffer lcd_devices_glcd2usb lcd_devices_goldelox lcd_devices_i2c lcd_devices_ks0108 lcd_devices_l4m lcd_devices_lc7981 lcd_devices_lh155 lcd_devices_nokcol lcd_devices_pcd8544 lcd_devices_remote lcd_devices_rs232 lcd_devices_sed133x lcd_devices_sed153x lcd_devices_sed156x lcd_devices_ssdoled lcd_devices_stv8105 lcd_devices_t6963 )
 SLOT=0
 SRC_URI=mirror://sourceforge/serdisplib/serdisplib-2.01.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=67ad897e3e85a4b5f9d68f06abf4d339
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 7f959c8e40e7..f7ee89b3e1e3 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/asdf-3.3.2-r1 b/metadata/md5-cache/dev-lisp/asdf-3.3.2-r1
new file mode 100644
index 000000000000..71280297d813
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/asdf-3.3.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test
+DEPEND=!dev-lisp/cl-asdf !<dev-lisp/asdf-2.33-r3 doc? ( virtual/texi2dvi ) test? ( virtual/commonlisp )
+DESCRIPTION=ASDF is Another System Definition Facility for Common Lisp
+EAPI=6
+HOMEPAGE=http://common-lisp.net/project/asdf/
+IUSE=doc test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=MIT
+PDEPEND=virtual/commonlisp ~dev-lisp/uiop-3.3.2 virtual/commonlisp
+SLOT=0/3.3.2-r1
+SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.3.2.tar.gz
+_eclasses_=common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0b5dbcfb281c3a853d1ba3fafdc82575
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.3.11 b/metadata/md5-cache/dev-lisp/sbcl-1.3.11
index 06d3d867d426..df23321b9334 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-1.3.11
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.3.11
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/1.3.11
 SRC_URI=mirror://sourceforge/sbcl/sbcl-1.3.11-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.3.11-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.3.9-armhf-linux-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-macos? ( mirror://sourceforge/sbcl/sbcl-1.1.6-x86-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dc7cd705eb6a7562acc80a0f9b46f511
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.3.21 b/metadata/md5-cache/dev-lisp/sbcl-1.3.21
index ed95b16f4467..c21de14fa59f 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-1.3.21
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.3.21
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/1.3.21
 SRC_URI=mirror://sourceforge/sbcl/sbcl-1.3.21-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.3.21-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.3.12-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.3.16-arm64-linux-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-macos? ( mirror://sourceforge/sbcl/sbcl-1.1.6-x86-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0d52a512c5cad7321467ad9e5e0bbd56
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.4.10 b/metadata/md5-cache/dev-lisp/sbcl-1.4.10
new file mode 100644
index 000000000000..b248153398a6
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.4.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lisp/asdf-3.1:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) pax_kernel? ( sys-apps/elfix )
+DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
+EAPI=6
+HOMEPAGE=http://sbcl.sourceforge.net/
+IUSE=debug doc source +threads +unicode pax_kernel zlib
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
+SLOT=0/1.4.10
+SRC_URI=mirror://sourceforge/sbcl/sbcl-1.4.10-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.4.8-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.3.12-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x86-macos? ( mirror://sourceforge/sbcl/sbcl-1.1.6-x86-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=92360fdd65d6b5fb02534a6fbc996b7b
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.4.7 b/metadata/md5-cache/dev-lisp/sbcl-1.4.7
index 5350b5e04f82..05d083182993 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-1.4.7
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.4.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/1.4.7
 SRC_URI=mirror://sourceforge/sbcl/sbcl-1.4.7-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.4.7-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.3.12-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x86-macos? ( mirror://sourceforge/sbcl/sbcl-1.1.6-x86-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=da10eca43b92c5b6f8a92d2c0236fb83
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.4.8 b/metadata/md5-cache/dev-lisp/sbcl-1.4.8
index 6052c50bc324..9ac087d4930f 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-1.4.8
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.4.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/1.4.8
 SRC_URI=mirror://sourceforge/sbcl/sbcl-1.4.8-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.4.8-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.3.12-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x86-macos? ( mirror://sourceforge/sbcl/sbcl-1.1.6-x86-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=92360fdd65d6b5fb02534a6fbc996b7b
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.4.9 b/metadata/md5-cache/dev-lisp/sbcl-1.4.9
index 220e823c8699..a33c0815abf8 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-1.4.9
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.4.9
@@ -4,10 +4,10 @@ DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Li
 EAPI=6
 HOMEPAGE=http://sbcl.sourceforge.net/
 IUSE=debug doc source +threads +unicode pax_kernel zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/1.4.9
 SRC_URI=mirror://sourceforge/sbcl/sbcl-1.4.9-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.4.8-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.3.12-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x86-macos? ( mirror://sourceforge/sbcl/sbcl-1.1.6-x86-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=92360fdd65d6b5fb02534a6fbc996b7b
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1975f2194b86bfea9308c2441d7f79ea
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 7431b3687b04..d7322d1cb596 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/PyQt4-4.12.1 b/metadata/md5-cache/dev-python/PyQt4-4.12.1
deleted file mode 100644
index 0cd7cc536e7f..000000000000
--- a/metadata/md5-cache/dev-python/PyQt4-4.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sip-4.19.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-qt/qtcore-4.8.5:4 X? ( >=dev-qt/qtgui-4.8.5:4 ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-qt/qtdbus-4.8.5:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) designer? ( >=dev-qt/designer-4.8.5:4 ) help? ( >=dev-qt/qthelp-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) phonon? ( >=media-libs/phonon-4.7[qt4] ) script? ( >=dev-qt/qtscript-4.8.5:4 ) scripttools? ( >=dev-qt/qtgui-4.8.5:4 ) sql? ( >=dev-qt/qtsql-4.8.5:4 ) svg? ( >=dev-qt/qtsvg-4.8.5:4 ) testlib? ( >=dev-qt/qttest-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.5:4 ) dbus? ( virtual/pkgconfig )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=6
-HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
-IUSE=X compat dbus debug declarative designer doc examples help multimedia opengl phonon script scripttools sql svg testlib webkit xmlpatterns python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sip-4.19.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-qt/qtcore-4.8.5:4 X? ( >=dev-qt/qtgui-4.8.5:4 ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-qt/qtdbus-4.8.5:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) designer? ( >=dev-qt/designer-4.8.5:4 ) help? ( >=dev-qt/qthelp-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) phonon? ( >=media-libs/phonon-4.7[qt4] ) script? ( >=dev-qt/qtscript-4.8.5:4 ) scripttools? ( >=dev-qt/qtgui-4.8.5:4 ) sql? ( >=dev-qt/qtsql-4.8.5:4 ) svg? ( >=dev-qt/qtsvg-4.8.5:4 ) testlib? ( >=dev-qt/qttest-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.5:4 )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) sql? ( X ) testlib? ( X )
-SLOT=0
-SRC_URI=mirror://sourceforge/pyqt/PyQt4_gpl_x11-4.12.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8e255e29ae02312532c66b9833f97e34
diff --git a/metadata/md5-cache/dev-python/astor-0.7.1 b/metadata/md5-cache/dev-python/astor-0.7.1
new file mode 100644
index 000000000000..afe08ec083a5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astor-0.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Read/rewrite/write Python ASTs
+EAPI=6
+HOMEPAGE=https://pypi.org/project/astor/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/a/astor/astor-0.7.1.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=69f389f4b94945d7538aecd4f2c6a023
diff --git a/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r3 b/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r3
index e1290cc4bb24..cae978479a7e 100644
--- a/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r3
+++ b/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r3
@@ -5,11 +5,11 @@ DESCRIPTION=Atomic file writes
 EAPI=7
 HOMEPAGE=https://github.com/untitaker/python-atomicwrites
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd
 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/atomicwrites/atomicwrites-1.1.5.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=71543809a309c72bcb393bb60844e965
+_md5_=05f65bca032686d633772e50b9c1cafb
diff --git a/metadata/md5-cache/dev-python/batinfo-0.4.2 b/metadata/md5-cache/dev-python/batinfo-0.4.2
new file mode 100644
index 000000000000..5ee591f9f2a3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/batinfo-0.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A simple Python lib to retreive battery information
+EAPI=6
+HOMEPAGE=https://github.com/nicolargo/batinfo https://pypi.org/project/batinfo/
+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 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/batinfo/batinfo-0.4.2.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8c92916b43b5856192fb486b1985599f
diff --git a/metadata/md5-cache/dev-python/cliff-tablib-1.1-r2 b/metadata/md5-cache/dev-python/cliff-tablib-1.1-r2
new file mode 100644
index 000000000000..7fb3af620a7d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cliff-tablib-1.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Formatter extensions of JSON, YAML, and HTML output for the cliff framework
+EAPI=7
+HOMEPAGE=https://github.com/dreamhost/cliff-tablib
+IUSE=doc examples python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/tablib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cliff[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cliff-tablib/cliff-tablib-1.1.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=2e6e66b20da0047738e05f31ee664345
diff --git a/metadata/md5-cache/dev-python/cryptography-2.2.2-r1 b/metadata/md5-cache/dev-python/cryptography-2.2.2-r1
index 7fd82f5ec50e..a7fc62056bf2 100644
--- a/metadata/md5-cache/dev-python/cryptography-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/cryptography-2.2.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.0.2o-r2:0 ) ) ) libressl? ( dev-libs/libressl:0= ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( dev-python/enum34[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/enum34[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/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( ~dev-python/cryptography-vectors-2.2.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/hypothesis[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/iso8601[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pretend[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.0.2o-r6:0 ) ) ) libressl? ( dev-libs/libressl:0= ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( dev-python/enum34[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/enum34[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/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( ~dev-python/cryptography-vectors-2.2.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/hypothesis[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/iso8601[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pretend[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=6
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
 IUSE=libressl test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=|| ( Apache-2.0 BSD )
-RDEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.0.2o-r2:0 ) ) ) libressl? ( dev-libs/libressl:0= ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( dev-python/enum34[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/enum34[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/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.0.2o-r6:0 ) ) ) libressl? ( dev-libs/libressl:0= ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( dev-python/enum34[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/enum34[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/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-2.2.2.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a407b521cbccd7e8a9618e383ba1aeb8
+_md5_=bec7fd07f176250a438690b84c3101cf
diff --git a/metadata/md5-cache/dev-python/cryptography-2.3 b/metadata/md5-cache/dev-python/cryptography-2.3
index d531889be598..dd5b050f0e71 100644
--- a/metadata/md5-cache/dev-python/cryptography-2.3
+++ b/metadata/md5-cache/dev-python/cryptography-2.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.0.2o-r2:0 ) ) ) libressl? ( dev-libs/libressl:0= ) python_targets_pypy? ( dev-python/enum34[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/enum34[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/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( !~dev-python/cffi-1.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( !~dev-python/cffi-1.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( !~dev-python/cffi-1.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( !~dev-python/cffi-1.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( !~dev-python/cffi-1.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) test? ( ~dev-python/cryptography-vectors-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/hypothesis[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/iso8601[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pretend[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.0.2o-r6:0 ) ) ) libressl? ( dev-libs/libressl:0= ) python_targets_pypy? ( dev-python/enum34[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/enum34[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/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( !~dev-python/cffi-1.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( !~dev-python/cffi-1.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( !~dev-python/cffi-1.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( !~dev-python/cffi-1.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( !~dev-python/cffi-1.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) test? ( ~dev-python/cryptography-vectors-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/hypothesis[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/iso8601[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pretend[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=6
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
 IUSE=libressl test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( Apache-2.0 BSD )
-RDEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.0.2o-r2:0 ) ) ) libressl? ( dev-libs/libressl:0= ) python_targets_pypy? ( dev-python/enum34[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/enum34[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/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.0.2o-r6:0 ) ) ) libressl? ( dev-libs/libressl:0= ) python_targets_pypy? ( dev-python/enum34[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/enum34[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/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-2.3.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b44fe700cfa326783f52d056b6154711
+_md5_=f615c55a1ee70c09c7cad5f377a7db3b
diff --git a/metadata/md5-cache/dev-python/dbus-python-1.2.8 b/metadata/md5-cache/dev-python/dbus-python-1.2.8
index be45bbad6498..692b4e0582f7 100644
--- a/metadata/md5-cache/dev-python/dbus-python-1.2.8
+++ b/metadata/md5-cache/dev-python/dbus-python-1.2.8
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for the D-Bus messagebus
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=~amd64 ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=sys-apps/dbus-1.8:= >=dev-libs/glib-2.40 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.8.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=88a5e056de12553aa8be8cb8e999dd43
+_md5_=6522e6ab924d3b1c09a57105ce5d761c
diff --git a/metadata/md5-cache/dev-python/django-1.11.14 b/metadata/md5-cache/dev-python/django-1.11.14
deleted file mode 100644
index 8ae5a6168901..000000000000
--- a/metadata/md5-cache/dev-python/django-1.11.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/sphinx-1.0.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[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=[sqlite?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,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(-)] >=app-admin/webapp-config-1.50.15
-DESCRIPTION=High-level Python web framework
-EAPI=6
-HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
-IUSE=doc sqlite test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD Apache-2.0 MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,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(-)] >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://www.djangoproject.com/m/releases/1.11/Django-1.11.14.tar.gz mirror://pypi/D/Django/Django-1.11.14.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d4b315d387e9583a669a55b11df09a20
diff --git a/metadata/md5-cache/dev-python/django-1.11.15 b/metadata/md5-cache/dev-python/django-1.11.15
index befa10a7c984..9ba8de48705d 100644
--- a/metadata/md5-cache/dev-python/django-1.11.15
+++ b/metadata/md5-cache/dev-python/django-1.11.15
@@ -4,11 +4,11 @@ DESCRIPTION=High-level Python web framework
 EAPI=6
 HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
 IUSE=doc sqlite test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD Apache-2.0 MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,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(-)] >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/1.11/Django-1.11.15.tar.gz mirror://pypi/D/Django/Django-1.11.15.tar.gz
 _eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=734eb3320893e8bb7fb64a6399f81427
+_md5_=d4b315d387e9583a669a55b11df09a20
diff --git a/metadata/md5-cache/dev-python/dnspython-1.16.0_pre20180731 b/metadata/md5-cache/dev-python/dnspython-1.16.0_pre20180731
new file mode 100644
index 000000000000..945878ba4fe4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dnspython-1.16.0_pre20180731
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+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=DNS toolkit for Python
+EAPI=6
+HOMEPAGE=http://www.dnspython.org/ https://pypi.org/project/dnspython/
+IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=ISC
+RDEPEND=dev-python/pycryptodome[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/ecdsa-0.13[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/idna-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !dev-python/dnspython:py2 !dev-python/dnspython:py3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/rthalley/dnspython/archive/be7e71e54a6edc87ead1b15af8981b8921e0e83d.tar.gz -> dnspython-1.16.0_pre20180731.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=482dc4d1711c208997970ed55db1919b
diff --git a/metadata/md5-cache/dev-python/docopt-0.6.2-r2 b/metadata/md5-cache/dev-python/docopt-0.6.2-r2
index e291a8cc7e43..01a53ef60910 100644
--- a/metadata/md5-cache/dev-python/docopt-0.6.2-r2
+++ b/metadata/md5-cache/dev-python/docopt-0.6.2-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Pythonic argument parser, that will make you smile
 EAPI=5
 HOMEPAGE=https://pypi.org/project/docopt/ https://github.com/docopt/docopt
 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 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~ppc64 x86 ~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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/docopt/docopt-0.6.2.tar.gz https://github.com/docopt/docopt/archive/0.6.2.tar.gz -> docopt-0.6.2.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=22a4c1b0fdeaf3edbb79d850fea6db1e
+_md5_=832ce7329589832559586fb55dfa1c15
diff --git a/metadata/md5-cache/dev-python/dpkt-1.9.1 b/metadata/md5-cache/dev-python/dpkt-1.9.1
new file mode 100644
index 000000000000..6ac7913a2481
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dpkt-1.9.1
@@ -0,0 +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(-)]
+DESCRIPTION=Fast, simple packet creation / parsing
+EAPI=6
+HOMEPAGE=https://github.com/kbandla/dpkt
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+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/d/dpkt/dpkt-1.9.1.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a72a292be4d3ff76e7944e1b38541193
diff --git a/metadata/md5-cache/dev-python/empy-3.3.3 b/metadata/md5-cache/dev-python/empy-3.3.3
new file mode 100644
index 000000000000..601ff1eba318
--- /dev/null
+++ b/metadata/md5-cache/dev-python/empy-3.3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A powerful and robust templating system for Python
+EAPI=6
+HOMEPAGE=http://www.alcyone.com/software/empy/
+IUSE=doc 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 ~ia64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://www.alcyone.com/software/empy/empy-3.3.3.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4ec1502c77a06daa4a89163414edd5bb
diff --git a/metadata/md5-cache/dev-python/fs-2.0.26 b/metadata/md5-cache/dev-python/fs-2.0.26
new file mode 100644
index 000000000000..d8a99a1c1b63
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fs-2.0.26
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/dexml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mako[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Filesystem abstraction layer
+EAPI=6
+HOMEPAGE=https://pypi.org/project/fs/ https://docs.pyfilesystem.org https://www.willmcgugan.com/tag/fs/
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/dexml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/f/fs/fs-2.0.26.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d138e49aece6b178454ec44414468813
diff --git a/metadata/md5-cache/dev-python/intelhex-2.2.1 b/metadata/md5-cache/dev-python/intelhex-2.2.1
new file mode 100644
index 000000000000..a6e3ba480f86
--- /dev/null
+++ b/metadata/md5-cache/dev-python/intelhex-2.2.1
@@ -0,0 +1,14 @@
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library for Intel HEX files manipulations
+EAPI=7
+HOMEPAGE=https://pypi.org/project/IntelHex/ https://github.com/bialix/intelhex
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~mips ~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/IntelHex/intelhex-2.2.1.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=97a9a38262072b40def413a3cd1699ac
diff --git a/metadata/md5-cache/dev-python/ipaddr-2.2.0 b/metadata/md5-cache/dev-python/ipaddr-2.2.0
new file mode 100644
index 000000000000..0205839abc99
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipaddr-2.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python IP address manipulation library
+EAPI=6
+HOMEPAGE=https://github.com/google/ipaddr-py https://pypi.org/project/ipaddr/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipaddr/ipaddr-2.2.0.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6eea1f8110b6c317d4f158059a6ef6c1
diff --git a/metadata/md5-cache/dev-python/json-rpc-1.11.0 b/metadata/md5-cache/dev-python/json-rpc-1.11.0
new file mode 100644
index 000000000000..131d83fb80ed
--- /dev/null
+++ b/metadata/md5-cache/dev-python/json-rpc-1.11.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/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(-)] dev-python/mock[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/flask[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=JSON-RPC transport implementation for python
+EAPI=6
+HOMEPAGE=https://github.com/pavlov99/json-rpc
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/j/json-rpc/json-rpc-1.11.0.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0603a5719f67389b4e6b81e936ec2c0c
diff --git a/metadata/md5-cache/dev-python/jsonfield-2.0.2 b/metadata/md5-cache/dev-python/jsonfield-2.0.2
new file mode 100644
index 000000000000..78b0125cf28a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonfield-2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/django[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=Reusable Django field that allows you to store validated JSON in your model
+EAPI=6
+HOMEPAGE=https://pypi.org/project/jsonfield/ https://github.com/bradjasper/django-jsonfield
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~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/j/jsonfield/jsonfield-2.0.2.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=259f63e0590573a0dc7d767ff7f49d7b
diff --git a/metadata/md5-cache/dev-python/jsonpointer-2.0 b/metadata/md5-cache/dev-python/jsonpointer-2.0
new file mode 100644
index 000000000000..0d359844b2fd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonpointer-2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Identify specific nodes in a JSON document (according to draft 08)
+EAPI=6
+HOMEPAGE=https://github.com/stefankoegl/python-json-pointer https://pypi.org/project/jsonpointer/
+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 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/j/jsonpointer/jsonpointer-2.0.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d544c36dd472f076c1b741692db4bf8b
diff --git a/metadata/md5-cache/dev-python/more-itertools-4.2.0-r1 b/metadata/md5-cache/dev-python/more-itertools-4.2.0-r1
index 6a02effad5d6..a211fb3c611c 100644
--- a/metadata/md5-cache/dev-python/more-itertools-4.2.0-r1
+++ b/metadata/md5-cache/dev-python/more-itertools-4.2.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=More routines for operating on iterables, beyond itertools
 EAPI=7
 HOMEPAGE=https://pypi.org/project/more-itertools/
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm ~ia64 ~ppc x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=<dev-python/six-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/more-itertools/more-itertools-4.2.0.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5197985491640eb859ba230f13b96688
+_md5_=0c1d093cad4d842ce71687f6cc7bcfd1
diff --git a/metadata/md5-cache/dev-python/odfpy-1.3.6 b/metadata/md5-cache/dev-python/odfpy-1.3.6
new file mode 100644
index 000000000000..da22968261f9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/odfpy-1.3.6
@@ -0,0 +1,15 @@
+BDEPEND=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+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_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Python API and tools to manipulate OpenDocument files
+EAPI=7
+HOMEPAGE=https://github.com/eea/odfpy https://pypi.org/project/odfpy/
+IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 GPL-2 LGPL-2.1
+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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/o/odfpy/odfpy-1.3.6.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=6ee989661331ef2560524ac1277e0c08
diff --git a/metadata/md5-cache/dev-python/olefile-0.44 b/metadata/md5-cache/dev-python/olefile-0.44
index c6a0a550d37c..f9832f3f9e3f 100644
--- a/metadata/md5-cache/dev-python/olefile-0.44
+++ b/metadata/md5-cache/dev-python/olefile-0.44
@@ -4,11 +4,11 @@ DESCRIPTION=Python package to parse, read and write Microsoft OLE2 files
 EAPI=6
 HOMEPAGE=https://www.decalage.info/olefile
 IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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/decalage2/olefile/releases/download/v0.44/olefile-0.44.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=569169df8fed06f5f190837539e535e4
+_md5_=62218e75ca523467e026af1fb81c3ac0
diff --git a/metadata/md5-cache/dev-python/olefile-0.45.1 b/metadata/md5-cache/dev-python/olefile-0.45.1
index a62f391e3420..705297b77358 100644
--- a/metadata/md5-cache/dev-python/olefile-0.45.1
+++ b/metadata/md5-cache/dev-python/olefile-0.45.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python package to parse, read and write Microsoft OLE2 files
 EAPI=7
 HOMEPAGE=https://www.decalage.info/olefile
 IUSE=doc python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/decalage2/olefile/archive/v0.45.1.tar.gz -> olefile-0.45.1.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4f8be1664cf49bf1ca1d60687336da40
+_md5_=be813b283342e659224a12c07f2da8b5
diff --git a/metadata/md5-cache/dev-python/openpyxl-2.4.11 b/metadata/md5-cache/dev-python/openpyxl-2.4.11
new file mode 100644
index 000000000000..7441e8c6609a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openpyxl-2.4.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( dev-python/jdcal[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/et_xmlfile[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Pure python reader and writer of Excel OpenXML files
+EAPI=6
+HOMEPAGE=https://openpyxl.readthedocs.io/en/stable/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/jdcal[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/et_xmlfile[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://bitbucket.org/openpyxl/openpyxl/get/2.4.11.tar.bz2 -> openpyxl-2.4.11.tar.bz2
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c882b945bed8555e15f7d1bf4ea920af
diff --git a/metadata/md5-cache/dev-python/openpyxl-9999 b/metadata/md5-cache/dev-python/openpyxl-9999
index 50b651f45a25..35b152ed2302 100644
--- a/metadata/md5-cache/dev-python/openpyxl-9999
+++ b/metadata/md5-cache/dev-python/openpyxl-9999
@@ -1,12 +1,13 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-python/jdcal[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/et_xmlfile[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/pytest[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/lxml[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(-)] dev-vcs/mercurial
+DEPEND=test? ( dev-python/jdcal[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/et_xmlfile[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-vcs/mercurial
 DESCRIPTION=Pure python reader and writer of Excel OpenXML files
-EAPI=5
+EAPI=7
 HOMEPAGE=https://openpyxl.readthedocs.io/en/stable/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 LICENSE=MIT
-RDEPEND=dev-python/jdcal[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/et_xmlfile[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 )
+RDEPEND=dev-python/jdcal[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/et_xmlfile[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	mercurial	9813bb616cb1bd0c943177ab52204409	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5ebe2e0e26b5a8cdfdab645da2149480
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	eutils	b43d08fe0771faf2f5e7be19c2789d33	mercurial	9813bb616cb1bd0c943177ab52204409	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=768d186e4e42675a630e88e228d322c9
diff --git a/metadata/md5-cache/dev-python/pillow-4.3.0-r3 b/metadata/md5-cache/dev-python/pillow-4.3.0-r3
new file mode 100644
index 000000000000..7bd66fe628bf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pillow-4.3.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/olefile[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(-)] imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) qt5? ( dev-python/PyQt5[gui,widgets,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(-)] ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) 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(-)] doc? ( dev-python/sphinx[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/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/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(-)] media-gfx/imagemagick[png] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Python Imaging Library (fork)
+EAPI=6
+HOMEPAGE=https://python-pillow.org/
+IUSE=doc examples imagequant jpeg jpeg2k lcms qt5 test tiff tk truetype webp zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=HPND
+RDEPEND=dev-python/olefile[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(-)] imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) qt5? ( dev-python/PyQt5[gui,widgets,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(-)] ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,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=test? ( jpeg tiff ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/P/Pillow/Pillow-4.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7e2cb50888268872982487d48e2de46c
diff --git a/metadata/md5-cache/dev-python/pillow-5.2.0 b/metadata/md5-cache/dev-python/pillow-5.2.0
index a063eab9819a..1a0277dee477 100644
--- a/metadata/md5-cache/dev-python/pillow-5.2.0
+++ b/metadata/md5-cache/dev-python/pillow-5.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=Python Imaging Library (fork)
 EAPI=7
 HOMEPAGE=https://python-pillow.org/
 IUSE=doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=dev-python/olefile[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pillow/Pillow-5.2.0.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	virtualx	fba44f6a5c7bc8b332da3d4061896bf1
-_md5_=e773389d0359eac8bc23043ea0c707c1
+_md5_=04d5997cd8cd6790494c1477aa4a6cdf
diff --git a/metadata/md5-cache/dev-python/pipenv-9.0.0-r2 b/metadata/md5-cache/dev-python/pipenv-9.0.0-r2
new file mode 100644
index 000000000000..ad811ab98b2f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pipenv-9.0.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/flake8-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/pew-0.1.26[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/pip-9.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/requests-2.18.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/urllib3-1.21.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-python/pathlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python Development Workflow for Humans
+EAPI=6
+HOMEPAGE=https://github.com/pypa/pipenv https://pypi.org/project/pipenv/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/flake8-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/pew-0.1.26[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/pip-9.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/requests-2.18.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/urllib3-1.21.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-python/pathlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pipenv/pipenv-9.0.0.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f3f268244e2b2c7f4d0a7e22334cc519
diff --git a/metadata/md5-cache/dev-python/pivy-0.5_alpha20110303-r1 b/metadata/md5-cache/dev-python/pivy-0.5_alpha20110303-r1
deleted file mode 100644
index bbe6c17659c4..000000000000
--- a/metadata/md5-cache/dev-python/pivy-0.5_alpha20110303-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/coin >=media-libs/SoQt-1.5.0 dev-lang/swig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Coin3d binding for Python
-EAPI=5
-HOMEPAGE=http://pivy.coin3d.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=media-libs/coin >=media-libs/SoQt-1.5.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/pivy-0.5_alpha20110303.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=43d0fd40683d9596dd5818ff4e76a0f0
diff --git a/metadata/md5-cache/dev-python/pivy-9999 b/metadata/md5-cache/dev-python/pivy-9999
deleted file mode 100644
index 3513fbb7640b..000000000000
--- a/metadata/md5-cache/dev-python/pivy-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/coin >=media-libs/SoQt-1.5.0 dev-lang/swig dev-vcs/mercurial python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Coin3d binding for Python
-EAPI=5
-HOMEPAGE=http://pivy.coin3d.org/
-IUSE=python_targets_python2_7
-LICENSE=ISC
-RDEPEND=media-libs/coin >=media-libs/SoQt-1.5.0 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
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	mercurial	9813bb616cb1bd0c943177ab52204409	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7938dd8d050ceb0c7e53095f54c6e554
diff --git a/metadata/md5-cache/dev-python/prov-1.5.0 b/metadata/md5-cache/dev-python/prov-1.5.0
index 0cba479a67f9..b10720a7aaa7 100644
--- a/metadata/md5-cache/dev-python/prov-1.5.0
+++ b/metadata/md5-cache/dev-python/prov-1.5.0
@@ -1,15 +1,16 @@
+BDEPEND=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(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pydotplus[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/networkx-1.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/rdflib[python_targets_python2_7(-)?,python_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.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/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=test? ( dev-python/pydotplus[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/python-dateutil[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/lxml[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/networkx-1.10[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/rdflib[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.10[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(-)]
 DESCRIPTION=W3C provenance data dodel library
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pypi.org/project/prov/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/pydotplus[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/networkx-1.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/rdflib[python_targets_python2_7(-)?,python_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.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(-)] 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/pydotplus[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/python-dateutil[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/lxml[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/networkx-1.10[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/rdflib[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.10[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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/prov/prov-1.5.0.tar.gz
-_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3501a545ec05d513e611ee45a8a09466
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=3a8a32e8347b1962583abfcea93f871b
diff --git a/metadata/md5-cache/dev-python/prov-1.5.1 b/metadata/md5-cache/dev-python/prov-1.5.1
index 4a012e4a8b23..74d02f490895 100644
--- a/metadata/md5-cache/dev-python/prov-1.5.1
+++ b/metadata/md5-cache/dev-python/prov-1.5.1
@@ -1,7 +1,8 @@
+BDEPEND=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(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pydot[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/python-dateutil[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/lxml[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/networkx-1.10[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/rdflib[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.10[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(-)]
+DEPEND=test? ( dev-python/pydot[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/python-dateutil[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/lxml[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/networkx-1.10[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/rdflib[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.10[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(-)]
 DESCRIPTION=W3C provenance data dodel library
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pypi.org/project/prov/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
@@ -10,5 +11,5 @@ RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,python_targets_python3_4(-
 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/prov/prov-1.5.1.tar.gz
-_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6cc3865f313cb93e9f1d6fe7227de2e
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=be03a897e1231c1f5442dd2759dc7c5f
diff --git a/metadata/md5-cache/dev-python/psutil-5.4.3 b/metadata/md5-cache/dev-python/psutil-5.4.3
index bb96dcc5e449..35d028a543f0 100644
--- a/metadata/md5-cache/dev-python/psutil-5.4.3
+++ b/metadata/md5-cache/dev-python/psutil-5.4.3
@@ -4,7 +4,7 @@ DESCRIPTION=Retrieve information on running processes and system utilization
 EAPI=6
 HOMEPAGE=https://github.com/giampaolo/psutil https://pypi.org/project/psutil/
 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 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.4.3.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ae20e00f0e762c42fcfc95f2fb334538
+_md5_=bb185409ad12601ab538a8269c874b4d
diff --git a/metadata/md5-cache/dev-python/pydecomp-0.3 b/metadata/md5-cache/dev-python/pydecomp-0.3
index 89a57d6dc028..f9c98b947121 100644
--- a/metadata/md5-cache/dev-python/pydecomp-0.3
+++ b/metadata/md5-cache/dev-python/pydecomp-0.3
@@ -4,11 +4,11 @@ DESCRIPTION=A python library of common (de)compression and contents handling
 EAPI=6
 HOMEPAGE=https://github.com/dol-sen/pyDeComp
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 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=https://dev.gentoo.org/~dolsen/releases/pydecomp/pyDeComp-0.3.tar.gz -> pydecomp-0.3.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=856b8a024dabf57957c6788aea0447fb
+_md5_=adcb645215303dbb17e97335c0604565
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.5.4 b/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
index 7feabfc2e6b1..26ae1bede8e1 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python FTP server library
 EAPI=6
 HOMEPAGE=https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib/
 IUSE=doc examples ssl test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~hppa ia64 ~m68k ~mips ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=ssl? ( dev-python/pyopenssl[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[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=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/pyftpdlib/pyftpdlib-1.5.4.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f362c00896c1b7a3a141dcd7f6cddc8e
+_md5_=5a1c611a15645f5749738a3a609e12ad
diff --git a/metadata/md5-cache/dev-python/pyinsane-2.0.13 b/metadata/md5-cache/dev-python/pyinsane-2.0.13
new file mode 100644
index 000000000000..eba7bf4966c0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyinsane-2.0.13
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-gfx/sane-backends dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Python implementation of the Sane API and abstration layer
+EAPI=7
+HOMEPAGE=https://github.com/openpaperwork/pyinsane
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-gfx/sane-backends dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=2
+SRC_URI=mirror://pypi/p/pyinsane2/pyinsane2-2.0.13.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=867bd7da6d60ea88462d40f24897ca71
diff --git a/metadata/md5-cache/dev-python/pymssql-2.1.3 b/metadata/md5-cache/dev-python/pymssql-2.1.3
new file mode 100644
index 000000000000..f059c8977804
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymssql-2.1.3
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-db/freetds-0.63[mssql] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Simple MSSQL python extension module
+EAPI=7
+HOMEPAGE=http://www.pymssql.org/ https://pypi.python.org/pypi/pymssql
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-db/freetds-0.63[mssql] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pymssql/pymssql-2.1.3.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=10a3bd6861e197a80acfb6f20ab9fd67
diff --git a/metadata/md5-cache/dev-python/pyocr-0.5.2 b/metadata/md5-cache/dev-python/pyocr-0.5.2
new file mode 100644
index 000000000000..b6a644369033
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyocr-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-python/pillow dev-python/six
+DESCRIPTION=An optical character recognition (OCR) tool wrapper for python
+EAPI=7
+HOMEPAGE=https://github.com/openpaperwork/pyocr
+IUSE=cuneiform +tesseract python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-python/pillow dev-python/six python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( cuneiform tesseract ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pyocr/pyocr-0.5.2.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=54b67fd1e4fd5c6190ee5962df1055b3
diff --git a/metadata/md5-cache/dev-python/pypy-5.10.0 b/metadata/md5-cache/dev-python/pypy-5.10.0
index e273067a8335..e373a680f943 100644
--- a/metadata/md5-cache/dev-python/pypy-5.10.0
+++ b/metadata/md5-cache/dev-python/pypy-5.10.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0
 SLOT=0/41
 SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.10.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.14-0.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=4b4aec5f4f2048798a80d14f54dc1ec8
diff --git a/metadata/md5-cache/dev-python/pypy-6.0.0 b/metadata/md5-cache/dev-python/pypy-6.0.0
index 0023c60ec5bd..399462df6603 100644
--- a/metadata/md5-cache/dev-python/pypy-6.0.0
+++ b/metadata/md5-cache/dev-python/pypy-6.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0
 SLOT=0/41
 SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v6.0.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.14-0.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=bfcda38e6e1490b5f890f026c8389366
diff --git a/metadata/md5-cache/dev-python/pypy-9999 b/metadata/md5-cache/dev-python/pypy-9999
index 95d6ad30577e..459abdf4eb8d 100644
--- a/metadata/md5-cache/dev-python/pypy-9999
+++ b/metadata/md5-cache/dev-python/pypy-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0
 SLOT=0/41
 SRC_URI=https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.14-0.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=bf78cce9a97cb9460a2cceb0a6eb36e4
diff --git a/metadata/md5-cache/dev-python/pypy-bin-5.10.0 b/metadata/md5-cache/dev-python/pypy-bin-5.10.0
index fa46139a7576..47635bdaaf86 100644
--- a/metadata/md5-cache/dev-python/pypy-bin-5.10.0
+++ b/metadata/md5-cache/dev-python/pypy-bin-5.10.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/0 sys-devel/gcc:
 REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
 SLOT=0/41
 SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.10.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python-gentoo-patches-2.7.14-0.tar.xz amd64? ( !libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-amd64+bzip2+ncurses.tar.lz ) ) libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-amd64+bzip2+jit+libressl+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-amd64+bzip2+libressl+ncurses.tar.lz ) ) ) x86? ( !libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-x86+bzip2+ncurses.tar.lz ) ) ) libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-x86+bzip2+libressl+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-x86+bzip2+libressl+ncurses.tar.lz ) ) ) )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=efe45359d813b3dd7f86419a97d6bf74
diff --git a/metadata/md5-cache/dev-python/pypy-bin-6.0.0 b/metadata/md5-cache/dev-python/pypy-bin-6.0.0
index d9cb4ad391f3..e768cb9af2f1 100644
--- a/metadata/md5-cache/dev-python/pypy-bin-6.0.0
+++ b/metadata/md5-cache/dev-python/pypy-bin-6.0.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/0 sys-devel/gcc:
 REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
 SLOT=0/41
 SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v6.0.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python-gentoo-patches-2.7.14-0.tar.xz amd64? ( !libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-amd64+bzip2+ncurses.tar.lz ) ) libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.tar.lz ) ) ) x86? ( !libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-x86+bzip2+ncurses.tar.lz ) ) ) libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0/pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.tar.lz ) ) ) )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=5e0dab1b50323c945ef049ff8e93ce13
diff --git a/metadata/md5-cache/dev-python/pypy3-5.10.1 b/metadata/md5-cache/dev-python/pypy3-5.10.1
index f4e05559b708..d0e88c5f9457 100644
--- a/metadata/md5-cache/dev-python/pypy3-5.10.1
+++ b/metadata/md5-cache/dev-python/pypy3-5.10.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0
 SLOT=0/510
 SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.1-src.tar.bz2
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=77891cf2f93be4320dafd740b8cab68a
diff --git a/metadata/md5-cache/dev-python/pypy3-6.0.0 b/metadata/md5-cache/dev-python/pypy3-6.0.0
index b35341797a83..8da6fb1a1d6a 100644
--- a/metadata/md5-cache/dev-python/pypy3-6.0.0
+++ b/metadata/md5-cache/dev-python/pypy3-6.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0
 SLOT=0/60
 SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v6.0.0-src.tar.bz2
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=430b348c8fa1dc946d50b36610bde227
diff --git a/metadata/md5-cache/dev-python/pypy3-9999 b/metadata/md5-cache/dev-python/pypy3-9999
index 1ab476a2ed84..3f9ff6f9413a 100644
--- a/metadata/md5-cache/dev-python/pypy3-9999
+++ b/metadata/md5-cache/dev-python/pypy3-9999
@@ -7,5 +7,5 @@ IUSE=bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_ss
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0
 SLOT=0/60
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=c16a4d2a0cd96410c07065b619f8b6a0
diff --git a/metadata/md5-cache/dev-python/pypy3-bin-5.10.1 b/metadata/md5-cache/dev-python/pypy3-bin-5.10.1
index 8d6d2e60c26a..b292f66c9fbe 100644
--- a/metadata/md5-cache/dev-python/pypy3-bin-5.10.1
+++ b/metadata/md5-cache/dev-python/pypy3-bin-5.10.1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/0 sys-devel/gcc:
 REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
 SLOT=0/510
 SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.1-src.tar.bz2 amd64? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.10.1/pypy3-bin-5.10.1-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.10.1/pypy3-bin-5.10.1-amd64+bzip2+ncurses.tar.lz ) ) x86? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.10.1/pypy3-bin-5.10.1-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.10.1/pypy3-bin-5.10.1-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.10.1/pypy3-bin-5.10.1-x86+bzip2+ncurses.tar.lz ) ) )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=ada20145a5a99743efeb2ee405c3e6d0
diff --git a/metadata/md5-cache/dev-python/pypy3-bin-6.0.0 b/metadata/md5-cache/dev-python/pypy3-bin-6.0.0
index 56d008f45d8c..8f8a55d385b9 100644
--- a/metadata/md5-cache/dev-python/pypy3-bin-6.0.0
+++ b/metadata/md5-cache/dev-python/pypy3-bin-6.0.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/0 sys-devel/gcc:
 REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
 SLOT=0/60
 SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v6.0.0-src.tar.bz2 amd64? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0/pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0/pypy3-bin-6.0.0-amd64+bzip2+ncurses.tar.lz ) ) x86? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0/pypy3-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0/pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0/pypy3-bin-6.0.0-x86+bzip2+ncurses.tar.lz ) ) )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=13d954f74f12f1b12c6fc56bf8a08ce4
diff --git a/metadata/md5-cache/dev-python/pyqwt-5.2.0-r2 b/metadata/md5-cache/dev-python/pyqwt-5.2.0-r2
deleted file mode 100644
index a09f77dc9def..000000000000
--- a/metadata/md5-cache/dev-python/pyqwt-5.2.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-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(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),compat(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/qwt:5[svg?] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Python bindings for the Qwt library
-EAPI=5
-HOMEPAGE=http://pyqwt.sourceforge.net/
-IUSE=debug doc examples svg python_targets_python2_7
-KEYWORDS=amd64 ~arm ia64 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_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),compat(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/qwt:5[svg?]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=5
-SRC_URI=mirror://sourceforge/pyqwt/PyQwt-5.2.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2ec68dc86a0cf6d74f2678a954ae7fc8
diff --git a/metadata/md5-cache/dev-python/pysendfile-2.0.1 b/metadata/md5-cache/dev-python/pysendfile-2.0.1
index ec617a260075..46a434cc9243 100644
--- a/metadata/md5-cache/dev-python/pysendfile-2.0.1
+++ b/metadata/md5-cache/dev-python/pysendfile-2.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=A python interface to the sendfile(2) system call
 EAPI=5
 HOMEPAGE=https://github.com/giampaolo/pysendfile
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ia64 ppc64 sparc x86
+KEYWORDS=amd64 ~arm ia64 ~ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysendfile/pysendfile-2.0.1.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eeaf2319f258cc9c3fc5b3bec0026f3c
+_md5_=bbca5f839f30de6d14559998a959adbb
diff --git a/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1 b/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
index 67dcdeec6d7d..53f4c0017495 100644
--- a/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A python interface to the sendfile(2) system call
 EAPI=7
 HOMEPAGE=https://github.com/giampaolo/pysendfile
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~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 ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysendfile/pysendfile-2.0.1.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=39ec0c484242aa260edf6840bca2a16a
+_md5_=021bf457424a992b09164d992698a15c
diff --git a/metadata/md5-cache/dev-python/pyside-1.2.2-r2 b/metadata/md5-cache/dev-python/pyside-1.2.2-r2
deleted file mode 100644
index 759966e25b01..000000000000
--- a/metadata/md5-cache/dev-python/pyside-1.2.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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/shiboken-1.2.2: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-qt/qtcore-4.8.5:4[ssl] X? ( >=dev-qt/qtgui-4.8.5:4[accessibility] >=dev-qt/qttest-4.8.5:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) designer? ( >=dev-qt/designer-4.8.5:4 ) help? ( >=dev-qt/qthelp-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) phonon? ( media-libs/phonon[qt4] ) script? ( >=dev-qt/qtscript-4.8.5:4 ) sql? ( >=dev-qt/qtsql-4.8.5:4 ) svg? ( >=dev-qt/qtsvg-4.8.5:4[accessibility] ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.5:4 ) >=dev-qt/qtgui-4.8.5:4 sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=5
-HOMEPAGE=http://wiki.qt.io/PySide
-IUSE=X declarative designer help multimedia opengl phonon script scripttools sql svg test webkit xmlpatterns python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/shiboken-1.2.2: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-qt/qtcore-4.8.5:4[ssl] X? ( >=dev-qt/qtgui-4.8.5:4[accessibility] >=dev-qt/qttest-4.8.5:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) designer? ( >=dev-qt/designer-4.8.5:4 ) help? ( >=dev-qt/qthelp-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) phonon? ( media-libs/phonon[qt4] ) script? ( >=dev-qt/qtscript-4.8.5:4 ) sql? ( >=dev-qt/qtsql-4.8.5:4 ) svg? ( >=dev-qt/qtsvg-4.8.5:4[accessibility] ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.5:4 )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) declarative? ( X ) designer? ( X ) help? ( X ) multimedia? ( X ) opengl? ( X ) phonon? ( X ) scripttools? ( X script ) sql? ( X ) svg? ( X ) test? ( X ) webkit? ( X )
-SLOT=0
-SRC_URI=http://download.qt-project.org/official_releases/pyside/pyside-qt4.8+1.2.2.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=464d19722257adcf7f75ebf20c8c1471
diff --git a/metadata/md5-cache/dev-python/pysmi-0.3.1 b/metadata/md5-cache/dev-python/pysmi-0.3.1
new file mode 100644
index 000000000000..65a4cafc0612
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pysmi-0.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python Lex & Yacc
+EAPI=6
+HOMEPAGE=https://github.com/etingof/pysmi
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=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(-)] 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/pysmi/pysmi-0.3.1.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6b5a67a6167c350ef28b2a1621472b74
diff --git a/metadata/md5-cache/dev-python/pytest-3.6.3 b/metadata/md5-cache/dev-python/pytest-3.6.3
index d5897ca44ed6..4a6d4edd8c89 100644
--- a/metadata/md5-cache/dev-python/pytest-3.6.3
+++ b/metadata/md5-cache/dev-python/pytest-3.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=Simple powerful testing with Python
 EAPI=6
 HOMEPAGE=http://pytest.org/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=>=dev-python/atomicwrites-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/attrs-17.2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pluggy-0.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/py-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] virtual/python-funcsigs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<dev-python/logilab-common-1.3.0 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-3.6.3.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f4a4eaa3a9ec743da10305bc3f8cb38
+_md5_=2ecd371221e18f9536c2ba34260582a9
diff --git a/metadata/md5-cache/dev-python/pytest-describe-0.11.1 b/metadata/md5-cache/dev-python/pytest-describe-0.11.1
new file mode 100644
index 000000000000..c016bfd59a71
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-describe-0.11.1
@@ -0,0 +1,16 @@
+BDEPEND=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+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_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/pytest-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Describe-style plugin for py.test
+EAPI=7
+HOMEPAGE=https://github.com/ropez/pytest-describe https://pypi.org/project/pytest-describe
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/pytest-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-describe/pytest-describe-0.11.1.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=f7487bc50de1ebbb79b7cbaa74417cb9
diff --git a/metadata/md5-cache/dev-python/pytest-mock-1.10.0 b/metadata/md5-cache/dev-python/pytest-mock-1.10.0
index 927a3886f238..9f7ac32ba467 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-1.10.0
+++ b/metadata/md5-cache/dev-python/pytest-mock-1.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=Thin-wrapper around the mock package for easier use with py.test
 EAPI=6
 HOMEPAGE=https://github.com/pytest-dev/pytest-mock/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 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_targets_python3_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(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/mock-2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/mock-2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-1.10.0.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2f3cb8e028ceb06f25f85e3c385ddc1e
+_md5_=883f41068c85ccf9b35af0c76b269fa4
diff --git a/metadata/md5-cache/dev-python/pytest-mock-1.6.0 b/metadata/md5-cache/dev-python/pytest-mock-1.6.0
index e012e40ac597..a8e6a431d94e 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-1.6.0
+++ b/metadata/md5-cache/dev-python/pytest-mock-1.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=Thin-wrapper around the mock package for easier use with py.test
 EAPI=6
 HOMEPAGE=https://github.com/pytest-dev/pytest-mock/
 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 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 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_python2_7? ( >=dev-python/mock-2[python_targets_python2_7] ) python_targets_pypy? ( >=dev-python/mock-2[python_targets_pypy] ) 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-mock/pytest-mock-1.6.0.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c31de38012313e3cef89e5831f4ee3ac
+_md5_=3e269281f1a3a6d5066cb17d24156fe2
diff --git a/metadata/md5-cache/dev-python/pytest-mock-1.6.3 b/metadata/md5-cache/dev-python/pytest-mock-1.6.3
index 23bb75c24ddb..1ad6dcb9e527 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-1.6.3
+++ b/metadata/md5-cache/dev-python/pytest-mock-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=Thin-wrapper around the mock package for easier use with py.test
 EAPI=6
 HOMEPAGE=https://github.com/pytest-dev/pytest-mock/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 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_targets_python3_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(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/mock-2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/mock-2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-1.6.3.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2f3cb8e028ceb06f25f85e3c385ddc1e
+_md5_=883f41068c85ccf9b35af0c76b269fa4
diff --git a/metadata/md5-cache/dev-python/pytrie-0.3.1 b/metadata/md5-cache/dev-python/pytrie-0.3.1
new file mode 100644
index 000000000000..2a924e43a9cd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytrie-0.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/sortedcontainers[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 pure Python implementation of the trie data structure
+EAPI=6
+HOMEPAGE=https://github.com/gsakkis/pytrie/ https://pypi.org/project/PyTrie/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=dev-python/sortedcontainers[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/PyTrie/PyTrie-0.3.1.tar.gz -> pytrie-0.3.1.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=670d5c88fa4cdb01df83cb27f8dafeba
diff --git a/metadata/md5-cache/dev-python/roman-3.0 b/metadata/md5-cache/dev-python/roman-3.0
new file mode 100644
index 000000000000..cf5b1aa0cbb7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/roman-3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<dev-python/docutils-0.9[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=An Integer to Roman numerals converter
+EAPI=6
+HOMEPAGE=https://pypi.org/project/roman/
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=PSF-2
+RDEPEND=!<dev-python/docutils-0.9[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/r/roman/roman-3.0.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5a314530f2d46401e0a2b882d9159a4f
diff --git a/metadata/md5-cache/dev-python/scandir-1.8 b/metadata/md5-cache/dev-python/scandir-1.8
new file mode 100644
index 000000000000..7cb0fce5260e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/scandir-1.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=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 ~arm ~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.8.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=772b2089d6e0bf49af045c349abfe902
diff --git a/metadata/md5-cache/dev-python/schedule-0.5.0 b/metadata/md5-cache/dev-python/schedule-0.5.0
new file mode 100644
index 000000000000..a43635e9b92e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/schedule-0.5.0
@@ -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(-)] test? ( >=dev-python/mock-2.0.0 >=dev-python/pytest-3.0.3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python job scheduling for humans
+EAPI=6
+HOMEPAGE=https://github.com/dbader/schedule
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+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/s/schedule/schedule-0.5.0.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1fe395fd0499376af1c2862a9904685d
diff --git a/metadata/md5-cache/dev-python/serverfiles-0.2.1 b/metadata/md5-cache/dev-python/serverfiles-0.2.1
new file mode 100644
index 000000000000..9a33ea2c1339
--- /dev/null
+++ b/metadata/md5-cache/dev-python/serverfiles-0.2.1
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+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(-)] dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[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=Utility for accessing HTTP server and storing files locally for reuse
+EAPI=7
+HOMEPAGE=https://github.com/biolab/serverfiles
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-python/requests-2.11.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 )
+SLOT=0
+SRC_URI=https://github.com/biolab/serverfiles/archive/0.2.1.tar.gz -> serverfiles-0.2.1.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=50d6f35f86d9e99a4718822e22acbad9
diff --git a/metadata/md5-cache/dev-python/shiboken-1.2.2 b/metadata/md5-cache/dev-python/shiboken-1.2.2
deleted file mode 100644
index b9acc3d93aed..000000000000
--- a/metadata/md5-cache/dev-python/shiboken-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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-libs/libxml2 dev-libs/libxslt dev-qt/qtcore:4 dev-qt/qtxmlpatterns:4 test? ( dev-qt/qtgui:4 dev-qt/qttest:4 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A tool for creating Python bindings for C++ libraries
-EAPI=5
-HOMEPAGE=http://qt-project.org/wiki/PySide
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libxml2 dev-libs/libxslt dev-qt/qtcore:4 dev-qt/qtxmlpatterns:4
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://download.qt-project.org/official_releases/pyside/shiboken-1.2.2.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=04bf3a551e0507e1220a0298ebb3e1e4
diff --git a/metadata/md5-cache/dev-python/simplejson-3.16.0 b/metadata/md5-cache/dev-python/simplejson-3.16.0
new file mode 100644
index 000000000000..fc0a30acc457
--- /dev/null
+++ b/metadata/md5-cache/dev-python/simplejson-3.16.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
+EAPI=6
+HOMEPAGE=https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=|| ( MIT AFL-2.1 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/s/simplejson/simplejson-3.16.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6950d3e3c669b322d211bf448b99295c
diff --git a/metadata/md5-cache/dev-python/sip-4.19.12 b/metadata/md5-cache/dev-python/sip-4.19.12
index 8b4d653fba75..c1fe9031b694 100644
--- a/metadata/md5-cache/dev-python/sip-4.19.12
+++ b/metadata/md5-cache/dev-python/sip-4.19.12
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=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=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python extension module generator for C and C++ libraries
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
-IUSE=debug doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=debug doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0/12
 SRC_URI=mirror://sourceforge/pyqt/sip-4.19.12.tar.gz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8481e072c9f9604e885caeb60fa03742
+_md5_=065a15bde73e10778fa414a880850d2b
diff --git a/metadata/md5-cache/dev-python/sip-4.9999 b/metadata/md5-cache/dev-python/sip-4.9999
index 0d9328796131..30155acb86a8 100644
--- a/metadata/md5-cache/dev-python/sip-4.9999
+++ b/metadata/md5-cache/dev-python/sip-4.9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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(-)] sys-devel/bison sys-devel/flex doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-vcs/mercurial
+DEPEND=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-devel/bison sys-devel/flex doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-vcs/mercurial
 DESCRIPTION=Python extension module generator for C and C++ libraries
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
-IUSE=debug doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=debug doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 )
+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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python2_7 )
 SLOT=0/12
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	mercurial	9813bb616cb1bd0c943177ab52204409	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d22b751f2169fdee1357a589e5560078
+_md5_=a4f11e71cafcada386ab81439625452e
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.7.5 b/metadata/md5-cache/dev-python/snakeoil-0.7.5
index f5e1941794cf..18124854e787 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.7.5
+++ b/metadata/md5-cache/dev-python/snakeoil-0.7.5
@@ -4,11 +4,11 @@ DESCRIPTION=misc common functionality and useful optimizations
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/snakeoil
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=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/pkgcore/snakeoil/releases/download/v0.7.5/snakeoil-0.7.5.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=30102bb54c957b1c1a16e7fabf865a37
+_md5_=4baa4cc4670f93eabcd97a7aa87e3536
diff --git a/metadata/md5-cache/dev-python/spyder-3.3.0 b/metadata/md5-cache/dev-python/spyder-3.3.0
new file mode 100644
index 000000000000..427d3321d17e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-3.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=hdf5? ( dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cloudpickle[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jedi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycodestyle[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyflakes[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pylint[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),svg,webengine?,webkit?] dev-python/pyzmq[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/qtawesome-0.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/qtconsole[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/QtPy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),svg,webengine?,webkit?] >=dev-python/rope-0.10.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/spyder-kernels-1.0 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=The Scientific PYthon Development EnviRonment
+EAPI=6
+HOMEPAGE=https://www.spyder-ide.org/ https://github.com/spyder-ide/spyder/ https://pypi.org/project/spyder/
+IUSE=hdf5 +webengine webkit python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=hdf5? ( dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cloudpickle[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jedi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycodestyle[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyflakes[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pylint[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),svg,webengine?,webkit?] dev-python/pyzmq[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/qtawesome-0.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/qtconsole[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/QtPy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),svg,webengine?,webkit?] >=dev-python/rope-0.10.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/spyder-kernels-1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=webengine? ( !webkit ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/s/spyder/spyder-3.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aed29306f99d1ac567315fe7254414e3
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-0.2.4 b/metadata/md5-cache/dev-python/spyder-kernels-0.2.4
new file mode 100644
index 000000000000..35c310571375
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-kernels-0.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cloudpickle[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Kernels used by spyder on its ipython console
+EAPI=6
+HOMEPAGE=https://github.com/spyder-ide/spyder-kernels/ https://pypi.org/project/spyder-kernels/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cloudpickle[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/s/spyder-kernels/spyder-kernels-0.2.4.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=35bd46725c4ea33dc96abb4b2357af9d
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-1.0.1 b/metadata/md5-cache/dev-python/spyder-kernels-1.0.1
new file mode 100644
index 000000000000..c91daf787b1e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-kernels-1.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cloudpickle[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Kernels used by spyder on its ipython console
+EAPI=6
+HOMEPAGE=https://github.com/spyder-ide/spyder-kernels/ https://pypi.org/project/spyder-kernels/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cloudpickle[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/s/spyder-kernels/spyder-kernels-1.0.1.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=35bd46725c4ea33dc96abb4b2357af9d
diff --git a/metadata/md5-cache/dev-python/tablib-0.12.1-r1 b/metadata/md5-cache/dev-python/tablib-0.12.1-r1
new file mode 100644
index 000000000000..7bebb0c4e41c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tablib-0.12.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/odfpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/openpyxl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unicodecsv[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-python/pandas-0.23 )
+DESCRIPTION=A format-agnostic tabular dataset library written in Python
+EAPI=7
+HOMEPAGE=http://python-tablib.org/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/odfpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/openpyxl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unicodecsv[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/t/tablib/tablib-0.12.1.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=58e19e160c96b480b7d476539f7b9f8f
diff --git a/metadata/md5-cache/dev-python/tappy-2.4 b/metadata/md5-cache/dev-python/tappy-2.4
index 9575c48df082..1591c2b9b304 100644
--- a/metadata/md5-cache/dev-python/tappy-2.4
+++ b/metadata/md5-cache/dev-python/tappy-2.4
@@ -4,7 +4,7 @@ DESCRIPTION=Test Anything Protocol (TAP) tools
 EAPI=6
 HOMEPAGE=https://github.com/python-tap/tappy https://pypi.org/project/tap.py/
 IUSE=test yaml python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=~amd64 ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] yaml? ( dev-python/more-itertools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tap.py/tap.py-2.4.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d413858764e0fb2d08de2e6bb8c59972
+_md5_=5cf89fd7fc6e7d56e30c3ff2ff8e3bb4
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.7 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.7
new file mode 100644
index 000000000000..4a6da7a619d1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.16.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/click-5.0[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(-)] >=dev-python/click-log-0.3.0[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(-)] <dev-python/click-log-0.4.0[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(-)] >=dev-python/click-threading-0.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(-)] >=dev-python/requests-2.4.1[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(-)] !=dev-python/requests-2.9.0[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(-)] >=dev-python/requests-toolbelt-0.4.0[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(-)] >=dev-python/atomicwrites-0.1.7[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(-)] 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(-)] dev-python/setuptools_scm[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(-)] test? ( >=dev-python/hypothesis-3.1[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(-)] dev-python/pytest[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(-)] dev-python/pytest-localserver[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(-)] dev-python/pytest-subtesthack[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[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=Synchronize calendars and contacts
+EAPI=6
+HOMEPAGE=https://github.com/pimutils/vdirsyncer
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/click-5.0[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(-)] >=dev-python/click-log-0.3.0[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(-)] <dev-python/click-log-0.4.0[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(-)] >=dev-python/click-threading-0.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(-)] >=dev-python/requests-2.4.1[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(-)] !=dev-python/requests-2.9.0[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(-)] >=dev-python/requests-toolbelt-0.4.0[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(-)] >=dev-python/atomicwrites-0.1.7[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[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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 )
+SLOT=0
+SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.7.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d195eb089ce97398819b2edef77b95d8
diff --git a/metadata/md5-cache/dev-python/ws4py-0.5.1 b/metadata/md5-cache/dev-python/ws4py-0.5.1
index 53550bc9c073..5977686804d7 100644
--- a/metadata/md5-cache/dev-python/ws4py-0.5.1
+++ b/metadata/md5-cache/dev-python/ws4py-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=WebSocket client and server library for Python 2 and 3 as well as Py
 EAPI=6
 HOMEPAGE=https://github.com/Lawouach/WebSocket-for-Python
 IUSE=+client +server test +threads python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 arm x86
 LICENSE=BSD
 RDEPEND=>=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cython-0.19.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(-)] client? ( >=www-servers/tornado-3.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(-)] ) server? ( >=dev-python/cherrypy-3.2.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[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/Lawouach/WebSocket-for-Python/archive/0.5.1.tar.gz -> ws4py-0.5.1.tar.gz
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c2dc9ef6bfeb5054fffce63be9fe7e6
+_md5_=c0848bc1cbdfcebe9321fd0752c9b038
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 385c4e8f47e5..f27f917f3afd 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/assistant-4.8.7 b/metadata/md5-cache/dev-qt/assistant-4.8.7
deleted file mode 100644
index 6cb5dc10bd56..000000000000
--- a/metadata/md5-cache/dev-qt/assistant-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qthelp-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtsql-4.8.7[aqua=,debug=,sqlite,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=Tool for viewing on-line documentation in Qt help file format
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=webkit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qthelp-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtsql-4.8.7[aqua=,debug=,sqlite,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b300d5278454dfe97f22a39d245f369
diff --git a/metadata/md5-cache/dev-qt/designer-4.8.7 b/metadata/md5-cache/dev-qt/designer-4.8.7
deleted file mode 100644
index 0874a27f1bcf..000000000000
--- a/metadata/md5-cache/dev-qt/designer-4.8.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] declarative? ( ~dev-qt/qtdeclarative-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt3support? ( ~dev-qt/qt3support-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=WYSIWYG tool for designing and building Qt-based GUIs
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=declarative phonon qt3support webkit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-PDEPEND=phonon? ( media-libs/phonon[designer,qt4] )
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] declarative? ( ~dev-qt/qtdeclarative-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt3support? ( ~dev-qt/qt3support-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6719fa40f2cb2c29f754aaf5774e1e96
diff --git a/metadata/md5-cache/dev-qt/linguist-4.8.7 b/metadata/md5-cache/dev-qt/linguist-4.8.7
deleted file mode 100644
index 31b3f933221f..000000000000
--- a/metadata/md5-cache/dev-qt/linguist-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/designer-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=Graphical tool for translating Qt applications
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-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 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/designer-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a78e80405b82d2f789e27b20e9b2c8f9
diff --git a/metadata/md5-cache/dev-qt/pixeltool-4.8.7 b/metadata/md5-cache/dev-qt/pixeltool-4.8.7
deleted file mode 100644
index e800567db79a..000000000000
--- a/metadata/md5-cache/dev-qt/pixeltool-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qthelp-4.8.5:4 dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=Qt screen magnifier
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-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 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qthelp-4.8.5:4 dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=954fd7eadb00d359bf282eae9ba0e051
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-4.8.7 b/metadata/md5-cache/dev-qt/qdbusviewer-4.8.7
deleted file mode 100644
index 7a79af9685f0..000000000000
--- a/metadata/md5-cache/dev-qt/qdbusviewer-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=Graphical tool that lets you introspect D-Bus objects and messages
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-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 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1b8a74368c2140ede5cffe5625b4281a
diff --git a/metadata/md5-cache/dev-qt/qt-meta-4.8.6-r1 b/metadata/md5-cache/dev-qt/qt-meta-4.8.6-r1
deleted file mode 100644
index fe450ad01936..000000000000
--- a/metadata/md5-cache/dev-qt/qt-meta-4.8.6-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Cross-platform application development framework (metapackage)
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+dbus examples +qt3support +webkit
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=metapackage
-RDEPEND=>=dev-qt/assistant-4.8.6:4 >=dev-qt/designer-4.8.6:4 >=dev-qt/linguist-4.8.6:4 >=dev-qt/pixeltool-4.8.6:4 dbus? ( >=dev-qt/qdbusviewer-4.8.6:4 ) qt3support? ( >=dev-qt/qt3support-4.8.6:4 ) >=dev-qt/qtbearer-4.8.6:4 >=dev-qt/qtcore-4.8.6:4 dbus? ( >=dev-qt/qtdbus-4.8.6:4 ) >=dev-qt/qtdeclarative-4.8.6:4 examples? ( >=dev-qt/qtdemo-4.8.6:4 ) >=dev-qt/qtgui-4.8.6:4 >=dev-qt/qthelp-4.8.6:4 >=dev-qt/qtmultimedia-4.8.6:4 >=dev-qt/qtopengl-4.8.6:4 >=dev-qt/qtscript-4.8.6:4 >=dev-qt/qtsql-4.8.6:4 >=dev-qt/qtsvg-4.8.6:4 >=dev-qt/qttest-4.8.6:4 webkit? ( >=dev-qt/qtwebkit-4.8.6:4 ) >=dev-qt/qtxmlpatterns-4.8.6:4
-SLOT=4
-_md5_=8b1a8558a8b62ecc283c6f08a4bef823
diff --git a/metadata/md5-cache/dev-qt/qt3support-4.8.7 b/metadata/md5-cache/dev-qt/qt3support-4.8.7
deleted file mode 100644
index 6af65ec26b99..000000000000
--- a/metadata/md5-cache/dev-qt/qt3support-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[accessibility=,aqua=,debug=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtsql-4.8.7[aqua=,debug=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,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 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=The Qt3Support module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+accessibility abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[accessibility=,aqua=,debug=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtsql-4.8.7[aqua=,debug=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a2c75745dfd39498ce1f9cbd7a8545ce
diff --git a/metadata/md5-cache/dev-qt/qtbearer-4.8.7 b/metadata/md5-cache/dev-qt/qtbearer-4.8.7
deleted file mode 100644
index f14c5f702978..000000000000
--- a/metadata/md5-cache/dev-qt/qtbearer-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] connman? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) networkmanager? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=The network bearer plugins for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=connman networkmanager abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] connman? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) networkmanager? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2721c297d91f29730ebdf11b31e7f104
diff --git a/metadata/md5-cache/dev-qt/qtcore-4.8.7-r4 b/metadata/md5-cache/dev-qt/qtcore-4.8.7-r4
deleted file mode 100644
index d9cfd624936e..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-4.8.7-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=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(-)?] glib? ( dev-libs/glib: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(-)?] ) iconv? ( >=virtual/libiconv-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( <dev-libs/icu-59:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !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(-)?] ) ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=Cross-platform application development framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+glib iconv icu libressl qt3support 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 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-PDEPEND=~dev-qt/qttranslations-4.8.7 qt3support? ( ~dev-qt/qtgui-4.8.7[aqua=,debug=,glib=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glib? ( dev-libs/glib: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(-)?] ) iconv? ( >=virtual/libiconv-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( <dev-libs/icu-59:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !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(-)?] ) ) dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d16d9ffe614ef9b0263f828f80276f1a
diff --git a/metadata/md5-cache/dev-qt/qtdbus-4.8.7 b/metadata/md5-cache/dev-qt/qtdbus-4.8.7
deleted file mode 100644
index a314b2e7a3db..000000000000
--- a/metadata/md5-cache/dev-qt/qtdbus-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=The DBus module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-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 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=acaa67c7ce4fd63265bb722e0b4aa5f6
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-4.8.7 b/metadata/md5-cache/dev-qt/qtdeclarative-4.8.7
deleted file mode 100644
index ceb94809a3fb..000000000000
--- a/metadata/md5-cache/dev-qt/qtdeclarative-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[accessibility=,aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtopengl-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtsql-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtsvg-4.8.7[accessibility=,aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtxmlpatterns-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt3support? ( ~dev-qt/qt3support-4.8.7[accessibility=,aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=The Declarative module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+accessibility qt3support webkit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[accessibility=,aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtopengl-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtsql-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtsvg-4.8.7[accessibility=,aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtxmlpatterns-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt3support? ( ~dev-qt/qt3support-4.8.7[accessibility=,aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=146bff8ddc26c95b394e6dc1355280b0
diff --git a/metadata/md5-cache/dev-qt/qtdemo-4.8.7 b/metadata/md5-cache/dev-qt/qtdemo-4.8.7
deleted file mode 100644
index 8310deffe1b3..000000000000
--- a/metadata/md5-cache/dev-qt/qtdemo-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/designer-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qthelp-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtsql-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtsvg-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qttest-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dbus? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) declarative? ( ~dev-qt/qtdeclarative-4.8.7[aqua=,debug=,webkit?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) multimedia? ( ~dev-qt/qtmultimedia-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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? ( ~dev-qt/qtopengl-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) phonon? ( >=media-libs/phonon-4.8.3-r1[qt4,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmlpatterns? ( ~dev-qt/qtxmlpatterns-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=Demonstration module and examples for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=dbus declarative multimedia opengl phonon webkit xmlpatterns abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=amd64 arm ppc ppc64 x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/designer-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qthelp-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtsql-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtsvg-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qttest-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dbus? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) declarative? ( ~dev-qt/qtdeclarative-4.8.7[aqua=,debug=,webkit?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) multimedia? ( ~dev-qt/qtmultimedia-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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? ( ~dev-qt/qtopengl-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) phonon? ( >=media-libs/phonon-4.8.3-r1[qt4,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmlpatterns? ( ~dev-qt/qtxmlpatterns-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=896c70cef2df9a7e988a389d67b47908
diff --git a/metadata/md5-cache/dev-qt/qtgui-4.8.7 b/metadata/md5-cache/dev-qt/qtgui-4.8.7
deleted file mode 100644
index eb29a55d8082..000000000000
--- a/metadata/md5-cache/dev-qt/qtgui-4.8.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-eselect/eselect-qtgraphicssystem ~dev-qt/qtcore-4.8.7[aqua=,debug=,glib=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] >=media-libs/freetype-2.4.11-r1: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: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(-)?] 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(-)?] !aqua? ( >=x11-libs/libICE-1.0.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/libSM-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(-)?] >=x11-libs/libX11-1.5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.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(-)?] >=x11-libs/libXext-1.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.6.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(-)?] >=x11-libs/libXrandr-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(-)?] >=x11-libs/libXrender-0.9.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(-)?] xinerama? ( >=x11-libs/libXinerama-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(-)?] ) xv? ( >=x11-libs/libXv-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(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) egl? ( media-libs/mesa[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(-)?] ) glib? ( dev-libs/glib: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(-)?] ) gtkstyle? ( >=x11-libs/cairo-1.12[-qt4(-),abi_x86_32(-)?,abi_x86_64(-)?,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/gtk+-2.24.23-r1:2[aqua=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mng? ( >=media-libs/libmng-1.0.10-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(-)?] ) nas? ( >=media-libs/nas-1.9.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(-)?] ) nis? ( elibc_glibc? ( net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,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-4.0.3-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(-)?] ) !<dev-qt/qthelp-4.8.5:4 !aqua? ( x11-base/xorg-proto ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=The GUI module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-PDEPEND=qt3support? ( ~dev-qt/qt3support-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RDEPEND=app-eselect/eselect-qtgraphicssystem ~dev-qt/qtcore-4.8.7[aqua=,debug=,glib=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtscript-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] >=media-libs/freetype-2.4.11-r1: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: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(-)?] 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(-)?] !aqua? ( >=x11-libs/libICE-1.0.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/libSM-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(-)?] >=x11-libs/libX11-1.5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.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(-)?] >=x11-libs/libXext-1.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.6.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(-)?] >=x11-libs/libXrandr-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(-)?] >=x11-libs/libXrender-0.9.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(-)?] xinerama? ( >=x11-libs/libXinerama-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(-)?] ) xv? ( >=x11-libs/libXv-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(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) egl? ( media-libs/mesa[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(-)?] ) glib? ( dev-libs/glib: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(-)?] ) gtkstyle? ( >=x11-libs/cairo-1.12[-qt4(-),abi_x86_32(-)?,abi_x86_64(-)?,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/gtk+-2.24.23-r1:2[aqua=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mng? ( >=media-libs/libmng-1.0.10-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(-)?] ) nas? ( >=media-libs/nas-1.9.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(-)?] ) nis? ( elibc_glibc? ( net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,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-4.0.3-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(-)?] ) !<dev-qt/qthelp-4.8.5:4 dev-qt/qtchooser
-REQUIRED_USE=gtkstyle? ( glib )
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz https://dev.gentoo.org/~pesa/patches/qtgui-systemtrayicon-plugin-system.patch
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f3b6e2d49f934e0e285d40b0401030f1
diff --git a/metadata/md5-cache/dev-qt/qthelp-4.8.7 b/metadata/md5-cache/dev-qt/qthelp-4.8.7
deleted file mode 100644
index d2efe99f1b13..000000000000
--- a/metadata/md5-cache/dev-qt/qthelp-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtsql-4.8.7[aqua=,debug=,sqlite,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] compat? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=The Help module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=compat doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtsql-4.8.7[aqua=,debug=,sqlite,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] compat? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz compat? ( http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz https://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b6d62e02fd1a2f7bb99e9c3205f956b5
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-4.8.7 b/metadata/md5-cache/dev-qt/qtmultimedia-4.8.7
deleted file mode 100644
index dbdb67286b8a..000000000000
--- a/metadata/md5-cache/dev-qt/qtmultimedia-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,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 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=The Multimedia module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=amd64 arm ~arm64 ~ia64 ppc ppc64 x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=baa34dbdb77b7de4e798dc0bae03bed5
diff --git a/metadata/md5-cache/dev-qt/qtopengl-4.8.7 b/metadata/md5-cache/dev-qt/qtopengl-4.8.7
deleted file mode 100644
index fddd5d8fdfff..000000000000
--- a/metadata/md5-cache/dev-qt/qtopengl-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,egl=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,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.5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.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(-)?] >=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(-)?] dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=The OpenGL module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=egl qt3support abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[aqua=,debug=,egl=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,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.5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.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(-)?] >=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(-)?] dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=19991b6a4797ae1432183aa8457f3d51
diff --git a/metadata/md5-cache/dev-qt/qtscript-4.8.7 b/metadata/md5-cache/dev-qt/qtscript-4.8.7
deleted file mode 100644
index fe9d6332ca62..000000000000
--- a/metadata/md5-cache/dev-qt/qtscript-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=The QtScript module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+jit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a1f8308dd18687be2a07eb8c126242be
diff --git a/metadata/md5-cache/dev-qt/qtsql-4.8.7-r1 b/metadata/md5-cache/dev-qt/qtsql-4.8.7-r1
deleted file mode 100644
index 69cf3048632a..000000000000
--- a/metadata/md5-cache/dev-qt/qtsql-4.8.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) oci8? ( >=dev-db/oracle-instantclient-basic-11.2.0.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(-)?] ) odbc? ( || ( >=dev-db/unixODBC-2.3.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(-)?] >=dev-db/libiodbc-3.52.8-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(-)?] ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.3: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(-)?] ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=The SQL module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=freetds mysql oci8 odbc postgres qt3support +sqlite abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) oci8? ( >=dev-db/oracle-instantclient-basic-11.2.0.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(-)?] ) odbc? ( || ( >=dev-db/unixODBC-2.3.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(-)?] >=dev-db/libiodbc-3.52.8-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(-)?] ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.3: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(-)?] ) dev-qt/qtchooser
-REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=06755ff8361593fefe1e7a21463c3119
diff --git a/metadata/md5-cache/dev-qt/qtsvg-4.8.7 b/metadata/md5-cache/dev-qt/qtsvg-4.8.7
deleted file mode 100644
index 7c0d740e601a..000000000000
--- a/metadata/md5-cache/dev-qt/qtsvg-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[accessibility=,aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=The SVG module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+accessibility abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtgui-4.8.7[accessibility=,aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=37209ba46a9093d16f8f843c07b343c0
diff --git a/metadata/md5-cache/dev-qt/qttest-4.8.7 b/metadata/md5-cache/dev-qt/qttest-4.8.7
deleted file mode 100644
index 9aace1cdb345..000000000000
--- a/metadata/md5-cache/dev-qt/qttest-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=The QtTest module for unit testing Qt applications and libraries
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-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 aqua debug pch +exceptions
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=81855f82799c8b155558207a12bfda1f
diff --git a/metadata/md5-cache/dev-qt/qttranslations-4.8.7 b/metadata/md5-cache/dev-qt/qttranslations-4.8.7
deleted file mode 100644
index 2e22682d2c57..000000000000
--- a/metadata/md5-cache/dev-qt/qttranslations-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7 dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=Translation files for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=dev-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d1438e3e6cf1eae8e2f2210930ff7fb8
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.11.1 b/metadata/md5-cache/dev-qt/qtwebengine-5.11.1
index 203cf81ca73a..d4be6fa64a80 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtwebengine-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1
 _md5_=d497a46388bf87b2d7261bbd47473f79
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.9.4 b/metadata/md5-cache/dev-qt/qtwebengine-5.9.4
index fa176033c794..f7e7e29c762f 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	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1
 _md5_=beab5a3f85a25a404648c9581592cfcc
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.9.6-r1 b/metadata/md5-cache/dev-qt/qtwebengine-5.9.6-r1
index 9529dfbaa349..bb952dc50124 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.9.6-r1
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.9.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtwebengine-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1
 _md5_=b9f035f274deae30270ee9afb8508e13
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.7 b/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.7
deleted file mode 100644
index 151d5976eae1..000000000000
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=The XmlPatterns module for the Qt toolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-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 aqua debug pch
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,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-qt/qtchooser
-SLOT=4
-SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt4-build-multilib	e5db64f959b709518118df46041ed840	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8395aba6231a7567f34fecb4f3e76bb
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index b30992e9071e..f4827584ed00 100644
--- a/metadata/md5-cache/dev-ros/Manifest.gz
+++ b/metadata/md5-cache/dev-ros/Manifest.gz
diff --git a/metadata/md5-cache/dev-ros/amcl-1.16.0 b/metadata/md5-cache/dev-ros/amcl-1.16.0
deleted file mode 100644
index 0f05fb4a85a5..000000000000
--- a/metadata/md5-cache/dev-ros/amcl-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_server[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Probabilistic localization system for a robot moving in 2D
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/amcl https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=LGPL-2.1
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=70e6da7d5ce69126a2d7ca72eaf6d4db
diff --git a/metadata/md5-cache/dev-ros/amcl-1.16.1 b/metadata/md5-cache/dev-ros/amcl-1.16.1
index c22480510173..1486dfc435fb 100644
--- a/metadata/md5-cache/dev-ros/amcl-1.16.1
+++ b/metadata/md5-cache/dev-ros/amcl-1.16.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_server[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_server[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Probabilistic localization system for a robot moving in 2D
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/amcl https://github.com/ros-planning/navigation
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-2.1
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] 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(-)]
+RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=70e6da7d5ce69126a2d7ca72eaf6d4db
+_md5_=be834cde3d67befef47d893f5a7709af
diff --git a/metadata/md5-cache/dev-ros/amcl-1.16.2 b/metadata/md5-cache/dev-ros/amcl-1.16.2
new file mode 100644
index 000000000000..f908236b675a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/amcl-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_server[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Probabilistic localization system for a robot moving in 2D
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/amcl https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=LGPL-2.1
+RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be834cde3d67befef47d893f5a7709af
diff --git a/metadata/md5-cache/dev-ros/amcl-9999 b/metadata/md5-cache/dev-ros/amcl-9999
index aeb8c912fda8..a744b56d5170 100644
--- a/metadata/md5-cache/dev-ros/amcl-9999
+++ b/metadata/md5-cache/dev-ros/amcl-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_server[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_server[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Probabilistic localization system for a robot moving in 2D
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/amcl https://github.com/ros-planning/navigation
 IUSE=python_targets_python2_7 test
 LICENSE=LGPL-2.1
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] 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(-)]
+RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros 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
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=70e6da7d5ce69126a2d7ca72eaf6d4db
+_md5_=be834cde3d67befef47d893f5a7709af
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-1.16.2 b/metadata/md5-cache/dev-ros/base_local_planner-1.16.2
new file mode 100644
index 000000000000..d28a928d232f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/base_local_planner-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-cpp/gtest dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/base_local_planner https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3f2461b494627330ad86749debfa698d
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-9999 b/metadata/md5-cache/dev-ros/base_local_planner-9999
index 9e8515213189..50151dfd5963 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/base_local_planner-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules test? ( dev-cpp/gtest dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-cpp/gtest dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/base_local_planner https://github.com/ros-planning/navigation
 IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
-RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b3ed73ed616527b8d43769f3431cd67d
+_md5_=3f2461b494627330ad86749debfa698d
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.15.1-r1 b/metadata/md5-cache/dev-ros/carrot_planner-1.15.1-r1
deleted file mode 100644
index 1a9660a01a7c..000000000000
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.15.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/base_local_planner dev-ros/pluginlib dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/base_local_planner dev-ros/pluginlib dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.1.tar.gz -> navigation-1.15.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=652eabed7e78cf1845e6f7b10c87c6cb
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.15.2 b/metadata/md5-cache/dev-ros/carrot_planner-1.15.2
deleted file mode 100644
index 2e9f22792c9c..000000000000
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.15.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/base_local_planner dev-ros/pluginlib dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/base_local_planner dev-ros/pluginlib dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0f86efe3fc2906cfaf3e153cdf5571b7
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.16.0 b/metadata/md5-cache/dev-ros/carrot_planner-1.16.0
deleted file mode 100644
index d61be5880ed2..000000000000
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4be292b4011ccde05d2990b2bf94c896
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.16.2 b/metadata/md5-cache/dev-ros/carrot_planner-1.16.2
new file mode 100644
index 000000000000..54a348dac2d3
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/carrot_planner-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f313433e654cf7fd2c15889af60ca7b6
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-9999 b/metadata/md5-cache/dev-ros/carrot_planner-9999
index 56cceb324ce2..4c4bf616c807 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-9999
+++ b/metadata/md5-cache/dev-ros/carrot_planner-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] 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(-)]
+RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] 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
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4be292b4011ccde05d2990b2bf94c896
+_md5_=f313433e654cf7fd2c15889af60ca7b6
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.2 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.2
new file mode 100644
index 000000000000..30a727ce75d0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Recovery behavior that attempts to clear space by reverting the costmaps to the static map
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/clear_costmap_recovery https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6f5f6e992cb9b9458f29c2261ea58db9
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.15.1-r1 b/metadata/md5-cache/dev-ros/costmap_2d-1.15.1-r1
deleted file mode 100644
index dee5ee8c9165..000000000000
--- a/metadata/md5-cache/dev-ros/costmap_2d-1.15.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/voxel_grid dev-cpp/eigen:3 sci-libs/pcl:= dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Creates a 2D costmap from sensor data
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/voxel_grid dev-cpp/eigen:3 sci-libs/pcl:= dev-libs/boost:=[threads] dev-libs/tinyxml2:= 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=ros_messages_cxx || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.1.tar.gz -> navigation-1.15.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2f373fd48291f32855a1f0b1d11140eb
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.15.2 b/metadata/md5-cache/dev-ros/costmap_2d-1.15.2
deleted file mode 100644
index eb30128a3f1d..000000000000
--- a/metadata/md5-cache/dev-ros/costmap_2d-1.15.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/voxel_grid dev-cpp/eigen:3 sci-libs/pcl:= dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Creates a 2D costmap from sensor data
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/voxel_grid dev-cpp/eigen:3 sci-libs/pcl:= dev-libs/boost:=[threads] dev-libs/tinyxml2:= 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=ros_messages_cxx || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7595cef3a8f73907396c66b83e151d04
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.16.0 b/metadata/md5-cache/dev-ros/costmap_2d-1.16.0
deleted file mode 100644
index 9a50477a617d..000000000000
--- a/metadata/md5-cache/dev-ros/costmap_2d-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/cmake_modules test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Creates a 2D costmap from sensor data
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=ros_messages_cxx || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f757c71d5fed266aec092c5319e6cc91
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.16.2 b/metadata/md5-cache/dev-ros/costmap_2d-1.16.2
new file mode 100644
index 000000000000..ca29c8d1ff19
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/costmap_2d-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/cmake_modules test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Creates a 2D costmap from sensor data
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=ros_messages_cxx || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=57a98707a5970bcae04812304ccf114f
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-9999 b/metadata/md5-cache/dev-ros/costmap_2d-9999
index ceff2f0c4141..bdd167b6f9a2 100644
--- a/metadata/md5-cache/dev-ros/costmap_2d-9999
+++ b/metadata/md5-cache/dev-ros/costmap_2d-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/cmake_modules test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/cmake_modules test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Creates a 2D costmap from sensor data
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
 IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=ros_messages_cxx || ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f757c71d5fed266aec092c5319e6cc91
+_md5_=57a98707a5970bcae04812304ccf114f
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.15.1-r1 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.15.1-r1
deleted file mode 100644
index 524ba36497aa..000000000000
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-1.15.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/pcl_conversions dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/pcl_conversions dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.1.tar.gz -> navigation-1.15.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0154a4b03f40d64150370dff938499a7
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.15.2 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.15.2
deleted file mode 100644
index d1d0ff3a5eca..000000000000
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-1.15.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/pcl_conversions dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/pcl_conversions dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0d9aeea234fa56d222948ecc96170bb8
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.0 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.0
deleted file mode 100644
index 1ac02eb87d52..000000000000
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=25595817cf2e5428d925448732a50ab5
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.2 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.2
new file mode 100644
index 000000000000..ce123a0077aa
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d6c3db79a4697290cfde448ae971a8b3
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-9999 b/metadata/md5-cache/dev-ros/dwa_local_planner-9999
index 6165d4816ff7..62da17d8c729 100644
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] dev-libs/console_bridge:= 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(-)]
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= 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
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=25595817cf2e5428d925448732a50ab5
+_md5_=d6c3db79a4697290cfde448ae971a8b3
diff --git a/metadata/md5-cache/dev-ros/fake_localization-1.16.2 b/metadata/md5-cache/dev-ros/fake_localization-1.16.2
new file mode 100644
index 000000000000..d888a7ff9dec
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/fake_localization-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A ROS node that simply forwards odometry information
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/fake_localization https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fe5ebab6223f30f32aae686cac901a1f
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.16.2 b/metadata/md5-cache/dev-ros/global_planner-1.16.2
new file mode 100644
index 000000000000..926f786fccea
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/global_planner-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Path planner library and node
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d533489a07b679923b935774584e18d0
diff --git a/metadata/md5-cache/dev-ros/image_transport-1.11.13-r1 b/metadata/md5-cache/dev-ros/image_transport-1.11.13-r1
deleted file mode 100644
index aaf59f9f084b..000000000000
--- a/metadata/md5-cache/dev-ros/image_transport-1.11.13-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/image_transport https://github.com/ros-perception/image_common
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.13.tar.gz -> image_common-1.11.13.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=895df990389640b80dc174b560f6fa9b
diff --git a/metadata/md5-cache/dev-ros/image_transport-1.11.13-r2 b/metadata/md5-cache/dev-ros/image_transport-1.11.13-r2
new file mode 100644
index 000000000000..1a13e46aeefe
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/image_transport-1.11.13-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/image_transport https://github.com/ros-perception/image_common
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.13.tar.gz -> image_common-1.11.13.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c65070a00dc45efc3e05e6e3135146e8
diff --git a/metadata/md5-cache/dev-ros/image_transport-9999 b/metadata/md5-cache/dev-ros/image_transport-9999
index 372b3a3f63fd..8726f437caf9 100644
--- a/metadata/md5-cache/dev-ros/image_transport-9999
+++ b/metadata/md5-cache/dev-ros/image_transport-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/image_transport https://github.com/ros-perception/image_common
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= 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(-)]
+RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= 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
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=895df990389640b80dc174b560f6fa9b
+_md5_=c65070a00dc45efc3e05e6e3135146e8
diff --git a/metadata/md5-cache/dev-ros/imu_transformer-0.2.2-r1 b/metadata/md5-cache/dev-ros/imu_transformer-0.2.2-r1
index f8a686d93871..fd1b16858e87 100644
--- a/metadata/md5-cache/dev-ros/imu_transformer-0.2.2-r1
+++ b/metadata/md5-cache/dev-ros/imu_transformer-0.2.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.2.tar.gz -> imu_pipeline-0.2.2.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=95d7d99252854df8a0930ca709a62587
+_md5_=fb1cde35e9cde01860c566856883c2af
diff --git a/metadata/md5-cache/dev-ros/map_server-1.16.2 b/metadata/md5-cache/dev-ros/map_server-1.16.2
new file mode 100644
index 000000000000..9de93fb59323
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/map_server-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Offers map data as a ROS service
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=20a9fcd3c331088ea81e0daac42647e1
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.14.3 b/metadata/md5-cache/dev-ros/message_filters-1.14.3
new file mode 100644
index 000000000000..e1d781321016
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/message_filters-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Set of message filters which take in messages and may output those messages at a later time
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5535611168573147fe3d3121c1fba155
diff --git a/metadata/md5-cache/dev-ros/move_base-1.16.2 b/metadata/md5-cache/dev-ros/move_base-1.16.2
new file mode 100644
index 000000000000..f2ba7e722178
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/move_base-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=734742f28191ddb49d6b5ae03dde8f07
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.2 b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.2
new file mode 100644
index 000000000000..ce96f30cf7c5
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Move slow and clear
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/move_slow_and_clear https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=27440bbb78c1902a2e58cf47873f7e8b
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.16.2 b/metadata/md5-cache/dev-ros/nav_core-1.16.2
new file mode 100644
index 000000000000..df6150953b8e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/nav_core-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Common interfaces for navigation specific robot actions
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=536f7f888c3b1762eb1f2b97d36770b7
diff --git a/metadata/md5-cache/dev-ros/navfn-1.16.2 b/metadata/md5-cache/dev-ros/navfn-1.16.2
new file mode 100644
index 000000000000..13262c0aa7d6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/navfn-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Fast interpolated navigation function that can be used to create plans for a mobile base
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/navfn https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d0b6129249ee15523878a8d7dbf7998b
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.4 b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.4
new file mode 100644
index 000000000000..5b7617cf6d63
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/python_qt_binding https://github.com/ros-visualization/python_qt_binding
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.3.4.tar.gz -> python_qt_binding-0.3.4.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b4bc9e65ec3daf39cf8d6948dcfb244a
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.10 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.10
new file mode 100644
index 000000000000..28a27ac543c6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Helpers to work with dot graphs
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/qt_dotgraph https://github.com/ros-visualization/qt_gui_core
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.10.tar.gz -> qt_gui_core-0.3.10.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dbfe7832a166facf273a3f0f7cea1e8a
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.9 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.9
new file mode 100644
index 000000000000..7645b41d2d65
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Helpers to work with dot graphs
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/qt_dotgraph https://github.com/ros-visualization/qt_gui_core
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.9.tar.gz -> qt_gui_core-0.3.9.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dbfe7832a166facf273a3f0f7cea1e8a
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.3.10 b/metadata/md5-cache/dev-ros/qt_gui-0.3.10
new file mode 100644
index 000000000000..44a195f7b419
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.3.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS infrastructure for an integrated graphical user interface based on Qt
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/qt_gui https://github.com/ros-visualization/qt_gui_core
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.10.tar.gz -> qt_gui_core-0.3.10.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bd38eef50c703ab7083bbce4ba482d0c
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.3.9 b/metadata/md5-cache/dev-ros/qt_gui-0.3.9
new file mode 100644
index 000000000000..6c96beb493d8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.3.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS infrastructure for an integrated graphical user interface based on Qt
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/qt_gui https://github.com/ros-visualization/qt_gui_core
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.9.tar.gz -> qt_gui_core-0.3.9.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bd38eef50c703ab7083bbce4ba482d0c
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.10 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.10
new file mode 100644
index 000000000000..d7ad45490335
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Main to start an instance of the integrated graphical user interface provided by qt_gui
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/qt_gui_app https://github.com/ros-visualization/qt_gui_core
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.10.tar.gz -> qt_gui_core-0.3.10.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1c6cc48b2bd0562f4b48a1d565485f2e
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.9 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.9
new file mode 100644
index 000000000000..18f9fa4dd869
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Main to start an instance of the integrated graphical user interface provided by qt_gui
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/qt_gui_app https://github.com/ros-visualization/qt_gui_core
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.9.tar.gz -> qt_gui_core-0.3.9.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1c6cc48b2bd0562f4b48a1d565485f2e
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.10 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.10
new file mode 100644
index 000000000000..1847c794db9f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/qt_gui_cpp https://github.com/ros-visualization/qt_gui_core
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.10.tar.gz -> qt_gui_core-0.3.10.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=758e40eb529360557431e071c86b73da
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.9 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.9
new file mode 100644
index 000000000000..f7e9d1b849dc
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/qt_gui_cpp https://github.com/ros-visualization/qt_gui_core
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.9.tar.gz -> qt_gui_core-0.3.9.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=758e40eb529360557431e071c86b73da
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.10 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.10
new file mode 100644
index 000000000000..68172505faff
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Common functionality for ROS RQT GUI plugins written in Python
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/qt_gui_py_common https://github.com/ros-visualization/qt_gui_core
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.10.tar.gz -> qt_gui_core-0.3.10.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3e9d1a7011df960f0818cd2bbf67dc0f
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.9 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.9
new file mode 100644
index 000000000000..925cb91a95de
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Common functionality for ROS RQT GUI plugins written in Python
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/qt_gui_py_common https://github.com/ros-visualization/qt_gui_core
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.9.tar.gz -> qt_gui_core-0.3.9.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3e9d1a7011df960f0818cd2bbf67dc0f
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.14.3 b/metadata/md5-cache/dev-ros/rosbag-1.14.3
new file mode 100644
index 000000000000..4a2e4e3731e7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbag-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Set of tools for recording from and playing back to ROS topics
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rosbag https://github.com/ros/ros_comm
+IUSE=lz4 python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/console_bridge:= lz4? ( dev-ros/roslz4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a253007abb2a2f4a57e8e2d48526d0bc
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3 b/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3
new file mode 100644
index 000000000000..71b597401997
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Set of tools for recording from and playing back ROS message
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f7925c61f68d68826a64ea1a3db361e5
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.14.3 b/metadata/md5-cache/dev-ros/roscpp-1.14.3
new file mode 100644
index 000000000000..95074f688e5c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roscpp-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=C++ implementation of ROS
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/roscpp https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1c23cf512a2168f51addad0286240575
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.14.3 b/metadata/md5-cache/dev-ros/rosgraph-1.14.3
new file mode 100644
index 000000000000..e8a6c61f3b36
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Prints information about the ROS Computation Graph
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9ae3594f91af473a0a8ea4c5324a24a2
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.14.3 b/metadata/md5-cache/dev-ros/roslaunch-1.14.3
new file mode 100644
index 000000000000..3eada9611edd
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare test
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Tool for easily launching multiple ROS nodes
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a07cde16b2117a2026da07e04ce3efca
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.14.3 b/metadata/md5-cache/dev-ros/roslz4-1.14.3
new file mode 100644
index 000000000000..a9ee0d03ce04
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslz4-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=app-arch/lz4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=58ef86e1e99d15652979f7f57a698554
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.14.3 b/metadata/md5-cache/dev-ros/rosmaster-1.14.3
new file mode 100644
index 000000000000..008f36de0a0a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/defusedxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS Master implementation
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/defusedxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0d9d3900dc5c68466ac94f1fac6a1fdd
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.14.3 b/metadata/md5-cache/dev-ros/rosmsg-1.14.3
new file mode 100644
index 000000000000..edeb02a7f354
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Command-line tools for displaying information about message and services
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rosmsg https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=98d0f4511f9aedd29d7fe52bfb9381e1
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.14.3 b/metadata/md5-cache/dev-ros/rosnode-1.14.3
new file mode 100644
index 000000000000..2682a4e15b7b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosnode-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=91c1007f9639b788f89f3e525011386b
diff --git a/metadata/md5-cache/dev-ros/rosout-1.14.3 b/metadata/md5-cache/dev-ros/rosout-1.14.3
new file mode 100644
index 000000000000..783fc5a9adf4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosout-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2aaed6538c95db1d04be23166164f9fc
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.14.3 b/metadata/md5-cache/dev-ros/rosparam-1.14.3
new file mode 100644
index 000000000000..a96c7c462798
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosparam-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d890276e87f09538e6d7067e949c7099
diff --git a/metadata/md5-cache/dev-ros/rospy-1.14.3 b/metadata/md5-cache/dev-ros/rospy-1.14.3
new file mode 100644
index 000000000000..40e4c3ed6497
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rospy-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Python client library for ROS
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=96925456256576cc756080991ddab33c
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.14.3 b/metadata/md5-cache/dev-ros/rosservice-1.14.3
new file mode 100644
index 000000000000..a86c57dc7b29
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosservice-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Command-line tool for listing and querying ROS Services
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=75c5887a7d2588ef136bfc7b12275d3e
diff --git a/metadata/md5-cache/dev-ros/rostest-1.14.3 b/metadata/md5-cache/dev-ros/rostest-1.14.3
new file mode 100644
index 000000000000..96f6e0f1d2b8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rostest-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Integration test suite based on roslaunch that is compatible with xUnit frameworks
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1d2d3be469d52cfc187ccd69b887e4c3
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.14.3 b/metadata/md5-cache/dev-ros/rostopic-1.14.3
new file mode 100644
index 000000000000..9599374c1eef
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rostopic-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d69fee37006be24d0b6e1685c25467f2
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.14.3 b/metadata/md5-cache/dev-ros/roswtf-1.14.3
new file mode 100644
index 000000000000..8b22b1041d8a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roswtf-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Tool for diagnosing issues with a running ROS system
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=12d49760283c9fe8c4a693ee5b412404
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.15.1-r1 b/metadata/md5-cache/dev-ros/rotate_recovery-1.15.1-r1
deleted file mode 100644
index 25107d5621e9..000000000000
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.15.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/base_local_planner dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/base_local_planner dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.1.tar.gz -> navigation-1.15.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a867ab83263d54d67780be99590b41d0
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.15.2 b/metadata/md5-cache/dev-ros/rotate_recovery-1.15.2
deleted file mode 100644
index 6aa73869ceb4..000000000000
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.15.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/base_local_planner dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/base_local_planner dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=318b216d63e161c7b2595aecc47e21d3
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.16.0 b/metadata/md5-cache/dev-ros/rotate_recovery-1.16.0
deleted file mode 100644
index c409513eb343..000000000000
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-ros/base_local_planner dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-ros/base_local_planner dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e8840f4fb3afb2ce141fa9065d6c80a1
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.16.2 b/metadata/md5-cache/dev-ros/rotate_recovery-1.16.2
new file mode 100644
index 000000000000..b223cca6cb12
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=79af0da29a098079e29336b6254e7576
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-9999 b/metadata/md5-cache/dev-ros/rotate_recovery-9999
index d44fa3e00fdb..a6149372043d 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-9999
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/costmap_2d dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-ros/base_local_planner dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-ros/base_local_planner dev-libs/boost:= dev-libs/console_bridge:= 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(-)]
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= 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
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e8840f4fb3afb2ce141fa9065d6c80a1
+_md5_=79af0da29a098079e29336b6254e7576
diff --git a/metadata/md5-cache/dev-ros/rviz-1.12.15-r1 b/metadata/md5-cache/dev-ros/rviz-1.12.15-r1
deleted file mode 100644
index 2282e9deb61e..000000000000
--- a/metadata/md5-cache/dev-ros/rviz-1.12.15-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=3D visualization tool for ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rviz/archive/1.12.15.tar.gz -> rviz-1.12.15.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=687aca9371910653219bcb8c29921bfb
diff --git a/metadata/md5-cache/dev-ros/rviz-1.13.0 b/metadata/md5-cache/dev-ros/rviz-1.13.0
deleted file mode 100644
index 5bef3924a705..000000000000
--- a/metadata/md5-cache/dev-ros/rviz-1.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=3D visualization tool for ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rviz/archive/1.13.0.tar.gz -> rviz-1.13.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=687aca9371910653219bcb8c29921bfb
diff --git a/metadata/md5-cache/dev-ros/rviz-1.13.1 b/metadata/md5-cache/dev-ros/rviz-1.13.1
deleted file mode 100644
index 584f9e6371fa..000000000000
--- a/metadata/md5-cache/dev-ros/rviz-1.13.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=3D visualization tool for ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rviz/archive/1.13.1.tar.gz -> rviz-1.13.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=687aca9371910653219bcb8c29921bfb
diff --git a/metadata/md5-cache/dev-ros/rviz-1.13.1-r1 b/metadata/md5-cache/dev-ros/rviz-1.13.1-r1
new file mode 100644
index 000000000000..38d9c5149259
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rviz-1.13.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:= virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=3D visualization tool for ROS
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:= virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rviz/archive/1.13.1.tar.gz -> rviz-1.13.1.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dce18c89515ad667aee3e37f3e86549e
diff --git a/metadata/md5-cache/dev-ros/rviz-9999 b/metadata/md5-cache/dev-ros/rviz-9999
index 405251543c0c..e8683d89b6ce 100644
--- a/metadata/md5-cache/dev-ros/rviz-9999
+++ b/metadata/md5-cache/dev-ros/rviz-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:= virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=3D visualization tool for ROS
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] 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(-)]
+RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:= virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] 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
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=010d460f695337d55407dde9cb5426b1
+_md5_=dce18c89515ad667aee3e37f3e86549e
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.14.3 b/metadata/md5-cache/dev-ros/test_rosbag-1.14.3
new file mode 100644
index 000000000000..e4340ee38c28
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Unit tests for rosbag
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d843f7488fb7751fb1fe658e0a77871d
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.3 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.3
new file mode 100644
index 000000000000..48563cd55034
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Unit tests for rosbag_storage
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+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=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a3a4349eb4685fed27769dca9dbbba79
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.14.3 b/metadata/md5-cache/dev-ros/test_roscpp-1.14.3
new file mode 100644
index 000000000000..81cf287d9ce8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Unit tests for roscpp
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=test? ( ros_messages_cxx ) || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4c7956905f90cdc2c1c822678436f32b
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.14.3 b/metadata/md5-cache/dev-ros/test_rosgraph-1.14.3
new file mode 100644
index 000000000000..c0cfdfb41b0b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Unit tests for rosgraph
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=36004a15c0339bcfd879f71ab3b1b0f8
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.14.3 b/metadata/md5-cache/dev-ros/test_roslaunch-1.14.3
new file mode 100644
index 000000000000..dc88fde771d0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Unit tests for roslaunch
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+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=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=049c34f79fde3816b3cd760c60d6ebe6
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.14.3 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.14.3
new file mode 100644
index 000000000000..30e03f852741
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Unit tests for roslib
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c7cf129fbd2e981f620395cd07082d54
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.14.3 b/metadata/md5-cache/dev-ros/test_rosmaster-1.14.3
new file mode 100644
index 000000000000..884b27c2171f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Unit tests for rosmaster
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=84b36ef7daaed21698582cccb302d99c
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.14.3 b/metadata/md5-cache/dev-ros/test_rosparam-1.14.3
new file mode 100644
index 000000000000..25d1f73d4f24
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Unit tests for rosparam
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e3d861aca70a89f9fdb3dd3d3a035b2a
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.14.3 b/metadata/md5-cache/dev-ros/test_rospy-1.14.3
new file mode 100644
index 000000000000..f8d6c59e60a3
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Unit tests for rospy
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=460b5ab79316cc162d89b7c05d7414fb
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.14.3 b/metadata/md5-cache/dev-ros/test_rosservice-1.14.3
new file mode 100644
index 000000000000..fe594c0184d2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Unit tests for rospy
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=62ccda53b67d99e18909f07672b9a763
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.14.3 b/metadata/md5-cache/dev-ros/topic_tools-1.14.3
new file mode 100644
index 000000000000..3db161e03365
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Tools for directing, throttling and selecting ROS topics
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/topic_tools https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=08600867e3bf640a8096994857d57e96
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-1.16.2 b/metadata/md5-cache/dev-ros/voxel_grid-1.16.2
new file mode 100644
index 000000000000..77c025a95873
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Implementation of an efficient 3D voxel grid
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/voxel_grid https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7a3b333f83f6dfe5a0782e85e11a567f
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.14.3 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.14.3
new file mode 100644
index 000000000000..0d88dafe490c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=C++ implementation of the XML-RPC protocol
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6c9dcddaab2b3dcfa90c57072244d64f
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index f3b9ecd45f4c..0dcc352b2b5c 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.2.1 b/metadata/md5-cache/dev-ruby/actioncable-5.2.1
new file mode 100644
index 000000000000..f60293f11e1d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.2.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.2.1:*[ruby_targets_ruby23] dev-ruby/nio4r:2[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.2.1:*[ruby_targets_ruby24] dev-ruby/nio4r:2[ruby_targets_ruby24] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.1:*[ruby_targets_ruby25] dev-ruby/nio4r:2[ruby_targets_ruby25] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby25] dev-ruby/test-unit:2[ruby_targets_ruby25] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Integrated WebSockets for Rails
+EAPI=6
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.2.1:*[ruby_targets_ruby23] dev-ruby/nio4r:2[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.2.1:*[ruby_targets_ruby24] dev-ruby/nio4r:2[ruby_targets_ruby24] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.1:*[ruby_targets_ruby25] dev-ruby/nio4r:2[ruby_targets_ruby25] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RESTRICT=test
+SLOT=5.2
+SRC_URI=https://github.com/rails/rails/archive/v5.2.1.tar.gz -> rails-5.2.1.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0fde23eea7d0387b9fd1263029d5e071
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.2.1 b/metadata/md5-cache/dev-ruby/actionmailer-5.2.1
new file mode 100644
index 000000000000..55cd4f9abdcf
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby23] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby23] ~dev-ruby/activejob-5.2.1[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby24] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby24] ~dev-ruby/activejob-5.2.1[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby25] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby25] ~dev-ruby/activejob-5.2.1[ruby_targets_ruby25] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25] =dev-ruby/mail-2*:*[ruby_targets_ruby25] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Framework for designing email-service layers
+EAPI=6
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby23] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby23] ~dev-ruby/activejob-5.2.1[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby24] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby24] ~dev-ruby/activejob-5.2.1[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby25] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby25] ~dev-ruby/activejob-5.2.1[ruby_targets_ruby25] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25] =dev-ruby/mail-2*:*[ruby_targets_ruby25] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=5.2
+SRC_URI=https://github.com/rails/rails/archive/v5.2.1.tar.gz -> rails-5.2.1.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e137c36d9a9dd7b31fe1d693114fcf74
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.2.1 b/metadata/md5-cache/dev-ruby/actionpack-5.2.1
new file mode 100644
index 000000000000..8f6e33d7db15
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby23] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby24] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby25] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby25] dev-ruby/rack:2.0[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby25] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/capybara-2.13:2[ruby_targets_ruby23] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby23] www-servers/puma[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/capybara-2.13:2[ruby_targets_ruby24] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby24] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby25] dev-ruby/bundler[ruby_targets_ruby25] >=dev-ruby/capybara-2.13:2[ruby_targets_ruby25] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby25] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby25] www-servers/puma[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Eases web-request routing, handling, and response
+EAPI=6
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby23] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby24] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby25] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby25] dev-ruby/rack:2.0[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby25] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=5.2
+SRC_URI=https://github.com/rails/rails/archive/v5.2.1.tar.gz -> rails-5.2.1.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=37f3a1e6f4b5ca2116b2955e12f6e250
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.2.1 b/metadata/md5-cache/dev-ruby/actionview-5.2.1
new file mode 100644
index 000000000000..c6cfff5d0c3e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionview-5.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby25] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25] =dev-ruby/builder-3*:*[ruby_targets_ruby25] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby25] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby23] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby24] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby25] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
+EAPI=6
+HOMEPAGE=https://github.com/rails/rails/
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby25] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25] =dev-ruby/builder-3*:*[ruby_targets_ruby25] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby25] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=5.2
+SRC_URI=https://github.com/rails/rails/archive/v5.2.1.tar.gz -> rails-5.2.1.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b6ddd27d05c0ba21b08f121b697896eb
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.2.1 b/metadata/md5-cache/dev-ruby/activejob-5.2.1
new file mode 100644
index 000000000000..be9928ea4ec3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activejob-5.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby25] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Job framework with pluggable queues
+EAPI=6
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby25] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=5.2
+SRC_URI=https://github.com/rails/rails/archive/v5.2.1.tar.gz -> rails-5.2.1.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c9fd7f829936333e7d91d35b787d62ee
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.2.1 b/metadata/md5-cache/dev-ruby/activemodel-5.2.1
new file mode 100644
index 000000000000..72b6213ef56b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.2.1:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.2.1:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.1:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/railties-5.2.1[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( ~dev-ruby/railties-5.2.1[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-5.2.1[ruby_targets_ruby25] dev-ruby/test-unit:2[ruby_targets_ruby25] dev-ruby/mocha[ruby_targets_ruby25] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
+EAPI=6
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.2.1:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.2.1:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.1:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=5.2
+SRC_URI=https://github.com/rails/rails/archive/v5.2.1.tar.gz -> rails-5.2.1.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=63eac167c16c62e975eaab6c23f6c9de
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.2.1 b/metadata/md5-cache/dev-ruby/activerecord-5.2.1
new file mode 100644
index 000000000000..c5f56953a1dd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby23] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby23] dev-ruby/arel:9.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.18.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby24] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby24] dev-ruby/arel:9.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.18.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby25] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby25] dev-ruby/arel:9.0[ruby_targets_ruby25] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby25] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby25] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby25] ) ) postgres? ( >=dev-ruby/pg-0.18.0:*[ruby_targets_ruby25] ) ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.2.1[ruby_targets_ruby23] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.2.1[ruby_targets_ruby24] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby25] ~dev-ruby/actionmailer-5.2.1[ruby_targets_ruby25] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby25] dev-ruby/mocha[ruby_targets_ruby25] dev-ruby/minitest:5[ruby_targets_ruby25] ) ) test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
+EAPI=6
+HOMEPAGE=https://github.com/rails/rails/
+IUSE=mysql postgres sqlite test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby23] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby23] dev-ruby/arel:9.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.18.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby24] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby24] dev-ruby/arel:9.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.18.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby25] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby25] dev-ruby/arel:9.0[ruby_targets_ruby25] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby25] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby25] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby25] ) ) postgres? ( >=dev-ruby/pg-0.18.0:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=5.2
+SRC_URI=https://github.com/rails/rails/archive/v5.2.1.tar.gz -> rails-5.2.1.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7df2162e56c5c91a2b5d0d59015d9e64
diff --git a/metadata/md5-cache/dev-ruby/activestorage-5.2.0 b/metadata/md5-cache/dev-ruby/activestorage-5.2.0
index b123831873d0..29e504e5f25b 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-5.2.0
+++ b/metadata/md5-cache/dev-ruby/activestorage-5.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Attach cloud and local files in Rails applications
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.2.0:*[ruby_targets_ruby23] ~dev-ruby/activerecord-5.2.0:*[ruby_targets_ruby23] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby23] =dev-ruby/marcel-0.3*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.2.0:*[ruby_targets_ruby24] ~dev-ruby/activerecord-5.2.0:*[ruby_targets_ruby24] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby24] =dev-ruby/marcel-0.3*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.0:*[ruby_targets_ruby25] ~dev-ruby/activerecord-5.2.0:*[ruby_targets_ruby25] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby25] =dev-ruby/marcel-0.3*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.0.tar.gz -> rails-5.2.0.tgz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cd932f947244660d425317bf2f3e0af6
+_md5_=11235b3445e1c0e38b874f300ed9e8c3
diff --git a/metadata/md5-cache/dev-ruby/activestorage-5.2.1 b/metadata/md5-cache/dev-ruby/activestorage-5.2.1
new file mode 100644
index 000000000000..3a1d515cf654
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activestorage-5.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/mupdf ) test? ( ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.2.1:*[ruby_targets_ruby23] ~dev-ruby/activerecord-5.2.1:*[ruby_targets_ruby23] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby23] =dev-ruby/marcel-0.3*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.2.1:*[ruby_targets_ruby24] ~dev-ruby/activerecord-5.2.1:*[ruby_targets_ruby24] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby24] =dev-ruby/marcel-0.3*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.1:*[ruby_targets_ruby25] ~dev-ruby/activerecord-5.2.1:*[ruby_targets_ruby25] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby25] =dev-ruby/marcel-0.3*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/railties-5.2.1[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/mini_magick[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( ~dev-ruby/railties-5.2.1[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/mini_magick[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-5.2.1[ruby_targets_ruby25] dev-ruby/test-unit:2[ruby_targets_ruby25] dev-ruby/mini_magick[ruby_targets_ruby25] dev-ruby/mocha[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] dev-ruby/sqlite3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Attach cloud and local files in Rails applications
+EAPI=6
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.2.1:*[ruby_targets_ruby23] ~dev-ruby/activerecord-5.2.1:*[ruby_targets_ruby23] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby23] =dev-ruby/marcel-0.3*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.2.1:*[ruby_targets_ruby24] ~dev-ruby/activerecord-5.2.1:*[ruby_targets_ruby24] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby24] =dev-ruby/marcel-0.3*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.1:*[ruby_targets_ruby25] ~dev-ruby/activerecord-5.2.1:*[ruby_targets_ruby25] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby25] =dev-ruby/marcel-0.3*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=5.2
+SRC_URI=https://github.com/rails/rails/archive/v5.2.1.tar.gz -> rails-5.2.1.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dff07a010327766cf7341a7485fa99d2
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.2.1 b/metadata/md5-cache/dev-ruby/activesupport-5.2.1
new file mode 100644
index 000000000000..60aa22c67d06
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby23] || ( dev-ruby/i18n:1[ruby_targets_ruby23] dev-ruby/i18n:0.9[ruby_targets_ruby23] dev-ruby/i18n:0.8[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] ) >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby24] || ( dev-ruby/i18n:1[ruby_targets_ruby24] dev-ruby/i18n:0.9[ruby_targets_ruby24] dev-ruby/i18n:0.8[ruby_targets_ruby24] dev-ruby/i18n:0.7[ruby_targets_ruby24] ) >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25] || ( dev-ruby/i18n:1[ruby_targets_ruby25] dev-ruby/i18n:0.9[ruby_targets_ruby25] dev-ruby/i18n:0.8[ruby_targets_ruby25] dev-ruby/i18n:0.7[ruby_targets_ruby25] ) >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby25] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby23] >=dev-ruby/builder-3.1.0[ruby_targets_ruby23] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby24] >=dev-ruby/builder-3.1.0[ruby_targets_ruby24] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby25] >=dev-ruby/builder-3.1.0[ruby_targets_ruby25] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby25] dev-ruby/rack[ruby_targets_ruby25] dev-ruby/mocha[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Utility Classes and Extension to the Standard Library
+EAPI=6
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby23] || ( dev-ruby/i18n:1[ruby_targets_ruby23] dev-ruby/i18n:0.9[ruby_targets_ruby23] dev-ruby/i18n:0.8[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] ) >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby24] || ( dev-ruby/i18n:1[ruby_targets_ruby24] dev-ruby/i18n:0.9[ruby_targets_ruby24] dev-ruby/i18n:0.8[ruby_targets_ruby24] dev-ruby/i18n:0.7[ruby_targets_ruby24] ) >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25] || ( dev-ruby/i18n:1[ruby_targets_ruby25] dev-ruby/i18n:0.9[ruby_targets_ruby25] dev-ruby/i18n:0.8[ruby_targets_ruby25] dev-ruby/i18n:0.7[ruby_targets_ruby25] ) >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby25] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=5.2
+SRC_URI=https://github.com/rails/rails/archive/v5.2.1.tar.gz -> rails-5.2.1.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3378b5fcf1615f1bd69886b7effa62f8
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1 b/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1
index 00d6f9f3eece..f4d41f1aa8d6 100644
--- a/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0:*[ruby_targets_ruby24] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3[ruby_targets_ruby23] >=dev-ruby/rake-0.10[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby23] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby23] dev-util/cucumber[ruby_targets_ruby23] dev-util/aruba[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3[ruby_targets_ruby24] >=dev-ruby/rake-0.10[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby24] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby24] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby24] dev-util/cucumber[ruby_targets_ruby24] dev-util/aruba[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0:*[ruby_targets_ruby24] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby25] >=dev-ruby/railties-3.0:*[ruby_targets_ruby25] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3[ruby_targets_ruby23] >=dev-ruby/rake-0.10[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby23] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby23] dev-util/cucumber[ruby_targets_ruby23] dev-util/aruba[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3[ruby_targets_ruby24] >=dev-ruby/rake-0.10[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby24] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby24] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby24] dev-util/cucumber[ruby_targets_ruby24] dev-util/aruba[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby25] >=dev-ruby/uglifier-1.3[ruby_targets_ruby25] >=dev-ruby/rake-0.10[ruby_targets_ruby25] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby25] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby25] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby25] dev-util/cucumber[ruby_targets_ruby25] dev-util/aruba[ruby_targets_ruby25] dev-ruby/sqlite3[ruby_targets_ruby25] dev-ruby/bundler[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Write specs for your Rails 3+ generators
 EAPI=5
 HOMEPAGE=https://github.com/alexrothenberg/ammeter
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0:*[ruby_targets_ruby24] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0:*[ruby_targets_ruby24] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby25] >=dev-ruby/railties-3.0:*[ruby_targets_ruby25] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/ammeter-1.1.4.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a341662c622b914d9a892363c5c828a2
+_md5_=142fa77511ab4a6014b5cd897771d678
diff --git a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1 b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
index 19d33e71eb37..553efc5fb0d8 100644
--- a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
+++ b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Like your annoying friend that asks you questions all the time
 EAPI=5
 HOMEPAGE=http://solutious.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/annoy-0.5.6.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a4fcf248e9bc9e878c821b25bffca2c2
+_md5_=a29817a9b5d32d0b0021886da22f10f7
diff --git a/metadata/md5-cache/dev-ruby/arel-helpers-2.7.0 b/metadata/md5-cache/dev-ruby/arel-helpers-2.7.0
index 2a6796aacd75..dff7cd4270f7 100644
--- a/metadata/md5-cache/dev-ruby/arel-helpers-2.7.0
+++ b/metadata/md5-cache/dev-ruby/arel-helpers-2.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.2[ruby_targets_ruby23] dev-ruby/activerecord:5.1[ruby_targets_ruby23] dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( dev-ruby/activerecord:5.2[ruby_targets_ruby24] dev-ruby/activerecord:5.1[ruby_targets_ruby24] dev-ruby/activerecord:5.0[ruby_targets_ruby24] dev-ruby/activerecord:4.2[ruby_targets_ruby24] ) ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rr[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rr[ruby_targets_ruby24] dev-ruby/activerecord[ruby_targets_ruby24,sqlite] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.2[ruby_targets_ruby23] dev-ruby/activerecord:5.1[ruby_targets_ruby23] dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( dev-ruby/activerecord:5.2[ruby_targets_ruby24] dev-ruby/activerecord:5.1[ruby_targets_ruby24] dev-ruby/activerecord:5.0[ruby_targets_ruby24] dev-ruby/activerecord:4.2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( || ( dev-ruby/activerecord:5.2[ruby_targets_ruby25] dev-ruby/activerecord:5.1[ruby_targets_ruby25] dev-ruby/activerecord:5.0[ruby_targets_ruby25] dev-ruby/activerecord:4.2[ruby_targets_ruby25] ) ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rr[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rr[ruby_targets_ruby24] dev-ruby/activerecord[ruby_targets_ruby24,sqlite] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rr[ruby_targets_ruby25] dev-ruby/activerecord[ruby_targets_ruby25,sqlite] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Tools to help construct database queries
 EAPI=6
 HOMEPAGE=https://github.com/camertron/arel-helpers
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.2[ruby_targets_ruby23] dev-ruby/activerecord:5.1[ruby_targets_ruby23] dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( dev-ruby/activerecord:5.2[ruby_targets_ruby24] dev-ruby/activerecord:5.1[ruby_targets_ruby24] dev-ruby/activerecord:5.0[ruby_targets_ruby24] dev-ruby/activerecord:4.2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.2[ruby_targets_ruby23] dev-ruby/activerecord:5.1[ruby_targets_ruby23] dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( dev-ruby/activerecord:5.2[ruby_targets_ruby24] dev-ruby/activerecord:5.1[ruby_targets_ruby24] dev-ruby/activerecord:5.0[ruby_targets_ruby24] dev-ruby/activerecord:4.2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( || ( dev-ruby/activerecord:5.2[ruby_targets_ruby25] dev-ruby/activerecord:5.1[ruby_targets_ruby25] dev-ruby/activerecord:5.0[ruby_targets_ruby25] dev-ruby/activerecord:4.2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/arel-helpers-2.7.0.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bc1635e63c462fd9c6dd85fda31888ea
+_md5_=1a6e0eab488f782013856f7509ba649c
diff --git a/metadata/md5-cache/dev-ruby/astrolabe-1.3.1 b/metadata/md5-cache/dev-ruby/astrolabe-1.3.1
index f8ccca052ad2..349d24e7a64b 100644
--- a/metadata/md5-cache/dev-ruby/astrolabe-1.3.1
+++ b/metadata/md5-cache/dev-ruby/astrolabe-1.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=An object-oriented AST extension for Parser
 EAPI=5
 HOMEPAGE=https://github.com/yujinakayama/astrolabe
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/astrolabe-1.3.1.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cab2d8a44a64fb603bc7e42478fe33f9
+_md5_=ff88d8657be20eed13221543948930ef
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.2.6 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.2.6
index 832a8bf91c6b..ccd1222c803a 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.2.6
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.2.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rails[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] dev-ruby/rspec-rails[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
 EAPI=6
 HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=7
 SRC_URI=mirror://rubygems/autoprefixer-rails-7.2.6.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=675ed5f0f1bbbfa5a1a74b7ac15f9c27
+_md5_=392fec94790078644828690bd35402cd
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.6.5 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.6.5
index 2a21de0c978b..a74bea171829 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.6.5
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.6.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rails[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] dev-ruby/rspec-rails[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
 EAPI=6
 HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=8
 SRC_URI=mirror://rubygems/autoprefixer-rails-8.6.5.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3c4afc443e2099b3baec8002ebb645f9
+_md5_=62c219a1e51129194005bf7d64bd8a93
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.1.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.1.0
new file mode 100644
index 000000000000..a76db844e61f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rails[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] dev-ruby/rspec-rails[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
+EAPI=6
+HOMEPAGE=https://github.com/ai/autoprefixer-rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=9
+SRC_URI=mirror://rubygems/autoprefixer-rails-9.1.0.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=541d241f7a680c8ad89cce1f3a8da3dc
diff --git a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1 b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
index dcecc49eeb50..6c9fb78f22c9 100644
--- a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
+++ b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby23] <dev-ruby/ice_nine-0.12[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby23] <dev-ruby/thread_safe-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby24] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby24] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby24] <dev-ruby/ice_nine-0.12[ruby_targets_ruby24] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby24] <dev-ruby/thread_safe-1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby23] <dev-ruby/ice_nine-0.12[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby23] <dev-ruby/thread_safe-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby24] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby24] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby24] <dev-ruby/ice_nine-0.12[ruby_targets_ruby24] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby24] <dev-ruby/thread_safe-1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby25] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby25] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby25] <dev-ruby/ice_nine-0.12[ruby_targets_ruby25] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby25] <dev-ruby/thread_safe-1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Define types with optional constraints for use within axiom and other libraries
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/axiom-types https://github.com/dkubb/axiom-types
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby23] <dev-ruby/ice_nine-0.12[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby23] <dev-ruby/thread_safe-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby24] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby24] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby24] <dev-ruby/ice_nine-0.12[ruby_targets_ruby24] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby24] <dev-ruby/thread_safe-1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby23] <dev-ruby/ice_nine-0.12[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby23] <dev-ruby/thread_safe-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby24] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby24] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby24] <dev-ruby/ice_nine-0.12[ruby_targets_ruby24] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby24] <dev-ruby/thread_safe-1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby25] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby25] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby25] <dev-ruby/ice_nine-0.12[ruby_targets_ruby25] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby25] <dev-ruby/thread_safe-1[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/axiom-types-0.1.1.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bc81d249c6983aebf59f9e8d4123619a
+_md5_=917d48fb5b3ff91f14b82d119e4152c1
diff --git a/metadata/md5-cache/dev-ruby/bogus-0.1.6 b/metadata/md5-cache/dev-ruby/bogus-0.1.6
index cd80f11f4ab3..c684a35837c8 100644
--- a/metadata/md5-cache/dev-ruby/bogus-0.1.6
+++ b/metadata/md5-cache/dev-ruby/bogus-0.1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Ensuring that the things you stub or mock actually exist
 EAPI=6
 HOMEPAGE=https://github.com/psyho/bogus
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/bogus-0.1.6.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fc33d4a71055f32a712735d4c2f95a5a
+_md5_=050f4bb6a789b91d326a79ed234a1ab0
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.8.1 b/metadata/md5-cache/dev-ruby/bunny-2.8.1
deleted file mode 100644
index 2352f04f4b83..000000000000
--- a/metadata/md5-cache/dev-ruby/bunny-2.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Another synchronous Ruby AMQP client
-EAPI=6
-HOMEPAGE=https://github.com/celldee/bunny
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/bunny-2.8.1.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5a4ed0825d08494a5e8980569f1ee2cf
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.9.1 b/metadata/md5-cache/dev-ruby/bunny-2.9.1
deleted file mode 100644
index 507ae27a8c21..000000000000
--- a/metadata/md5-cache/dev-ruby/bunny-2.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Another synchronous Ruby AMQP client
-EAPI=6
-HOMEPAGE=https://github.com/celldee/bunny
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/bunny-2.9.1.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9f091aa283b2ac564d599eadc715201b
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.9.2 b/metadata/md5-cache/dev-ruby/bunny-2.9.2
index ea13b92dafcf..56285c4b6e02 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.9.2
+++ b/metadata/md5-cache/dev-ruby/bunny-2.9.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Another synchronous Ruby AMQP client
 EAPI=6
 HOMEPAGE=https://github.com/celldee/bunny
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/bunny-2.9.2.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9f091aa283b2ac564d599eadc715201b
+_md5_=5ac38b0e23e8f2ca17cf52904b7a7321
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.5.1 b/metadata/md5-cache/dev-ruby/capybara-3.5.1
new file mode 100644
index 000000000000..5f7221c16fd9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capybara-3.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( www-client/firefox ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby23] dev-ruby/sinatra:2[ruby_targets_ruby23] www-servers/puma[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby24] dev-ruby/sinatra:2[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby25] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby25] dev-ruby/sinatra:2[ruby_targets_ruby25] www-servers/puma[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby23] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby23] >=dev-ruby/xpath-3.1:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/xpath-3.1:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/xpath-3.1:3[ruby_targets_ruby25] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
+EAPI=6
+HOMEPAGE=https://github.com/jnicklas/capybara
+IUSE=test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby23] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby23] >=dev-ruby/xpath-3.1:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/xpath-3.1:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/xpath-3.1:3[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=3
+SRC_URI=mirror://rubygems/capybara-3.5.1.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1
+_md5_=7325bde2c6bd0a2f017132f0da68895a
diff --git a/metadata/md5-cache/dev-ruby/coercible-1.0.0 b/metadata/md5-cache/dev-ruby/coercible-1.0.0
index e92f03b877c5..148eacbdfd3d 100644
--- a/metadata/md5-cache/dev-ruby/coercible-1.0.0
+++ b/metadata/md5-cache/dev-ruby/coercible-1.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby24] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby24] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby25] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Powerful, flexible and configurable coercion library
 EAPI=5
 HOMEPAGE=https://github.com/solnic/coercible https://rubygems.org/gems/coercible
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby24] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby24] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby25] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/coercible-1.0.0.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5078749cc0a0c8eb615967cdc06cf608
+_md5_=c803fa3e4a9af2451ef53e43c01866b7
diff --git a/metadata/md5-cache/dev-ruby/combustion-0.9.1 b/metadata/md5-cache/dev-ruby/combustion-0.9.1
index 605917f491ff..6977b98c8897 100644
--- a/metadata/md5-cache/dev-ruby/combustion-0.9.1
+++ b/metadata/md5-cache/dev-ruby/combustion-0.9.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/thor-0.14.6[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/thor-0.14.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby25] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby25] >=dev-ruby/thor-0.14.6[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Elegant Rails Engine Testing
 EAPI=6
 HOMEPAGE=https://github.com/pat/combustion
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/thor-0.14.6[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/thor-0.14.6[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby25] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby25] >=dev-ruby/thor-0.14.6[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/combustion-0.9.1.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f41e795c053786acad0179752c7e7856
+_md5_=43e77ce0a82f0ab6aeee13084c9f960a
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.18.0 b/metadata/md5-cache/dev-ruby/fakefs-0.18.0
new file mode 100644
index 000000000000..da6ae49786a2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.18.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby25] >=dev-ruby/minitest-5.5[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A fake filesystem. Use it in your tests
+EAPI=6
+HOMEPAGE=https://github.com/defunkt/fakefs
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/defunkt/fakefs/archive/v0.18.0.tar.gz -> fakefs-0.18.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=949d8635d4504734b109dbbd3238b3e7
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.12.2 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.12.2
index 387cb6f4359c..229edd63a153 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.12.2
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.12.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby24] <dev-ruby/faraday-1[ruby_targets_ruby24] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby24] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby24] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby24] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby24] ) ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/addressable[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/webmock:3[ruby_targets_ruby23] dev-ruby/json:0[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] >=dev-ruby/hashie-1.2[ruby_targets_ruby23] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/addressable[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/webmock:3[ruby_targets_ruby24] dev-ruby/json:0[ruby_targets_ruby24] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby24] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby24] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby24] >=dev-ruby/hashie-1.2[ruby_targets_ruby24] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby24] <dev-ruby/faraday-1[ruby_targets_ruby24] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby24] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby24] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby24] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby25] <dev-ruby/faraday-1[ruby_targets_ruby25] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby25] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby25] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby25] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby25] ) ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/addressable[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/webmock:3[ruby_targets_ruby23] dev-ruby/json:0[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] >=dev-ruby/hashie-1.2[ruby_targets_ruby23] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/addressable[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/webmock:3[ruby_targets_ruby24] dev-ruby/json:0[ruby_targets_ruby24] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby24] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby24] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby24] >=dev-ruby/hashie-1.2[ruby_targets_ruby24] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] dev-ruby/addressable[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] dev-ruby/webmock:3[ruby_targets_ruby25] dev-ruby/json:0[ruby_targets_ruby25] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby25] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby25] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby25] >=dev-ruby/hashie-1.2[ruby_targets_ruby25] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Various middleware for Faraday
 EAPI=6
 HOMEPAGE=https://github.com/lostisland/faraday_middleware
-IUSE=+parsexml +oauth +mashify +rashify test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=+parsexml +oauth +mashify +rashify test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby24] <dev-ruby/faraday-1[ruby_targets_ruby24] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby24] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby24] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby24] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby24] <dev-ruby/faraday-1[ruby_targets_ruby24] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby24] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby24] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby24] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby25] <dev-ruby/faraday-1[ruby_targets_ruby25] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby25] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby25] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby25] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v0.12.2.tar.gz -> faraday_middleware-0.12.2.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=264135f13900d47e4e8340c39541aa35
+_md5_=a7ce83716740528abb1b11cf060f3ac8
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.9.5-r1 b/metadata/md5-cache/dev-ruby/i18n-0.9.5-r1
index 679f5d10b499..51aeb4b41b2c 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.9.5-r1
+++ b/metadata/md5-cache/dev-ruby/i18n-0.9.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Add Internationalization support to your Ruby application
 EAPI=6
 HOMEPAGE=http://rails-i18n.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0.9
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v0.9.5.tar.gz -> i18n-0.9.5.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d434fd05f8687022e4687ddf93645e10
+_md5_=05f1ad82dc7396e66ed0fbb953c0f2b1
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.0.0 b/metadata/md5-cache/dev-ruby/i18n-1.0.0
deleted file mode 100644
index 060b957d14a6..000000000000
--- a/metadata/md5-cache/dev-ruby/i18n-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/test_declarative[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/test_declarative[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Add Internationalization support to your Ruby application
-EAPI=6
-HOMEPAGE=http://rails-i18n.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=1
-SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.0.0.tar.gz -> i18n-1.0.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=913800fa6a8d987d448e12a8c82dccfb
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.1.0 b/metadata/md5-cache/dev-ruby/i18n-1.1.0
new file mode 100644
index 000000000000..9e4025907974
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/i18n-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/test_declarative[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/test_declarative[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby25] dev-ruby/bundler[ruby_targets_ruby25] >=dev-ruby/mocha-0.13[ruby_targets_ruby25] dev-ruby/test_declarative[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Add Internationalization support to your Ruby application
+EAPI=6
+HOMEPAGE=http://rails-i18n.org/
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=1
+SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.1.0.tar.gz -> i18n-1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d9d804769bbc574609702693e65a004e
diff --git a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2 b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2
index b149e8e22719..ebdd4ff6fd0b 100644
--- a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2
+++ b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Deep Freeze Ruby Objects
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/ice_nine https://github.com/dkubb/ice_nine
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ice_nine-0.11.2.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d5d4198267efd94702bcd05c223cacb0
+_md5_=c099cec2ad811a4e5aa5ee0b37dc3339
diff --git a/metadata/md5-cache/dev-ruby/marcel-0.3.2-r1 b/metadata/md5-cache/dev-ruby/marcel-0.3.2-r1
index f7cca3224423..accb7b75536c 100644
--- a/metadata/md5-cache/dev-ruby/marcel-0.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/marcel-0.3.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Simple mime type detection using magic numbers, filenames, and exten
 EAPI=6
 HOMEPAGE=https://github.com/basecamp/marcel
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/mimemagic-0.3.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mimemagic-0.3.2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mimemagic-0.3.2:0[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/marcel-0.3.2.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1c35e903cbabba1520e5a4d09308c412
+_md5_=be07db0eb0514db6af72cf7a5ff068b2
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.2 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.2
index 3b95da45de38..7b7356d5dbcb 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.2
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Fast mime detection by extension or content
 EAPI=5
 HOMEPAGE=https://github.com/minad/mimemagic
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/mimemagic-0.3.2.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f0e05a2bd2aa66db1a8c9036a76e12e7
+_md5_=7f71c2317d6a31941818bace78e26592
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.8.0 b/metadata/md5-cache/dev-ruby/mini_magick-4.8.0
index 457f493139b3..7c06f7d54456 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.8.0
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=Manipulate images with minimal use of memory
 EAPI=6
 HOMEPAGE=https://github.com/minimagick/minimagick
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=media-gfx/imagemagick ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.8.0.tar.gz -> mini_magick-4.8.0.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=85aff19fe2453cb46b21fba2cef8c671
+_md5_=a40175e95331b3a14d18dcf73f16ea02
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.5.4 b/metadata/md5-cache/dev-ruby/oauth-0.5.4
index a05ee8d8f6b8..1bda170d804f 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.5.4
+++ b/metadata/md5-cache/dev-ruby/oauth-0.5.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/actionpack:5.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/mocha:1.0[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/actionpack:5.1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/actionpack:5.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/mocha:1.0[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/actionpack:5.2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25] dev-ruby/mocha:1.0[ruby_targets_ruby25] dev-ruby/webmock[ruby_targets_ruby25] dev-ruby/rack[ruby_targets_ruby25] dev-ruby/actionpack:5.2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A RubyGem for implementing both OAuth clients and servers
 EAPI=6
 HOMEPAGE=https://github.com/oauth-xx/oauth-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/oauth-xx/oauth-ruby/archive/v0.5.4.tar.gz -> oauth-0.5.4.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ec5880fd78c3258e742fe2548d12adf6
+_md5_=9e6fcd43269a4ca71d81316c1497573f
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13-r1 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13-r1
index 1f7bafe15f25..8539ef2cab08 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13-r1
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Library that implements a subset of the Ruby 1.9 Process::spawn
 EAPI=6
 HOMEPAGE=https://github.com/rtomayko/posix-spawn/
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT LGPL-2.1
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/posix-spawn-0.3.13.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=010e143cb0ba2555356ad90127a780bc
+_md5_=4960fc566882568e5194b4290999aa84
diff --git a/metadata/md5-cache/dev-ruby/rails-5.2.0 b/metadata/md5-cache/dev-ruby/rails-5.2.0
index 1632c22a4623..c2b22ab2d338 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.2.0
+++ b/metadata/md5-cache/dev-ruby/rails-5.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=ruby on rails is a web-application and persistance framework
 EAPI=6
 HOMEPAGE=http://www.rubyonrails.org
 IUSE=+asset-pipeline test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/actioncable-5.2.0[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.2.0[ruby_targets_ruby23] ~dev-ruby/actionpack-5.2.0[ruby_targets_ruby23] ~dev-ruby/actionview-5.2.0[ruby_targets_ruby23] ~dev-ruby/activejob-5.2.0[ruby_targets_ruby23] ~dev-ruby/activemodel-5.2.0[ruby_targets_ruby23] ~dev-ruby/activerecord-5.2.0[ruby_targets_ruby23] ~dev-ruby/activestorage-5.2.0[ruby_targets_ruby23] ~dev-ruby/activesupport-5.2.0[ruby_targets_ruby23] ~dev-ruby/railties-5.2.0[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actioncable-5.2.0[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.2.0[ruby_targets_ruby24] ~dev-ruby/actionpack-5.2.0[ruby_targets_ruby24] ~dev-ruby/actionview-5.2.0[ruby_targets_ruby24] ~dev-ruby/activejob-5.2.0[ruby_targets_ruby24] ~dev-ruby/activemodel-5.2.0[ruby_targets_ruby24] ~dev-ruby/activerecord-5.2.0[ruby_targets_ruby24] ~dev-ruby/activestorage-5.2.0[ruby_targets_ruby24] ~dev-ruby/activesupport-5.2.0[ruby_targets_ruby24] ~dev-ruby/railties-5.2.0[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( ~dev-ruby/actioncable-5.2.0[ruby_targets_ruby25] ~dev-ruby/actionmailer-5.2.0[ruby_targets_ruby25] ~dev-ruby/actionpack-5.2.0[ruby_targets_ruby25] ~dev-ruby/actionview-5.2.0[ruby_targets_ruby25] ~dev-ruby/activejob-5.2.0[ruby_targets_ruby25] ~dev-ruby/activemodel-5.2.0[ruby_targets_ruby25] ~dev-ruby/activerecord-5.2.0[ruby_targets_ruby25] ~dev-ruby/activestorage-5.2.0[ruby_targets_ruby25] ~dev-ruby/activesupport-5.2.0[ruby_targets_ruby25] ~dev-ruby/railties-5.2.0[ruby_targets_ruby25] >=dev-ruby/bundler-1.3[ruby_targets_ruby25] =dev-ruby/bundler-1*[ruby_targets_ruby25] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby25] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby25] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby25] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=5.2
 SRC_URI=mirror://rubygems/rails-5.2.0.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a57b90f98e92af06ac02442f02582945
+_md5_=ec517d266969c2963a02005a4196b07f
diff --git a/metadata/md5-cache/dev-ruby/rails-5.2.1 b/metadata/md5-cache/dev-ruby/rails-5.2.1
new file mode 100644
index 000000000000..6e09ce440b54
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rails-5.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/actioncable-5.2.1[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.2.1[ruby_targets_ruby23] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby23] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby23] ~dev-ruby/activejob-5.2.1[ruby_targets_ruby23] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby23] ~dev-ruby/activerecord-5.2.1[ruby_targets_ruby23] ~dev-ruby/activestorage-5.2.1[ruby_targets_ruby23] ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby23] ~dev-ruby/railties-5.2.1[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actioncable-5.2.1[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.2.1[ruby_targets_ruby24] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby24] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby24] ~dev-ruby/activejob-5.2.1[ruby_targets_ruby24] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby24] ~dev-ruby/activerecord-5.2.1[ruby_targets_ruby24] ~dev-ruby/activestorage-5.2.1[ruby_targets_ruby24] ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby24] ~dev-ruby/railties-5.2.1[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( ~dev-ruby/actioncable-5.2.1[ruby_targets_ruby25] ~dev-ruby/actionmailer-5.2.1[ruby_targets_ruby25] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby25] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby25] ~dev-ruby/activejob-5.2.1[ruby_targets_ruby25] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby25] ~dev-ruby/activerecord-5.2.1[ruby_targets_ruby25] ~dev-ruby/activestorage-5.2.1[ruby_targets_ruby25] ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby25] ~dev-ruby/railties-5.2.1[ruby_targets_ruby25] >=dev-ruby/bundler-1.3[ruby_targets_ruby25] =dev-ruby/bundler-1*[ruby_targets_ruby25] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby25] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby25] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby25] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby25] ) ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=ruby on rails is a web-application and persistance framework
+EAPI=6
+HOMEPAGE=http://www.rubyonrails.org
+IUSE=+asset-pipeline test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/actioncable-5.2.1[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.2.1[ruby_targets_ruby23] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby23] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby23] ~dev-ruby/activejob-5.2.1[ruby_targets_ruby23] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby23] ~dev-ruby/activerecord-5.2.1[ruby_targets_ruby23] ~dev-ruby/activestorage-5.2.1[ruby_targets_ruby23] ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby23] ~dev-ruby/railties-5.2.1[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actioncable-5.2.1[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.2.1[ruby_targets_ruby24] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby24] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby24] ~dev-ruby/activejob-5.2.1[ruby_targets_ruby24] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby24] ~dev-ruby/activerecord-5.2.1[ruby_targets_ruby24] ~dev-ruby/activestorage-5.2.1[ruby_targets_ruby24] ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby24] ~dev-ruby/railties-5.2.1[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( ~dev-ruby/actioncable-5.2.1[ruby_targets_ruby25] ~dev-ruby/actionmailer-5.2.1[ruby_targets_ruby25] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby25] ~dev-ruby/actionview-5.2.1[ruby_targets_ruby25] ~dev-ruby/activejob-5.2.1[ruby_targets_ruby25] ~dev-ruby/activemodel-5.2.1[ruby_targets_ruby25] ~dev-ruby/activerecord-5.2.1[ruby_targets_ruby25] ~dev-ruby/activestorage-5.2.1[ruby_targets_ruby25] ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby25] ~dev-ruby/railties-5.2.1[ruby_targets_ruby25] >=dev-ruby/bundler-1.3[ruby_targets_ruby25] =dev-ruby/bundler-1*[ruby_targets_ruby25] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby25] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby25] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby25] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=5.2
+SRC_URI=mirror://rubygems/rails-5.2.1.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bbec4f65cf1596f930b26ece4c17936a
diff --git a/metadata/md5-cache/dev-ruby/railties-5.2.1 b/metadata/md5-cache/dev-ruby/railties-5.2.1
new file mode 100644
index 000000000000..eeebd4eeec42
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/railties-5.2.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby23] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] dev-ruby/method_source[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby24] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] dev-ruby/method_source[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby25] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby25] >=dev-ruby/thor-0.18.1[ruby_targets_ruby25] >=dev-ruby/rake-0.8.7[ruby_targets_ruby25] dev-ruby/method_source[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/actionview-5.2.1[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( ~dev-ruby/actionview-5.2.1[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/actionview-5.2.1[ruby_targets_ruby25] dev-ruby/mocha:0.14[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Tools for creating, working with, and running Rails applications
+EAPI=6
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=>=app-eselect/eselect-rails-0.23 ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby23] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] dev-ruby/method_source[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby24] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] dev-ruby/method_source[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.1[ruby_targets_ruby25] ~dev-ruby/actionpack-5.2.1[ruby_targets_ruby25] >=dev-ruby/thor-0.18.1[ruby_targets_ruby25] >=dev-ruby/rake-0.8.7[ruby_targets_ruby25] dev-ruby/method_source[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RESTRICT=test
+SLOT=5.2
+SRC_URI=https://github.com/rails/rails/archive/v5.2.1.tar.gz -> rails-5.2.1.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6a0f5db67963f83bb7d3ecb01ac337b6
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.16.0 b/metadata/md5-cache/dev-ruby/rmagick-2.16.0
index c48dce3322bb..704c2f13f058 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-2.16.0
+++ b/metadata/md5-cache/dev-ruby/rmagick-2.16.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rmagick-2.16.0.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=17f4e82389e25ff54a0c7ca84148acd8
+_md5_=9aeed7e5b99864b419899d4eaaf4b23a
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.8.0 b/metadata/md5-cache/dev-ruby/rspec-3.8.0
new file mode 100644
index 000000000000..8563728950e5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-3.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby25] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby25] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=6
+HOMEPAGE=https://github.com/rspec/rspec
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby25] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby25] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=3
+SRC_URI=mirror://rubygems/rspec-3.8.0.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f415ef40ae6e1b45665964524dd5bec2
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.8.0 b/metadata/md5-cache/dev-ruby/rspec-core-3.8.0
new file mode 100644
index 000000000000..7c1389df8651
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby25] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] ) ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby23] dev-ruby/syntax[ruby_targets_ruby23] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] dev-ruby/syntax[ruby_targets_ruby24] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby25] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] dev-ruby/syntax[ruby_targets_ruby25] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby25] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=6
+HOMEPAGE=https://github.com/rspec/rspec-core
+IUSE=highlight test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby25] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-core/archive/v3.8.0.tar.gz -> rspec-core-3.8.0-git.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=316a7d8206abf773d05db92ec3f1da5f
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.0
new file mode 100644
index 000000000000..e6320db4866f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] <dev-ruby/diff-lcs-2[ruby_targets_ruby25] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby25] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=6
+HOMEPAGE=https://github.com/rspec/rspec-expectations
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] <dev-ruby/diff-lcs-2[ruby_targets_ruby25] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.8.0.tar.gz -> rspec-expectations-3.8.0-git.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f665734cfc44dfe2d5694a18d5bf49b6
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.1 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.1
new file mode 100644
index 000000000000..140ff122bdde
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] <dev-ruby/diff-lcs-2[ruby_targets_ruby25] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby25] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=6
+HOMEPAGE=https://github.com/rspec/rspec-expectations
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] <dev-ruby/diff-lcs-2[ruby_targets_ruby25] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.8.1.tar.gz -> rspec-expectations-3.8.1-git.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f665734cfc44dfe2d5694a18d5bf49b6
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.0
new file mode 100644
index 000000000000..82420841e531
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] =dev-ruby/diff-lcs-1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=6
+HOMEPAGE=https://github.com/rspec/rspec-mocks
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] =dev-ruby/diff-lcs-1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.8.0.tar.gz -> rspec-mocks-3.8.0-git.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5ff9a3d28b7dfd439945c904d468c9df
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.8.0 b/metadata/md5-cache/dev-ruby/rspec-rails-3.8.0
new file mode 100644
index 000000000000..306d79bd25a4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby24] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0:*[ruby_targets_ruby24] =dev-ruby/rspec-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby25] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby25] >=dev-ruby/railties-3.0:*[ruby_targets_ruby25] =dev-ruby/rspec-3.8*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby23] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby23] ~dev-ruby/rspec-rails-3.8.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby24] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby24] ~dev-ruby/rspec-rails-3.8.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby25] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby25] ~dev-ruby/rspec-rails-3.8.0[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=RSpec's official Ruby on Rails plugin
+EAPI=6
+HOMEPAGE=http://rspec.info/
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby24] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0:*[ruby_targets_ruby24] =dev-ruby/rspec-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby25] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby25] >=dev-ruby/railties-3.0:*[ruby_targets_ruby25] =dev-ruby/rspec-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.8.0.tar.gz -> rspec-rails-3.8.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ba577a2800cf6414dc49b62d96f79179
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.7.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.7.0
deleted file mode 100644
index 20fd5f288138..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-3.7.0:3[ruby_targets_ruby23] dev-ruby/thread_order[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-3.7.0:3[ruby_targets_ruby24] dev-ruby/thread_order[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=6
-HOMEPAGE=https://github.com/rspec/rspec-support
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-support/archive/v3.7.0.tar.gz -> rspec-support-3.7.0-git.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=28ae1309339c6dcc9e2d60704bd6fd60
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.8.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.8.0
new file mode 100644
index 000000000000..1400f84dbcab
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-3.8.0:3[ruby_targets_ruby23] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-3.8.0:3[ruby_targets_ruby24] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-3.8.0:3[ruby_targets_ruby25] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=6
+HOMEPAGE=https://github.com/rspec/rspec-support
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-support/archive/v3.8.0.tar.gz -> rspec-support-3.8.0-git.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a60708045c1408b6bc23ef668dfb8cc9
diff --git a/metadata/md5-cache/dev-ruby/virtus-1.0.5 b/metadata/md5-cache/dev-ruby/virtus-1.0.5
index b1148974c17f..150d6b925983 100644
--- a/metadata/md5-cache/dev-ruby/virtus-1.0.5
+++ b/metadata/md5-cache/dev-ruby/virtus-1.0.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby23] <dev-ruby/axiom-types-1[ruby_targets_ruby23] >=dev-ruby/coercible-1.0[ruby_targets_ruby23] <dev-ruby/coercible-2[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby23] <dev-ruby/descendants_tracker-1[ruby_targets_ruby23] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby23] <dev-ruby/equalizer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby24] <dev-ruby/axiom-types-1[ruby_targets_ruby24] >=dev-ruby/coercible-1.0[ruby_targets_ruby24] <dev-ruby/coercible-2[ruby_targets_ruby24] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby24] <dev-ruby/descendants_tracker-1[ruby_targets_ruby24] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby24] <dev-ruby/equalizer-1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/inflecto[ruby_targets_ruby23] dev-ruby/bogus[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/inflecto[ruby_targets_ruby24] dev-ruby/bogus[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby23] <dev-ruby/axiom-types-1[ruby_targets_ruby23] >=dev-ruby/coercible-1.0[ruby_targets_ruby23] <dev-ruby/coercible-2[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby23] <dev-ruby/descendants_tracker-1[ruby_targets_ruby23] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby23] <dev-ruby/equalizer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby24] <dev-ruby/axiom-types-1[ruby_targets_ruby24] >=dev-ruby/coercible-1.0[ruby_targets_ruby24] <dev-ruby/coercible-2[ruby_targets_ruby24] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby24] <dev-ruby/descendants_tracker-1[ruby_targets_ruby24] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby24] <dev-ruby/equalizer-1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby25] <dev-ruby/axiom-types-1[ruby_targets_ruby25] >=dev-ruby/coercible-1.0[ruby_targets_ruby25] <dev-ruby/coercible-2[ruby_targets_ruby25] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby25] <dev-ruby/descendants_tracker-1[ruby_targets_ruby25] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby25] <dev-ruby/equalizer-1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/inflecto[ruby_targets_ruby23] dev-ruby/bogus[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/inflecto[ruby_targets_ruby24] dev-ruby/bogus[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/inflecto[ruby_targets_ruby25] dev-ruby/bogus[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Attributes on Steroids for Plain Old Ruby Objects
 EAPI=6
 HOMEPAGE=https://github.com/solnic/virtus https://rubygems.org/gems/virtus
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby23] <dev-ruby/axiom-types-1[ruby_targets_ruby23] >=dev-ruby/coercible-1.0[ruby_targets_ruby23] <dev-ruby/coercible-2[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby23] <dev-ruby/descendants_tracker-1[ruby_targets_ruby23] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby23] <dev-ruby/equalizer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby24] <dev-ruby/axiom-types-1[ruby_targets_ruby24] >=dev-ruby/coercible-1.0[ruby_targets_ruby24] <dev-ruby/coercible-2[ruby_targets_ruby24] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby24] <dev-ruby/descendants_tracker-1[ruby_targets_ruby24] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby24] <dev-ruby/equalizer-1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby23] <dev-ruby/axiom-types-1[ruby_targets_ruby23] >=dev-ruby/coercible-1.0[ruby_targets_ruby23] <dev-ruby/coercible-2[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby23] <dev-ruby/descendants_tracker-1[ruby_targets_ruby23] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby23] <dev-ruby/equalizer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby24] <dev-ruby/axiom-types-1[ruby_targets_ruby24] >=dev-ruby/coercible-1.0[ruby_targets_ruby24] <dev-ruby/coercible-2[ruby_targets_ruby24] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby24] <dev-ruby/descendants_tracker-1[ruby_targets_ruby24] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby24] <dev-ruby/equalizer-1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby25] <dev-ruby/axiom-types-1[ruby_targets_ruby25] >=dev-ruby/coercible-1.0[ruby_targets_ruby25] <dev-ruby/coercible-2[ruby_targets_ruby25] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby25] <dev-ruby/descendants_tracker-1[ruby_targets_ruby25] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby25] <dev-ruby/equalizer-1[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/virtus-1.0.5.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=68c659ea7f0c8ab3821eafa9763976fd
+_md5_=165565e71eb1e9bb8631a08ae20c2e93
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.1.6 b/metadata/md5-cache/dev-ruby/will_paginate-3.1.6
index 610ba05af278..835f0e41bb0a 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.1.6
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( <dev-ruby/rails-5[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( <dev-ruby/rails-5[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rails[ruby_targets_ruby25] dev-ruby/mocha[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Most awesome pagination solution for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/mislav/will_paginate/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=~amd64 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=3
 SRC_URI=mirror://rubygems/will_paginate-3.1.6.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9f07ce188d7f06e9e43d72ab780562f9
+_md5_=8d990e25fa3ab5f1aeaa1b4f9c15bbb1
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 5ab541b9c77f..1abd2ae7f0f1 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/racket-6.11-r1 b/metadata/md5-cache/dev-scheme/racket-6.11-r1
deleted file mode 100644
index c8fdf43f2bb2..000000000000
--- a/metadata/md5-cache/dev-scheme/racket-6.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
-DESCRIPTION=General purpose, multi-paradigm Lisp-Scheme programming language
-EAPI=6
-HOMEPAGE=http://racket-lang.org/
-IUSE=doc +futures +jit minimal +places +readline +threads +X
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-3+ LGPL-3
-RDEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
-REQUIRED_USE=futures? ( jit )
-SLOT=0
-SRC_URI=minimal? ( http://download.racket-lang.org/installers/6.11/racket-minimal-6.11-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/6.11/racket-6.11-src-builtpkgs.tgz )
-_eclasses_=pax-utils	b963274a93e76570a88168c1f1db4cd7
-_md5_=700da2c916772ba2b41d9d496ec5360f
diff --git a/metadata/md5-cache/dev-scheme/racket-6.12-r1 b/metadata/md5-cache/dev-scheme/racket-6.12-r1
deleted file mode 100644
index d7248a288701..000000000000
--- a/metadata/md5-cache/dev-scheme/racket-6.12-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
-DESCRIPTION=General purpose, multi-paradigm Lisp-Scheme programming language
-EAPI=6
-HOMEPAGE=http://racket-lang.org/
-IUSE=doc +futures +jit minimal +places +readline +threads +X
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-3+ LGPL-3
-RDEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
-REQUIRED_USE=futures? ( jit )
-SLOT=0
-SRC_URI=minimal? ( http://download.racket-lang.org/installers/6.12/racket-minimal-6.12-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/6.12/racket-6.12-src-builtpkgs.tgz )
-_eclasses_=pax-utils	b963274a93e76570a88168c1f1db4cd7
-_md5_=700da2c916772ba2b41d9d496ec5360f
diff --git a/metadata/md5-cache/dev-scheme/racket-6.12-r2 b/metadata/md5-cache/dev-scheme/racket-6.12-r2
new file mode 100644
index 000000000000..b3fcdc9302a4
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/racket-6.12-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
+DESCRIPTION=General purpose, multi-paradigm Lisp-Scheme programming language
+EAPI=6
+HOMEPAGE=http://racket-lang.org/
+IUSE=doc +futures +jit minimal +places +readline +threads +X
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-3+ LGPL-3
+RDEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
+REQUIRED_USE=futures? ( jit )
+SLOT=0
+SRC_URI=minimal? ( http://download.racket-lang.org/installers/6.12/racket-minimal-6.12-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/6.12/racket-6.12-src-builtpkgs.tgz )
+_eclasses_=pax-utils	e85f015e815dd463b0c206d781ef45a5
+_md5_=a19ff2f2e4b0fe057aba2c9239e4929f
diff --git a/metadata/md5-cache/dev-scheme/racket-6.7 b/metadata/md5-cache/dev-scheme/racket-6.7
index 5d20f9bba9c4..8e226c16a87e 100644
--- a/metadata/md5-cache/dev-scheme/racket-6.7
+++ b/metadata/md5-cache/dev-scheme/racket-6.7
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 x11-libs/cairo[X?] virtual/libffi
 REQUIRED_USE=futures? ( jit )
 SLOT=0
 SRC_URI=minimal? ( http://download.racket-lang.org/installers/6.7/racket-minimal-6.7-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/6.7/racket-6.7-src-builtpkgs.tgz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b67c555f4a26847a057f04a885a3b9e
diff --git a/metadata/md5-cache/dev-scheme/racket-7.0 b/metadata/md5-cache/dev-scheme/racket-7.0
new file mode 100644
index 000000000000..914fcab63abe
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/racket-7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
+DESCRIPTION=General purpose, multi-paradigm Lisp-Scheme programming language
+EAPI=7
+HOMEPAGE=http://racket-lang.org/
+IUSE=doc +futures +jit minimal +places +readline +threads +X
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-3+ LGPL-3
+RDEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
+REQUIRED_USE=futures? ( jit )
+SLOT=0
+SRC_URI=minimal? ( http://download.racket-lang.org/installers/7.0/racket-minimal-7.0-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/7.0/racket-7.0-src-builtpkgs.tgz )
+_eclasses_=pax-utils	e85f015e815dd463b0c206d781ef45a5
+_md5_=248554296404777749ae7088a633bac5
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 2aed10b9de3b..0c2559310801 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/biber-2.7 b/metadata/md5-cache/dev-tex/biber-2.7
new file mode 100644
index 000000000000..90c0a3ed101d
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/biber-2.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-lang/perl-5.24 dev-perl/autovivification dev-perl/Business-ISBN dev-perl/Business-ISMN dev-perl/Business-ISSN dev-perl/Class-Accessor dev-perl/Data-Compare dev-perl/Data-Dump dev-perl/Data-Uniqid dev-perl/DateTime-Calendar-Julian dev-perl/DateTime-Format-Builder dev-perl/Encode-EUCJPASCII dev-perl/Encode-HanExtra dev-perl/Encode-JIS2K dev-perl/File-Slurp dev-perl/IPC-Run3 dev-perl/libwww-perl[ssl] >=dev-perl/Lingua-Translit-0.250 dev-perl/List-AllUtils dev-perl/List-MoreUtils dev-perl/List-MoreUtils-XS dev-perl/Log-Log4perl dev-perl/LWP-Protocol-https dev-perl/Regexp-Common dev-perl/Sort-Key >=dev-perl/Text-BibTeX-0.760.0 dev-perl/Text-CSV dev-perl/Text-CSV_XS dev-perl/Text-Roman dev-perl/URI >=dev-perl/Unicode-LineBreak-2016.3.0 >=virtual/perl-Unicode-Normalize-1.250.0 >=dev-perl/XML-LibXML-1.70 dev-perl/XML-LibXML-Simple dev-perl/XML-LibXSLT dev-perl/XML-Writer ~dev-tex/biblatex-3.7 virtual/perl-IPC-Cmd >=virtual/perl-Unicode-Collate-1.190.0 dev-perl/Config-AutoConf dev-perl/Module-Build dev-perl/ExtUtils-LibBuilder test? ( dev-perl/File-Which dev-perl/Test-Differences ) dev-lang/perl:=
+DESCRIPTION=A BibTeX replacement for users of biblatex
+EAPI=6
+HOMEPAGE=http://biblatex-biber.sourceforge.net/ https://github.com/plk/biber/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Artistic-2
+RDEPEND=>=dev-lang/perl-5.24 dev-perl/autovivification dev-perl/Business-ISBN dev-perl/Business-ISMN dev-perl/Business-ISSN dev-perl/Class-Accessor dev-perl/Data-Compare dev-perl/Data-Dump dev-perl/Data-Uniqid dev-perl/DateTime-Calendar-Julian dev-perl/DateTime-Format-Builder dev-perl/Encode-EUCJPASCII dev-perl/Encode-HanExtra dev-perl/Encode-JIS2K dev-perl/File-Slurp dev-perl/IPC-Run3 dev-perl/libwww-perl[ssl] >=dev-perl/Lingua-Translit-0.250 dev-perl/List-AllUtils dev-perl/List-MoreUtils dev-perl/List-MoreUtils-XS dev-perl/Log-Log4perl dev-perl/LWP-Protocol-https dev-perl/Regexp-Common dev-perl/Sort-Key >=dev-perl/Text-BibTeX-0.760.0 dev-perl/Text-CSV dev-perl/Text-CSV_XS dev-perl/Text-Roman dev-perl/URI >=dev-perl/Unicode-LineBreak-2016.3.0 >=virtual/perl-Unicode-Normalize-1.250.0 >=dev-perl/XML-LibXML-1.70 dev-perl/XML-LibXML-Simple dev-perl/XML-LibXSLT dev-perl/XML-Writer ~dev-tex/biblatex-3.7 virtual/perl-IPC-Cmd >=virtual/perl-Unicode-Collate-1.190.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=https://github.com/plk/biber/archive/v2.7.tar.gz -> biber-2.7.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=7c051ef9b9bbf69c489869a51e128691
diff --git a/metadata/md5-cache/dev-tex/biblatex-3.7-r1 b/metadata/md5-cache/dev-tex/biblatex-3.7-r1
new file mode 100644
index 000000000000..094f2bc1a261
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/biblatex-3.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=dev-texlive/texlive-bibtexextra dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DESCRIPTION=Reimplementation of the bibliographic facilities provided by LaTeX
+EAPI=6
+HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex https://github.com/plk/biblatex/
+IUSE=+biber doc examples
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LPPL-1.3
+PDEPEND=biber? ( ~dev-tex/biber-2.7 )
+RDEPEND=dev-texlive/texlive-bibtexextra dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric virtual/latex-base
+SLOT=0
+SRC_URI=mirror://sourceforge/biblatex/biblatex-3.7.tds.tgz
+_eclasses_=latex-package	773c51c2ef26eaff025998531e7c6731
+_md5_=c373a527f980904825c2b9a2e1c755fd
diff --git a/metadata/md5-cache/dev-tex/latexmk-456 b/metadata/md5-cache/dev-tex/latexmk-456
new file mode 100644
index 000000000000..edbd8dae9b68
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/latexmk-456
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=virtual/latex-base dev-lang/perl app-arch/unzip
+DESCRIPTION=Perl script for automatically building LaTeX documents
+EAPI=7
+HOMEPAGE=http://www.phys.psu.edu/~collins/software/latexmk/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=virtual/latex-base dev-lang/perl
+SLOT=0
+SRC_URI=http://www.phys.psu.edu/~collins/software/latexmk/latexmk-456.zip
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=93e0e76ef325fd5a746c04662bc38c65
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 4e19055784d1..4d09e1040f52 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3
index fd2d9dc8d98c..2bb689e394fc 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22.3-linux.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8189526f55920102ecb861df2315965d
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6
index 691eec4a1017..6f1970d0997d 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22.6-linux.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8189526f55920102ecb861df2315965d
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1
index 1f966c713702..22529c5ade46 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22.6.1-linux.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8189526f55920102ecb861df2315965d
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-23 b/metadata/md5-cache/dev-util/android-sdk-update-manager-23
index 04def92b8f23..0137243b3b8b 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-23
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-23
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r23-linux.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3c2875e8568e23cb6220af91a76b63fa
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-23-r1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-23-r1
index 4b728b2ce631..e50911eb91b9 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-23-r1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-23-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r23-linux.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1404a9bdfde2927752d5a0c4195959a7
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1
index 163cc5fecd61..112fcb800243 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1404a9bdfde2927752d5a0c4195959a7
diff --git a/metadata/md5-cache/dev-util/astyle-3.1-r2 b/metadata/md5-cache/dev-util/astyle-3.1-r2
index 69e129172ed6..ccbafbc998b3 100644
--- a/metadata/md5-cache/dev-util/astyle-3.1-r2
+++ b/metadata/md5-cache/dev-util/astyle-3.1-r2
@@ -10,4 +10,4 @@ RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-
 SLOT=0/3.1
 SRC_URI=mirror://sourceforge/astyle/astyle_3.1_linux.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c10fd0c1f4f7851480eb48aeadcbca5b
+_md5_=310b351c3369e043eab3592464bc2d8d
diff --git a/metadata/md5-cache/dev-util/boost-build-1.62.0-r1 b/metadata/md5-cache/dev-util/boost-build-1.62.0-r1
index cd2f0ea199b4..9fbd4dc45ae8 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.62.0-r1
+++ b/metadata/md5-cache/dev-util/boost-build-1.62.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=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_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1 test? ( sys-apps/diffutils 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_python3_7(-),python_single_target_python2_7(+)] )
 DESCRIPTION=A system for large project software construction, simple to use and powerful
 EAPI=6
-HOMEPAGE=http://www.boost.org/doc/tools/build/index.html
+HOMEPAGE=https://boostorg.github.io/build/
 IUSE=examples python test python_targets_python2_7
 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 ~x64-solaris ~x86-solaris
 LICENSE=Boost-1.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.62.0/boost_1_62_0.tar.bz2
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9368679d44e8fa0e13452cd7682c9300
+_md5_=38606327001d6eb105fce3fde79af673
diff --git a/metadata/md5-cache/dev-util/boost-build-1.63.0 b/metadata/md5-cache/dev-util/boost-build-1.63.0
index 330e5a939f14..cbd404d8ceea 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.63.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.63.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=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_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1 test? ( sys-apps/diffutils 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_python3_7(-),python_single_target_python2_7(+)] )
 DESCRIPTION=A system for large project software construction, simple to use and powerful
 EAPI=6
-HOMEPAGE=http://www.boost.org/doc/tools/build/index.html
+HOMEPAGE=https://boostorg.github.io/build/
 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
 LICENSE=Boost-1.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.63.0/boost_1_63_0.tar.bz2
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=731696f1637dbe739fe34fe4747492fd
+_md5_=89ae7e24ed0a2c981889a551abdbea88
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 9d18d6e90f62..af223fda02b8 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.65.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.65.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=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_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1 test? ( sys-apps/diffutils 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_python3_7(-),python_single_target_python2_7(+)] )
 DESCRIPTION=A system for large project software construction, simple to use and powerful
 EAPI=6
-HOMEPAGE=http://www.boost.org/doc/tools/build/index.html
+HOMEPAGE=https://boostorg.github.io/build/
 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
 LICENSE=Boost-1.0
@@ -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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=494b2b1412d3b6342fce8a31a13d4e53
+_md5_=040c1fda0812af4067b094f5fc7c1664
diff --git a/metadata/md5-cache/dev-util/boost-build-1.66.0 b/metadata/md5-cache/dev-util/boost-build-1.66.0
index b6ae00f523f7..d133d7b02c5f 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.66.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.66.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=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_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.35.0 !<=dev-util/boost-build-1.35.0-r1 test? ( sys-apps/diffutils 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_python3_7(-),python_single_target_python2_7(+)] )
 DESCRIPTION=A system for large project software construction, simple to use and powerful
 EAPI=6
-HOMEPAGE=http://www.boost.org/doc/tools/build/index.html
+HOMEPAGE=https://boostorg.github.io/build/
 IUSE=examples python test python_targets_python2_7
 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_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.35.0 !<=dev-util/boost-build-1.35.0-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.66.0/boost_1_66_0.tar.bz2
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b655da4795f6ed4ac23ccda5870119d7
+_md5_=9c00aced5990cd22398640889429d264
diff --git a/metadata/md5-cache/dev-util/boost-build-1.67.0 b/metadata/md5-cache/dev-util/boost-build-1.67.0
index 7975a4dc188a..620ddd2e81fc 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.67.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.67.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=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_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.35.0 !<=dev-util/boost-build-1.35.0-r1 test? ( sys-apps/diffutils 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_python3_7(-),python_single_target_python2_7(+)] )
 DESCRIPTION=A system for large project software construction, simple to use and powerful
 EAPI=7
-HOMEPAGE=http://www.boost.org/doc/tools/build/index.html
+HOMEPAGE=https://boostorg.github.io/build/
 IUSE=examples python test python_targets_python2_7
 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_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.35.0 !<=dev-util/boost-build-1.35.0-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.67.0/boost_1_67_0.tar.bz2
 _eclasses_=eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3dfd9ab471572a832cc2aca28a7811e0
+_md5_=f898727ba132680b80e23ccaf18fbaa3
diff --git a/metadata/md5-cache/dev-util/cargo-0.26.0 b/metadata/md5-cache/dev-util/cargo-0.26.0
index 47a854c5bd2e..b086eba7ef0b 100644
--- a/metadata/md5-cache/dev-util/cargo-0.26.0
+++ b/metadata/md5-cache/dev-util/cargo-0.26.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/rust-lang/cargo/archive/0.26.0.tar.gz -> cargo-0.26.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/atty/0.2.8/download -> atty-0.2.8.crate https://crates.io/api/v1/crates/backtrace/0.3.5/download -> backtrace-0.3.5.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.16/download -> backtrace-sys-0.1.16.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/bufstream/0.1.3/download -> bufstream-0.1.3.crate https://crates.io/api/v1/crates/cc/1.0.9/download -> cc-1.0.9.crate https://crates.io/api/v1/crates/cfg-if/0.1.2/download -> cfg-if-0.1.2.crate https://crates.io/api/v1/crates/cmake/0.1.30/download -> cmake-0.1.30.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.5.1/download -> core-foundation-0.5.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.5.1/download -> core-foundation-sys-0.5.1.crate https://crates.io/api/v1/crates/crates-io/0.15.0/download -> crates-io-0.15.0.crate https://crates.io/api/v1/crates/crossbeam/0.3.2/download -> crossbeam-0.3.2.crate https://crates.io/api/v1/crates/crypto-hash/0.3.1/download -> crypto-hash-0.3.1.crate https://crates.io/api/v1/crates/curl/0.4.11/download -> curl-0.4.11.crate https://crates.io/api/v1/crates/curl-sys/0.4.1/download -> curl-sys-0.4.1.crate https://crates.io/api/v1/crates/docopt/0.8.3/download -> docopt-0.8.3.crate https://crates.io/api/v1/crates/dtoa/0.4.2/download -> dtoa-0.4.2.crate https://crates.io/api/v1/crates/env_logger/0.5.6/download -> env_logger-0.5.6.crate https://crates.io/api/v1/crates/failure/0.1.1/download -> failure-0.1.1.crate https://crates.io/api/v1/crates/failure_derive/0.1.1/download -> failure_derive-0.1.1.crate https://crates.io/api/v1/crates/filetime/0.1.15/download -> filetime-0.1.15.crate https://crates.io/api/v1/crates/flate2/1.0.1/download -> flate2-1.0.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/git2/0.6.11/download -> git2-0.6.11.crate https://crates.io/api/v1/crates/git2-curl/0.7.0/download -> git2-curl-0.7.0.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.3.0/download -> globset-0.3.0.crate https://crates.io/api/v1/crates/hamcrest/0.1.1/download -> hamcrest-0.1.1.crate https://crates.io/api/v1/crates/hex/0.3.1/download -> hex-0.3.1.crate https://crates.io/api/v1/crates/home/0.3.2/download -> home-0.3.2.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/ignore/0.4.1/download -> ignore-0.4.1.crate https://crates.io/api/v1/crates/itoa/0.4.1/download -> itoa-0.4.1.crate https://crates.io/api/v1/crates/jobserver/0.1.11/download -> jobserver-0.1.11.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/lazy_static/1.0.0/download -> lazy_static-1.0.0.crate https://crates.io/api/v1/crates/lazycell/0.6.0/download -> lazycell-0.6.0.crate https://crates.io/api/v1/crates/libc/0.2.40/download -> libc-0.2.40.crate https://crates.io/api/v1/crates/libgit2-sys/0.6.19/download -> libgit2-sys-0.6.19.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.6/download -> libssh2-sys-0.2.6.crate https://crates.io/api/v1/crates/libz-sys/1.0.18/download -> libz-sys-1.0.18.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.10/download -> miniz-sys-0.1.10.crate https://crates.io/api/v1/crates/miow/0.3.1/download -> miow-0.3.1.crate https://crates.io/api/v1/crates/num/0.1.42/download -> num-0.1.42.crate https://crates.io/api/v1/crates/num-bigint/0.1.43/download -> num-bigint-0.1.43.crate https://crates.io/api/v1/crates/num-complex/0.1.43/download -> num-complex-0.1.43.crate https://crates.io/api/v1/crates/num-integer/0.1.36/download -> num-integer-0.1.36.crate https://crates.io/api/v1/crates/num-iter/0.1.35/download -> num-iter-0.1.35.crate https://crates.io/api/v1/crates/num-rational/0.1.42/download -> num-rational-0.1.42.crate https://crates.io/api/v1/crates/num-traits/0.2.2/download -> num-traits-0.2.2.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/openssl/0.10.6/download -> openssl-0.10.6.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.28/download -> openssl-sys-0.9.28.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/proc-macro2/0.3.6/download -> proc-macro2-0.3.6.crate https://crates.io/api/v1/crates/quick-error/1.2.1/download -> quick-error-1.2.1.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/0.5.1/download -> quote-0.5.1.crate https://crates.io/api/v1/crates/rand/0.4.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.37/download -> redox_syscall-0.1.37.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex/0.2.10/download -> regex-0.2.10.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.5.3/download -> regex-syntax-0.5.3.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.0/download -> remove_dir_all-0.5.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.7/download -> rustc-demangle-0.1.7.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/same-file/1.0.2/download -> same-file-1.0.2.crate https://crates.io/api/v1/crates/schannel/0.1.11/download -> schannel-0.1.11.crate https://crates.io/api/v1/crates/scoped-tls/0.1.1/download -> scoped-tls-0.1.1.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.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.37/download -> serde-1.0.37.crate https://crates.io/api/v1/crates/serde_derive/1.0.37/download -> serde_derive-1.0.37.crate https://crates.io/api/v1/crates/serde_derive_internals/0.23.0/download -> serde_derive_internals-0.23.0.crate https://crates.io/api/v1/crates/serde_ignored/0.0.4/download -> serde_ignored-0.0.4.crate https://crates.io/api/v1/crates/serde_json/1.0.13/download -> serde_json-1.0.13.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/socket2/0.3.4/download -> socket2-0.3.4.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/0.13.1/download -> syn-0.13.1.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.6.1/download -> synstructure-0.6.1.crate https://crates.io/api/v1/crates/tar/0.4.14/download -> tar-0.4.14.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/termcolor/0.3.6/download -> termcolor-0.3.6.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/thread_local/0.3.5/download -> thread_local-0.3.5.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.5/download -> unicode-normalization-0.1.5.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/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.0/download -> url-1.7.0.crate https://crates.io/api/v1/crates/userenv-sys/0.2.0/download -> userenv-sys-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.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/vcpkg/0.2.2/download -> vcpkg-0.2.2.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.1.4/download -> walkdir-2.1.4.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.4/download -> winapi-0.3.4.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/0.1.6/download -> wincolor-0.1.6.crate x86? ( https://static.rust-lang.org/dist/cargo-0.25.0-i686-unknown-linux-gnu.tar.gz ) amd64? ( https://static.rust-lang.org/dist/cargo-0.25.0-x86_64-unknown-linux-gnu.tar.gz ) arm? ( https://static.rust-lang.org/dist/cargo-0.25.0-arm-unknown-linux-gnueabi.tar.gz https://static.rust-lang.org/dist/cargo-0.25.0-arm-unknown-linux-gnueabihf.tar.gz https://static.rust-lang.org/dist/cargo-0.25.0-armv7-unknown-linux-gnueabihf.tar.gz ) arm64? ( https://static.rust-lang.org/dist/cargo-0.25.0-aarch64-unknown-linux-gnu.tar.gz )
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	959846e2836f8244430c9582dd6493af	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	3e38275395b24dfed9849a57ba58a486	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=c3a2db9f5079d2ce4dda986988a9cea7
diff --git a/metadata/md5-cache/dev-util/cargo-0.27.0 b/metadata/md5-cache/dev-util/cargo-0.27.0
index e2569f90c017..2fafd6cf3735 100644
--- a/metadata/md5-cache/dev-util/cargo-0.27.0
+++ b/metadata/md5-cache/dev-util/cargo-0.27.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/rust-lang/cargo/archive/0.27.0.tar.gz -> cargo-0.27.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.9/download -> atty-0.2.9.crate https://crates.io/api/v1/crates/backtrace/0.3.6/download -> backtrace-0.3.6.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.16/download -> backtrace-sys-0.1.16.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/bufstream/0.1.3/download -> bufstream-0.1.3.crate https://crates.io/api/v1/crates/cc/1.0.10/download -> cc-1.0.10.crate https://crates.io/api/v1/crates/cfg-if/0.1.2/download -> cfg-if-0.1.2.crate https://crates.io/api/v1/crates/clap/2.31.2/download -> clap-2.31.2.crate https://crates.io/api/v1/crates/cmake/0.1.30/download -> cmake-0.1.30.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.5.1/download -> core-foundation-0.5.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.5.1/download -> core-foundation-sys-0.5.1.crate https://crates.io/api/v1/crates/crates-io/0.16.0/download -> crates-io-0.16.0.crate https://crates.io/api/v1/crates/crossbeam/0.3.2/download -> crossbeam-0.3.2.crate https://crates.io/api/v1/crates/crypto-hash/0.3.1/download -> crypto-hash-0.3.1.crate https://crates.io/api/v1/crates/curl/0.4.12/download -> curl-0.4.12.crate https://crates.io/api/v1/crates/curl-sys/0.4.2/download -> curl-sys-0.4.2.crate https://crates.io/api/v1/crates/dtoa/0.4.2/download -> dtoa-0.4.2.crate https://crates.io/api/v1/crates/env_logger/0.5.9/download -> env_logger-0.5.9.crate https://crates.io/api/v1/crates/failure/0.1.1/download -> failure-0.1.1.crate https://crates.io/api/v1/crates/failure_derive/0.1.1/download -> failure_derive-0.1.1.crate https://crates.io/api/v1/crates/filetime/0.1.15/download -> filetime-0.1.15.crate https://crates.io/api/v1/crates/filetime/0.2.0/download -> filetime-0.2.0.crate https://crates.io/api/v1/crates/flate2/1.0.1/download -> flate2-1.0.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/git2/0.7.1/download -> git2-0.7.1.crate https://crates.io/api/v1/crates/git2-curl/0.8.1/download -> git2-curl-0.8.1.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.4.0/download -> globset-0.4.0.crate https://crates.io/api/v1/crates/hamcrest/0.1.1/download -> hamcrest-0.1.1.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/home/0.3.3/download -> home-0.3.3.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/ignore/0.4.2/download -> ignore-0.4.2.crate https://crates.io/api/v1/crates/itoa/0.4.1/download -> itoa-0.4.1.crate https://crates.io/api/v1/crates/jobserver/0.1.11/download -> jobserver-0.1.11.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/lazy_static/1.0.0/download -> lazy_static-1.0.0.crate https://crates.io/api/v1/crates/lazycell/0.6.0/download -> lazycell-0.6.0.crate https://crates.io/api/v1/crates/libc/0.2.40/download -> libc-0.2.40.crate https://crates.io/api/v1/crates/libgit2-sys/0.7.1/download -> libgit2-sys-0.7.1.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.6/download -> libssh2-sys-0.2.6.crate https://crates.io/api/v1/crates/libz-sys/1.0.18/download -> libz-sys-1.0.18.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.10/download -> miniz-sys-0.1.10.crate https://crates.io/api/v1/crates/miow/0.3.1/download -> miow-0.3.1.crate https://crates.io/api/v1/crates/num-traits/0.2.4/download -> num-traits-0.2.4.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/openssl/0.10.6/download -> openssl-0.10.6.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.28/download -> openssl-sys-0.9.28.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.11/download -> pkg-config-0.3.11.crate https://crates.io/api/v1/crates/proc-macro2/0.3.7/download -> proc-macro2-0.3.7.crate https://crates.io/api/v1/crates/quick-error/1.2.1/download -> quick-error-1.2.1.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/0.5.2/download -> quote-0.5.2.crate https://crates.io/api/v1/crates/rand/0.4.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.37/download -> redox_syscall-0.1.37.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.crate https://crates.io/api/v1/crates/regex/1.0.0/download -> regex-1.0.0.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.0/download -> regex-syntax-0.6.0.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.8/download -> rustc-demangle-0.1.8.crate https://crates.io/api/v1/crates/same-file/1.0.2/download -> same-file-1.0.2.crate https://crates.io/api/v1/crates/schannel/0.1.12/download -> schannel-0.1.12.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.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.55/download -> serde-1.0.55.crate https://crates.io/api/v1/crates/serde_derive/1.0.55/download -> serde_derive-1.0.55.crate https://crates.io/api/v1/crates/serde_ignored/0.0.4/download -> serde_ignored-0.0.4.crate https://crates.io/api/v1/crates/serde_json/1.0.17/download -> serde_json-1.0.17.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/socket2/0.3.5/download -> socket2-0.3.5.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/0.13.10/download -> syn-0.13.10.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.6.1/download -> synstructure-0.6.1.crate https://crates.io/api/v1/crates/tar/0.4.15/download -> tar-0.4.15.crate https://crates.io/api/v1/crates/tempfile/3.0.2/download -> tempfile-3.0.2.crate https://crates.io/api/v1/crates/termcolor/0.3.6/download -> termcolor-0.3.6.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/thread_local/0.3.5/download -> thread_local-0.3.5.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.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/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.0/download -> url-1.7.0.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/vcpkg/0.2.3/download -> vcpkg-0.2.3.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.1.4/download -> walkdir-2.1.4.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.4/download -> winapi-0.3.4.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/0.1.6/download -> wincolor-0.1.6.crate x86? ( https://static.rust-lang.org/dist/cargo-0.26.0-i686-unknown-linux-gnu.tar.xz ) amd64? ( https://static.rust-lang.org/dist/cargo-0.26.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/cargo-0.26.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/cargo-0.26.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/cargo-0.26.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/cargo-0.26.0-aarch64-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	959846e2836f8244430c9582dd6493af	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	3e38275395b24dfed9849a57ba58a486	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=1f924437247d567ac0e325ace63181d7
diff --git a/metadata/md5-cache/dev-util/cargo-0.28.0 b/metadata/md5-cache/dev-util/cargo-0.28.0
index ad286b628ea5..fcde6b4c9a54 100644
--- a/metadata/md5-cache/dev-util/cargo-0.28.0
+++ b/metadata/md5-cache/dev-util/cargo-0.28.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/rust-lang/cargo/archive/0.28.0.tar.gz -> cargo-0.28.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.10/download -> atty-0.2.10.crate https://crates.io/api/v1/crates/backtrace/0.3.7/download -> backtrace-0.3.7.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.16/download -> backtrace-sys-0.1.16.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/bufstream/0.1.3/download -> bufstream-0.1.3.crate https://crates.io/api/v1/crates/cargo/0.28.0/download -> cargo-0.28.0.crate https://crates.io/api/v1/crates/cc/1.0.15/download -> cc-1.0.15.crate https://crates.io/api/v1/crates/cfg-if/0.1.3/download -> cfg-if-0.1.3.crate https://crates.io/api/v1/crates/clap/2.31.2/download -> clap-2.31.2.crate https://crates.io/api/v1/crates/cmake/0.1.31/download -> cmake-0.1.31.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.5.1/download -> core-foundation-0.5.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.5.1/download -> core-foundation-sys-0.5.1.crate https://crates.io/api/v1/crates/crates-io/0.16.0/download -> crates-io-0.16.0.crate https://crates.io/api/v1/crates/crossbeam/0.3.2/download -> crossbeam-0.3.2.crate https://crates.io/api/v1/crates/crypto-hash/0.3.1/download -> crypto-hash-0.3.1.crate https://crates.io/api/v1/crates/curl/0.4.12/download -> curl-0.4.12.crate https://crates.io/api/v1/crates/curl-sys/0.4.5/download -> curl-sys-0.4.5.crate https://crates.io/api/v1/crates/dtoa/0.4.2/download -> dtoa-0.4.2.crate https://crates.io/api/v1/crates/env_logger/0.5.10/download -> env_logger-0.5.10.crate https://crates.io/api/v1/crates/failure/0.1.1/download -> failure-0.1.1.crate https://crates.io/api/v1/crates/failure_derive/0.1.1/download -> failure_derive-0.1.1.crate https://crates.io/api/v1/crates/filetime/0.2.1/download -> filetime-0.2.1.crate https://crates.io/api/v1/crates/flate2/1.0.1/download -> flate2-1.0.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/git2/0.7.1/download -> git2-0.7.1.crate https://crates.io/api/v1/crates/git2-curl/0.8.1/download -> git2-curl-0.8.1.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.4.0/download -> globset-0.4.0.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/home/0.3.3/download -> home-0.3.3.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/ignore/0.4.2/download -> ignore-0.4.2.crate https://crates.io/api/v1/crates/itoa/0.4.1/download -> itoa-0.4.1.crate https://crates.io/api/v1/crates/jobserver/0.1.11/download -> jobserver-0.1.11.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/lazy_static/1.0.0/download -> lazy_static-1.0.0.crate https://crates.io/api/v1/crates/lazycell/0.6.0/download -> lazycell-0.6.0.crate https://crates.io/api/v1/crates/libc/0.2.40/download -> libc-0.2.40.crate https://crates.io/api/v1/crates/libgit2-sys/0.7.1/download -> libgit2-sys-0.7.1.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.7/download -> libssh2-sys-0.2.7.crate https://crates.io/api/v1/crates/libz-sys/1.0.18/download -> libz-sys-1.0.18.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.10/download -> miniz-sys-0.1.10.crate https://crates.io/api/v1/crates/miow/0.3.1/download -> miow-0.3.1.crate https://crates.io/api/v1/crates/num-traits/0.2.4/download -> num-traits-0.2.4.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/openssl/0.10.7/download -> openssl-0.10.7.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.30/download -> openssl-sys-0.9.30.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.11/download -> pkg-config-0.3.11.crate https://crates.io/api/v1/crates/proc-macro2/0.3.8/download -> proc-macro2-0.3.8.crate https://crates.io/api/v1/crates/quick-error/1.2.1/download -> quick-error-1.2.1.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/0.5.2/download -> quote-0.5.2.crate https://crates.io/api/v1/crates/rand/0.4.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.37/download -> redox_syscall-0.1.37.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.crate https://crates.io/api/v1/crates/regex/1.0.0/download -> regex-1.0.0.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.0/download -> regex-syntax-0.6.0.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.8/download -> rustc-demangle-0.1.8.crate https://crates.io/api/v1/crates/same-file/1.0.2/download -> same-file-1.0.2.crate https://crates.io/api/v1/crates/schannel/0.1.12/download -> schannel-0.1.12.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.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.55/download -> serde-1.0.55.crate https://crates.io/api/v1/crates/serde_derive/1.0.55/download -> serde_derive-1.0.55.crate https://crates.io/api/v1/crates/serde_ignored/0.0.4/download -> serde_ignored-0.0.4.crate https://crates.io/api/v1/crates/serde_json/1.0.17/download -> serde_json-1.0.17.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/socket2/0.3.5/download -> socket2-0.3.5.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/0.13.10/download -> syn-0.13.10.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.6.1/download -> synstructure-0.6.1.crate https://crates.io/api/v1/crates/tar/0.4.15/download -> tar-0.4.15.crate https://crates.io/api/v1/crates/tempfile/3.0.2/download -> tempfile-3.0.2.crate https://crates.io/api/v1/crates/termcolor/0.3.6/download -> termcolor-0.3.6.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/thread_local/0.3.5/download -> thread_local-0.3.5.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.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/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.0/download -> url-1.7.0.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/vcpkg/0.2.3/download -> vcpkg-0.2.3.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.1.4/download -> walkdir-2.1.4.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.4/download -> winapi-0.3.4.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/0.1.6/download -> wincolor-0.1.6.crate x86? ( https://static.rust-lang.org/dist/cargo-0.27.0-i686-unknown-linux-gnu.tar.xz ) amd64? ( https://static.rust-lang.org/dist/cargo-0.27.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/cargo-0.27.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/cargo-0.27.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/cargo-0.27.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/cargo-0.27.0-aarch64-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	959846e2836f8244430c9582dd6493af	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	3e38275395b24dfed9849a57ba58a486	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=9fa14bfc09e9b94ca33bc3f85791dfc3
diff --git a/metadata/md5-cache/dev-util/cargo-0.29.0 b/metadata/md5-cache/dev-util/cargo-0.29.0
new file mode 100644
index 000000000000..3d1c663889a1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cargo-0.29.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser >=virtual/rust-1.19.0 dev-util/cmake sys-apps/coreutils sys-apps/diffutils sys-apps/findutils sys-apps/sed
+DESCRIPTION=The Rust's package manager
+EAPI=6
+HOMEPAGE=http://crates.io
+IUSE=doc libressl debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( MIT Apache-2.0 )
+RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser !dev-util/cargo-bin net-misc/curl[ssl]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/rust-lang/cargo/archive/0.29.0.tar.gz -> cargo-0.29.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.6/download -> aho-corasick-0.6.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/backtrace/0.3.9/download -> backtrace-0.3.9.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.23/download -> backtrace-sys-0.1.23.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/bufstream/0.1.3/download -> bufstream-0.1.3.crate https://crates.io/api/v1/crates/cargo/0.29.0/download -> cargo-0.29.0.crate https://crates.io/api/v1/crates/cc/1.0.18/download -> cc-1.0.18.crate https://crates.io/api/v1/crates/cfg-if/0.1.4/download -> cfg-if-0.1.4.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cmake/0.1.31/download -> cmake-0.1.31.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.6.1/download -> core-foundation-0.6.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.1/download -> core-foundation-sys-0.6.1.crate https://crates.io/api/v1/crates/crates-io/0.17.0/download -> crates-io-0.17.0.crate https://crates.io/api/v1/crates/crossbeam/0.3.2/download -> crossbeam-0.3.2.crate https://crates.io/api/v1/crates/crypto-hash/0.3.1/download -> crypto-hash-0.3.1.crate https://crates.io/api/v1/crates/curl/0.4.14/download -> curl-0.4.14.crate https://crates.io/api/v1/crates/curl-sys/0.4.8/download -> curl-sys-0.4.8.crate https://crates.io/api/v1/crates/dtoa/0.4.3/download -> dtoa-0.4.3.crate https://crates.io/api/v1/crates/env_logger/0.5.11/download -> env_logger-0.5.11.crate https://crates.io/api/v1/crates/failure/0.1.2/download -> failure-0.1.2.crate https://crates.io/api/v1/crates/failure_derive/0.1.2/download -> failure_derive-0.1.2.crate https://crates.io/api/v1/crates/filetime/0.2.1/download -> filetime-0.2.1.crate https://crates.io/api/v1/crates/flate2/1.0.2/download -> flate2-1.0.2.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/git2/0.7.5/download -> git2-0.7.5.crate https://crates.io/api/v1/crates/git2-curl/0.8.1/download -> git2-curl-0.8.1.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.4.1/download -> globset-0.4.1.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/home/0.3.3/download -> home-0.3.3.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/ignore/0.4.3/download -> ignore-0.4.3.crate https://crates.io/api/v1/crates/itoa/0.4.2/download -> itoa-0.4.2.crate https://crates.io/api/v1/crates/jobserver/0.1.11/download -> jobserver-0.1.11.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/lazy_static/1.0.2/download -> lazy_static-1.0.2.crate https://crates.io/api/v1/crates/lazycell/0.6.0/download -> lazycell-0.6.0.crate https://crates.io/api/v1/crates/libc/0.2.42/download -> libc-0.2.42.crate https://crates.io/api/v1/crates/libgit2-sys/0.7.7/download -> libgit2-sys-0.7.7.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.8/download -> libssh2-sys-0.2.8.crate https://crates.io/api/v1/crates/libz-sys/1.0.18/download -> libz-sys-1.0.18.crate https://crates.io/api/v1/crates/log/0.4.3/download -> log-0.4.3.crate https://crates.io/api/v1/crates/matches/0.1.7/download -> matches-0.1.7.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.10/download -> miniz-sys-0.1.10.crate https://crates.io/api/v1/crates/miow/0.3.1/download -> miow-0.3.1.crate https://crates.io/api/v1/crates/num-traits/0.2.5/download -> num-traits-0.2.5.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/openssl/0.10.10/download -> openssl-0.10.10.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.33/download -> openssl-sys-0.9.33.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.12/download -> pkg-config-0.3.12.crate https://crates.io/api/v1/crates/proc-macro2/0.4.9/download -> proc-macro2-0.4.9.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.4/download -> quote-0.6.4.crate https://crates.io/api/v1/crates/rand/0.4.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/rand/0.5.4/download -> rand-0.5.4.crate https://crates.io/api/v1/crates/rand_core/0.2.1/download -> rand_core-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.0.2/download -> regex-1.0.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.2/download -> regex-syntax-0.6.2.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.9/download -> rustc-demangle-0.1.9.crate https://crates.io/api/v1/crates/same-file/1.0.2/download -> same-file-1.0.2.crate https://crates.io/api/v1/crates/schannel/0.1.13/download -> schannel-0.1.13.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.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.70/download -> serde-1.0.70.crate https://crates.io/api/v1/crates/serde_derive/1.0.70/download -> serde_derive-1.0.70.crate https://crates.io/api/v1/crates/serde_ignored/0.0.4/download -> serde_ignored-0.0.4.crate https://crates.io/api/v1/crates/serde_json/1.0.24/download -> serde_json-1.0.24.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/socket2/0.3.7/download -> socket2-0.3.7.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.14.6/download -> syn-0.14.6.crate https://crates.io/api/v1/crates/synstructure/0.9.0/download -> synstructure-0.9.0.crate https://crates.io/api/v1/crates/tar/0.4.16/download -> tar-0.4.16.crate https://crates.io/api/v1/crates/tempfile/3.0.3/download -> tempfile-3.0.3.crate https://crates.io/api/v1/crates/termcolor/0.3.6/download -> termcolor-0.3.6.crate https://crates.io/api/v1/crates/termcolor/1.0.1/download -> termcolor-1.0.1.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.5/download -> thread_local-0.3.5.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.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/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.1/download -> url-1.7.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/vcpkg/0.2.4/download -> vcpkg-0.2.4.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.1.4/download -> walkdir-2.1.4.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/0.1.6/download -> wincolor-0.1.6.crate https://crates.io/api/v1/crates/wincolor/1.0.0/download -> wincolor-1.0.0.crate x86? ( https://static.rust-lang.org/dist/cargo-0.28.0-i686-unknown-linux-gnu.tar.xz ) amd64? ( https://static.rust-lang.org/dist/cargo-0.28.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/cargo-0.28.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/cargo-0.28.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/cargo-0.28.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/cargo-0.28.0-aarch64-unknown-linux-gnu.tar.xz )
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	3e38275395b24dfed9849a57ba58a486	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=33c6e72411a18c5983586fddf364a6c0
diff --git a/metadata/md5-cache/dev-util/catfish-1.2.2 b/metadata/md5-cache/dev-util/catfish-1.2.2
index 5b26bf83c586..f77371232a90 100644
--- a/metadata/md5-cache/dev-util/catfish-1.2.2
+++ b/metadata/md5-cache/dev-util/catfish-1.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=A frontend for find, (s)locate, doodle, tracker, beagle, strigi and
 EAPI=5
 HOMEPAGE=https://launchpad.net/catfish-search http://twotoasts.de/index.php/catfish/
 IUSE=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 x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-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_python3_7(-),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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/gtk+:3[introspection] virtual/freedesktop-icon-theme
 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=0
 SRC_URI=https://launchpad.net/catfish-search/1.2/1.2.2/+download/catfish-1.2.2.tar.bz2
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9cd8191b00773be2bc4ca0d02ecb5f60
+_md5_=b3e0cc4842f7fba8ed4bf28a6ccee98a
diff --git a/metadata/md5-cache/dev-util/catfish-1.4.6 b/metadata/md5-cache/dev-util/catfish-1.4.6
index 69782b1c0613..825c3ebaf90f 100644
--- a/metadata/md5-cache/dev-util/catfish-1.4.6
+++ b/metadata/md5-cache/dev-util/catfish-1.4.6
@@ -4,11 +4,11 @@ DESCRIPTION=A frontend for find, (s)locate, doodle, tracker, beagle, strigi and
 EAPI=6
 HOMEPAGE=https://docs.xfce.org/apps/catfish/start
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=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/pygobject: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(-)] x11-libs/gtk+:3[introspection] virtual/freedesktop-icon-theme 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://archive.xfce.org/src/apps/catfish/1.4/catfish-1.4.6.tar.bz2
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=81dc8e47b7cc9e281482d984320170d7
+_md5_=a930f82f49a2ebd22f6ba9348a8ef2b8
diff --git a/metadata/md5-cache/dev-util/clion-2017.3.4 b/metadata/md5-cache/dev-util/clion-2017.3.4
deleted file mode 100644
index d343da94c140..000000000000
--- a/metadata/md5-cache/dev-util/clion-2017.3.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=A complete toolset for C and C++ development
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/clion
-KEYWORDS=~amd64 ~x86
-LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
-RDEPEND=sys-devel/gdb dev-util/cmake
-SLOT=0
-SRC_URI=http://download.jetbrains.com/cpp/CLion-2017.3.4.tar.gz -> clion-2017.3.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9d6aad82957b1fa26df263cdf0ec2f6c
diff --git a/metadata/md5-cache/dev-util/clion-2018.1 b/metadata/md5-cache/dev-util/clion-2018.1
deleted file mode 100644
index 9aa1853b736a..000000000000
--- a/metadata/md5-cache/dev-util/clion-2018.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=A complete toolset for C and C++ development
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/clion
-KEYWORDS=~amd64 ~x86
-LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
-RDEPEND=sys-devel/gdb dev-util/cmake
-SLOT=0
-SRC_URI=http://download.jetbrains.com/cpp/CLion-2018.1.tar.gz -> clion-2018.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9d6aad82957b1fa26df263cdf0ec2f6c
diff --git a/metadata/md5-cache/dev-util/clion-2018.2 b/metadata/md5-cache/dev-util/clion-2018.2
new file mode 100644
index 000000000000..3765f5b09560
--- /dev/null
+++ b/metadata/md5-cache/dev-util/clion-2018.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=A complete toolset for C and C++ development
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/clion
+IUSE=-custom-jdk
+KEYWORDS=~amd64 ~x86
+LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+RDEPEND=sys-devel/gdb dev-util/cmake !custom-jdk? ( virtual/jdk )
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=http://download.jetbrains.com/cpp/CLion-2018.2.tar.gz -> clion-2018.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=10b3c813515bc35b8c489e0cc6660001
diff --git a/metadata/md5-cache/dev-util/d-feet-0.3.13 b/metadata/md5-cache/dev-util/d-feet-0.3.13
new file mode 100644
index 000000000000..b0496dd07470
--- /dev/null
+++ b/metadata/md5-cache/dev-util/d-feet-0.3.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.9.4:3[introspection] >=dev-libs/gobject-introspection-0.9.6:= app-text/yelp-tools >=dev-util/intltool-0.40.0 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=D-Feet is a powerful D-Bus debugger
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/DFeet
+IUSE=test +X python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.9.4:3[introspection] >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/glib-2.34:2 >=dev-python/pygobject-3.3.91:3[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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=sys-apps/dbus-1 X? ( x11-libs/libwnck:3[introspection] )
+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=0
+SRC_URI=mirror://gnome/sources/d-feet/0.3/d-feet-0.3.13.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bcd335f215b4376f05fabd4047a5a2f0
diff --git a/metadata/md5-cache/dev-util/electron-1.6.16 b/metadata/md5-cache/dev-util/electron-1.6.16
index 2fa7f2da7dc3..f0f94b61fb89 100644
--- a/metadata/md5-cache/dev-util/electron-1.6.16
+++ b/metadata/md5-cache/dev-util/electron-1.6.16
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=1.6
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-56.0.2924.87.tar.xz https://github.com/electron/electron/archive/v1.6.16.tar.gz -> electron-1.6.16.tar.gz https://github.com/electron/chromium-breakpad/archive/c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz -> electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz https://github.com/google/breakpad/archive/e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz -> electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz https://github.com/electron/brightray/archive/909c49265493bd095c27cefd999567be2107899a.tar.gz -> electron-brightray-909c49265493bd095c27cefd999567be2107899a.tar.gz https://github.com/electron/node/archive/9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz -> electron-node-9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz https://github.com/zcbenz/native-mate/archive/fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz -> electron-native-mate-fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz https://github.com/electron/pdf-viewer/archive/a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz -> electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz https://github.com/elprans/grit/archive/9536fb6429147d27ef1563088341825db0a893cd.tar.gz -> electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz https://github.com/electron/libchromiumcontent/archive/a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz -> electron-libchromiumcontent-a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/elprans/node-browserify/releases/download/14.0.0-gentoo/browserify-build.tar.gz -> browserify-14.0.0.tar.gz https://github.com/elprans/gentoo-electron-patches/archive/electron-1.6.16.tar.gz -> electron-patches-1.6.16.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=de3d4415034bb1c230dd795e7a6477d0
diff --git a/metadata/md5-cache/dev-util/electron-1.7.15 b/metadata/md5-cache/dev-util/electron-1.7.15
index b49ec2ad6e14..54be16cb7b3c 100644
--- a/metadata/md5-cache/dev-util/electron-1.7.15
+++ b/metadata/md5-cache/dev-util/electron-1.7.15
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=1.7
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-58.0.3029.110.tar.xz https://github.com/electron/electron/archive/v1.7.15.tar.gz -> electron-1.7.15.tar.gz https://github.com/electron/chromium-breakpad/archive/c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz -> electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz https://github.com/google/breakpad/archive/e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz -> electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz https://github.com/electron/node/archive/a992f2ff412b85606ec1d4c1eb00ad832fa1e640.tar.gz -> electron-node-a992f2ff412b85606ec1d4c1eb00ad832fa1e640.tar.gz https://github.com/zcbenz/native-mate/archive/7d9c1a80f025f4c46f7da8ea73246fe0f1968579.tar.gz -> electron-native-mate-7d9c1a80f025f4c46f7da8ea73246fe0f1968579.tar.gz https://github.com/electron/pdf-viewer/archive/beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf.tar.gz -> electron-pdf-viewer-beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf.tar.gz https://github.com/elprans/grit/archive/9536fb6429147d27ef1563088341825db0a893cd.tar.gz -> electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz https://github.com/electron/libchromiumcontent/archive/2f7b83669315f9492380334d1a8b1cd9bc758efd.tar.gz -> electron-libchromiumcontent-2f7b83669315f9492380334d1a8b1cd9bc758efd.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/elprans/node-browserify/releases/download/14.0.0-gentoo/browserify-build.tar.gz -> browserify-14.0.0.tar.gz https://github.com/elprans/gentoo-electron-patches/archive/electron-1.7.15.tar.gz -> electron-patches-1.7.15.tar.gz https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz -> ninja-1.8.2.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2a7814fa6e8ce92b2052850713904264
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2-r1 b/metadata/md5-cache/dev-util/ninja-1.8.2-r1
new file mode 100644
index 000000000000..7228ceb850bb
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ninja-1.8.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm setup test unpack
+DEPEND=|| ( 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-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
+DESCRIPTION=A small build system similar to make
+EAPI=6
+HOMEPAGE=https://ninja-build.org/
+IUSE=doc emacs test vim-syntax zsh-completion
+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 ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh ) !<net-irc/ninja-1.5.9_pre14-r1
+SLOT=0
+SRC_URI=https://github.com/Kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz -> ninja-1.8.2-fortran.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=b5a2502f1ff666039bb8b15f1c6f1506
diff --git a/metadata/md5-cache/dev-util/qstlink2-1.2.3 b/metadata/md5-cache/dev-util/qstlink2-1.2.3
index 6515b0922c15..c9efe1b806e2 100644
--- a/metadata/md5-cache/dev-util/qstlink2-1.2.3
+++ b/metadata/md5-cache/dev-util/qstlink2-1.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/fpoussin/QStlink2/archive/v1.2.3.tar.gz -> qstlink2-1.2.3.tar.gz https://github.com/fpoussin/QtUsb/archive/v0.2.1.tar.gz -> qtusb-0.2.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=82f8c613bd2089d019449e825431dd83
diff --git a/metadata/md5-cache/dev-util/radare2-2.8.0 b/metadata/md5-cache/dev-util/radare2-2.8.0
new file mode 100644
index 000000000000..44a3bcc0d4ea
--- /dev/null
+++ b/metadata/md5-cache/dev-util/radare2-2.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/pkgconfig
+DESCRIPTION=unix-like reverse engineering framework and commandline tools
+EAPI=6
+HOMEPAGE=http://www.radare.org
+IUSE=ssl libressl
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://github.com/radare/radare2/archive/2.8.0.tar.gz -> radare2-2.8.0.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7750fe55df8278051dbea6d5b5999fb0
diff --git a/metadata/md5-cache/dev-util/rebar-2.6.4 b/metadata/md5-cache/dev-util/rebar-2.6.4
index 94c4b26b89cc..3a6030bae012 100644
--- a/metadata/md5-cache/dev-util/rebar-2.6.4
+++ b/metadata/md5-cache/dev-util/rebar-2.6.4
@@ -3,10 +3,10 @@ DEPEND=dev-lang/erlang
 DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
 EAPI=5
 HOMEPAGE=https://github.com/rebar/rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/rebar/rebar/archive/2.6.4.tar.gz -> rebar-2.6.4.tar.gz
 _eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=de5e2f61915fe69bc79243b3ba799fe7
+_md5_=498ea006289f6acc3368313a30910c5c
diff --git a/metadata/md5-cache/dev-util/rustfmt-0.5.0 b/metadata/md5-cache/dev-util/rustfmt-0.5.0
index 63abea9eaa57..c67da91c95eb 100644
--- a/metadata/md5-cache/dev-util/rustfmt-0.5.0
+++ b/metadata/md5-cache/dev-util/rustfmt-0.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/rust-1.8.0 >=dev-util/cargo-0.13.0
+DEPEND=>=dev-lang/rust-1.8.0
 DESCRIPTION=Tool to find and fix Rust formatting issues
 EAPI=6
 HOMEPAGE=https://github.com/rust-lang-nursery/rustfmt
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( MIT Apache-2.0 )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.5.1/download -> aho-corasick-0.5.1.crate https://crates.io/api/v1/crates/unicode-xid/0.0.3/download -> unicode-xid-0.0.3.crate https://crates.io/api/v1/crates/log/0.3.6/download -> log-0.3.6.crate https://crates.io/api/v1/crates/term/0.2.14/download -> term-0.2.14.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.19/download -> rustc-serialize-0.3.19.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/toml/0.1.28/download -> toml-0.1.28.crate https://crates.io/api/v1/crates/bitflags/0.5.0/download -> bitflags-0.5.0.crate https://crates.io/api/v1/crates/strings/0.0.1/download -> strings-0.0.1.crate https://crates.io/api/v1/crates/getopts/0.2.14/download -> getopts-0.2.14.crate https://crates.io/api/v1/crates/diff/0.1.9/download -> diff-0.1.9.crate https://crates.io/api/v1/crates/mempool/0.3.1/download -> mempool-0.3.1.crate https://crates.io/api/v1/crates/unicode-segmentation/0.1.2/download -> unicode-segmentation-0.1.2.crate https://crates.io/api/v1/crates/term/0.4.4/download -> term-0.4.4.crate https://crates.io/api/v1/crates/syntex_syntax/0.32.0/download -> syntex_syntax-0.32.0.crate https://crates.io/api/v1/crates/winapi/0.2.6/download -> winapi-0.2.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.1/download -> kernel32-sys-0.2.1.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/regex/0.1.63/download -> regex-0.1.63.crate https://crates.io/api/v1/crates/regex-syntax/0.3.1/download -> regex-syntax-0.3.1.crate https://crates.io/api/v1/crates/rustfmt/0.5.0/download -> rustfmt-0.5.0.crate https://crates.io/api/v1/crates/env_logger/0.3.3/download -> env_logger-0.3.3.crate https://crates.io/api/v1/crates/libc/0.2.9/download -> libc-0.2.9.crate
-_eclasses_=cargo	959846e2836f8244430c9582dd6493af	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	3e38275395b24dfed9849a57ba58a486	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=a9f913a24eb5a2ca731e80ca71e644b9
diff --git a/metadata/md5-cache/dev-util/rustfmt-0.6.3 b/metadata/md5-cache/dev-util/rustfmt-0.6.3
index 2527e281e6c9..14b5e7a35968 100644
--- a/metadata/md5-cache/dev-util/rustfmt-0.6.3
+++ b/metadata/md5-cache/dev-util/rustfmt-0.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/rust-1.8.0 >=dev-util/cargo-0.13.0
+DEPEND=>=dev-lang/rust-1.8.0
 DESCRIPTION=Tool to find and fix Rust formatting issues
 EAPI=6
 HOMEPAGE=https://github.com/rust-lang-nursery/rustfmt
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( MIT Apache-2.0 )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/diff/0.1.9/download -> diff-0.1.9.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/getopts/0.2.14/download -> getopts-0.2.14.crate https://crates.io/api/v1/crates/itertools/0.4.19/download -> itertools-0.4.19.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.16/download -> libc-0.2.16.crate https://crates.io/api/v1/crates/log/0.3.6/download -> log-0.3.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/multimap/0.3.0/download -> multimap-0.3.0.crate https://crates.io/api/v1/crates/regex/0.1.77/download -> regex-0.1.77.crate https://crates.io/api/v1/crates/regex-syntax/0.3.5/download -> regex-syntax-0.3.5.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.19/download -> rustc-serialize-0.3.19.crate https://crates.io/api/v1/crates/rustfmt/0.6.3/download -> rustfmt-0.6.3.crate https://crates.io/api/v1/crates/strings/0.0.1/download -> strings-0.0.1.crate https://crates.io/api/v1/crates/syntex_errors/0.44.0/download -> syntex_errors-0.44.0.crate https://crates.io/api/v1/crates/syntex_pos/0.44.0/download -> syntex_pos-0.44.0.crate https://crates.io/api/v1/crates/syntex_syntax/0.44.1/download -> syntex_syntax-0.44.1.crate https://crates.io/api/v1/crates/term/0.4.4/download -> term-0.4.4.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/toml/0.1.30/download -> toml-0.1.30.crate https://crates.io/api/v1/crates/unicode-segmentation/0.1.2/download -> unicode-segmentation-0.1.2.crate https://crates.io/api/v1/crates/unicode-xid/0.0.3/download -> unicode-xid-0.0.3.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/walkdir/0.1.8/download -> walkdir-0.1.8.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
+_eclasses_=cargo	3e38275395b24dfed9849a57ba58a486	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=6f30c14e7e861b05fdb1fe76cce2b6aa
diff --git a/metadata/md5-cache/dev-util/rustfmt-0.8.6 b/metadata/md5-cache/dev-util/rustfmt-0.8.6
index c5313100ec48..ace02c50b8a3 100644
--- a/metadata/md5-cache/dev-util/rustfmt-0.8.6
+++ b/metadata/md5-cache/dev-util/rustfmt-0.8.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/rust-1.8.0 >=dev-util/cargo-0.13.0
+DEPEND=>=dev-lang/rust-1.8.0
 DESCRIPTION=Tool to find and fix Rust formatting issues
 EAPI=6
 HOMEPAGE=https://github.com/rust-lang-nursery/rustfmt
@@ -8,5 +8,5 @@ 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
+_eclasses_=cargo	3e38275395b24dfed9849a57ba58a486	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=11e063e6ef6c1bbc9f53047fcc5cf7da
diff --git a/metadata/md5-cache/dev-util/valgrind-3.12.0 b/metadata/md5-cache/dev-util/valgrind-3.12.0
index 833bb6d61123..69ca5ac5ccc5 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.12.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.12.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=93800245ff27d751071fb559ccb5ee07
diff --git a/metadata/md5-cache/dev-util/valgrind-3.13.0 b/metadata/md5-cache/dev-util/valgrind-3.13.0
index 3b88f4555eec..59c04860db9a 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.13.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.13.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2e72593bf5e806b95beedc4711cef1df
diff --git a/metadata/md5-cache/dev-util/valgrind-3.13.0-r1 b/metadata/md5-cache/dev-util/valgrind-3.13.0-r1
index 321bfc10572f..a5eb83367a1f 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.13.0-r1
+++ b/metadata/md5-cache/dev-util/valgrind-3.13.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=964b809532c1be7bea072cd9efb191d4
diff --git a/metadata/md5-cache/dev-util/valgrind-3.13.0-r2 b/metadata/md5-cache/dev-util/valgrind-3.13.0-r2
index 4b1c81f26bb2..f9ed9d6ba677 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.13.0-r2
+++ b/metadata/md5-cache/dev-util/valgrind-3.13.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8b316c576e87e4fdf1eaf72b423a5eba
diff --git a/metadata/md5-cache/dev-util/valgrind-9999 b/metadata/md5-cache/dev-util/valgrind-9999
index 384f3a29cd9a..52de1b2ce5ee 100644
--- a/metadata/md5-cache/dev-util/valgrind-9999
+++ b/metadata/md5-cache/dev-util/valgrind-9999
@@ -7,5 +7,5 @@ IUSE=mpi
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ecd76cf1e6a019cc24c84921a58de47
diff --git a/metadata/md5-cache/dev-util/wsta-0.5.0 b/metadata/md5-cache/dev-util/wsta-0.5.0
index cca94d6b5913..020940b68d80 100644
--- a/metadata/md5-cache/dev-util/wsta-0.5.0
+++ b/metadata/md5-cache/dev-util/wsta-0.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-libs/openssl:* virtual/rust >=dev-util/cargo-0.13.0
+DEPEND=dev-libs/openssl:* virtual/rust
 DESCRIPTION=A CLI development tool for WebSocket APIs
 EAPI=6
 HOMEPAGE=https://github.com/esphen/wsta/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/openssl:*
 SLOT=0
 SRC_URI=https://github.com/esphen/wsta/archive/0.5.0.tar.gz -> wsta-0.5.0.tar.gz https://crates.io/api/v1/crates/argparse/0.2.1/download -> argparse-0.2.1.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/byteorder/0.5.3/download -> byteorder-0.5.3.crate https://crates.io/api/v1/crates/cfg-if/0.1.0/download -> cfg-if-0.1.0.crate https://crates.io/api/v1/crates/config/0.1.3/download -> config-0.1.3.crate https://crates.io/api/v1/crates/cookie/0.2.5/download -> cookie-0.2.5.crate https://crates.io/api/v1/crates/gcc/0.3.40/download -> gcc-0.3.40.crate https://crates.io/api/v1/crates/gdi32-sys/0.2.0/download -> gdi32-sys-0.2.0.crate https://crates.io/api/v1/crates/hpack/0.2.0/download -> hpack-0.2.0.crate https://crates.io/api/v1/crates/httparse/1.2.1/download -> httparse-1.2.1.crate https://crates.io/api/v1/crates/hyper/0.9.14/download -> hyper-0.9.14.crate https://crates.io/api/v1/crates/idna/0.1.0/download -> idna-0.1.0.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/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.2/download -> lazy_static-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.18/download -> libc-0.2.18.crate https://crates.io/api/v1/crates/libressl-pnacl-sys/2.1.6/download -> libressl-pnacl-sys-2.1.6.crate https://crates.io/api/v1/crates/log/0.3.6/download -> log-0.3.6.crate https://crates.io/api/v1/crates/matches/0.1.4/download -> matches-0.1.4.crate https://crates.io/api/v1/crates/mime/0.2.2/download -> mime-0.2.2.crate https://crates.io/api/v1/crates/net2/0.2.26/download -> net2-0.2.26.crate https://crates.io/api/v1/crates/nom/1.0.1/download -> nom-1.0.1.crate https://crates.io/api/v1/crates/num_cpus/1.2.0/download -> num_cpus-1.2.0.crate https://crates.io/api/v1/crates/openssl/0.7.14/download -> openssl-0.7.14.crate https://crates.io/api/v1/crates/openssl-sys/0.7.17/download -> openssl-sys-0.7.17.crate https://crates.io/api/v1/crates/openssl-sys-extras/0.7.14/download -> openssl-sys-extras-0.7.14.crate https://crates.io/api/v1/crates/openssl-verify/0.1.0/download -> openssl-verify-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.8/download -> pkg-config-0.3.8.crate https://crates.io/api/v1/crates/pnacl-build-helper/1.4.10/download -> pnacl-build-helper-1.4.10.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.22/download -> rustc-serialize-0.3.22.crate https://crates.io/api/v1/crates/rustc_version/0.1.7/download -> rustc_version-0.1.7.crate https://crates.io/api/v1/crates/semver/0.1.20/download -> semver-0.1.20.crate https://crates.io/api/v1/crates/solicit/0.4.4/download -> solicit-0.4.4.crate https://crates.io/api/v1/crates/tempdir/0.3.5/download -> tempdir-0.3.5.crate https://crates.io/api/v1/crates/time/0.1.35/download -> time-0.1.35.crate https://crates.io/api/v1/crates/traitobject/0.0.1/download -> traitobject-0.0.1.crate https://crates.io/api/v1/crates/typeable/0.1.2/download -> typeable-0.1.2.crate https://crates.io/api/v1/crates/unicase/1.4.0/download -> unicase-1.4.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.2.3/download -> unicode-bidi-0.2.3.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.2/download -> unicode-normalization-0.1.2.crate https://crates.io/api/v1/crates/url/1.2.4/download -> url-1.2.4.crate https://crates.io/api/v1/crates/user32-sys/0.2.0/download -> user32-sys-0.2.0.crate https://crates.io/api/v1/crates/websocket/0.17.1/download -> websocket-0.17.1.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 https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/xdg/2.0.0/download -> xdg-2.0.0.crate
-_eclasses_=cargo	959846e2836f8244430c9582dd6493af	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	3e38275395b24dfed9849a57ba58a486	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=3f1d4bd47139b20a9acf60d5bcef8958
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index fa3e1d116a02..1dea9c48ebfc 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/gitg-3.26.0 b/metadata/md5-cache/dev-vcs/gitg-3.26.0
index 79c631dc39fa..320ed038ff46 100644
--- a/metadata/md5-cache/dev-vcs/gitg-3.26.0
+++ b/metadata/md5-cache/dev-vcs/gitg-3.26.0
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libsecret dev-libs/libgee:0.8[introspection] >=app-text/gtkspe
 REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gitg/3.26/gitg-3.26.0.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=29fa463da29424e3bbedce5958ca5aa3
diff --git a/metadata/md5-cache/dev-vcs/gitolite-3.6.8 b/metadata/md5-cache/dev-vcs/gitolite-3.6.8
new file mode 100644
index 000000000000..9fa158144429
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/gitolite-3.6.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=
+DESCRIPTION=Highly flexible server for git directory version tracker
+EAPI=6
+HOMEPAGE=https://github.com/sitaramc/gitolite
+IUSE=selinux tools
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !app-vim/gitolite-syntax !dev-vcs/gitolite-gentoo selinux? ( sec-policy/selinux-gitosis ) dev-perl/JSON dev-lang/perl:=
+SLOT=0
+SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.8.tar.gz -> gitolite-3.6.8.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f6bd4de02b6c650b196369ee8c2a416a
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 168c4077b913..444928a666e2 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/dolphin-5.0 b/metadata/md5-cache/games-emulation/dolphin-5.0
index e68ba6c30b3c..0e3bd4698c5f 100644
--- a/metadata/md5-cache/games-emulation/dolphin-5.0
+++ b/metadata/md5-cache/games-emulation/dolphin-5.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dolphin-emu/dolphin/archive/5.0.zip -> dolphin-5.0.zip
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=53700fefc0602964510d85b69aff4aa2
diff --git a/metadata/md5-cache/games-emulation/dolphin-9999 b/metadata/md5-cache/games-emulation/dolphin-9999
index 1322fba9243e..9f1b01831b95 100644
--- a/metadata/md5-cache/games-emulation/dolphin-9999
+++ b/metadata/md5-cache/games-emulation/dolphin-9999
@@ -7,5 +7,5 @@ IUSE=alsa ao bluetooth discord-presence doc egl +evdev ffmpeg libav log lto open
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1:= dev-libs/hidapi:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) systemd? ( sys-apps/systemd:0= ) upnp? ( >=net-libs/miniupnpc-1.7 )
 SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e6a41e312442621c74d06e87775378df
diff --git a/metadata/md5-cache/games-emulation/mednafen-0.9.46 b/metadata/md5-cache/games-emulation/mednafen-0.9.46
index 3250bf42b03d..6c2ca950d287 100644
--- a/metadata/md5-cache/games-emulation/mednafen-0.9.46
+++ b/metadata/md5-cache/games-emulation/mednafen-0.9.46
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libcdio >=dev-libs/lzo-2.10 media-libs/libsdl[sound,joystick,opengl,video] media-libs/libsndfile sys-libs/zlib[minizip] virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://mednafen.github.io/releases/files/mednafen-0.9.46.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=011823ed3813cc72f542ee55fb448fa3
diff --git a/metadata/md5-cache/games-emulation/zsnes-1.51-r6 b/metadata/md5-cache/games-emulation/zsnes-1.51-r6
index b4ea44754bf4..1ae9027276e2 100644
--- a/metadata/md5-cache/games-emulation/zsnes-1.51-r6
+++ b/metadata/md5-cache/games-emulation/zsnes-1.51-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/zsnes/zsnes151src.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b6e0776e067ebdc897d6a959cfc26bfa
diff --git a/metadata/md5-cache/games-emulation/zsnes-1.51-r7 b/metadata/md5-cache/games-emulation/zsnes-1.51-r7
index 9f9417fd727a..53bff600eed7 100644
--- a/metadata/md5-cache/games-emulation/zsnes-1.51-r7
+++ b/metadata/md5-cache/games-emulation/zsnes-1.51-r7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/zsnes/zsnes151src.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e9c85e87d34287a1f7ee5a167affc8ab
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 2dc0e46377f1..d6ac01dc7fcb 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/eduke32-20180702.6937 b/metadata/md5-cache/games-fps/eduke32-20180702.6937
deleted file mode 100644
index ccc7c29668ca..000000000000
--- a/metadata/md5-cache/games-fps/eduke32-20180702.6937
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=media-libs/libsdl2[joystick,opengl?,sound,video,X] media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?] sys-libs/zlib:= flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) timidity? ( media-sound/timidity-freepats ) vpx? ( media-libs/libvpx:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) xmp? ( media-libs/exempi:= ) app-arch/unzip x86? ( dev-lang/nasm ) >=sys-apps/sed-4
-DESCRIPTION=An open source engine port of the classic PC first person shooter Duke Nukem 3D
-EAPI=6
-HOMEPAGE=http://www.eduke32.com/
-IUSE=cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=BUILDLIC GPL-2 HRP
-RDEPEND=media-libs/libsdl2[joystick,opengl?,sound,video,X] media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?] sys-libs/zlib:= flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) timidity? ( media-sound/timidity-freepats ) vpx? ( media-libs/libvpx:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) xmp? ( media-libs/exempi:= ) cdinstall? ( games-fps/duke3d-data ) demo? ( games-fps/duke3d-demodata )
-REQUIRED_USE=cdinstall? ( !demo ) demo? ( !cdinstall ) hrp? ( ^^ ( demo cdinstall ) !voxels ) offensive? ( ^^ ( demo cdinstall ) ) opl? ( ^^ ( demo cdinstall ) !sc-55 ) psx? ( ^^ ( demo cdinstall ) ) sc-55? ( ^^ ( demo cdinstall ) !opl ) voxels? ( !hrp ) vpx? ( opengl )
-SLOT=0
-SRC_URI=http://dukeworld.com/eduke32/synthesis/20180702-6937/eduke32_src_20180702-6937.tar.xz http://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1be49671d65817925c0fc186be820422
diff --git a/metadata/md5-cache/games-fps/eduke32-20180802.6963 b/metadata/md5-cache/games-fps/eduke32-20180802.6963
new file mode 100644
index 000000000000..89dc4e1e4baa
--- /dev/null
+++ b/metadata/md5-cache/games-fps/eduke32-20180802.6963
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst unpack
+DEPEND=media-libs/libsdl2[joystick,opengl?,sound,video,X] media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?] sys-libs/zlib:= flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) timidity? ( media-sound/timidity-freepats ) vpx? ( media-libs/libvpx:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) xmp? ( media-libs/exempi:= ) app-arch/unzip x86? ( dev-lang/nasm ) >=sys-apps/sed-4
+DESCRIPTION=An open source engine port of the classic PC first person shooter Duke Nukem 3D
+EAPI=6
+HOMEPAGE=http://www.eduke32.com/
+IUSE=cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=BUILDLIC GPL-2 HRP
+RDEPEND=media-libs/libsdl2[joystick,opengl?,sound,video,X] media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?] sys-libs/zlib:= flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) timidity? ( media-sound/timidity-freepats ) vpx? ( media-libs/libvpx:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) xmp? ( media-libs/exempi:= ) cdinstall? ( games-fps/duke3d-data ) demo? ( games-fps/duke3d-demodata )
+REQUIRED_USE=cdinstall? ( !demo ) demo? ( !cdinstall ) hrp? ( ^^ ( demo cdinstall ) !voxels ) offensive? ( ^^ ( demo cdinstall ) ) opl? ( ^^ ( demo cdinstall ) !sc-55 ) psx? ( ^^ ( demo cdinstall ) ) sc-55? ( ^^ ( demo cdinstall ) !opl ) voxels? ( !hrp ) vpx? ( opengl )
+SLOT=0
+SRC_URI=http://dukeworld.com/eduke32/synthesis/20180802-6963/eduke32_src_20180802-6963.tar.xz http://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1be49671d65817925c0fc186be820422
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index b07bfbb5d4c6..15f1e934f63e 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/five-or-more-3.28.0 b/metadata/md5-cache/games-puzzle/five-or-more-3.28.0
new file mode 100644
index 000000000000..56473b7a52d6
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/five-or-more-3.28.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.20:3 app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext 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=Five or More Game for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Five%20or%20more
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.32:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.20:3 !<x11-themes/gnome-themes-standard-3.14
+SLOT=0
+SRC_URI=mirror://gnome/sources/five-or-more/3.28/five-or-more-3.28.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2ccefeb493a03b0820cab2e8e692bb77
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index d935ec6c7f67..5e5a6e838920 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.12.2 b/metadata/md5-cache/games-server/minecraft-server-1.12.2
deleted file mode 100644
index 90036a3f960d..000000000000
--- a/metadata/md5-cache/games-server/minecraft-server-1.12.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DESCRIPTION=The official server for the sandbox video game Minecraft
-EAPI=6
-HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=Mojang
-RDEPEND=app-misc/screen virtual/jre
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://s3.amazonaws.com/Minecraft.Download/versions/1.12.2/minecraft_server.1.12.2.jar -> minecraft-server-1.12.2.jar
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=04a52257e0588b2d98e9d66ad2f76e10
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.13 b/metadata/md5-cache/games-server/minecraft-server-1.13
new file mode 100644
index 000000000000..fb0051e766b7
--- /dev/null
+++ b/metadata/md5-cache/games-server/minecraft-server-1.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup unpack
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=The official server for the sandbox video game
+EAPI=6
+HOMEPAGE=https://www.minecraft.net/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Mojang
+RDEPEND=app-misc/screen >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://launcher.mojang.com/mc/game/1.13/server/d0caafb8438ebd206f99930cfaecfa6c9a13dca0/server.jar -> minecraft-server-1.13.jar
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ddcf6eb23b16f3103e69f0f6dac3c6d9
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 966ac428cbc6..dbe0f03346e5 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/xboxdrv-0.8.8 b/metadata/md5-cache/games-util/xboxdrv-0.8.8
index f47836b26142..68ee105ec292 100644
--- a/metadata/md5-cache/games-util/xboxdrv-0.8.8
+++ b/metadata/md5-cache/games-util/xboxdrv-0.8.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost:= dev-libs/dbus-glib:= virtual/libudev:= sys-apps/dbus:= dev-libs/glib:2= virtual/libusb:1= x11-libs/libX11:=
 SLOT=0
 SRC_URI=https://pingus.seul.org/~grumbel/xboxdrv/xboxdrv-linux-0.8.8.tar.bz2
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=c2be9b9c1b542286c8364c727528863b
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 2d8cf5103519..b6a41d053fd3 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/dconf-editor-3.26.2 b/metadata/md5-cache/gnome-base/dconf-editor-3.26.2
new file mode 100644
index 000000000000..d69600911902
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/dconf-editor-3.26.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.46.0:2 >=gnome-base/dconf-0.25.1 >=x11-libs/gtk+-3.22.0:3 >=sys-devel/gettext-0.19.7 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=Graphical tool for editing the dconf configuration database
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/dconf-editor
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.46.0:2 >=gnome-base/dconf-0.25.1 >=x11-libs/gtk+-3.22.0:3 !<gnome-base/dconf-0.22[X]
+SLOT=0
+SRC_URI=mirror://gnome/sources/dconf-editor/3.26/dconf-editor-3.26.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a06cb79780ae01a441f2038039826a0d
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.4 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.4
index 1940dd2733b3..468d1c7fa496 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.4
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.4
@@ -11,5 +11,5 @@ REQUIRED_USE=input_devices_wacom? ( udev ) smartcard? ( udev ) wayland? ( udev )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.24/gnome-settings-daemon-3.24.4.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-settings-daemon-3.24.4-patchset.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0aace946b266355d0d1786ec34911234
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.22.3 b/metadata/md5-cache/gnome-base/gnome-shell-3.22.3
index bfc58997e779..35a20fc9c7de 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.22.3
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.22.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.22/gnome-shell-3.22.3.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aa06cf8320df81f6602730ddb0f11685
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.24.3 b/metadata/md5-cache/gnome-base/gnome-shell-3.24.3
index e6908169b9e8..6ec93b73da1c 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.24.3
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.24.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.24/gnome-shell-3.24.3.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8f4a23f62fa7b5948a97a9d719b5756d
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 0046a99b4563..4597717ad72d 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/authenticator-0.2.1 b/metadata/md5-cache/gnome-extra/authenticator-0.2.1
new file mode 100644
index 000000000000..14dff52d72c0
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/authenticator-0.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=app-crypt/libsecret dev-python/pillow[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(-)] dev-python/pyotp[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(-)] dev-python/pyzbar[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(-)] media-gfx/gnome-screenshot x11-libs/gtk+:3 >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Two-factor authentication code generator for GNOME
+EAPI=6
+HOMEPAGE=https://github.com/bilelmoussaoui/Authenticator
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-crypt/libsecret dev-python/pillow[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(-)] dev-python/pyotp[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(-)] dev-python/pyzbar[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(-)] media-gfx/gnome-screenshot x11-libs/gtk+:3
+SLOT=0
+SRC_URI=https://github.com/bilelmoussaoui/Authenticator/archive/0.2.1.tar.gz -> authenticator-0.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=01e3c417b1bfd9f376b318f176dc3850
diff --git a/metadata/md5-cache/gnome-extra/authenticator-9999 b/metadata/md5-cache/gnome-extra/authenticator-9999
new file mode 100644
index 000000000000..fc1c4e5237b3
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/authenticator-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst test unpack
+DEPEND=app-crypt/libsecret dev-python/pillow[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(-)] dev-python/pyotp[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(-)] dev-python/pyzbar[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(-)] media-gfx/gnome-screenshot x11-libs/gtk+:3 >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Two-factor authentication code generator for GNOME
+EAPI=6
+HOMEPAGE=https://github.com/bilelmoussaoui/Authenticator
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+LICENSE=GPL-2+
+RDEPEND=app-crypt/libsecret dev-python/pillow[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(-)] dev-python/pyotp[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(-)] dev-python/pyzbar[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(-)] media-gfx/gnome-screenshot x11-libs/gtk+:3
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=01e3c417b1bfd9f376b318f176dc3850
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2 b/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2
index e02383550680..3be8f16a80eb 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/Cinnamon/archive/3.6.6.tar.gz -> cinnamon-3.6.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f0771af73f2cfb7fe624540a08e2430d
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-3.8.8 b/metadata/md5-cache/gnome-extra/cinnamon-3.8.8
index b948cdeb76f7..9165dfc9264e 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-3.8.8
+++ b/metadata/md5-cache/gnome-extra/cinnamon-3.8.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/Cinnamon/archive/3.8.8.tar.gz -> cinnamon-3.8.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=16aba224fe1f3565497cdafa9b0a2e76
diff --git a/metadata/md5-cache/gnome-extra/cjs-3.6.1 b/metadata/md5-cache/gnome-extra/cjs-3.6.1
index 1eb121c7a321..d000587ba2fb 100644
--- a/metadata/md5-cache/gnome-extra/cjs-3.6.1
+++ b/metadata/md5-cache/gnome-extra/cjs-3.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/spidermonkey:38 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-int
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cjs/archive/3.6.1.tar.gz -> cjs-3.6.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6c3ba181385a02506d6b4a16bc2b9011
diff --git a/metadata/md5-cache/gnome-extra/cjs-3.8.0 b/metadata/md5-cache/gnome-extra/cjs-3.8.0
index 3b5320376bac..0613bc6fd64b 100644
--- a/metadata/md5-cache/gnome-extra/cjs-3.8.0
+++ b/metadata/md5-cache/gnome-extra/cjs-3.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/spidermonkey:52 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-int
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cjs/archive/3.8.0.tar.gz -> cjs-3.8.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1570270fa46e73b35db49fb1d84dceac
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 27153372563a..9070d29a0c4b 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/akonadi-17.12.3 b/metadata/md5-cache/kde-apps/akonadi-17.12.3
deleted file mode 100644
index 737b5b050203..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-17.12.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.43.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=Storage service for PIM data and libraries for PIM apps
-EAPI=6
-HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
-IUSE=+mysql postgres sqlite tools xml test debug designer test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !<kde-apps/kapptemplate-17.11.80 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi: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
-REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/akonadi-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1662857a64bd827b0e822df0a3e2937
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.3 b/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.3
deleted file mode 100644
index 9facadde3aa2..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Library for akonadi calendar integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-calendar: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/akonadi-calendar-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6daa3c2ac727f2e08ac6c2a1418e5f65
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.3 b/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.3
deleted file mode 100644
index 1c780ca7d02b..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/prison-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Library for akonadi contact integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/prison-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-contacts: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/akonadi-contacts-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4a771ce5a6cc7eb4dc6776de65bdd3de
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.3 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.3
deleted file mode 100644
index 5aafb2478d38..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/mailcommon-17.12.3:5 >=kde-apps/mailimporter-17.12.3:5 >=kde-apps/messagelib-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Import_Options
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/mailcommon-17.12.3:5 >=kde-apps/mailimporter-17.12.3:5 >=kde-apps/messagelib-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-import-wizard: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/akonadi-import-wizard-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f57b135c6ee16070c0ff81c4e398e559
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-17.12.3 b/metadata/md5-cache/kde-apps/akonadi-mime-17.12.3
deleted file mode 100644
index e1141cbce205..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-mime-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Library for akonadi mime types
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt x11-misc/shared-mime-info !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-mime: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/akonadi-mime-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d097f29bdfbd334902ac5d49f1da3409
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-17.12.3 b/metadata/md5-cache/kde-apps/akonadi-notes-17.12.3
deleted file mode 100644
index 3de786901a33..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-notes-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.43.0:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-apps/akonadi-17.12.3:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Library for akonadi notes integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.43.0:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-notes: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/akonadi-notes-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=43d1cdb3f16b94f42a942fef0cdfedce
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-17.12.3 b/metadata/md5-cache/kde-apps/akonadi-search-17.12.3
deleted file mode 100644
index 200e2f95cbf9..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-search-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/krunner-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/xapian-1.3:=[chert] dev-libs/boost test? ( >=kde-apps/akonadi-17.12.3:5[mysql,postgres,sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=Libraries and daemons to implement searching in Akonadi
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/akonadi-search.git
-IUSE=test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/krunner-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-search: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/akonadi-search-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3901f8bfaaafc58739a1888482e88fce
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-17.12.3 b/metadata/md5-cache/kde-apps/akonadiconsole-17.12.3
deleted file mode 100644
index 8228a72783d5..000000000000
--- a/metadata/md5-cache/kde-apps/akonadiconsole-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-search-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/messagelib-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application for debugging Akonadi Resources
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-search-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/messagelib-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadiconsole: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/akonadiconsole-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=97d96994eac2be12ae7c658e927f27c4
diff --git a/metadata/md5-cache/kde-apps/akregator-17.12.3 b/metadata/md5-cache/kde-apps/akregator-17.12.3
deleted file mode 100644
index 1130c4ba5e23..000000000000
--- a/metadata/md5-cache/kde-apps/akregator-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/grantleetheme-17.12.3:5 >=kde-apps/kontactinterface-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/messagelib-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=kde-apps/syndication-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=News feed aggregator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/akregator
-IUSE=debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/grantleetheme-17.12.3:5 >=kde-apps/kontactinterface-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/messagelib-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=kde-apps/syndication-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akregator: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/akregator-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=edf9d8f2080dba19cc49ab9b2fbc9be1
diff --git a/metadata/md5-cache/kde-apps/analitza-17.12.3 b/metadata/md5-cache/kde-apps/analitza-17.12.3
deleted file mode 100644
index 9127f5cfccb2..000000000000
--- a/metadata/md5-cache/kde-apps/analitza-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[-gles2] >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 eigen? ( dev-cpp/eigen:3 ) nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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 library for mathematical features
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=eigen nls test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[-gles2] >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/analitza: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/analitza-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=877641783e6e7b8f75eeda0057fd87ad
diff --git a/metadata/md5-cache/kde-apps/ark-17.12.3 b/metadata/md5-cache/kde-apps/ark-17.12.3
deleted file mode 100644
index 10ca98f5b3bd..000000000000
--- a/metadata/md5-cache/kde-apps/ark-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kpty-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.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.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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 test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kpty-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.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.43.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	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ee9253b597bcf939ff69d2fcaa0d369b
diff --git a/metadata/md5-cache/kde-apps/artikulate-17.12.3 b/metadata/md5-cache/kde-apps/artikulate-17.12.3
deleted file mode 100644
index 41e7830715f9..000000000000
--- a/metadata/md5-cache/kde-apps/artikulate-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Language learning application that helps improving pronunciation skills
-EAPI=6
-HOMEPAGE=https://edu.kde.org/applications/language/artikulate
-IUSE=+gstreamer qtmedia debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/artikulate: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
-REQUIRED_USE=|| ( gstreamer qtmedia )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/artikulate-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=78b21b5b2276ac003ae477ba0a9d05da
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-17.12.3 b/metadata/md5-cache/kde-apps/audiocd-kio-17.12.3
deleted file mode 100644
index 738e6543f7e8..000000000000
--- a/metadata/md5-cache/kde-apps/audiocd-kio-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-apps/libkcddb-17.12.3:5 >=kde-apps/libkcompactdisc-17.12.3:5 >=dev-qt/qtwidgets-5.9.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kioslave for accessing audio CDs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=flac vorbis debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-apps/libkcddb-17.12.3:5 >=kde-apps/libkcompactdisc-17.12.3:5 >=dev-qt/qtwidgets-5.9.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/audiocd-kio: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/audiocd-kio-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=87270f26f86e4bd643d4318c3eae05d6
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-17.12.3 b/metadata/md5-cache/kde-apps/baloo-widgets-17.12.3
deleted file mode 100644
index 69266fec95b3..000000000000
--- a/metadata/md5-cache/kde-apps/baloo-widgets-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/baloo-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kfilemetadata-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Widget library for baloo
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/baloo-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kfilemetadata-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/baloo-widgets: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/baloo-widgets-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=39ff0c9aa5ad956c827e7366b6bbf649
diff --git a/metadata/md5-cache/kde-apps/blinken-17.12.3 b/metadata/md5-cache/kde-apps/blinken-17.12.3
deleted file mode 100644
index 3717ba58e4a7..000000000000
--- a/metadata/md5-cache/kde-apps/blinken-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE version of the Simon Says game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/blinken https://edu.kde.org/blinken/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/blinken: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/blinken-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1accc6c87f3d1c860f1d767807dd9be1
diff --git a/metadata/md5-cache/kde-apps/bomber-17.12.3 b/metadata/md5-cache/kde-apps/bomber-17.12.3
deleted file mode 100644
index ed733b568508..000000000000
--- a/metadata/md5-cache/kde-apps/bomber-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE arcade bombing game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/bomber/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bomber: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/bomber-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fb4a130a977f6fc79197786e329c6eb9
diff --git a/metadata/md5-cache/kde-apps/bovo-17.12.3 b/metadata/md5-cache/kde-apps/bovo-17.12.3
deleted file mode 100644
index c30049f3bf6b..000000000000
--- a/metadata/md5-cache/kde-apps/bovo-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Five-in-a-row Board Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/bovo/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bovo: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/bovo-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7b3a789b91e994385d3b6abfd006ea92
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-17.12.3 b/metadata/md5-cache/kde-apps/calendarjanitor-17.12.3
deleted file mode 100644
index b8cf305a175a..000000000000
--- a/metadata/md5-cache/kde-apps/calendarjanitor-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-calendar-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tool to scan calendar data for buggy instances
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-calendar-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarjanitor: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/akonadi-calendar-tools-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8515b6b2811d74b61d96c38ff443aa46
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-17.12.3 b/metadata/md5-cache/kde-apps/calendarsupport-17.12.3
deleted file mode 100644
index 961e57a60296..000000000000
--- a/metadata/md5-cache/kde-apps/calendarsupport-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/kholidays-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-calendar-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Calendar support library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/kholidays-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-calendar-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarsupport: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/calendarsupport-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=11f0cc5ba8a737466af94b60f06f6af4
diff --git a/metadata/md5-cache/kde-apps/cantor-17.12.3 b/metadata/md5-cache/kde-apps/cantor-17.12.3
deleted file mode 100644
index 6f8a01a6369e..000000000000
--- a/metadata/md5-cache/kde-apps/cantor-17.12.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kpty-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 analitza? ( >=kde-apps/analitza-17.12.3:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) 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(-)] ) R? ( dev-lang/R ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Interface for doing mathematics and scientific computing
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/
-IUSE=+analitza julia lua postscript python qalculate R debug +handbook test python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kpty-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 analitza? ( >=kde-apps/analitza-17.12.3:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) 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(-)] ) R? ( dev-lang/R ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cantor: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
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/cantor-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5aba2106c0aebb2d930542002ef096bf
diff --git a/metadata/md5-cache/kde-apps/cervisia-17.12.3 b/metadata/md5-cache/kde-apps/cervisia-17.12.3
deleted file mode 100644
index 59e28ab9596f..000000000000
--- a/metadata/md5-cache/kde-apps/cervisia-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdesu-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kinit-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=CVS frontend by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/cervisia
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdesu-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kinit-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cervisia: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/cervisia-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=14ede4987e78de20196d54cce73e29cd
diff --git a/metadata/md5-cache/kde-apps/dolphin-17.12.3 b/metadata/md5-cache/kde-apps/dolphin-17.12.3
deleted file mode 100644
index 72ca688faaef..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kinit-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.43.0:5 >=kde-frameworks/kfilemetadata-5.43.0:5 >=kde-apps/baloo-widgets-17.12.3:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.43.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Plasma filemanager focusing on usability
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin
-IUSE=semantic-desktop thumbnail test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kinit-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.43.0:5 >=kde-frameworks/kfilemetadata-5.43.0:5 >=kde-apps/baloo-widgets-17.12.3:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.43.0:5 ) >=kde-apps/kio-extras-17.12.3:5 thumbnail? ( >=kde-apps/ffmpegthumbs-17.12.3:5 >=kde-apps/thumbnailers-17.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin: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/dolphin-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2ba872efe61f95502588b5aa32ebbb08
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.3
deleted file mode 100644
index 7d3557da0ffa..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/dolphin-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 git? ( >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra Dolphin plugins
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=bazaar dropbox git mercurial subversion debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/dolphin-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 git? ( >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 ) >=kde-apps/kompare-17.12.3:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/dolphin-plugins-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db481be3bab07bc0304a2fa90c254fc3
diff --git a/metadata/md5-cache/kde-apps/dragon-17.12.3 b/metadata/md5-cache/kde-apps/dragon-17.12.3
deleted file mode 100644
index 03c16536958e..000000000000
--- a/metadata/md5-cache/kde-apps/dragon-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A simple video player
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/dragonplayer
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dragon: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/dragon-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b29c8b6930a059928eef3e4451a236d
diff --git a/metadata/md5-cache/kde-apps/eventviews-17.12.3 b/metadata/md5-cache/kde-apps/eventviews-17.12.3
deleted file mode 100644
index 85d5545e0228..000000000000
--- a/metadata/md5-cache/kde-apps/eventviews-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-calendar-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Calendar viewer for KDE PIM
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-calendar-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/eventviews: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/eventviews-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dd44629452f4859391a6e46b987c2416
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.3 b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.3
deleted file mode 100644
index 5eedad6c4b49..000000000000
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=FFmpeg based thumbnail generator for video files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=libav debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kio-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ffmpegthumbs-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b680f88056ff147711f4aa86058f183
diff --git a/metadata/md5-cache/kde-apps/filelight-17.12.3 b/metadata/md5-cache/kde-apps/filelight-17.12.3
deleted file mode 100644
index f28032ace347..000000000000
--- a/metadata/md5-cache/kde-apps/filelight-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
-EAPI=6
-HOMEPAGE=https://utils.kde.org/projects/filelight/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/filelight: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/filelight-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f4380af917815f769646be4bbe5677af
diff --git a/metadata/md5-cache/kde-apps/granatier-17.12.3 b/metadata/md5-cache/kde-apps/granatier-17.12.3
deleted file mode 100644
index be712a560bec..000000000000
--- a/metadata/md5-cache/kde-apps/granatier-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Bomberman game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/granatier/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/granatier: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/granatier-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0c9d26b49f215399e273dbec7e5849e4
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-17.12.3 b/metadata/md5-cache/kde-apps/grantlee-editor-17.12.3
deleted file mode 100644
index d45374eb7f47..000000000000
--- a/metadata/md5-cache/kde-apps/grantlee-editor-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/messagelib-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/messagelib-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantlee-editor: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/grantlee-editor-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d286ef1fe8fe59b41e80cc5985c27a47
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-17.12.3 b/metadata/md5-cache/kde-apps/grantleetheme-17.12.3
deleted file mode 100644
index 4eb82bdeb734..000000000000
--- a/metadata/md5-cache/kde-apps/grantleetheme-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Library for Grantlee plugins
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantleetheme: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/grantleetheme-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ddc87bfaedbf2e9d4270a061f94c281c
diff --git a/metadata/md5-cache/kde-apps/gwenview-17.12.3 b/metadata/md5-cache/kde-apps/gwenview-17.12.3
deleted file mode 100644
index de570537f674..000000000000
--- a/metadata/md5-cache/kde-apps/gwenview-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-17.12.3:5= ) raw? ( >=kde-apps/libkdcraw-17.12.3:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.43.0:5 >=kde-frameworks/kfilemetadata-5.43.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.43.0:5 >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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 image viewer
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
-IUSE=fits kipi raw semantic-desktop X debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-17.12.3:5= ) raw? ( >=kde-apps/libkdcraw-17.12.3:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.43.0:5 >=kde-frameworks/kfilemetadata-5.43.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.43.0:5 >=dev-qt/qtimageformats-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/gwenview: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/gwenview-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b8a8cbb3e9464669707065457390e36
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-17.12.3 b/metadata/md5-cache/kde-apps/incidenceeditor-17.12.3
deleted file mode 100644
index d45f96d0397e..000000000000
--- a/metadata/md5-cache/kde-apps/incidenceeditor-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-calendar-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/eventviews-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kldap-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=Incidence editor for korganizer
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-calendar-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/eventviews-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kldap-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/incidenceeditor: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/incidenceeditor-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f4eed089370e7d277140697a72906b9a
diff --git a/metadata/md5-cache/kde-apps/juk-17.12.3 b/metadata/md5-cache/kde-apps/juk-17.12.3
deleted file mode 100644
index 132e94628b9e..000000000000
--- a/metadata/md5-cache/kde-apps/juk-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Jukebox and music manager by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/juk/
-IUSE=debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/juk: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/juk-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e59e959fc395e4a909680f5c704d2b0a
diff --git a/metadata/md5-cache/kde-apps/k3b-17.12.3 b/metadata/md5-cache/kde-apps/k3b-17.12.3
deleted file mode 100644
index cd1ed832c9a2..000000000000
--- a/metadata/md5-cache/kde-apps/k3b-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kfilemetadata-5.43.0:5[taglib?] >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=kde-apps/libkcddb-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Full-featured burning and ripping application based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/K3b
-IUSE=dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 FDL-1.2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kfilemetadata-5.43.0:5[taglib?] >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=kde-apps/libkcddb-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/k3b: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
-REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/k3b-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=df9b98222d6db74c913a3c095d2c61dc
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.3 b/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.3
deleted file mode 100644
index c2412563e5b0..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kcmutils-5.43.0:5 >=kde-plasma/kde-cli-tools-5.12.5:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Administer web accounts for the sites and services across the Plasma desktop
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-integration: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/kaccounts-integration-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4da966d49c35da73a6a52a26bdf18acf
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.3 b/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.3
deleted file mode 100644
index dcac490b0bc0..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kpackage-5.43.0:5 >=kde-apps/kaccounts-integration-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-util/intltool sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE accounts providers
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kpackage-5.43.0:5 >=kde-apps/kaccounts-integration-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-providers: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kaccounts-providers-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0a9ad0714a7d0512886e781e17f82fd0
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-17.12.3 b/metadata/md5-cache/kde-apps/kaddressbook-17.12.3
deleted file mode 100644
index 3ef3d5608845..000000000000
--- a/metadata/md5-cache/kde-apps/kaddressbook-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/prison-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-search-17.12.3:5 >=kde-apps/grantleetheme-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kontactinterface-17.12.3:5 >=kde-apps/libgravatar-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/libkleo-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 test? ( >=kde-apps/akonadi-17.12.3:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Address book application based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kaddressbook/
-IUSE=test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/prison-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-search-17.12.3:5 >=kde-apps/grantleetheme-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kontactinterface-17.12.3:5 >=kde-apps/libgravatar-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/libkleo-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaddressbook: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kaddressbook-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a9d1ed949062064d68c47fbb558911ab
diff --git a/metadata/md5-cache/kde-apps/kajongg-17.12.3 b/metadata/md5-cache/kde-apps/kajongg-17.12.3
deleted file mode 100644
index 0fc7d7e808ea..000000000000
--- a/metadata/md5-cache/kde-apps/kajongg-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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_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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classical Mah Jongg for four players
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kajongg/
-IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=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_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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-apps/libkmahjongg-17.12.3:5 !kde-apps/kajongg:4 !<kde-apps/kde4-l10n-17.03.90:4
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kajongg-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=33b6a8996129bfbcace21ea507f4efa1
diff --git a/metadata/md5-cache/kde-apps/kalarm-17.12.3 b/metadata/md5-cache/kde-apps/kalarm-17.12.3
deleted file mode 100644
index b159444c607e..000000000000
--- a/metadata/md5-cache/kde-apps/kalarm-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/kholidays-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kalarmcal-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kontactinterface-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/mailcommon-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KAlarm
-IUSE=X debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kauth-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/kholidays-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kalarmcal-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kontactinterface-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/mailcommon-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarm: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kalarm-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0c4048f7111051a3e96776a7a8640434
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-17.12.3 b/metadata/md5-cache/kde-apps/kalarmcal-17.12.3
deleted file mode 100644
index 8b119cd8601d..000000000000
--- a/metadata/md5-cache/kde-apps/kalarmcal-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kholidays-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Client library to access and handling of KAlarm calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kholidays-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarmcal: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kalarmcal-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2e4770e5e3b707e0a25e09bc7cfb49c7
diff --git a/metadata/md5-cache/kde-apps/kalgebra-17.12.3 b/metadata/md5-cache/kde-apps/kalgebra-17.12.3
deleted file mode 100644
index 3342cb04681c..000000000000
--- a/metadata/md5-cache/kde-apps/kalgebra-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/analitza-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 readline? ( sys-libs/readline:0= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=MathML-based graph calculator by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/
-IUSE=readline debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/analitza-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.43.0:5 >=dev-qt/qtquickcontrols-5.9.1:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalgebra: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kalgebra-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c535bc4bc38f65a9f37717be18ecd534
diff --git a/metadata/md5-cache/kde-apps/kalzium-17.12.3 b/metadata/md5-cache/kde-apps/kalzium-17.12.3
deleted file mode 100644
index 5575d2652b4e..000000000000
--- a/metadata/md5-cache/kde-apps/kalzium-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kplotting-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kunitconversion-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 editor? ( >=kde-frameworks/knewstuff-5.43.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Periodic table of the elements
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/
-IUSE=editor solver debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kplotting-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kunitconversion-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 editor? ( >=kde-frameworks/knewstuff-5.43.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalzium: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kalzium-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1e7ae72f4f20591857bdbbf06750dce
diff --git a/metadata/md5-cache/kde-apps/kamera-17.12.3 b/metadata/md5-cache/kde-apps/kamera-17.12.3
deleted file mode 100644
index 94193b621928..000000000000
--- a/metadata/md5-cache/kde-apps/kamera-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libgphoto2:= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma integration for gphoto2 cameras
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamera: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kamera-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5465e4588c79a2452170e24d1d90f0e2
diff --git a/metadata/md5-cache/kde-apps/kanagram-17.12.3 b/metadata/md5-cache/kde-apps/kanagram-17.12.3
deleted file mode 100644
index ced25fd26c8d..000000000000
--- a/metadata/md5-cache/kde-apps/kanagram-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-apps/libkeduvocdocument-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game based on anagrams of words
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/
-IUSE=speech debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-apps/libkeduvocdocument-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=kde-apps/kdeedu-data-17.12.3:5 >=dev-qt/qtmultimedia-5.9.1:5[qml] >=dev-qt/qtquickcontrols-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kanagram: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kanagram-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=950b84705055c7f275d2348f68b51575
diff --git a/metadata/md5-cache/kde-apps/kapman-17.12.3 b/metadata/md5-cache/kde-apps/kapman-17.12.3
deleted file mode 100644
index bcc8d1510e25..000000000000
--- a/metadata/md5-cache/kde-apps/kapman-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Pac-Man clone by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kapman/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapman: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kapman-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=586759bd2c8f685cab958fe42236e19f
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-17.12.3 b/metadata/md5-cache/kde-apps/kapptemplate-17.12.3
deleted file mode 100644
index 7d57074d3272..000000000000
--- a/metadata/md5-cache/kde-apps/kapptemplate-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=A shell script to create the necessary framework to develop KDE applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kapptemplate
-IUSE=debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapptemplate: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kapptemplate-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d8cae8acfb66064ccf580494f015efca
diff --git a/metadata/md5-cache/kde-apps/kate-17.12.3 b/metadata/md5-cache/kde-apps/kate-17.12.3
deleted file mode 100644
index 72f4da3b60b8..000000000000
--- a/metadata/md5-cache/kde-apps/kate-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 addons? ( >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/plasma-5.43.0:5 >=kde-frameworks/threadweaver-5.43.0:5 >=dev-qt/qtsql-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Kate is an advanced text editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kate https://kate-editor.org/
-IUSE=+addons test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 addons? ( >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/plasma-5.43.0:5 >=kde-frameworks/threadweaver-5.43.0:5 >=dev-qt/qtsql-5.9.1:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kate: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kate-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4557c2299ad7761fa80e34e6386b749e
diff --git a/metadata/md5-cache/kde-apps/katomic-17.12.3 b/metadata/md5-cache/kde-apps/katomic-17.12.3
deleted file mode 100644
index 52eb78ceb064..000000000000
--- a/metadata/md5-cache/kde-apps/katomic-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Atomic Entertainment Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/katomic/ https://games.kde.org/game.php?game=katomic
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/katomic:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/katomic-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=30ad7cb39d41cdde2158c3a5092a8667
diff --git a/metadata/md5-cache/kde-apps/kblackbox-17.12.3 b/metadata/md5-cache/kde-apps/kblackbox-17.12.3
deleted file mode 100644
index 1bacd1c516c6..000000000000
--- a/metadata/md5-cache/kde-apps/kblackbox-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Blackbox Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblackbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kblackbox-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ced47c4135ce7ebc8768260713161dc
diff --git a/metadata/md5-cache/kde-apps/kblocks-17.12.3 b/metadata/md5-cache/kde-apps/kblocks-17.12.3
deleted file mode 100644
index 75283948d327..000000000000
--- a/metadata/md5-cache/kde-apps/kblocks-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A single-player Tetris-like KDE game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kblocks/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblocks: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kblocks-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e6c7a965b8437e71e47720b819d93b8f
diff --git a/metadata/md5-cache/kde-apps/kblog-17.12.3 b/metadata/md5-cache/kde-apps/kblog-17.12.3
deleted file mode 100644
index 8ea2f2e12bfc..000000000000
--- a/metadata/md5-cache/kde-apps/kblog-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kxmlrpcclient-5.43.0:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/syndication-17.12.3:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Library providing client-side support for web application remote blogging APIs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kxmlrpcclient-5.43.0:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/syndication-17.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblog: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kblog-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=69827f55f43dbadd66f7ad38e4425220
diff --git a/metadata/md5-cache/kde-apps/kbounce-17.12.3 b/metadata/md5-cache/kde-apps/kbounce-17.12.3
deleted file mode 100644
index 97d7da96a714..000000000000
--- a/metadata/md5-cache/kde-apps/kbounce-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Bounce Ball Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kbounce/ https://games.kde.org/game.php?game=kbounce
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbounce:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kbounce-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3e9eea7ec2eeefa8292d6463093fe6a3
diff --git a/metadata/md5-cache/kde-apps/kbreakout-17.12.3 b/metadata/md5-cache/kde-apps/kbreakout-17.12.3
deleted file mode 100644
index a3bc5d1dac47..000000000000
--- a/metadata/md5-cache/kde-apps/kbreakout-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breakout-like game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kbreakout/ https://games.kde.org/game.php?game=kbreakout
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbreakout: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kbreakout-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f6608ff0068faa12ea4cb53ee937b97
diff --git a/metadata/md5-cache/kde-apps/kbruch-17.12.3 b/metadata/md5-cache/kde-apps/kbruch-17.12.3
deleted file mode 100644
index d5a607768fd2..000000000000
--- a/metadata/md5-cache/kde-apps/kbruch-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Educational application to learn calculating with fractions
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbruch: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kbruch-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0198a951b20af2bbf374476ae95371b3
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-17.12.3 b/metadata/md5-cache/kde-apps/kcachegrind-17.12.3
deleted file mode 100644
index 70ed9a6bfdbd..000000000000
--- a/metadata/md5-cache/kde-apps/kcachegrind-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Frontend for Cachegrind by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kcachegrind https://kcachegrind.github.io/html/Home.html
-IUSE=nls debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcachegrind: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kcachegrind-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f56459c85d0f0f4bc7e486b4fb22eea
diff --git a/metadata/md5-cache/kde-apps/kcalc-17.12.3 b/metadata/md5-cache/kde-apps/kcalc-17.12.3
deleted file mode 100644
index bb26a3d4a2d8..000000000000
--- a/metadata/md5-cache/kde-apps/kcalc-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kinit-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/gmp:0= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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 calculator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kcalc https://utils.kde.org/projects/kcalc/
-IUSE=debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kinit-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalc: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kcalc-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=93f503820c608c53df594b31ed2f064e
diff --git a/metadata/md5-cache/kde-apps/kcalcore-17.12.3 b/metadata/md5-cache/kde-apps/kcalcore-17.12.3
deleted file mode 100644
index 62414382a3a8..000000000000
--- a/metadata/md5-cache/kde-apps/kcalcore-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.1:5 dev-libs/libical:= sys-devel/bison sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=Library for handling calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ test? ( LGPL-3+ )
-RDEPEND=>=dev-qt/qtgui-5.9.1:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalcore: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/kcalcore-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2eecaadfa72f110a4ea0ea227ea009ad
diff --git a/metadata/md5-cache/kde-apps/kcalutils-17.12.3 b/metadata/md5-cache/kde-apps/kcalutils-17.12.3
deleted file mode 100644
index c7561c03d8b0..000000000000
--- a/metadata/md5-cache/kde-apps/kcalutils-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=Library providing utility functions for the handling of calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalutils: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/kcalutils-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=44445f57b28e3f2e566a6bb591ca6391
diff --git a/metadata/md5-cache/kde-apps/kcharselect-17.12.3 b/metadata/md5-cache/kde-apps/kcharselect-17.12.3
deleted file mode 100644
index 321ba90c8801..000000000000
--- a/metadata/md5-cache/kde-apps/kcharselect-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE character selection utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kcharselect https://utils.kde.org/projects/kcharselect
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcharselect: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kcharselect-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2067d25f6c7c5828c88ed80b1612c5e0
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-17.12.3 b/metadata/md5-cache/kde-apps/kcolorchooser-17.12.3
deleted file mode 100644
index 4bc2146e7bbc..000000000000
--- a/metadata/md5-cache/kde-apps/kcolorchooser-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE color selector/editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kcolorchooser/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcolorchooser: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kcolorchooser-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4cb674a0f6cd9ab0b4b5cf46086e4e31
diff --git a/metadata/md5-cache/kde-apps/kcontacts-17.12.3 b/metadata/md5-cache/kde-apps/kcontacts-17.12.3
deleted file mode 100644
index 02be69f731bc..000000000000
--- a/metadata/md5-cache/kde-apps/kcontacts-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=Address book API based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcontacts: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kcontacts-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ca3068c945a3005958e99fabf7c1122d
diff --git a/metadata/md5-cache/kde-apps/kcron-17.12.3 b/metadata/md5-cache/kde-apps/kcron-17.12.3
deleted file mode 100644
index cf9fd865ac5e..000000000000
--- a/metadata/md5-cache/kde-apps/kcron-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Task Scheduler
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcron: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kcron-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b9a967ae5a94d590357eb0e289bced2
diff --git a/metadata/md5-cache/kde-apps/kdav-17.12.3 b/metadata/md5-cache/kde-apps/kdav-17.12.3
deleted file mode 100644
index bb1ba1c955b3..000000000000
--- a/metadata/md5-cache/kde-apps/kdav-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=DAV protocol implemention with KJobs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdav: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kdav-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a2af203f23498c5dddb29eef132deea
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.3 b/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.3
deleted file mode 100644
index cb6207b4e53b..000000000000
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for the KDE Applications collection
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=accessibility pim sdk
-KEYWORDS=amd64 x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kate-17.12.3 >=kde-apps/kdeadmin-meta-17.12.3 >=kde-apps/kdecore-meta-17.12.3 >=kde-apps/kdeedu-meta-17.12.3 >=kde-apps/kdegames-meta-17.12.3 >=kde-apps/kdegraphics-meta-17.12.3 >=kde-apps/kdemultimedia-meta-17.12.3 >=kde-apps/kdenetwork-meta-17.12.3 >=kde-apps/kdeutils-meta-17.12.3 accessibility? ( >=kde-apps/kdeaccessibility-meta-17.12.3 ) pim? ( >=kde-apps/kdepim-meta-17.12.3 ) sdk? ( >=kde-apps/kdesdk-meta-17.12.3 ) !kde-apps/kde-apps-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=1a7e45f3a14a4bba759702155e71f47c
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.3 b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.3
deleted file mode 100644
index 50ec7e2e497e..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kdoctools-5.43.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Development Scripts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!kde-apps/kde4-l10n app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-scripts: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kde-dev-scripts-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=249bf20236a2f762edc4f99d2286a49b
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.3 b/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.3
deleted file mode 100644
index 30a68fea629b..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Development Utilities
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-utils: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kde-dev-utils-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a5347474aeed4132a93db0c0278fb3ce
diff --git a/metadata/md5-cache/kde-apps/kde-meta-17.12.3 b/metadata/md5-cache/kde-apps/kde-meta-17.12.3
deleted file mode 100644
index 2da684aebaa3..000000000000
--- a/metadata/md5-cache/kde-apps/kde-meta-17.12.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Merge this to pull in all KDE Plasma and Applications packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=amd64 x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kde-apps-meta-17.12.3 >=kde-plasma/plasma-meta-5.12.5 !kde-apps/kde-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ecc4e6890aadabb83c55aa18afe1154a
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.3 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.3
deleted file mode 100644
index 001094d452e3..000000000000
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=amd64 x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kmag-17.12.3 >=kde-apps/kmousetool-17.12.3 >=kde-apps/kmouth-17.12.3 !kde-apps/kdeaccessibility-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e93f28138a29be6eea210ffb91ddf750
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.3 b/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.3
deleted file mode 100644
index 34b1957b497a..000000000000
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+cron
-KEYWORDS=amd64 x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ksystemlog-17.12.3 cron? ( >=kde-apps/kcron-17.12.3 ) !kde-apps/kdeadmin-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e5c199615be39f0ae707784167301c1c
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-17.12.3 b/metadata/md5-cache/kde-apps/kdebase-meta-17.12.3
deleted file mode 100644
index afd105cb3999..000000000000
--- a/metadata/md5-cache/kde-apps/kdebase-meta-17.12.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Transitional package to pull in plasma-meta plus basic applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=amd64 x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdecore-meta-17.12.3 >=kde-plasma/plasma-meta-5.12.5 !kde-apps/kdebase-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=98f90848a91ccd5dea7df67309563b49
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-17.12.3 b/metadata/md5-cache/kde-apps/kdebugsettings-17.12.3
deleted file mode 100644
index c3a630de3d90..000000000000
--- a/metadata/md5-cache/kde-apps/kdebugsettings-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=Application to enable/disable qCDebug
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdebugsettings: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/kdebugsettings-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0d7b7155f9a415a5f5d4fa1d8a402e8f
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-17.12.3 b/metadata/md5-cache/kde-apps/kdecore-meta-17.12.3
deleted file mode 100644
index 71144513c4c9..000000000000
--- a/metadata/md5-cache/kde-apps/kdecore-meta-17.12.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdecore - merge this to pull in the most basic applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+handbook
-KEYWORDS=amd64 x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dolphin-17.12.3 >=kde-apps/kdialog-17.12.3 >=kde-apps/keditbookmarks-17.12.3 >=kde-apps/kfind-17.12.3 || ( www-client/falkon www-client/qupzilla >=kde-apps/konqueror-17.12.3 ) >=kde-apps/konsole-17.12.3 >=kde-apps/kwrite-17.12.3 handbook? ( >=kde-apps/khelpcenter-17.12.3 ) !kde-apps/kdecore-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d661fc93f72ad7d7b3671ac54adac8c8
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-17.12.3 b/metadata/md5-cache/kde-apps/kdeedu-data-17.12.3
deleted file mode 100644
index 72a44b2ef11a..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-data-17.12.3
+++ /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.43.0:5 >=dev-qt/qtcore-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Shared icons, artwork and data files for educational applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kdeedu-data-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1c545e25ab09e49303b337932bd6bd1
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.3 b/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.3
deleted file mode 100644
index 4ae632521921..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
-EAPI=6
-HOMEPAGE=https://edu.kde.org
-KEYWORDS=amd64 x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/analitza-17.12.3 >=kde-apps/artikulate-17.12.3 >=kde-apps/blinken-17.12.3 >=kde-apps/cantor-17.12.3 >=kde-apps/kalgebra-17.12.3 >=kde-apps/kalzium-17.12.3 >=kde-apps/kanagram-17.12.3 >=kde-apps/kbruch-17.12.3 >=kde-apps/kdeedu-data-17.12.3 >=kde-apps/kgeography-17.12.3 >=kde-apps/khangman-17.12.3 >=kde-apps/kig-17.12.3 >=kde-apps/kiten-17.12.3 >=kde-apps/klettres-17.12.3 >=kde-apps/kmplot-17.12.3 >=kde-apps/kqtquickcharts-17.12.3 >=kde-apps/ktouch-17.12.3 >=kde-apps/kturtle-17.12.3 >=kde-apps/kwordquiz-17.12.3 >=kde-apps/libkeduvocdocument-17.12.3 >=kde-apps/marble-17.12.3 >=kde-apps/minuet-17.12.3 >=kde-apps/parley-17.12.3 >=kde-apps/rocs-17.12.3 >=kde-apps/step-17.12.3 !kde-apps/kdeedu-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=53d94f00d56d3272bc17a73b9ac4e668
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-17.12.3 b/metadata/md5-cache/kde-apps/kdegames-meta-17.12.3
deleted file mode 100644
index cdd057a89654..000000000000
--- a/metadata/md5-cache/kde-apps/kdegames-meta-17.12.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
-EAPI=6
-HOMEPAGE=https://games.kde.org/
-IUSE=opengl python
-KEYWORDS=amd64 x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/bomber-17.12.3 >=kde-apps/bovo-17.12.3 >=kde-apps/granatier-17.12.3 >=kde-apps/kapman-17.12.3 >=kde-apps/katomic-17.12.3 >=kde-apps/kblackbox-17.12.3 >=kde-apps/kblocks-17.12.3 >=kde-apps/kbounce-17.12.3 >=kde-apps/kbreakout-17.12.3 >=kde-apps/kdiamond-17.12.3 >=kde-apps/kfourinline-17.12.3 >=kde-apps/kgoldrunner-17.12.3 >=kde-apps/kigo-17.12.3 >=kde-apps/killbots-17.12.3 >=kde-apps/kiriki-17.12.3 >=kde-apps/kjumpingcube-17.12.3 >=kde-apps/klickety-17.12.3 >=kde-apps/klines-17.12.3 >=kde-apps/kmahjongg-17.12.3 >=kde-apps/kmines-17.12.3 >=kde-apps/knavalbattle-17.12.3 >=kde-apps/knetwalk-17.12.3 >=kde-apps/kolf-17.12.3 >=kde-apps/kollision-17.12.3 >=kde-apps/konquest-17.12.3 >=kde-apps/kpat-17.12.3 >=kde-apps/kreversi-17.12.3 >=kde-apps/kshisen-17.12.3 >=kde-apps/ksirk-17.12.3 >=kde-apps/ksnakeduel-17.12.3 >=kde-apps/kspaceduel-17.12.3 >=kde-apps/ksquares-17.12.3 >=kde-apps/ktuberling-17.12.3 >=kde-apps/libkdegames-17.12.3 >=kde-apps/libkmahjongg-17.12.3 >=kde-apps/lskat-17.12.3 >=kde-apps/palapeli-17.12.3 >=kde-apps/picmi-17.12.3 opengl? ( >=kde-apps/ksudoku-17.12.3 >=kde-apps/kubrick-17.12.3 ) python? ( >=kde-apps/kajongg-17.12.3 ) !kde-apps/kdegames-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=851480dcb41008ab004d6d9dd2224060
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.3 b/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.3
deleted file mode 100644
index 4fd2845bea83..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/
-IUSE=scanner
-KEYWORDS=amd64 x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/gwenview-17.12.3 >=kde-apps/kamera-17.12.3 >=kde-apps/kcolorchooser-17.12.3 >=kde-apps/kdegraphics-mobipocket-17.12.3 >=kde-apps/kolourpaint-17.12.3 >=kde-apps/kruler-17.12.3 >=kde-apps/libkdcraw-17.12.3 >=kde-apps/libkexiv2-17.12.3 >=kde-apps/libkipi-17.12.3 >=kde-apps/okular-17.12.3 >=kde-apps/spectacle-17.12.3 >=kde-apps/svgpart-17.12.3 >=kde-apps/thumbnailers-17.12.3 scanner? ( >=kde-apps/libksane-17.12.3 ) !kde-apps/kdegraphics-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=bb8ed734e5a0a2ff6331ccb1008ada71
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.3 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.3
deleted file mode 100644
index 81aa1a91ad35..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.1:5 thumbnail? ( >=kde-frameworks/kio-5.43.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library to support mobipocket ebooks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+thumbnail debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.9.1:5 thumbnail? ( >=kde-frameworks/kio-5.43.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdegraphics-mobipocket: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kdegraphics-mobipocket-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e233ca9040255226596502f44ed301e3
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.3 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.3
deleted file mode 100644
index ccc655cbdb6e..000000000000
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/ https://multimedia.kde.org/
-IUSE=+cdrom +ffmpeg
-KEYWORDS=amd64 x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dragon-17.12.3 >=kde-apps/juk-17.12.3 >=kde-apps/kdenlive-17.12.3 >=kde-apps/kmix-17.12.3 >=kde-apps/kwave-17.12.3 >=kde-apps/libkcddb-17.12.3 cdrom? ( >=kde-apps/audiocd-kio-17.12.3 >=kde-apps/k3b-17.12.3 >=kde-apps/libkcompactdisc-17.12.3 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-17.12.3 ) !kde-apps/kdemultimedia-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c3ac833c986e726b0d6f863d5de8f292
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.3 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.3
deleted file mode 100644
index 7ed45632a108..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kcontrol filesharing config module for SMB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenetwork-filesharing: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kdenetwork-filesharing-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=26b94e0c50648369b567ecb7a129470d
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.3 b/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.3
deleted file mode 100644
index 82be144da1ab..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=amd64 x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdenetwork-filesharing-17.12.3 >=kde-apps/kget-17.12.3 >=kde-apps/krdc-17.12.3 >=kde-apps/krfb-17.12.3 >=kde-apps/plasma-telepathy-meta-17.12.3 >=kde-apps/zeroconf-ioslave-17.12.3 !kde-apps/kdenetwork-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=21d830b3d6b27255d9da7c1b06bdda94
diff --git a/metadata/md5-cache/kde-apps/kdenlive-17.12.3 b/metadata/md5-cache/kde-apps/kdenlive-17.12.3
deleted file mode 100644
index 98f6889e1d70..000000000000
--- a/metadata/md5-cache/kde-apps/kdenlive-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.43.0:5 ) v4l? ( media-libs/libv4l ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Non-linear video editing suite by KDE
-EAPI=6
-HOMEPAGE=https://www.kdenlive.org/
-IUSE=freesound gles2 jogshuttle semantic-desktop v4l debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.43.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenlive: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kdenlive-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=497a80d018e57abd5bc801a5f8eda8c4
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-17.12.3 b/metadata/md5-cache/kde-apps/kdepim-addons-17.12.3
deleted file mode 100644
index d1f18bbe6bbe..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-addons-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/prison-5.43.0:5 >=kde-frameworks/syntax-highlighting-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-notes-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/eventviews-17.12.3:5 >=kde-apps/grantleetheme-17.12.3:5 >=kde-apps/incidenceeditor-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kimap-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/libkleo-17.12.3:5 >=kde-apps/libksieve-17.12.3:5 >=kde-apps/libktnef-17.12.3:5 >=kde-apps/mailcommon-17.12.3:5 >=kde-apps/messagelib-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 importwizard? ( >=kde-apps/akonadi-import-wizard-17.12.3:5 ) >=app-crypt/gpgme-1.7.1[cxx,qt5] sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=Plugins for KDE Personal Information Management Suite
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=importwizard test debug examples test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/prison-5.43.0:5 >=kde-frameworks/syntax-highlighting-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-notes-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/eventviews-17.12.3:5 >=kde-apps/grantleetheme-17.12.3:5 >=kde-apps/incidenceeditor-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kimap-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/libkleo-17.12.3:5 >=kde-apps/libksieve-17.12.3:5 >=kde-apps/libktnef-17.12.3:5 >=kde-apps/mailcommon-17.12.3:5 >=kde-apps/messagelib-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 importwizard? ( >=kde-apps/akonadi-import-wizard-17.12.3:5 ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-addons: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/kdepim-addons-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ae25d4a87bea6e93ea726b6f3c926fba
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.3 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.3
deleted file mode 100644
index da0af6327723..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/prison-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/grantleetheme-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/libkleo-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=Libraries for KDE PIM applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/prison-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/grantleetheme-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/libkleo-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-apps-libs: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kdepim-apps-libs-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0fbcb637d0c5141c18a78b27da5c5ac8
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-17.12.3 b/metadata/md5-cache/kde-apps/kdepim-meta-17.12.3
deleted file mode 100644
index 96364d035294..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-meta-17.12.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development
-KEYWORDS=amd64 x86
-LICENSE=metapackage
-RDEPEND=>=kde-frameworks/kholidays-5.43.0 >=kde-apps/akonadi-17.12.3 >=kde-apps/akonadiconsole-17.12.3 >=kde-apps/akonadi-calendar-17.12.3 >=kde-apps/akonadi-contacts-17.12.3 >=kde-apps/akonadi-import-wizard-17.12.3 >=kde-apps/akonadi-mime-17.12.3 >=kde-apps/akonadi-notes-17.12.3 >=kde-apps/akonadi-search-17.12.3 >=kde-apps/akregator-17.12.3 >=kde-apps/calendarjanitor-17.12.3 >=kde-apps/calendarsupport-17.12.3 >=kde-apps/eventviews-17.12.3 >=kde-apps/grantlee-editor-17.12.3 >=kde-apps/grantleetheme-17.12.3 >=kde-apps/incidenceeditor-17.12.3 >=kde-apps/kaddressbook-17.12.3 >=kde-apps/kalarm-17.12.3 >=kde-apps/kalarmcal-17.12.3 >=kde-apps/kcalcore-17.12.3 >=kde-apps/kcalutils-17.12.3 >=kde-apps/kcontacts-17.12.3 >=kde-apps/kdepim-addons-17.12.3 >=kde-apps/kdepim-apps-libs-17.12.3 >=kde-apps/kdepim-runtime-17.12.3 >=kde-apps/kidentitymanagement-17.12.3 >=kde-apps/kimap-17.12.3 >=kde-apps/kldap-17.12.3 >=kde-apps/kleopatra-17.12.3 >=kde-apps/kmail-17.12.3 >=kde-apps/kmail-account-wizard-17.12.3 >=kde-apps/kmailtransport-17.12.3 >=kde-apps/kmbox-17.12.3 >=kde-apps/kmime-17.12.3 >=kde-apps/knotes-17.12.3 >=kde-apps/konsolekalendar-17.12.3 >=kde-apps/kontact-17.12.3 >=kde-apps/kontactinterface-17.12.3 >=kde-apps/korganizer-17.12.3 >=kde-apps/kpimtextedit-17.12.3 >=kde-apps/ksmtp-17.12.3 >=kde-apps/libgravatar-17.12.3 >=kde-apps/libkdepim-17.12.3 >=kde-apps/libkgapi-17.12.3 >=kde-apps/libkleo-17.12.3 >=kde-apps/libksieve-17.12.3 >=kde-apps/libktnef-17.12.3 >=kde-apps/mailcommon-17.12.3 >=kde-apps/mailimporter-17.12.3 >=kde-apps/mbox-importer-17.12.3 >=kde-apps/messagelib-17.12.3 >=kde-apps/pim-data-exporter-17.12.3 >=kde-apps/pim-sieve-editor-17.12.3 >=kde-apps/pimcommon-17.12.3 >=kde-apps/syndication-17.12.3 !kde-apps/kdepim-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f15076e54a34af554feca1cdf1119de1
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.3 b/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.3
deleted file mode 100644
index 9255c0821819..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-calendar-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/akonadi-notes-17.12.3:5 >=kde-apps/kalarmcal-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdav-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kimap-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmbox-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/libkgapi-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=dev-qt/qtxmlpatterns-5.9.1:5 dev-libs/libxslt test? ( >=kde-apps/kimap-17.12.3:5[test] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Runtime plugin collection to extend the functionality of KDE PIM
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-calendar-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/akonadi-notes-17.12.3:5 >=kde-apps/kalarmcal-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdav-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kimap-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmbox-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/libkgapi-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.1:5 ) !kde-apps/kdepim-l10n !kde-misc/akonadi-ews >=kde-frameworks/oxygen-icons-5.43.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-runtime: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/kdepim-runtime-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c748fd33642ba9b347a176b99cc120d9
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.3 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.3
deleted file mode 100644
index 0c0214c152c0..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 dev-lang/perl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kioslaves from kdesdk package
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-kioslaves: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kdesdk-kioslaves-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f3c15e0450a1bd4ec54eecf3ecd4b08d
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.3 b/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.3
deleted file mode 100644
index 1e6fd2a0aba1..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development
-IUSE=cvs
-KEYWORDS=amd64 x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dolphin-plugins-17.12.3 >=kde-apps/kapptemplate-17.12.3 >=kde-apps/kcachegrind-17.12.3 >=kde-apps/kde-dev-scripts-17.12.3 >=kde-apps/kde-dev-utils-17.12.3 >=kde-apps/kdesdk-kioslaves-17.12.3 >=kde-apps/kdesdk-thumbnailers-17.12.3 >=kde-apps/kompare-17.12.3 >=kde-apps/kross-interpreters-17.12.3 >=kde-apps/libkomparediff2-17.12.3 >=kde-apps/lokalize-17.12.3 >=kde-apps/poxml-17.12.3 >=kde-apps/umbrello-17.12.3 cvs? ( >=kde-apps/cervisia-17.12.3 ) !kde-apps/kdesdk-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c80888ec990040efd2f8a98ef6e69ebe
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.3 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.3
deleted file mode 100644
index 5e8167ab1887..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Thumbnail generator for PO files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-thumbnailers: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kdesdk-thumbnailers-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c76569bd603747f8c7430c392dd9799f
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.3 b/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.3
deleted file mode 100644
index d348964cdd71..000000000000
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities https://utils.kde.org
-IUSE=cups floppy
-KEYWORDS=amd64 x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ark-17.12.3 >=kde-apps/filelight-17.12.3 >=kde-apps/kcalc-17.12.3 >=kde-apps/kcharselect-17.12.3 >=kde-apps/kdebugsettings-17.12.3 >=kde-apps/kdf-17.12.3 >=kde-apps/kgpg-17.12.3 >=kde-apps/kimagemapeditor-17.12.3 >=kde-apps/kteatime-17.12.3 >=kde-apps/ktimer-17.12.3 >=kde-apps/kwalletmanager-17.12.3 >=kde-apps/sweeper-17.12.3 cups? ( >=kde-apps/print-manager-17.12.3 ) floppy? ( >=kde-apps/kfloppy-17.12.3 ) !kde-apps/kdeutils-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8f8bfe15a10c32a4211a32fa43e87b96
diff --git a/metadata/md5-cache/kde-apps/kdf-17.12.3 b/metadata/md5-cache/kde-apps/kdf-17.12.3
deleted file mode 100644
index e1ef6ce18165..000000000000
--- a/metadata/md5-cache/kde-apps/kdf-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE free disk space utility
-EAPI=6
-HOMEPAGE=https://utils.kde.org/projects/kdf
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdf: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kdf-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=24c2dfc62cdb446ff315880a995b4d1f
diff --git a/metadata/md5-cache/kde-apps/kdialog-17.12.3 b/metadata/md5-cache/kde-apps/kdialog-17.12.3
deleted file mode 100644
index 03110d3d5ffd..000000000000
--- a/metadata/md5-cache/kde-apps/kdialog-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdialog: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kdialog-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aa335a44faa9a7e3d0d2a7f7d58bb41d
diff --git a/metadata/md5-cache/kde-apps/kdiamond-17.12.3 b/metadata/md5-cache/kde-apps/kdiamond-17.12.3
deleted file mode 100644
index b1f969ad2742..000000000000
--- a/metadata/md5-cache/kde-apps/kdiamond-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE three-in-a-row game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kdiamond/ https://games.kde.org/game.php?game=kdiamond
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdiamond: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kdiamond-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=358634852ab7cab926d16c2255029ebe
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-17.12.3 b/metadata/md5-cache/kde-apps/keditbookmarks-17.12.3
deleted file mode 100644
index 6bc00e561877..000000000000
--- a/metadata/md5-cache/kde-apps/keditbookmarks-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Bookmarks editor based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/keditbookmarks: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/keditbookmarks-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=853e5fbb7e0e5e2516b1478df5211f31
diff --git a/metadata/md5-cache/kde-apps/kfind-17.12.3 b/metadata/md5-cache/kde-apps/kfind-17.12.3
deleted file mode 100644
index 61b09281411e..000000000000
--- a/metadata/md5-cache/kde-apps/kfind-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=File finder utility based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kfind/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfind: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kfind-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=30a99ba051fde8876c1cc85363787690
diff --git a/metadata/md5-cache/kde-apps/kfloppy-17.12.3 b/metadata/md5-cache/kde-apps/kfloppy-17.12.3
deleted file mode 100644
index 26ea29f2f4e9..000000000000
--- a/metadata/md5-cache/kde-apps/kfloppy-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A straightforward graphical means to format 3.5" and 5.25" floppy disks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kfloppy/ https://utils.kde.org/projects/kfloppy/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfloppy: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kfloppy-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=18f96e7e8b0f4ac29ae570ab2a04741f
diff --git a/metadata/md5-cache/kde-apps/kfourinline-17.12.3 b/metadata/md5-cache/kde-apps/kfourinline-17.12.3
deleted file mode 100644
index 2daba7afc9d9..000000000000
--- a/metadata/md5-cache/kde-apps/kfourinline-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE four-in-a-row game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kfourinline/ https://games.kde.org/game.php?game=kfourinline
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfourinline: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kfourinline-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=93c9068f0a40b2159ba1fce5afb178a7
diff --git a/metadata/md5-cache/kde-apps/kgeography-17.12.3 b/metadata/md5-cache/kde-apps/kgeography-17.12.3
deleted file mode 100644
index 028e6cb25efb..000000000000
--- a/metadata/md5-cache/kde-apps/kgeography-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Geography learning tool
-EAPI=6
-HOMEPAGE=https://edu.kde.org/applications/miscellaneous/kgeography https://edu.kde.org/applications/all/kgeography
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgeography: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kgeography-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c9cae67b18c69be60a16c73ead27f9c
diff --git a/metadata/md5-cache/kde-apps/kget-17.12.3 b/metadata/md5-cache/kde-apps/kget-17.12.3
deleted file mode 100644
index 5fa8cd33a92d..000000000000
--- a/metadata/md5-cache/kde-apps/kget-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Advanced download manager by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/kget/
-IUSE=bittorrent gpg mms sqlite debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kget: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kget-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8573f80f6b22f94017187ae5625e6677
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-17.12.3 b/metadata/md5-cache/kde-apps/kgoldrunner-17.12.3
deleted file mode 100644
index a9dcbcf8134b..000000000000
--- a/metadata/md5-cache/kde-apps/kgoldrunner-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game of action and puzzle solving by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kgoldrunner/ https://games.kde.org/game.php?game=kgoldrunner
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgoldrunner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kgoldrunner-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=863558ed57928af9f80585fd91f00899
diff --git a/metadata/md5-cache/kde-apps/kgpg-17.12.3 b/metadata/md5-cache/kde-apps/kgpg-17.12.3
deleted file mode 100644
index bdfa17838fbc..000000000000
--- a/metadata/md5-cache/kde-apps/kgpg-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/gpgme sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kgpg https://utils.kde.org/projects/kgpg
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgpg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kgpg-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=943309f987a6f5b260289452f9af288b
diff --git a/metadata/md5-cache/kde-apps/khangman-17.12.3 b/metadata/md5-cache/kde-apps/khangman-17.12.3
deleted file mode 100644
index 5f5a079a4899..000000000000
--- a/metadata/md5-cache/kde-apps/khangman-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkeduvocdocument-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classical hangman game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/khangman https://edu.kde.org/khangman
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkeduvocdocument-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-17.12.3:5 >=dev-qt/qtgraphicaleffects-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khangman: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/khangman-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=99568731204c67092a57ab0ecce41cbc
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-17.12.3 b/metadata/md5-cache/kde-apps/khelpcenter-17.12.3
deleted file mode 100644
index 887668c1cb2d..000000000000
--- a/metadata/md5-cache/kde-apps/khelpcenter-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdoctools-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kinit-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=The KDE Help Center
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KHelpCenter
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdoctools-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kinit-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.12.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khelpcenter: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/khelpcenter-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c2e773979b239950d46878e87641d784
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.3 b/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.3
deleted file mode 100644
index ab5f0c2b7c86..000000000000
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/kpimtextedit-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=Library for managing identitites
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/kpimtextedit-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kidentitymanagement: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/kidentitymanagement-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8aa238e1eb8806504f2c4c035d961246
diff --git a/metadata/md5-cache/kde-apps/kig-17.12.3 b/metadata/md5-cache/kde-apps/kig-17.12.3
deleted file mode 100644
index fa9d32ff2344..000000000000
--- a/metadata/md5-cache/kde-apps/kig-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-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_python3_7(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.1:5 ) scripting? ( >=dev-libs/boost-1.48:=[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_python3_7(-),python_single_target_python2_7(+)] ) >=kde-frameworks/ktexteditor-5.43.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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 Interactive Geometry tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kig https://edu.kde.org/kig
-IUSE=geogebra scripting python_targets_python2_7 debug +handbook test
-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_python3_7(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.1:5 ) scripting? ( >=dev-libs/boost-1.48:=[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_python3_7(-),python_single_target_python2_7(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kig: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
-REQUIRED_USE=python_targets_python2_7
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kig-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f42dc61c650b2f4d4092aae104f23d1c
diff --git a/metadata/md5-cache/kde-apps/kigo-17.12.3 b/metadata/md5-cache/kde-apps/kigo-17.12.3
deleted file mode 100644
index 65c9474a120c..000000000000
--- a/metadata/md5-cache/kde-apps/kigo-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Go game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kigo/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kigo: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kigo-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f4dc19d078fb2f08d7347394bee1361b
diff --git a/metadata/md5-cache/kde-apps/killbots-17.12.3 b/metadata/md5-cache/kde-apps/killbots-17.12.3
deleted file mode 100644
index 0cf5d66ef218..000000000000
--- a/metadata/md5-cache/kde-apps/killbots-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kill the bots or they kill you!
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/killbots/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/killbots: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/killbots-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=043bb115a5e04e27931ba966b6c34a32
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.3 b/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.3
deleted file mode 100644
index 08d033e02db4..000000000000
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Generator of HTML image maps
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kimagemapeditor/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimagemapeditor: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kimagemapeditor-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5ff23deac4d4969cb68645846bf26815
diff --git a/metadata/md5-cache/kde-apps/kimap-17.12.3 b/metadata/md5-cache/kde-apps/kimap-17.12.3
deleted file mode 100644
index e960f6e35325..000000000000
--- a/metadata/md5-cache/kde-apps/kimap-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qttest-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Library for interacting with IMAP servers
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimap: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kimap-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3bf227dac15e3a95b4027b5d853ae297
diff --git a/metadata/md5-cache/kde-apps/kio-extras-17.12.3 b/metadata/md5-cache/kde-apps/kio-extras-17.12.3
deleted file mode 100644
index e496acfea79c..000000000000
--- a/metadata/md5-cache/kde-apps/kio-extras-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kpty-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 activities? ( >=kde-frameworks/kactivities-5.43.0:5 >=dev-qt/qtsql-5.9.1:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] ) man? ( >=kde-frameworks/khtml-5.43.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) slp? ( net-libs/openslp ) taglib? ( >=media-libs/taglib-1.11.1 ) x11-misc/shared-mime-info man? ( dev-util/gperf ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=KIO plugins present a filesystem-like view of arbitrary data
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kio-extras.git
-IUSE=activities htmlthumbs +man mtp openexr phonon samba +sftp slp taglib test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kpty-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 activities? ( >=kde-frameworks/kactivities-5.43.0:5 >=dev-qt/qtsql-5.9.1:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] ) man? ( >=kde-frameworks/khtml-5.43.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) slp? ( net-libs/openslp ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.43.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kio-extras: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/kio-extras-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a3a06b02bfe0dc4dfcd0ab4ddb2886c
diff --git a/metadata/md5-cache/kde-apps/kiriki-17.12.3 b/metadata/md5-cache/kde-apps/kiriki-17.12.3
deleted file mode 100644
index 5c0369294de2..000000000000
--- a/metadata/md5-cache/kde-apps/kiriki-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=An addictive and fun dice game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kiriki/ https://games.kde.org/game.php?game=kiriki
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiriki: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kiriki-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d320eacbb07cbf207de86e0a2b624f5f
diff --git a/metadata/md5-cache/kde-apps/kiten-17.12.3 b/metadata/md5-cache/kde-apps/kiten-17.12.3
deleted file mode 100644
index 8bdfcf7b82a1..000000000000
--- a/metadata/md5-cache/kde-apps/kiten-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Japanese dictionary and reference
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiten: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kiten-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a1b71ac487e773ecb0498566eebc80df
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-17.12.3 b/metadata/md5-cache/kde-apps/kjumpingcube-17.12.3
deleted file mode 100644
index 3c08dc62445f..000000000000
--- a/metadata/md5-cache/kde-apps/kjumpingcube-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tactical one or two player game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kjumpingcube/ https://games.kde.org/game.php?game=kjumpingcube
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kjumpingcube-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7002a69a747faee4ca103dcead3738dd
diff --git a/metadata/md5-cache/kde-apps/kldap-17.12.3 b/metadata/md5-cache/kde-apps/kldap-17.12.3
deleted file mode 100644
index cb62b911b014..000000000000
--- a/metadata/md5-cache/kde-apps/kldap-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl net-nds/openldap sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Library for interacting with LDAP servers
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kldap: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kldap-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b0dc73f10e541d86502e2666b45b8fc6
diff --git a/metadata/md5-cache/kde-apps/kleopatra-17.12.3 b/metadata/md5-cache/kde-apps/kleopatra-17.12.3
deleted file mode 100644
index a9f3b817274b..000000000000
--- a/metadata/md5-cache/kde-apps/kleopatra-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/libkleo-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Certificate manager and GUI for OpenPGP and CMS cryptography
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kleopatra
-IUSE=test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/libkleo-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kleopatra: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/kleopatra-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b706c2135448e93f9aa129af4485c1a9
diff --git a/metadata/md5-cache/kde-apps/klettres-17.12.3 b/metadata/md5-cache/kde-apps/klettres-17.12.3
deleted file mode 100644
index 23d35f57cfd7..000000000000
--- a/metadata/md5-cache/kde-apps/klettres-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Alphabet learning application
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/klettres https://edu.kde.org/klettres
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klettres: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/klettres-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5579e138193d7b1162751e78d421a2e7
diff --git a/metadata/md5-cache/kde-apps/klickety-17.12.3 b/metadata/md5-cache/kde-apps/klickety-17.12.3
deleted file mode 100644
index 14e2f7a6af34..000000000000
--- a/metadata/md5-cache/kde-apps/klickety-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A game almost the same as ksame, but a bit different by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klickety:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/klickety-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5aecf78928a8a55413b5d371b4bf1e5d
diff --git a/metadata/md5-cache/kde-apps/klines-17.12.3 b/metadata/md5-cache/kde-apps/klines-17.12.3
deleted file mode 100644
index 3a8c49a7e6ed..000000000000
--- a/metadata/md5-cache/kde-apps/klines-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A little KDE game about balls and how to get rid of them
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/klines/ https://games.kde.org/game.php?game=klines
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/klines-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=26c2f26b1ad47b77801df898361609a7
diff --git a/metadata/md5-cache/kde-apps/kmag-17.12.3 b/metadata/md5-cache/kde-apps/kmag-17.12.3
deleted file mode 100644
index 6da748215d7d..000000000000
--- a/metadata/md5-cache/kde-apps/kmag-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE screen magnifier
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmag/
-IUSE=keyboardfocus debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmag: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kmag-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=129fffd871dc8f571da468bc866a7f0a
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-17.12.3 b/metadata/md5-cache/kde-apps/kmahjongg-17.12.3
deleted file mode 100644
index b95050905487..000000000000
--- a/metadata/md5-cache/kde-apps/kmahjongg-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=kde-apps/libkmahjongg-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A tile matching game for one or two players
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kmahjongg/ https://games.kde.org/game.php?game=kmahjongg
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=kde-apps/libkmahjongg-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmahjongg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kmahjongg-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=abbbaa709afa9e93f0c77b710d0bda8d
diff --git a/metadata/md5-cache/kde-apps/kmail-17.12.3 b/metadata/md5-cache/kde-apps/kmail-17.12.3
deleted file mode 100644
index deac81ef6894..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/akonadi-search-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kontactinterface-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libgravatar-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/libkleo-17.12.3:5 >=kde-apps/libksieve-17.12.3:5 >=kde-apps/libktnef-17.12.3:5 >=kde-apps/mailcommon-17.12.3:5 >=kde-apps/messagelib-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kldap-17.12.3:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-17.12.3:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Email client, supporting POP3 and IMAP mailboxes.
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/kmail/
-IUSE=test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/akonadi-search-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kontactinterface-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libgravatar-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/libkleo-17.12.3:5 >=kde-apps/libksieve-17.12.3:5 >=kde-apps/libktnef-17.12.3:5 >=kde-apps/mailcommon-17.12.3:5 >=kde-apps/messagelib-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/ktnef >=kde-apps/kdepim-runtime-17.12.3:5 >=kde-apps/kmail-account-wizard-17.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail: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/kmail-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a614c65ba62eeaea42f7fb440d451fca
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.3 b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.3
deleted file mode 100644
index f0c6cf0ea659..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kross-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kldap-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/libkleo-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Assistant for KMail accounts configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Account_Wizard
-IUSE=test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kross-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kldap-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/libkleo-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail-account-wizard: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kmail-account-wizard-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b3cefd8d1d14ed51cfa838a13538d7d9
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-17.12.3 b/metadata/md5-cache/kde-apps/kmailtransport-17.12.3
deleted file mode 100644
index 58fd45acfe47..000000000000
--- a/metadata/md5-cache/kde-apps/kmailtransport-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/ksmtp-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 test? ( >=kde-frameworks/ktextwidgets-5.43.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Mail transport service
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/ksmtp-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmailtransport: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/kmailtransport-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6fa394951c53bde0be69c502a36e4b87
diff --git a/metadata/md5-cache/kde-apps/kmbox-17.12.3 b/metadata/md5-cache/kde-apps/kmbox-17.12.3
deleted file mode 100644
index fcc3fda9f02b..000000000000
--- a/metadata/md5-cache/kde-apps/kmbox-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/kmime-17.12.3:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Library for accessing MBox format mail storages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-apps/kmime-17.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmbox: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kmbox-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8e8f16a3e8f2b9fcae8a53a6a2e23439
diff --git a/metadata/md5-cache/kde-apps/kmime-17.12.3 b/metadata/md5-cache/kde-apps/kmime-17.12.3
deleted file mode 100644
index 1ebffe75ad25..000000000000
--- a/metadata/md5-cache/kde-apps/kmime-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Libary for handling mail messages and newsgroup articles
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmime: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kmime-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f66ab2b6f0262acbd6535ec0f0ef705f
diff --git a/metadata/md5-cache/kde-apps/kmines-17.12.3 b/metadata/md5-cache/kde-apps/kmines-17.12.3
deleted file mode 100644
index 77730220f54e..000000000000
--- a/metadata/md5-cache/kde-apps/kmines-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classic mine sweeper game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kmines/ https://games.kde.org/game.php?game=kmines
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kmines-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=add6601a4b12edf66c3b431bb7879225
diff --git a/metadata/md5-cache/kde-apps/kmix-17.12.3 b/metadata/md5-cache/kde-apps/kmix-17.12.3
deleted file mode 100644
index a1fb7bd23326..000000000000
--- a/metadata/md5-cache/kde-apps/kmix-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/plasma-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma mixer gui
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/kmix/
-IUSE=alsa pulseaudio debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/plasma-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.12.5:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmix: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kmix-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cdad326ecafae640bc25e8b1fc6f2e46
diff --git a/metadata/md5-cache/kde-apps/kmousetool-17.12.3 b/metadata/md5-cache/kde-apps/kmousetool-17.12.3
deleted file mode 100644
index 607eb5b31c7e..000000000000
--- a/metadata/md5-cache/kde-apps/kmousetool-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libXext x11-libs/libXt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE program that clicks the mouse for you
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmousetool/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmousetool: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kmousetool-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d96f48431d3eed74d62d2c6864ac4738
diff --git a/metadata/md5-cache/kde-apps/kmouth-17.12.3 b/metadata/md5-cache/kde-apps/kmouth-17.12.3
deleted file mode 100644
index 6e759520f527..000000000000
--- a/metadata/md5-cache/kde-apps/kmouth-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtspeech-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Text-to-speech synthesizer front end
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmouth/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtspeech-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmouth: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kmouth-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b58707faeff0f8a54dd8487f82806c82
diff --git a/metadata/md5-cache/kde-apps/kmplot-17.12.3 b/metadata/md5-cache/kde-apps/kmplot-17.12.3
deleted file mode 100644
index c35a37a9d590..000000000000
--- a/metadata/md5-cache/kde-apps/kmplot-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mathematical function plotter
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmplot: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kmplot-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c8a6dfafb545ef74311793b81df8a11c
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-17.12.3 b/metadata/md5-cache/kde-apps/knavalbattle-17.12.3
deleted file mode 100644
index cea5ae7b15e4..000000000000
--- a/metadata/md5-cache/kde-apps/knavalbattle-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Battleship clone by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/navalbattle/ https://games.kde.org/game.php?game=kbattleship
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knavalbattle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/knavalbattle-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b862d0a0850111b39d62f10200b3abe4
diff --git a/metadata/md5-cache/kde-apps/knetwalk-17.12.3 b/metadata/md5-cache/kde-apps/knetwalk-17.12.3
deleted file mode 100644
index 1a267f9c5276..000000000000
--- a/metadata/md5-cache/kde-apps/knetwalk-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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 version of the popular NetWalk game for system administrators
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/knetwalk/ https://games.kde.org/game.php?game=knetwalk
-IUSE=test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knetwalk: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/knetwalk-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1be9ac0b30672497177adef3fc7293cb
diff --git a/metadata/md5-cache/kde-apps/knotes-17.12.3 b/metadata/md5-cache/kde-apps/knotes-17.12.3
deleted file mode 100644
index 856f49921624..000000000000
--- a/metadata/md5-cache/kde-apps/knotes-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-notes-17.12.3:5 >=kde-apps/akonadi-search-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kontactinterface-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Note taking application
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-notes-17.12.3:5 >=kde-apps/akonadi-search-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kontactinterface-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knotes: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/knotes-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=79506e94430279d2b052839b54c05e36
diff --git a/metadata/md5-cache/kde-apps/kolf-17.12.3 b/metadata/md5-cache/kde-apps/kolf-17.12.3
deleted file mode 100644
index c637f3f3066c..000000000000
--- a/metadata/md5-cache/kde-apps/kolf-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Minigolf game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kolf/ https://games.kde.org/game.php?game=kolf
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kolf-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5e36468cfb24c502d84fe8f39bc39eac
diff --git a/metadata/md5-cache/kde-apps/kollision-17.12.3 b/metadata/md5-cache/kde-apps/kollision-17.12.3
deleted file mode 100644
index 7f957402feda..000000000000
--- a/metadata/md5-cache/kde-apps/kollision-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Simple ball dodging game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kollision/ https://games.kde.org/game.php?game=kollision
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kollision: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kollision-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6d9bc9b6d74aeb70394e6256f4761f60
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-17.12.3 b/metadata/md5-cache/kde-apps/kolourpaint-17.12.3
deleted file mode 100644
index 95e976f50de4..000000000000
--- a/metadata/md5-cache/kde-apps/kolourpaint-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 scanner? ( >=kde-apps/libksane-17.12.3:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Paint Program by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kolourpaint/
-IUSE=scanner debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 scanner? ( >=kde-apps/libksane-17.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolourpaint: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kolourpaint-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=908d268ec6960f3169c4cf31cbc79308
diff --git a/metadata/md5-cache/kde-apps/kompare-17.12.3 b/metadata/md5-cache/kde-apps/kompare-17.12.3
deleted file mode 100644
index 774780f266bb..000000000000
--- a/metadata/md5-cache/kde-apps/kompare-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkomparediff2-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A program to view the differences between files
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kompare http://www.caffeinated.me.uk/kompare
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkomparediff2-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kompare: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kompare-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1ba865e973b9da25d08c0bdd42874464
diff --git a/metadata/md5-cache/kde-apps/konqueror-17.12.3 b/metadata/md5-cache/kde-apps/konqueror-17.12.3
deleted file mode 100644
index a2a01f2370a1..000000000000
--- a/metadata/md5-cache/kde-apps/konqueror-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kdesu-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tidy? ( app-text/htmltidy ) X? ( >=dev-qt/qtx11extras-5.9.1:5 ) activities? ( >=kde-frameworks/kactivities-5.43.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Web browser and file manager based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/konqueror/ https://konqueror.org/
-IUSE=activities speech tidy X test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kdesu-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tidy? ( app-text/htmltidy ) X? ( >=dev-qt/qtx11extras-5.9.1:5 ) >=kde-apps/kfind-17.12.3:5 >=kde-plasma/kde-cli-tools-5.12.5:5 !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konqueror: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/konqueror-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=425ed83d4dd1c7527a689ea90095b650
diff --git a/metadata/md5-cache/kde-apps/konqueror-18.04.3 b/metadata/md5-cache/kde-apps/konqueror-18.04.3
deleted file mode 100644
index 438d00985701..000000000000
--- a/metadata/md5-cache/kde-apps/konqueror-18.04.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kdesu-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tidy? ( app-text/htmltidy ) webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) activities? ( >=kde-frameworks/kactivities-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Web browser and file manager based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/konqueror/ https://konqueror.org/
-IUSE=activities speech tidy +webengine X test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kdesu-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tidy? ( app-text/htmltidy ) webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 >=kde-apps/kfind-18.04.3:5 >=kde-plasma/kde-cli-tools-5.12.5:5 !webengine? ( kde-misc/kwebkitpart:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konqueror:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.3/src/konqueror-18.04.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4c38a638504e95a360b5c10e5d7f84fc
diff --git a/metadata/md5-cache/kde-apps/konqueror-18.04.3-r1 b/metadata/md5-cache/kde-apps/konqueror-18.04.3-r1
new file mode 100644
index 000000000000..9ad7d652a045
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konqueror-18.04.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kdesu-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tidy? ( app-text/htmltidy ) webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) activities? ( >=kde-frameworks/kactivities-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Web browser and file manager based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/konqueror/ https://konqueror.org/
+IUSE=activities speech tidy +webengine X test debug +handbook test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kdesu-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tidy? ( app-text/htmltidy ) webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 >=kde-apps/kfind-18.04.3:5 >=kde-plasma/kde-cli-tools-5.12.5:5 !webengine? ( kde-misc/kwebkitpart:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konqueror:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/konqueror-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e04259f888a3fcefda21ba06131c9b1a
diff --git a/metadata/md5-cache/kde-apps/konquest-17.12.3 b/metadata/md5-cache/kde-apps/konquest-17.12.3
deleted file mode 100644
index 0cf4c61b4201..000000000000
--- a/metadata/md5-cache/kde-apps/konquest-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Galactic Strategy KDE Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/konquest/ https://games.kde.org/game.php?game=konquest
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konquest:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/konquest-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=328a4f3c3d060f3e505755b9363eab0b
diff --git a/metadata/md5-cache/kde-apps/konsole-17.12.3 b/metadata/md5-cache/kde-apps/konsole-17.12.3
deleted file mode 100644
index d27027897e6c..000000000000
--- a/metadata/md5-cache/kde-apps/konsole-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kinit-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kpty-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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's terminal emulator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/konsole https://konsole.kde.org
-IUSE=X test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kinit-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kpty-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsole: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/konsole-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d69be4ee3f6b52ad40e6c49dff77c9cf
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-17.12.3 b/metadata/md5-cache/kde-apps/konsolekalendar-17.12.3
deleted file mode 100644
index ba9011978deb..000000000000
--- a/metadata/md5-cache/kde-apps/konsolekalendar-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-calendar-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Command line interface to KDE calendars
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KonsoleKalendar
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-calendar-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsolekalendar: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/akonadi-calendar-tools-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=94169ee0b1afe2ca8327137183b3f019
diff --git a/metadata/md5-cache/kde-apps/kontact-17.12.3 b/metadata/md5-cache/kde-apps/kontact-17.12.3
deleted file mode 100644
index 5d8cc8326a45..000000000000
--- a/metadata/md5-cache/kde-apps/kontact-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/grantleetheme-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kontactinterface-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/mailcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Container application to unify several major PIM applications within one
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/grantleetheme-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kontactinterface-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/mailcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontact: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kontact-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5f6e06ffd7c65f8ed5c505f3eb2c9b5
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-17.12.3 b/metadata/md5-cache/kde-apps/kontactinterface-17.12.3
deleted file mode 100644
index 6bef0f05742b..000000000000
--- a/metadata/md5-cache/kde-apps/kontactinterface-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for embedding KParts in a Kontact component
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontactinterface: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kontactinterface-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5b8b5f18956d4053790ae487998490ca
diff --git a/metadata/md5-cache/kde-apps/korganizer-17.12.3 b/metadata/md5-cache/kde-apps/korganizer-17.12.3
deleted file mode 100644
index b87f028c1cd0..000000000000
--- a/metadata/md5-cache/kde-apps/korganizer-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kholidays-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-calendar-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/akonadi-notes-17.12.3:5 >=kde-apps/akonadi-search-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/eventviews-17.12.3:5 >=kde-apps/incidenceeditor-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kontactinterface-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) >=kde-apps/kldap-17.12.3:5 >=dev-qt/designer-5.9.1:5 test? ( >=kde-apps/akonadi-17.12.3:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Organizational assistant, providing calendars and other similar functionality
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/korganizer/
-IUSE=X test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kholidays-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-calendar-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/akonadi-notes-17.12.3:5 >=kde-apps/akonadi-search-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/eventviews-17.12.3:5 >=kde-apps/incidenceeditor-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kontactinterface-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/korganizer: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/korganizer-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b686b68f5d817fc0b4876d93ec2bcb07
diff --git a/metadata/md5-cache/kde-apps/kpat-17.12.3 b/metadata/md5-cache/kde-apps/kpat-17.12.3
deleted file mode 100644
index bb4f76cbc9bc..000000000000
--- a/metadata/md5-cache/kde-apps/kpat-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE patience game
-EAPI=6
-HOMEPAGE=https://games.kde.org/game.php?game=kpat
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kpat-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a8c51c0d08be43ad751e7f23652cfd5
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-17.12.3 b/metadata/md5-cache/kde-apps/kpimtextedit-17.12.3
deleted file mode 100644
index 8b9c3331a29a..000000000000
--- a/metadata/md5-cache/kde-apps/kpimtextedit-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kemoticons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-frameworks/syntax-highlighting-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.1:5 ) test? ( >=kde-frameworks/ktextwidgets-5.43.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.43.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=A textedit with PIM-specific features
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug designer test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kemoticons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-frameworks/syntax-highlighting-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.1:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpimtextedit: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/kpimtextedit-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ddf83a7053a182df9388624e625e8f47
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.3 b/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.3
deleted file mode 100644
index 531cac174592..000000000000
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kqtquickcharts: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kqtquickcharts-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a503349903246748e14c7c47e3a83bc6
diff --git a/metadata/md5-cache/kde-apps/krdc-17.12.3 b/metadata/md5-cache/kde-apps/krdc-17.12.3
deleted file mode 100644
index d88c0216bdcb..000000000000
--- a/metadata/md5-cache/kde-apps/krdc-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Remote desktop connection (RDP and VNC) client
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/krdc/
-IUSE=+rdp vnc debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krdc: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/krdc-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7828422a94ad659e366e6963d063b4a5
diff --git a/metadata/md5-cache/kde-apps/kreversi-17.12.3 b/metadata/md5-cache/kde-apps/kreversi-17.12.3
deleted file mode 100644
index 23708b73382f..000000000000
--- a/metadata/md5-cache/kde-apps/kreversi-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Board game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kreversi/ https://games.kde.org/game.php?game=kreversi
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kreversi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kreversi-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=28ad69a2c9942c60b40906520eeff604
diff --git a/metadata/md5-cache/kde-apps/krfb-17.12.3 b/metadata/md5-cache/kde-apps/krfb-17.12.3
deleted file mode 100644
index ecb34a064c0a..000000000000
--- a/metadata/md5-cache/kde-apps/krfb-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=VNC-compatible server to share Plasma desktops
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/krfb/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krfb: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/krfb-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5109c9f711b7a7b126d29da1aba93692
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-17.12.3 b/metadata/md5-cache/kde-apps/kross-interpreters-17.12.3
deleted file mode 100644
index f8434590382d..000000000000
--- a/metadata/md5-cache/kde-apps/kross-interpreters-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kross-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 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_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kross interpreter plugins for programming languages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+python ruby debug python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kross-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 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_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kross-interpreters: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
-REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kross-interpreters-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	da74609cfc48267b7201d50b0367af82	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2ceace77089e73a62c146ef8e0b20bcf
diff --git a/metadata/md5-cache/kde-apps/kruler-17.12.3 b/metadata/md5-cache/kde-apps/kruler-17.12.3
deleted file mode 100644
index 52b141f07523..000000000000
--- a/metadata/md5-cache/kde-apps/kruler-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screen ruler for Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kruler/
-IUSE=X debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kruler: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kruler-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=85772097201743f22dd5efc1181c3ee4
diff --git a/metadata/md5-cache/kde-apps/kshisen-17.12.3 b/metadata/md5-cache/kde-apps/kshisen-17.12.3
deleted file mode 100644
index a054ed251226..000000000000
--- a/metadata/md5-cache/kde-apps/kshisen-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=kde-apps/libkmahjongg-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE game similiar to Mahjongg
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kshisen/ https://games.kde.org/game.php?game=kshisen
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=kde-apps/libkmahjongg-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kshisen:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kshisen-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e9a6b4515d862af244614266d726b5ed
diff --git a/metadata/md5-cache/kde-apps/ksirk-17.12.3 b/metadata/md5-cache/kde-apps/ksirk-17.12.3
deleted file mode 100644
index 2d677072297f..000000000000
--- a/metadata/md5-cache/kde-apps/ksirk-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Port of the board game risk
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksirk/ https://games.kde.org/game.php?game=ksirk
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksirk: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ksirk-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c24b09c9a0077a560a175176f329f7ee
diff --git a/metadata/md5-cache/kde-apps/ksmtp-17.12.3 b/metadata/md5-cache/kde-apps/ksmtp-17.12.3
deleted file mode 100644
index 54a8b4ab3565..000000000000
--- a/metadata/md5-cache/kde-apps/ksmtp-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtnetwork-5.9.1:5 dev-libs/cyrus-sasl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Job-based library to send email through an SMTP server
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-apps/kmime-17.12.3:5 >=dev-qt/qtnetwork-5.9.1:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksmtp: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/ksmtp-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5f5df7ab4fd82830f00d6531d8ef6bdd
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-17.12.3 b/metadata/md5-cache/kde-apps/ksnakeduel-17.12.3
deleted file mode 100644
index 1b763e51d047..000000000000
--- a/metadata/md5-cache/kde-apps/ksnakeduel-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Tron game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksnakeduel/
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksnakeduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ksnakeduel-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9191a3216b550925f10a78e2a15ed1a2
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-17.12.3 b/metadata/md5-cache/kde-apps/kspaceduel-17.12.3
deleted file mode 100644
index 2555eb6b94bd..000000000000
--- a/metadata/md5-cache/kde-apps/kspaceduel-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Space Game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kspaceduel/ https://games.kde.org/game.php?game=kspaceduel
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kspaceduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kspaceduel-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a342ef06b5d3bf226688f7466b24682c
diff --git a/metadata/md5-cache/kde-apps/ksquares-17.12.3 b/metadata/md5-cache/kde-apps/ksquares-17.12.3
deleted file mode 100644
index 005aa2c6739e..000000000000
--- a/metadata/md5-cache/kde-apps/ksquares-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE clone of the game squares
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksquares/ https://games.kde.org/game.php?game=ksquares
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksquares: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ksquares-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd13b90659191abdeb84cebb8481a12f
diff --git a/metadata/md5-cache/kde-apps/ksudoku-17.12.3 b/metadata/md5-cache/kde-apps/ksudoku-17.12.3
deleted file mode 100644
index c04f85286c2f..000000000000
--- a/metadata/md5-cache/kde-apps/ksudoku-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 opengl? ( >=dev-qt/qtopengl-5.9.1:5 virtual/glu ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Logic-based symbol placement puzzle by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksudoku/ https://games.kde.org/game.php?game=ksudoku
-IUSE=opengl debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 opengl? ( >=dev-qt/qtopengl-5.9.1:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksudoku: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ksudoku-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c21615738dd644b33d7b5e81c5d9723
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-17.12.3 b/metadata/md5-cache/kde-apps/ksystemlog-17.12.3
deleted file mode 100644
index edb99eea0f1f..000000000000
--- a/metadata/md5-cache/kde-apps/ksystemlog-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 systemd? ( sys-apps/systemd ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=System log viewer by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/ksystemlog/
-IUSE=systemd test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 systemd? ( sys-apps/systemd ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksystemlog: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/ksystemlog-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3516164bfb24ac6d539aba94fbb8b2e4
diff --git a/metadata/md5-cache/kde-apps/kteatime-17.12.3 b/metadata/md5-cache/kde-apps/kteatime-17.12.3
deleted file mode 100644
index 91e1c49b54d9..000000000000
--- a/metadata/md5-cache/kde-apps/kteatime-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE timer for making a fine cup of tea
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kteatime
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kteatime: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kteatime-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=75e4defc2eb4d55924954cae9d54ee31
diff --git a/metadata/md5-cache/kde-apps/ktimer-17.12.3 b/metadata/md5-cache/kde-apps/ktimer-17.12.3
deleted file mode 100644
index b52ed12471d1..000000000000
--- a/metadata/md5-cache/kde-apps/ktimer-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Timer
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/ktimer https://utils.kde.org/projects/ktimer
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktimer: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktimer-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ccc65679639130ffdc0603fd03c2b333
diff --git a/metadata/md5-cache/kde-apps/ktouch-17.12.3 b/metadata/md5-cache/kde-apps/ktouch-17.12.3
deleted file mode 100644
index 78c26230e7ae..000000000000
--- a/metadata/md5-cache/kde-apps/ktouch-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kwindowsystem-5.43.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Program that helps to learn and practice touch typing
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/ktouch/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-17.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktouch: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktouch-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ff6cf761ab22c980ad553c954dcbc7bb
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.3 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.3
deleted file mode 100644
index 7c5873d5ff19..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/kaccounts-integration-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 net-libs/libaccounts-glib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy account management kcm
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=experimental debug
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/kaccounts-integration-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-17.12.3:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-accounts-kcm: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktp-accounts-kcm-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7666117504ac786cf324be68f6045ae9
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-17.12.3 b/metadata/md5-cache/kde-apps/ktp-approver-17.12.3
deleted file mode 100644
index 331c2997060f..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-approver-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy notification handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-approver: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktp-approver-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d42418d9f52d0ca958c8e0213b19b86a
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.3 b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.3
deleted file mode 100644
index 15e1bcd9f506..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/kaccounts-integration-17.12.3:5 >=kde-apps/ktp-common-internals-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy authentication handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/kaccounts-integration-17.12.3:5 >=kde-apps/ktp-common-internals-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-auth-handler: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktp-auth-handler-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05f84129c296a910a24709c4e930bf7b
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.3 b/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.3
deleted file mode 100644
index 0b08f55ef442..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/ktp-common-internals-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy audio/video conferencing ui
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/ktp-common-internals-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-call-ui: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktp-call-ui-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=798de42727ce04a299c27c47eb8cce7f
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.3 b/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.3
deleted file mode 100644
index a83ee20fc341..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kpeople-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-17.12.3:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.43.0:5 >=dev-qt/qtnetwork-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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 Telepathy common library
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=otr +sso debug test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kpeople-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-17.12.3:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-common-internals: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktp-common-internals-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ddfc3e0dd761aa540705545190fad3c4
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.3 b/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.3
deleted file mode 100644
index 259b74df5c57..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kpeople-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/ktp-common-internals-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy contact list
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kpeople-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/ktp-common-internals-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-list: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktp-contact-list-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80fbb773475ff7e322765d76b658d2b5
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.3 b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.3
deleted file mode 100644
index c69553c431d9..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/krunner-5.43.0:5 >=kde-apps/ktp-common-internals-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kservice-5.43.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy krunner plugin
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/krunner-5.43.0:5 >=kde-apps/ktp-common-internals-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-runner: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktp-contact-runner-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3d87c2f1f6cb9efb54c358ac7c82709b
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.3 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.3
deleted file mode 100644
index ded7d32a4a7d..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/plasma-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=kde-frameworks/ki18n-5.43.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/plasma-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-desktop-applets: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktp-desktop-applets-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1293624f6bd53098a8e4573f049ca5e2
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.3 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.3
deleted file mode 100644
index 4311970dfed2..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-apps/ktp-common-internals-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy file transfer handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-apps/ktp-common-internals-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-filetransfer-handler: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktp-filetransfer-handler-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0a931ef7f8393f572beb07d5b92b6dec
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.3 b/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.3
deleted file mode 100644
index 59f68e838272..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kidletime-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-apps/ktp-common-internals-17.12.3:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy workspace integration
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kidletime-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-apps/ktp-common-internals-17.12.3:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-17.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-kded-module: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktp-kded-module-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=edcf310594e835e817cdaef12ef0fe7b
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-17.12.3 b/metadata/md5-cache/kde-apps/ktp-send-file-17.12.3
deleted file mode 100644
index b54e8a847179..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-send-file-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/ktp-common-internals-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.43.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/ktp-common-internals-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.12.3:5 >=kde-apps/ktp-filetransfer-handler-17.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-send-file: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktp-send-file-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=29e5aeb6b2aee651d009b27a225f4087
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.3 b/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.3
deleted file mode 100644
index 484e6cc3787c..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdewebkit-5.43.0:5 >=kde-frameworks/kemoticons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kpeople-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-apps/ktp-common-internals-17.12.3:5[otr] >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy text chat window
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=speech debug
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdewebkit-5.43.0:5 >=kde-frameworks/kemoticons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kpeople-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-apps/ktp-common-internals-17.12.3:5[otr] >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=kde-apps/ktp-contact-list-17.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-text-ui: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktp-text-ui-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4ad080daed6383ce856c975abf975154
diff --git a/metadata/md5-cache/kde-apps/ktuberling-17.12.3 b/metadata/md5-cache/kde-apps/ktuberling-17.12.3
deleted file mode 100644
index 304f04569239..000000000000
--- a/metadata/md5-cache/kde-apps/ktuberling-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Potato game for kids by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ktuberling/ https://games.kde.org/game.php?game=ktuberling
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktuberling:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktuberling-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d91a227f6f59832cc1ce10f54f27a935
diff --git a/metadata/md5-cache/kde-apps/kturtle-17.12.3 b/metadata/md5-cache/kde-apps/kturtle-17.12.3
deleted file mode 100644
index 572da70d0d97..000000000000
--- a/metadata/md5-cache/kde-apps/kturtle-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Educational programming environment using the Logo programming language
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kturtle: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kturtle-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0695cfa1eac7b3da9bc15d7b43ecf403
diff --git a/metadata/md5-cache/kde-apps/kubrick-17.12.3 b/metadata/md5-cache/kde-apps/kubrick-17.12.3
deleted file mode 100644
index c8b9f5d96fd8..000000000000
--- a/metadata/md5-cache/kde-apps/kubrick-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 virtual/glu virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kubrick/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kubrick: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kubrick-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5a5251b75ac1dad649883199c6603ab4
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-17.12.3 b/metadata/md5-cache/kde-apps/kwalletmanager-17.12.3
deleted file mode 100644
index a8ab59925b36..000000000000
--- a/metadata/md5-cache/kde-apps/kwalletmanager-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kauth-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Wallet management tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kauth-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kwalletmanager-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b9456ebb01315d5e78573555e372f8d9
diff --git a/metadata/md5-cache/kde-apps/kwave-17.12.3 b/metadata/md5-cache/kde-apps/kwave-17.12.3
deleted file mode 100644
index 8c33faa7e91f..000000000000
--- a/metadata/md5-cache/kde-apps/kwave-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-apps/poxml-17.12.3:5 >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
-EAPI=6
-HOMEPAGE=http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/
-IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwave: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kwave-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51c92ce6a8e0d3da6b0c198b334f4e66
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-17.12.3 b/metadata/md5-cache/kde-apps/kwordquiz-17.12.3
deleted file mode 100644
index 36050749632a..000000000000
--- a/metadata/md5-cache/kde-apps/kwordquiz-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkeduvocdocument-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A powerful flashcard and vocabulary learning program
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkeduvocdocument-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwordquiz: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kwordquiz-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d9ed510323e20e824df18f4781257aba
diff --git a/metadata/md5-cache/kde-apps/kwrite-17.12.3 b/metadata/md5-cache/kde-apps/kwrite-17.12.3
deleted file mode 100644
index 715ab8ba742e..000000000000
--- a/metadata/md5-cache/kde-apps/kwrite-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE simple text editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kwrite
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwrite: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kate-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3eebb716b732227d9ef81fec1be7cf3c
diff --git a/metadata/md5-cache/kde-apps/libgravatar-17.12.3 b/metadata/md5-cache/kde-apps/libgravatar-17.12.3
deleted file mode 100644
index d225d1902772..000000000000
--- a/metadata/md5-cache/kde-apps/libgravatar-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=Library for gravatar integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libgravatar: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/libgravatar-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c2ae34e54e05359c2f12f1bd5a46dc7e
diff --git a/metadata/md5-cache/kde-apps/libkcddb-17.12.3 b/metadata/md5-cache/kde-apps/libkcddb-17.12.3
deleted file mode 100644
index cbf91614bb92..000000000000
--- a/metadata/md5-cache/kde-apps/libkcddb-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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 library for CDDB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=musicbrainz debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !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/libkcddb-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f1a229bf15d6a242bcb17474179919b
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.3 b/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.3
deleted file mode 100644
index 80a0fbdfe3bf..000000000000
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for playing & ripping CDs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=alsa debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/solid-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/libkcompactdisc-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3405524251ba92ccb870682afc75e2ce
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-17.12.3 b/metadata/md5-cache/kde-apps/libkdcraw-17.12.3
deleted file mode 100644
index cfc9e8c9379d..000000000000
--- a/metadata/md5-cache/kde-apps/libkdcraw-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.1:5 <media-libs/libraw-0.19:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Digital camera raw image library wrapper
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.9.1:5 <media-libs/libraw-0.19:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/libkdcraw-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=594d410b60f865d69e52b4a1d78ecdd5
diff --git a/metadata/md5-cache/kde-apps/libkdegames-17.12.3 b/metadata/md5-cache/kde-apps/libkdegames-17.12.3
deleted file mode 100644
index ae66ccbb0e5f..000000000000
--- a/metadata/md5-cache/kde-apps/libkdegames-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=Base library common to many KDE games
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/kglobalaccel-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/libkdegames-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=14fe3e55ef9d698d468f040b1e876166
diff --git a/metadata/md5-cache/kde-apps/libkdepim-17.12.3 b/metadata/md5-cache/kde-apps/libkdepim-17.12.3
deleted file mode 100644
index 7a314e4735d9..000000000000
--- a/metadata/md5-cache/kde-apps/libkdepim-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-search-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kldap-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.43.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=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-search-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kldap-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkdepim: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/libkdepim-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1e104cb8c154a752f9d9fb000c383a56
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.3 b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.3
deleted file mode 100644
index ae32a4183064..000000000000
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Library for reading/writing KVTML
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkeduvocdocument: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/libkeduvocdocument-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f53c2620ffb667c7189d86a4b93fad8
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-17.12.3 b/metadata/md5-cache/kde-apps/libkexiv2-17.12.3
deleted file mode 100644
index 0fc6bfa714e4..000000000000
--- a/metadata/md5-cache/kde-apps/libkexiv2-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-gfx/exiv2-0.25:=[xmp=] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Image Plugin Interface: an exiv2 library wrapper
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+xmp debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/libkexiv2-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e053e1f0bee3abd270171a88f874a84
diff --git a/metadata/md5-cache/kde-apps/libkgapi-17.12.3 b/metadata/md5-cache/kde-apps/libkgapi-17.12.3
deleted file mode 100644
index a72ffe707714..000000000000
--- a/metadata/md5-cache/kde-apps/libkgapi-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=Library for accessing Google calendar and contact resources
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/libkgapi.git
-IUSE=nls test debug test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/libkgapi-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c4f6491f70bcb0e46d3b169eaab34c9
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-17.12.3 b/metadata/md5-cache/kde-apps/libkgeomap-17.12.3
deleted file mode 100644
index a3748838ae6f..000000000000
--- a/metadata/md5-cache/kde-apps/libkgeomap-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-apps/marble-17.12.3:5=[kde] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=Wrapper library for world map components as marble, openstreetmap and googlemap
-EAPI=6
-HOMEPAGE=https://www.digikam.org/
-IUSE=test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-apps/marble-17.12.3:5=[kde] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkgeomap: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/libkgeomap-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b34d9283458a17ef95c979067648d0ac
diff --git a/metadata/md5-cache/kde-apps/libkipi-17.12.3 b/metadata/md5-cache/kde-apps/libkipi-17.12.3
deleted file mode 100644
index 3c71db919374..000000000000
--- a/metadata/md5-cache/kde-apps/libkipi-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A library for image plugins accross KDE applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5/32
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/libkipi-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5bf4ec6dc6f65005f4ea46207e8f426c
diff --git a/metadata/md5-cache/kde-apps/libkleo-17.12.3 b/metadata/md5-cache/kde-apps/libkleo-17.12.3
deleted file mode 100644
index 89070cf08ef4..000000000000
--- a/metadata/md5-cache/kde-apps/libkleo-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-apps/kpimtextedit-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for encryption handling
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-apps/kpimtextedit-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkleo: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/libkleo-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bde39a2f16bbc248b29fd64040ba38fc
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-17.12.3 b/metadata/md5-cache/kde-apps/libkmahjongg-17.12.3
deleted file mode 100644
index 409bd63c7b2b..000000000000
--- a/metadata/md5-cache/kde-apps/libkmahjongg-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/libkmahjongg-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=87c76059509d5be161c55116f3eeef25
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-17.12.3 b/metadata/md5-cache/kde-apps/libkomparediff2-17.12.3
deleted file mode 100644
index b424d3e58c05..000000000000
--- a/metadata/md5-cache/kde-apps/libkomparediff2-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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 library to compare files and strings
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkomparediff2: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/libkomparediff2-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=070686400b5185aa470d1dd14384e2ae
diff --git a/metadata/md5-cache/kde-apps/libksane-17.12.3 b/metadata/md5-cache/kde-apps/libksane-17.12.3
deleted file mode 100644
index a84394f43547..000000000000
--- a/metadata/md5-cache/kde-apps/libksane-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/sane-backends sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=SANE Library interface based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/sane-backends !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/libksane-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3022a3c08729b52f91d2103c0ce3ffaf
diff --git a/metadata/md5-cache/kde-apps/libksieve-17.12.3 b/metadata/md5-cache/kde-apps/libksieve-17.12.3
deleted file mode 100644
index c21c89d21927..000000000000
--- a/metadata/md5-cache/kde-apps/libksieve-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-frameworks/syntax-highlighting-5.43.0:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl >=kde-apps/kimap-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-frameworks/syntax-highlighting-5.43.0:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libksieve: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/libksieve-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b63b0638da8bf42ce2f97d1e5aea96a9
diff --git a/metadata/md5-cache/kde-apps/libktnef-17.12.3 b/metadata/md5-cache/kde-apps/libktnef-17.12.3
deleted file mode 100644
index 387fc4c793a4..000000000000
--- a/metadata/md5-cache/kde-apps/libktnef-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.43.0:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Library for handling TNEF data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.43.0:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcalutils-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libktnef: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/ktnef-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3fb6cf52fe9fc17da9fbd53d2413fd8b
diff --git a/metadata/md5-cache/kde-apps/lokalize-17.12.3 b/metadata/md5-cache/kde-apps/lokalize-17.12.3
deleted file mode 100644
index 4b2179065360..000000000000
--- a/metadata/md5-cache/kde-apps/lokalize-17.12.3
+++ /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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kross-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-text/hunspell-1.2.8:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Applications 5 translation tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/lokalize https://l10n.kde.org/tools
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kross-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-text/hunspell-1.2.8:= dev-python/translate-toolkit[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lokalize: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
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/lokalize-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1919d853a1b19bdd038ed6f729ce8e7f
diff --git a/metadata/md5-cache/kde-apps/lskat-17.12.3 b/metadata/md5-cache/kde-apps/lskat-17.12.3
deleted file mode 100644
index 2fb4f9bb52b5..000000000000
--- a/metadata/md5-cache/kde-apps/lskat-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Skat game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/lskat/ https://games.kde.org/game.php?game=lskat
-IUSE=debug +handbook selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lskat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/lskat-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1aacea058d1b846a3420b82a25896d8a
diff --git a/metadata/md5-cache/kde-apps/mailcommon-17.12.3 b/metadata/md5-cache/kde-apps/mailcommon-17.12.3
deleted file mode 100644
index 71e1bc3f6e73..000000000000
--- a/metadata/md5-cache/kde-apps/mailcommon-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/syntax-highlighting-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/mailimporter-17.12.3:5 >=kde-apps/messagelib-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.43.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=Common mail library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/syntax-highlighting-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/mailimporter-17.12.3:5 >=kde-apps/messagelib-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailcommon: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/mailcommon-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=268293d932414f207e635e5f8bc803c8
diff --git a/metadata/md5-cache/kde-apps/mailimporter-17.12.3 b/metadata/md5-cache/kde-apps/mailimporter-17.12.3
deleted file mode 100644
index 63a1121f7253..000000000000
--- a/metadata/md5-cache/kde-apps/mailimporter-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=Library to import mail from various sources
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailimporter: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/mailimporter-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8ce0c68806952e83a5ccab58e8aab991
diff --git a/metadata/md5-cache/kde-apps/marble-17.12.3 b/metadata/md5-cache/kde-apps/marble-17.12.3
deleted file mode 100644
index 9deff7446b3b..000000000000
--- a/metadata/md5-cache/kde-apps/marble-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 aprs? ( >=dev-qt/qtserialport-5.9.1:5 ) dbus? ( >=dev-qt/qtdbus-5.9.1:5 ) designer? ( >=dev-qt/designer-5.9.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/krunner-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Virtual Globe and World Atlas to learn more about Earth
-EAPI=6
-HOMEPAGE=https://marble.kde.org/
-IUSE=aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 aprs? ( >=dev-qt/qtserialport-5.9.1:5 ) dbus? ( >=dev-qt/qtdbus-5.9.1:5 ) designer? ( >=dev-qt/designer-5.9.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/krunner-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/marble: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/17.12
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/marble-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2282d34cec47684ade8f83bfdad534bb
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-17.12.3 b/metadata/md5-cache/kde-apps/mbox-importer-17.12.3
deleted file mode 100644
index 9b5a28e39883..000000000000
--- a/metadata/md5-cache/kde-apps/mbox-importer-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/mailcommon-17.12.3:5 >=kde-apps/mailimporter-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Import mbox email archives from various sources into Akonadi
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/mailcommon-17.12.3:5 >=kde-apps/mailimporter-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mbox-importer: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/mbox-importer-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4461e6ef9dbf65080d38c22a9f285846
diff --git a/metadata/md5-cache/kde-apps/messagelib-17.12.3 b/metadata/md5-cache/kde-apps/messagelib-17.12.3
deleted file mode 100644
index a22855f3d89c..000000000000
--- a/metadata/md5-cache/kde-apps/messagelib-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-frameworks/syntax-highlighting-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/grantleetheme-17.12.3:5 >=kde-apps/incidenceeditor-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kldap-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmbox-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libgravatar-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/libkleo-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.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=Libraries for messaging functions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-frameworks/syntax-highlighting-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/grantleetheme-17.12.3:5 >=kde-apps/incidenceeditor-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kdepim-apps-libs-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kldap-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmbox-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libgravatar-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/libkleo-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 !<kde-apps/kdepim-addons-16.08.50:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !=kde-apps/kmail-4.4*:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/messagelib: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/messagelib-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ffd5aa2c784b1bb28001d001dac75cbc
diff --git a/metadata/md5-cache/kde-apps/minuet-17.12.3 b/metadata/md5-cache/kde-apps/minuet-17.12.3
deleted file mode 100644
index c4b74756b29c..000000000000
--- a/metadata/md5-cache/kde-apps/minuet-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtquickcontrols2-5.9.1:5 media-sound/fluidsynth virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE Software for Music Education
-EAPI=6
-HOMEPAGE=https://minuet.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtquickcontrols2-5.9.1:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/minuet: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/minuet-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=55724ebb5c14ef34821fce2dfef99780
diff --git a/metadata/md5-cache/kde-apps/okular-17.12.3 b/metadata/md5-cache/kde-apps/okular-17.12.3
deleted file mode 100644
index ae138caad2c0..000000000000
--- a/metadata/md5-cache/kde-apps/okular-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjs-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kpty-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/threadweaver-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.43.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-17.12.3:5 >=dev-qt/qtgui-5.9.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-17.12.3:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.43.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tiff? ( media-libs/tiff:0 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Universal document viewer based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://okular.kde.org https://www.kde.org/applications/graphics/okular
-IUSE=chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjs-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kpty-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/threadweaver-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.43.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-17.12.3:5 >=dev-qt/qtgui-5.9.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-17.12.3:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.43.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.43.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.43.0:5 >=dev-qt/qtquickcontrols-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okular: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/okular-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7187184b03f4c57d86589057c745ed7b
diff --git a/metadata/md5-cache/kde-apps/palapeli-17.12.3 b/metadata/md5-cache/kde-apps/palapeli-17.12.3
deleted file mode 100644
index 5a265c1f231b..000000000000
--- a/metadata/md5-cache/kde-apps/palapeli-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Jigsaw puzzle game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/palapeli/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/palapeli: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/palapeli-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d7b6e27a5c3c2641acd0279230072806
diff --git a/metadata/md5-cache/kde-apps/parley-17.12.3 b/metadata/md5-cache/kde-apps/parley-17.12.3
deleted file mode 100644
index 78c3bc19d085..000000000000
--- a/metadata/md5-cache/kde-apps/parley-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/libkeduvocdocument-17.12.3:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kross-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A vocabulary trainer to help you memorize things
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/parley https://edu.kde.org/applications/school/parley
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-apps/libkeduvocdocument-17.12.3:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kross-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-17.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/parley: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/parley-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c969aa0a2bdfdb6a243c223a1fea5130
diff --git a/metadata/md5-cache/kde-apps/picmi-17.12.3 b/metadata/md5-cache/kde-apps/picmi-17.12.3
deleted file mode 100644
index bb23dbb293f1..000000000000
--- a/metadata/md5-cache/kde-apps/picmi-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Nonogram logic game by KDE
-EAPI=6
-HOMEPAGE=https://games.kde.org/game.php?game=picmi
-IUSE=test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/picmi: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/picmi-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d58896f3f78188ee5dda28fe0eab6eb3
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.3 b/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.3
deleted file mode 100644
index 62617fec1fe2..000000000000
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/mailcommon-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Assistant to backup and archive PIM data and configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Backup_Options
-IUSE=test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kidentitymanagement-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/kmime-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=kde-apps/mailcommon-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-data-exporter: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/pim-data-exporter-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=642472a374bd59e65f1eb4941d2f0a4a
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.3 b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.3
deleted file mode 100644
index bcf30f7331bc..000000000000
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/libksieve-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Assistant for editing IMAP Sieve filters
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/akonadi-mime-17.12.3:5 >=kde-apps/calendarsupport-17.12.3:5 >=kde-apps/kcalcore-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kmailtransport-17.12.3:5 >=kde-apps/libksieve-17.12.3:5 >=kde-apps/pimcommon-17.12.3:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-sieve-editor: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/pim-sieve-editor-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=477d864931db079a5bde724eb23f5bca
diff --git a/metadata/md5-cache/kde-apps/pimcommon-17.12.3 b/metadata/md5-cache/kde-apps/pimcommon-17.12.3
deleted file mode 100644
index 68d7f311d6ee..000000000000
--- a/metadata/md5-cache/kde-apps/pimcommon-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kimap-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 >=kde-frameworks/kiconthemes-5.43.0:5 dev-libs/libxslt test? ( >=kde-apps/kmime-17.12.3:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.43.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=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/akonadi-17.12.3:5 >=kde-apps/akonadi-contacts-17.12.3:5 >=kde-apps/kcontacts-17.12.3:5 >=kde-apps/kimap-17.12.3:5 >=kde-apps/kpimtextedit-17.12.3:5 >=kde-apps/libkdepim-17.12.3:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pimcommon: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/pimcommon-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1fdfcd240d22746fb7a2e6ca1cd1e04f
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.3 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.3
deleted file mode 100644
index 150ee87706bb..000000000000
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Plasma Telepathy client
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=gstreamer
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-2.1 )
-RDEPEND=>=kde-apps/ktp-accounts-kcm-17.12.3 >=kde-apps/ktp-approver-17.12.3 >=kde-apps/ktp-auth-handler-17.12.3 >=kde-apps/ktp-common-internals-17.12.3 >=kde-apps/ktp-contact-list-17.12.3 >=kde-apps/ktp-contact-runner-17.12.3 >=kde-apps/ktp-desktop-applets-17.12.3 >=kde-apps/ktp-filetransfer-handler-17.12.3 >=kde-apps/ktp-kded-module-17.12.3 >=kde-apps/ktp-send-file-17.12.3 >=kde-apps/ktp-text-ui-17.12.3 gstreamer? ( >=kde-apps/ktp-call-ui-17.12.3 ) !kde-apps/plasma-telepathy-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=22ea1ac7212aae774b8691d0973813ff
diff --git a/metadata/md5-cache/kde-apps/poxml-17.12.3 b/metadata/md5-cache/kde-apps/poxml-17.12.3
deleted file mode 100644
index 0feb8a2267af..000000000000
--- a/metadata/md5-cache/kde-apps/poxml-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.9.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtxml-5.9.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/poxml: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/poxml-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=11faf6e7ec534acbf7efa0ad12605277
diff --git a/metadata/md5-cache/kde-apps/print-manager-17.12.3 b/metadata/md5-cache/kde-apps/print-manager-17.12.3
deleted file mode 100644
index 32cfd74ff350..000000000000
--- a/metadata/md5-cache/kde-apps/print-manager-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/plasma-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-print/cups sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Manage print jobs and printers in Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+gtk debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/plasma-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-print/cups >=kde-plasma/kde-cli-tools-5.12.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/print-manager: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/print-manager-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=803cf78c5b02802ce8a8cce53137f846
diff --git a/metadata/md5-cache/kde-apps/rocs-17.12.3 b/metadata/md5-cache/kde-apps/rocs-17.12.3
deleted file mode 100644
index 6e8e68f05404..000000000000
--- a/metadata/md5-cache/kde-apps/rocs-17.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 dev-libs/grantlee:5 >=dev-libs/boost-1.49 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Interface to work with Graph Theory
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/rocs https://edu.kde.org/applications/mathematics/rocs
-IUSE=debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/rocs: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/rocs-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d087b3c10be79da7587ee2870a2d25ad
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.3 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.3
deleted file mode 100644
index 6381fa28c753..000000000000
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwallet-5.43.0:5 net-libs/signond sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KWallet extension for signond
-EAPI=6
-HOMEPAGE=https://01.org/gsso/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kwallet-5.43.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/signon-kwallet-extension: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/signon-kwallet-extension-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c2b30ed8a0a4c09b96614e8ffee0265c
diff --git a/metadata/md5-cache/kde-apps/spectacle-17.12.3 b/metadata/md5-cache/kde-apps/spectacle-17.12.3
deleted file mode 100644
index f59e85feb505..000000000000
--- a/metadata/md5-cache/kde-apps/spectacle-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-17.12.3:5= ) share? ( >=kde-frameworks/purpose-5.43.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screenshot capture utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=kipi share debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-17.12.3:5= ) share? ( >=kde-frameworks/purpose-5.43.0:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/spectacle: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/spectacle-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c484a360fb67d3bf24d14f2e9e60441e
diff --git a/metadata/md5-cache/kde-apps/spectacle-18.04.3 b/metadata/md5-cache/kde-apps/spectacle-18.04.3
deleted file mode 100644
index ba8fd485cb5c..000000000000
--- a/metadata/md5-cache/kde-apps/spectacle-18.04.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.04.3:5= ) share? ( >=kde-frameworks/purpose-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screenshot capture utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=kipi share debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.04.3:5= ) share? ( >=kde-frameworks/purpose-5.46.0:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/spectacle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.3/src/spectacle-18.04.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c484a360fb67d3bf24d14f2e9e60441e
diff --git a/metadata/md5-cache/kde-apps/spectacle-18.04.3-r1 b/metadata/md5-cache/kde-apps/spectacle-18.04.3-r1
new file mode 100644
index 000000000000..24665864822c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/spectacle-18.04.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.04.3:5= ) share? ( >=kde-frameworks/purpose-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Screenshot capture utility
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=kipi share debug +handbook
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.04.3:5= ) share? ( >=kde-frameworks/purpose-5.46.0:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/spectacle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/spectacle-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c6e562cb2d5cfc9731033806b4b1a985
diff --git a/metadata/md5-cache/kde-apps/step-17.12.3 b/metadata/md5-cache/kde-apps/step-17.12.3
deleted file mode 100644
index 62dc2d86c627..000000000000
--- a/metadata/md5-cache/kde-apps/step-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kplotting-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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=Interactive physics simulator
-EAPI=6
-HOMEPAGE=https://edu.kde.org/step
-IUSE=+gsl nls +qalculate debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdelibs4support-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kplotting-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/step: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/step-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f2cb197f76118477b120da7c04437790
diff --git a/metadata/md5-cache/kde-apps/svgpart-17.12.3 b/metadata/md5-cache/kde-apps/svgpart-17.12.3
deleted file mode 100644
index 274ad52f4ee0..000000000000
--- a/metadata/md5-cache/kde-apps/svgpart-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kpart for viewing SVGs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/svgpart-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=677ce5614775805d841af919bbe3f623
diff --git a/metadata/md5-cache/kde-apps/sweeper-17.12.3 b/metadata/md5-cache/kde-apps/sweeper-17.12.3
deleted file mode 100644
index 2941ae714dc0..000000000000
--- a/metadata/md5-cache/kde-apps/sweeper-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-stats-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/sweeper https://utils.kde.org/projects/sweeper
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-stats-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/sweeper: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/sweeper-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a2f71cea398a1568d822674945eb1fb
diff --git a/metadata/md5-cache/kde-apps/syndication-17.12.3 b/metadata/md5-cache/kde-apps/syndication-17.12.3
deleted file mode 100644
index af81dff24350..000000000000
--- a/metadata/md5-cache/kde-apps/syndication-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.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=Library for parsing RSS and Atom feeds
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/syndication: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/syndication-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=89e0ce4951588133aa55235b1e39fcc3
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-17.12.3 b/metadata/md5-cache/kde-apps/thumbnailers-17.12.3
deleted file mode 100644
index b644c4279bc5..000000000000
--- a/metadata/md5-cache/kde-apps/thumbnailers-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 raw? ( >=kde-apps/libkdcraw-17.12.3:5 >=kde-apps/libkexiv2-17.12.3:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=raw debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kio-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 raw? ( >=kde-apps/libkdcraw-17.12.3:5 >=kde-apps/libkexiv2-17.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/kdegraphics-thumbnailers-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=759e6a4fab5711cfa0a1fd54f797ef33
diff --git a/metadata/md5-cache/kde-apps/umbrello-17.12.3 b/metadata/md5-cache/kde-apps/umbrello-17.12.3
deleted file mode 100644
index 4eb87b94c05d..000000000000
--- a/metadata/md5-cache/kde-apps/umbrello-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kdelibs4support-5.43.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.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 UML Modeller
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/umbrello https://umbrello.kde.org
-IUSE=test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/umbrello: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/umbrello-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2975812936e6d4a2063673068f14b6d1
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.3 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.3
deleted file mode 100644
index a9abd1fadadd..000000000000
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdnssd-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/zeroconf-ioslave: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
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.3/src/zeroconf-ioslave-17.12.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7bb128b499f9de2610fe2bd8fe494880
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index f539ff00c4db..3b17e87320bd 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.46.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.46.0
index 2ce6ecbe9683..651ab1bdf599 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.46.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.46
 SRC_URI=mirror://kde/stable/frameworks/5.46/bluez-qt-5.46.0.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b9652fe9b29a726d59d2ae7c1dd76aa9
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.48.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.48.0
index 949a755b55b4..17b7cf3af4fc 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.48.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.48.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.48:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.48
 SRC_URI=mirror://kde/stable/frameworks/5.48/bluez-qt-5.48.0.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c56161d95ba41891363e8e9a5fa8cc78
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 1daeddaabf0e..19fb87fb3517 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.13.3 b/metadata/md5-cache/kde-plasma/bluedevil-5.13.3
deleted file mode 100644
index 63328b608249..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/bluez-qt-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Bluetooth stack for KDE Plasma
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/bluedevil.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-plasma/kde-cli-tools-5.13.3:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/bluedevil-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=327fe4aaf6cfe0f35575ffa20c84c8f0
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.13.4 b/metadata/md5-cache/kde-plasma/bluedevil-5.13.4
new file mode 100644
index 000000000000..bb2ac4dfd0bf
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/bluez-qt-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Bluetooth stack for KDE Plasma
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/bluedevil.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/bluez-qt-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-plasma/kde-cli-tools-5.13.4:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/bluedevil-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=327fe4aaf6cfe0f35575ffa20c84c8f0
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.13.3 b/metadata/md5-cache/kde-plasma/breeze-5.13.3
deleted file mode 100644
index 6aaf9e5eee83..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-5.13.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze visual style for the Plasma desktop
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/breeze.git
-IUSE=wayland X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-frameworks/breeze-icons-5.46.0:5 >=kde-plasma/kde-cli-tools-5.13.3:5
-RDEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/breeze-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=76478bfdc7579004b37923992e0c9bd3
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.13.4 b/metadata/md5-cache/kde-plasma/breeze-5.13.4
new file mode 100644
index 000000000000..4596c4bc4fa4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-5.13.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze visual style for the Plasma desktop
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/breeze.git
+IUSE=wayland X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-frameworks/breeze-icons-5.46.0:5 >=kde-plasma/kde-cli-tools-5.13.4:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/breeze-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=76478bfdc7579004b37923992e0c9bd3
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.13.3 b/metadata/md5-cache/kde-plasma/breeze-grub-5.13.3
deleted file mode 100644
index f4aa5cbc69b0..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.13.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze theme for GRUB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/breeze-grub-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6fdf18bfe569ca5ec4b257cbf248a838
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.13.4 b/metadata/md5-cache/kde-plasma/breeze-grub-5.13.4
new file mode 100644
index 000000000000..5318501ced85
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.13.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze theme for GRUB
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/breeze-grub-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6fdf18bfe569ca5ec4b257cbf248a838
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.3 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.3
deleted file mode 100644
index 06622af3f63d..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.3
+++ /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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/breeze-gtk.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/breeze-gtk-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aa4e75ba1788ac8e8c89c738a570dca9
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.4 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.4
new file mode 100644
index 000000000000..04ee4a8149cb
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/breeze-gtk.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/breeze-gtk-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aa4e75ba1788ac8e8c89c738a570dca9
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.3 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.3
deleted file mode 100644
index 040039b698e6..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-boot/plymouth >=kde-frameworks/extra-cmake-modules-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze theme for Plymouth
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=sys-boot/plymouth
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/breeze-plymouth-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71cd4b752982067f0bf4291ced279e2e
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.4 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.4
new file mode 100644
index 000000000000..1886e77c84e2
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-boot/plymouth >=kde-frameworks/extra-cmake-modules-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze theme for Plymouth
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=sys-boot/plymouth
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/breeze-plymouth-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=71cd4b752982067f0bf4291ced279e2e
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.13.3 b/metadata/md5-cache/kde-plasma/drkonqi-5.13.3
deleted file mode 100644
index a9a91418bf11..000000000000
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlrpcclient-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlrpcclient-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) !kde-apps/drkonqi:4 !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/drkonqi-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9e2c7f630747e5e7d1a55a324f24fe66
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.13.4 b/metadata/md5-cache/kde-plasma/drkonqi-5.13.4
new file mode 100644
index 000000000000..f08ce8646dfb
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlrpcclient-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlrpcclient-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) !kde-apps/drkonqi:4 !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/drkonqi-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9e2c7f630747e5e7d1a55a324f24fe66
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.3 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.3
deleted file mode 100644
index 34253f36cbaa..000000000000
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/kactivitymanagerd-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c84087786f761af2f2f91291fef6658
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.4 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.4
new file mode 100644
index 000000000000..05916c542f6c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/kactivitymanagerd-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2c84087786f761af2f2f91291fef6658
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.3 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.3
deleted file mode 100644
index ba3722d96910..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kdesu? ( >=kde-frameworks/kdesu-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kde-cli-tools.git
-IUSE=+kdesu X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kdesu? ( >=kde-frameworks/kdesu-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/kde-cli-tools-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7766ef7426560bed48a8528cda42b03a
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.4 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.4
new file mode 100644
index 000000000000..7e6f03f972b6
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kdesu? ( >=kde-frameworks/kdesu-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kde-cli-tools.git
+IUSE=+kdesu X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kdesu? ( >=kde-frameworks/kdesu-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/kde-cli-tools-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7766ef7426560bed48a8528cda42b03a
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.3 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.3
deleted file mode 100644
index 6313009ed552..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma systemsettings kcm to set GTK application look&feel
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kde-gtk-config.git
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.13.3:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/kde-gtk-config-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4615265b593490c44a10248e0671c5f0
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.4 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.4
new file mode 100644
index 000000000000..b8e0a87e4429
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma systemsettings kcm to set GTK application look&feel
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kde-gtk-config.git
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.13.4:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/kde-gtk-config-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4615265b593490c44a10248e0671c5f0
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.13.3 b/metadata/md5-cache/kde-plasma/kdecoration-5.13.3
deleted file mode 100644
index 57e4ea3b875b..000000000000
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plugin based library to create window decorations
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/kdecoration-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f930e6e4a11e943d9c208acbe1d17d0
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.13.4 b/metadata/md5-cache/kde-plasma/kdecoration-5.13.4
new file mode 100644
index 000000000000..24079bca8c67
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plugin based library to create window decorations
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/kdecoration-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1f930e6e4a11e943d9c208acbe1d17d0
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.3 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.3
deleted file mode 100644
index 875f0e267cd6..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kunitconversion-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 share? ( >=kde-frameworks/purpose-5.46.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra Plasma applets and engines
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=share webengine debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kunitconversion-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 share? ( >=kde-frameworks/purpose-5.46.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) >=kde-plasma/plasma-workspace-5.13.3:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/kdeplasma-addons-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=643b80ca8bc9361c1adeeb577c8559d1
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.4 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.4
new file mode 100644
index 000000000000..1620310372fd
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kunitconversion-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 share? ( >=kde-frameworks/purpose-5.46.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Extra Plasma applets and engines
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=share webengine debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kunitconversion-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 share? ( >=kde-frameworks/purpose-5.46.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/kdeplasma-addons-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=643b80ca8bc9361c1adeeb577c8559d1
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.13.3 b/metadata/md5-cache/kde-plasma/kgamma-5.13.3
deleted file mode 100644
index 80fac7cee549..000000000000
--- a/metadata/md5-cache/kde-plasma/kgamma-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screen gamma values kcontrol module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/kgamma5-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71795ef780600c9b60f785d8c08261e7
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.13.4 b/metadata/md5-cache/kde-plasma/kgamma-5.13.4
new file mode 100644
index 000000000000..1c46535b6e56
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Screen gamma values kcontrol module
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/kgamma5-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=71795ef780600c9b60f785d8c08261e7
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.13.3 b/metadata/md5-cache/kde-plasma/khotkeys-5.13.3
deleted file mode 100644
index 66170aaa6ff6..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5[X] >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma workspace hotkey module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5[X] >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.46.0:5 >=kde-plasma/kde-cli-tools-5.13.3:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/khotkeys-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6904c3c4af1d547e44c11ad829adad24
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.13.4 b/metadata/md5-cache/kde-plasma/khotkeys-5.13.4
new file mode 100644
index 000000000000..d6a37dcc243b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5[X] >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma workspace hotkey module
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5[X] >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.46.0:5 >=kde-plasma/kde-cli-tools-5.13.4:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/khotkeys-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6904c3c4af1d547e44c11ad829adad24
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.13.3 b/metadata/md5-cache/kde-plasma/kinfocenter-5.13.3
deleted file mode 100644
index 7aa9a93d03b5..000000000000
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.13.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.11.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.46.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A utility that provides information about a computer system
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/kinfocenter/
-IUSE=gles2 ieee1394 +opengl +pci wayland debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.11.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.46.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.13.3:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/kinfocenter-5.13.3.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d4c09e9e77d487bf576a2b29a2adabd7
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.13.4 b/metadata/md5-cache/kde-plasma/kinfocenter-5.13.4
new file mode 100644
index 000000000000..ee49e170298e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.13.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.11.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.46.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A utility that provides information about a computer system
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/kinfocenter/
+IUSE=gles2 ieee1394 +opengl +pci wayland debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.11.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.46.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.13.4:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/kinfocenter-5.13.4.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d4c09e9e77d487bf576a2b29a2adabd7
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.13.3 b/metadata/md5-cache/kde-plasma/kmenuedit-5.13.3
deleted file mode 100644
index c9325748051b..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.13.3:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma menu editor
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kmenuedit.git
-IUSE=+hotkeys debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.13.3:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/kmenuedit-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=79dd695df3d092cb71cb68fa0a40922e
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.13.4 b/metadata/md5-cache/kde-plasma/kmenuedit-5.13.4
new file mode 100644
index 000000000000..c38a9f16dd6e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.13.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma menu editor
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kmenuedit.git
+IUSE=+hotkeys debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.13.4:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/kmenuedit-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=79dd695df3d092cb71cb68fa0a40922e
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.13.3 b/metadata/md5-cache/kde-plasma/kscreen-5.13.3
deleted file mode 100644
index 1734ad22688e..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreen-5.13.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/libkscreen-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma screen management
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kscreen.git
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/libkscreen-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-plasma/kde-cli-tools-5.13.3:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/kscreen-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=115ed4bc0c1b07387834e50e1c40a24a
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.13.4 b/metadata/md5-cache/kde-plasma/kscreen-5.13.4
new file mode 100644
index 000000000000..965c6c818e45
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.13.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/libkscreen-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma screen management
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kscreen.git
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/libkscreen-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-plasma/kde-cli-tools-5.13.4:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/kscreen-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=115ed4bc0c1b07387834e50e1c40a24a
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.3 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.3
deleted file mode 100644
index 1599c257cd53..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.3
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library and components for secure lock screen architecture
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+pam seccomp test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.13.3:5
-RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) !<kde-plasma/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-REQUIRED_USE=seccomp? ( pam )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/kscreenlocker-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=88661cc25861daf2570bc8defeeb0fb8
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.4 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.4
new file mode 100644
index 000000000000..849c85b009e8
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.4
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library and components for secure lock screen architecture
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+pam seccomp test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.13.4:5
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) !<kde-plasma/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+REQUIRED_USE=seccomp? ( pam )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/kscreenlocker-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=88661cc25861daf2570bc8defeeb0fb8
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.3 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.3
deleted file mode 100644
index 8b9bbc105e22..000000000000
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/ksshaskpass.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/ksshaskpass-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=49a7fbc618003d798a48ed7a5583f88a
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.4 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.4
new file mode 100644
index 000000000000..3c65d4a26b51
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/ksshaskpass.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/ksshaskpass-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=49a7fbc618003d798a48ed7a5583f88a
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.13.3 b/metadata/md5-cache/kde-plasma/ksysguard-5.13.3
deleted file mode 100644
index 16a89ded4fd7..000000000000
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-plasma/libksysguard-5.13.3:5[-minimal(-)] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Network-enabled task manager and system monitor
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=lm_sensors debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-plasma/libksysguard-5.13.3:5[-minimal(-)] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/ksysguard-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=422e45360735caf62d25b7cc991f0c4b
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.13.4 b/metadata/md5-cache/kde-plasma/ksysguard-5.13.4
new file mode 100644
index 000000000000..a04425f95709
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-plasma/libksysguard-5.13.4:5[-minimal(-)] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Network-enabled task manager and system monitor
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=lm_sensors debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-plasma/libksysguard-5.13.4:5[-minimal(-)] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/ksysguard-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=422e45360735caf62d25b7cc991f0c4b
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.3 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.3
deleted file mode 100644
index a468647db406..000000000000
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= virtual/pam sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KWallet PAM module to not enter password again
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/kwallet-pam-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=08268d68786c887fb10c1371dbf55a14
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.4 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.4
new file mode 100644
index 000000000000..3dc370580350
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= virtual/pam sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KWallet PAM module to not enter password again
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/kwallet-pam-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=08268d68786c887fb10c1371dbf55a14
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.3 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.3
deleted file mode 100644
index 99339d6a6420..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kwayland-integration.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/kwayland-integration-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b16aa1be100a377eab4994c0259dfc82
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.4 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.4
new file mode 100644
index 000000000000..d4c3cba40b15
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kwayland-integration.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/kwayland-integration-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b16aa1be100a377eab4994c0259dfc82
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.13.3 b/metadata/md5-cache/kde-plasma/kwin-5.13.3
deleted file mode 100644
index 0a9fbed768de..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.13.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5= >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5= >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5[X] >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/breeze-5.13.3:5 >=kde-plasma/kdecoration-5.13.3:5 >=kde-plasma/kscreenlocker-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[gles2=] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsensors-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=dev-qt/designer-5.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE window manager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=caps gles2 multimedia test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.13.3:5
-RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5= >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5= >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5[X] >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/breeze-5.13.3:5 >=kde-plasma/kdecoration-5.13.3:5 >=kde-plasma/kscreenlocker-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[gles2=] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsensors-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=dev-qt/qtvirtualkeyboard-5.11.1:5 multimedia? ( >=dev-qt/qtmultimedia-5.11.1:5[gstreamer,qml] ) !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/kwin-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2e2dc432b48a6a9045dbd4e950856d0c
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.13.4 b/metadata/md5-cache/kde-plasma/kwin-5.13.4
new file mode 100644
index 000000000000..6a89b6176fb4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.13.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5= >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5= >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5[X] >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/breeze-5.13.4:5 >=kde-plasma/kdecoration-5.13.4:5 >=kde-plasma/kscreenlocker-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[gles2=] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsensors-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=dev-qt/designer-5.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE window manager
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=caps gles2 multimedia test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+PDEPEND=>=kde-plasma/kde-cli-tools-5.13.4:5
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5= >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5= >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5[X] >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/breeze-5.13.4:5 >=kde-plasma/kdecoration-5.13.4:5 >=kde-plasma/kscreenlocker-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[gles2=] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsensors-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=dev-qt/qtvirtualkeyboard-5.11.1:5 multimedia? ( >=dev-qt/qtmultimedia-5.11.1:5[gstreamer,qml] ) !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/kwin-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2e2dc432b48a6a9045dbd4e950856d0c
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.13.3 b/metadata/md5-cache/kde-plasma/kwrited-5.13.3
deleted file mode 100644
index 66147706cd64..000000000000
--- a/metadata/md5-cache/kde-plasma/kwrited-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma daemon listening for wall and write messages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/kwrited-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=941469a5fbde947061e37aea560400cf
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.13.4 b/metadata/md5-cache/kde-plasma/kwrited-5.13.4
new file mode 100644
index 000000000000..4a0f86202ff8
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma daemon listening for wall and write messages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/kwrited-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=941469a5fbde947061e37aea560400cf
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.13.3 b/metadata/md5-cache/kde-plasma/libkscreen-5.13.3
deleted file mode 100644
index 9311de6a2ab9..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.13.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwayland-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma screen management library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kwayland-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5/7
-SRC_URI=mirror://kde/stable/plasma/5.13.3/libkscreen-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0cbd0b147bc072fa9c56d5e7406a806d
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.13.4 b/metadata/md5-cache/kde-plasma/libkscreen-5.13.4
new file mode 100644
index 000000000000..f7f5ed6b7ed7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.13.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwayland-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma screen management library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kwayland-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5/7
+SRC_URI=mirror://kde/stable/plasma/5.13.4/libkscreen-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0cbd0b147bc072fa9c56d5e7406a806d
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.13.3 b/metadata/md5-cache/kde-plasma/libksysguard-5.13.3
deleted file mode 100644
index e47a85d9796d..000000000000
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.46.0:5 !minimal? ( >=kde-frameworks/plasma-5.46.0:5 ) X? ( x11-base/xorg-proto ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Task management and system monitoring library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+detailedmemory minimal X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/libksysguard-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1df790fea6be84d5725f1b6abfa61d8
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.13.4 b/metadata/md5-cache/kde-plasma/libksysguard-5.13.4
new file mode 100644
index 000000000000..968941a067c3
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.46.0:5 !minimal? ( >=kde-frameworks/plasma-5.46.0:5 ) X? ( x11-base/xorg-proto ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Task management and system monitoring library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+detailedmemory minimal X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/libksysguard-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d1df790fea6be84d5725f1b6abfa61d8
diff --git a/metadata/md5-cache/kde-plasma/milou-5.13.3 b/metadata/md5-cache/kde-plasma/milou-5.13.3
deleted file mode 100644
index 705ef373227e..000000000000
--- a/metadata/md5-cache/kde-plasma/milou-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Dedicated search application built on top of Baloo
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/milou.git
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/milou-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71cb10636550c1dd4c981ad9f34d9512
diff --git a/metadata/md5-cache/kde-plasma/milou-5.13.4 b/metadata/md5-cache/kde-plasma/milou-5.13.4
new file mode 100644
index 000000000000..8ca496fa59e4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/milou-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Dedicated search application built on top of Baloo
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/milou.git
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/milou-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=71cb10636550c1dd4c981ad9f34d9512
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.13.3 b/metadata/md5-cache/kde-plasma/oxygen-5.13.3
deleted file mode 100644
index 7dfcef031c3b..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) >=kde-frameworks/kservice-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Oxygen visual style for the Plasma desktop
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/oxygen.git
-IUSE=wayland debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) >=kde-plasma/kde-cli-tools-5.13.3:5 !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/oxygen-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0c09a9de33a307799ada206672743127
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.13.4 b/metadata/md5-cache/kde-plasma/oxygen-5.13.4
new file mode 100644
index 000000000000..5771981cc40c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) >=kde-frameworks/kservice-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Oxygen visual style for the Plasma desktop
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/oxygen.git
+IUSE=wayland debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) >=kde-plasma/kde-cli-tools-5.13.4:5 !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/oxygen-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0c09a9de33a307799ada206672743127
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.3 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.3
deleted file mode 100644
index 62310fae9d26..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/plasma-browser-integration-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5ba4283e4817210af2858a2ff7992a5c
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.4
new file mode 100644
index 000000000000..c5a8a02586df
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-browser-integration-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5ba4283e4817210af2858a2ff7992a5c
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.3 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.3
deleted file mode 100644
index fcb51a405bba..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.46.0:5 >=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpeople-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-plasma/kwin-5.13.3:5 >=kde-plasma/plasma-workspace-5.13.3:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.11.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) mouse? ( x11-drivers/xf86-input-evdev x11-drivers/xf86-input-libinput ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma desktop
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad test debug +handbook test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/attica-5.46.0:5 >=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpeople-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-plasma/kwin-5.13.3:5 >=kde-plasma/plasma-workspace-5.13.3:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.11.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.46.0:5 >=kde-plasma/breeze-5.13.3:5 >=kde-plasma/kde-cli-tools-5.13.3:5 >=kde-plasma/oxygen-5.13.3:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 sys-apps/accountsservice sys-apps/util-linux x11-apps/setxkbmap pulseaudio? ( >=kde-plasma/plasma-pa-5.13.3:5 ) !kde-apps/kcontrol !<kde-apps/kde4-l10n-17.08.1-r1 !kde-apps/knetattach[handbook] !kde-misc/kcm-touchpad !kde-plasma/plasma-desktop:4 !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/plasma-desktop-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aee173a9ebd60518375c8bab2a2ca4e8
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.4
new file mode 100644
index 000000000000..0aebdb7a3a0f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.46.0:5 >=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpeople-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-plasma/kwin-5.13.4:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.11.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) mouse? ( x11-drivers/xf86-input-evdev x11-drivers/xf86-input-libinput ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma desktop
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad test debug +handbook test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/attica-5.46.0:5 >=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpeople-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-plasma/kwin-5.13.4:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.11.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.46.0:5 >=kde-plasma/breeze-5.13.4:5 >=kde-plasma/kde-cli-tools-5.13.4:5 >=kde-plasma/oxygen-5.13.4:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 sys-apps/accountsservice sys-apps/util-linux x11-apps/setxkbmap pulseaudio? ( >=kde-plasma/plasma-pa-5.13.4:5 ) !kde-apps/kcontrol !<kde-apps/kde4-l10n-17.08.1-r1 !kde-apps/knetattach[handbook] !kde-misc/kcm-touchpad !kde-plasma/plasma-desktop:4 !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-desktop-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aee173a9ebd60518375c8bab2a2ca4e8
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.13.3 b/metadata/md5-cache/kde-plasma/plasma-integration-5.13.3
deleted file mode 100644
index 445a351a07d5..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.13.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-plasma/breeze-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libXcursor x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-plasma/breeze-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/plasma-integration-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=49567c5d3af294f6eda67b114d1c7794
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-integration-5.13.4
new file mode 100644
index 000000000000..d783fdb97fc1
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.13.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-plasma/breeze-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libXcursor x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-plasma/breeze-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-integration-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=49567c5d3af294f6eda67b114d1c7794
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.13.3 b/metadata/md5-cache/kde-plasma/plasma-meta-5.13.3
deleted file mode 100644
index 650f0b96a344..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.13.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/workspaces/plasmadesktop/
-IUSE=bluetooth +browser-integration crypt +display-manager grub gtk +handbook legacy-systray networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.13.3:5 >=kde-plasma/drkonqi-5.13.3:5 >=kde-plasma/kactivitymanagerd-5.13.3:5 >=kde-plasma/kde-cli-tools-5.13.3:5 >=kde-plasma/kdecoration-5.13.3:5 >=kde-plasma/kdeplasma-addons-5.13.3:5 >=kde-plasma/kgamma-5.13.3:5 >=kde-plasma/khotkeys-5.13.3:5 >=kde-plasma/kinfocenter-5.13.3:5 >=kde-plasma/kmenuedit-5.13.3:5 >=kde-plasma/kscreen-5.13.3:5 >=kde-plasma/kscreenlocker-5.13.3:5 >=kde-plasma/ksshaskpass-5.13.3:5 >=kde-plasma/ksysguard-5.13.3:5 >=kde-plasma/kwayland-integration-5.13.3:5 >=kde-plasma/kwin-5.13.3:5 >=kde-plasma/kwrited-5.13.3:5 >=kde-plasma/libkscreen-5.13.3:5 >=kde-plasma/libksysguard-5.13.3:5 >=kde-plasma/milou-5.13.3:5 >=kde-plasma/oxygen-5.13.3:5 >=kde-plasma/plasma-desktop-5.13.3:5 >=kde-plasma/plasma-integration-5.13.3:5 >=kde-plasma/plasma-workspace-5.13.3:5 >=kde-plasma/polkit-kde-agent-5.13.3:5 >=kde-plasma/powerdevil-5.13.3:5 >=kde-plasma/systemsettings-5.13.3:5 >=kde-plasma/user-manager-5.13.3:5 bluetooth? ( >=kde-plasma/bluedevil-5.13.3:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.13.3:5 ) crypt? ( >=kde-plasma/plasma-vault-5.13.3:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.13.3:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.13.3:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.13.3:5 >=kde-plasma/kde-gtk-config-5.13.3:5 legacy-systray? ( dev-libs/libappindicator:3 dev-libs/libappindicator:2 ) ) handbook? ( >=kde-apps/khelpcenter-17.12.3:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.13.3:5 ) pam? ( >=kde-plasma/kwallet-pam-5.13.3:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.13.3:5 >=kde-plasma/plymouth-kcm-5.13.3:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.13.3:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.13.3:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.13.3:5 )
-REQUIRED_USE=legacy-systray? ( gtk )
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=29deb41a52a2338f6aa32aa945599041
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-meta-5.13.4
new file mode 100644
index 000000000000..0eda5dd0a7b0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.13.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/workspaces/plasmadesktop/
+IUSE=bluetooth +browser-integration crypt +display-manager grub gtk +handbook legacy-systray networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.13.4:5 >=kde-plasma/drkonqi-5.13.4:5 >=kde-plasma/kactivitymanagerd-5.13.4:5 >=kde-plasma/kde-cli-tools-5.13.4:5 >=kde-plasma/kdecoration-5.13.4:5 >=kde-plasma/kdeplasma-addons-5.13.4:5 >=kde-plasma/kgamma-5.13.4:5 >=kde-plasma/khotkeys-5.13.4:5 >=kde-plasma/kinfocenter-5.13.4:5 >=kde-plasma/kmenuedit-5.13.4:5 >=kde-plasma/kscreen-5.13.4:5 >=kde-plasma/kscreenlocker-5.13.4:5 >=kde-plasma/ksshaskpass-5.13.4:5 >=kde-plasma/ksysguard-5.13.4:5 >=kde-plasma/kwayland-integration-5.13.4:5 >=kde-plasma/kwin-5.13.4:5 >=kde-plasma/kwrited-5.13.4:5 >=kde-plasma/libkscreen-5.13.4:5 >=kde-plasma/libksysguard-5.13.4:5 >=kde-plasma/milou-5.13.4:5 >=kde-plasma/oxygen-5.13.4:5 >=kde-plasma/plasma-desktop-5.13.4:5 >=kde-plasma/plasma-integration-5.13.4:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=kde-plasma/polkit-kde-agent-5.13.4:5 >=kde-plasma/powerdevil-5.13.4:5 >=kde-plasma/systemsettings-5.13.4:5 >=kde-plasma/user-manager-5.13.4:5 bluetooth? ( >=kde-plasma/bluedevil-5.13.4:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.13.4:5 ) crypt? ( >=kde-plasma/plasma-vault-5.13.4:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.13.4:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.13.4:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.13.4:5 >=kde-plasma/kde-gtk-config-5.13.4:5 legacy-systray? ( dev-libs/libappindicator:3 dev-libs/libappindicator:2 ) ) handbook? ( >=kde-apps/khelpcenter-17.12.3:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.13.4:5 ) pam? ( >=kde-plasma/kwallet-pam-5.13.4:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.13.4:5 >=kde-plasma/plymouth-kcm-5.13.4:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.13.4:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.13.4:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.13.4:5 )
+REQUIRED_USE=legacy-systray? ( gtk )
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	475002208a2233f4ab555934b2b0ed0b	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=29deb41a52a2338f6aa32aa945599041
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.13.3 b/metadata/md5-cache/kde-plasma/plasma-nm-5.13.3
deleted file mode 100644
index 33736a906a84..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/networkmanager-qt-5.46.0:5[teamd=] >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.46.0:5 >=dev-qt/qtxml-5.11.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.11.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma applet for NetworkManager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=modemmanager openconnect teamd debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/networkmanager-qt-5.46.0:5[teamd=] >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.46.0:5 >=dev-qt/qtxml-5.11.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.11.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.13.3:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/plasma-nm-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=09751f65ed040a5c61670fb82f060dc1
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-nm-5.13.4
new file mode 100644
index 000000000000..a5e61637caf3
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/networkmanager-qt-5.46.0:5[teamd=] >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.46.0:5 >=dev-qt/qtxml-5.11.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.11.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma applet for NetworkManager
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=modemmanager openconnect teamd debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/networkmanager-qt-5.46.0:5[teamd=] >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.46.0:5 >=dev-qt/qtxml-5.11.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.11.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.13.4:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-nm-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=09751f65ed040a5c61670fb82f060dc1
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.13.3 b/metadata/md5-cache/kde-plasma/plasma-pa-5.13.3
deleted file mode 100644
index c3663fe11d45..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma applet for audio volume management using PulseAudio
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/plasma-pa-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3cde5a5f584ab14dc14893c934d1926f
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.13.3-r2 b/metadata/md5-cache/kde-plasma/plasma-pa-5.13.3-r2
deleted file mode 100644
index 35341e584e06..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.13.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libcanberra media-sound/pulseaudio sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma applet for audio volume management using PulseAudio
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/plasma-pa-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=243a225e8844ba6c59384e651e29ba53
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.13.4-r1 b/metadata/md5-cache/kde-plasma/plasma-pa-5.13.4-r1
new file mode 100644
index 000000000000..17243d2ffc90
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.13.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libcanberra media-sound/pulseaudio sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma applet for audio volume management using PulseAudio
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-pa-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c0b8aaf21c9620af55f6ac8a7729834a
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.3 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.3
deleted file mode 100644
index 7faeeb57340b..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Useful applications for Plasma development
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-5.46.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/plasma-sdk-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1912402c18a065c9290e91bbcae8aa35
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.4
new file mode 100644
index 000000000000..a708688e0948
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Useful applications for Plasma development
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-5.46.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-sdk-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1912402c18a065c9290e91bbcae8aa35
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.13.3 b/metadata/md5-cache/kde-plasma/plasma-vault-5.13.3
deleted file mode 100644
index 4d895582320b..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-plasma/libksysguard-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma applet and services for creating encrypted vaults
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
-IUSE=networkmanager debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-3
-RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-plasma/libksysguard-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.46.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/plasma-vault-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51140a239b643c5b7478c7d671ec9a8f
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-vault-5.13.4
new file mode 100644
index 000000000000..96142bb19c10
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-plasma/libksysguard-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma applet and services for creating encrypted vaults
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
+IUSE=networkmanager debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-3
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-plasma/libksysguard-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.46.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-vault-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=51140a239b643c5b7478c7d671ec9a8f
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.13.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.13.3
deleted file mode 100644
index 0d6a39139e4c..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.13.3
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kjs-5.46.0:5 >=kde-frameworks/kjsembed-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/kscreenlocker-5.13.3:5 >=kde-plasma/kwin-5.13.3:5 >=kde-plasma/libksysguard-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5[jpeg] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.46.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.46.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.46.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) >=dev-qt/qtconcurrent-5.11.1:5 x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma workspace
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.13.3:5
-RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kjs-5.46.0:5 >=kde-frameworks/kjsembed-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/kscreenlocker-5.13.3:5 >=kde-plasma/kwin-5.13.3:5 >=kde-plasma/libksysguard-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5[jpeg] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.46.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.46.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.46.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdesu-5.46.0:5 >=kde-apps/kio-extras-17.12.3:5 >=kde-plasma/ksysguard-5.13.3:5 >=kde-plasma/milou-5.13.3:5 >=kde-plasma/plasma-integration-5.13.3:5 >=dev-qt/qdbus-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtpaths-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/plasma-workspace-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=958a76cb5aaf27336de7ee44c530c73d
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.13.4
new file mode 100644
index 000000000000..bff89c0ee749
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.13.4
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kjs-5.46.0:5 >=kde-frameworks/kjsembed-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/kscreenlocker-5.13.4:5 >=kde-plasma/kwin-5.13.4:5 >=kde-plasma/libksysguard-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5[jpeg] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.46.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.46.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.46.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) >=dev-qt/qtconcurrent-5.11.1:5 x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=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.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma workspace
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.13.4:5
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kjs-5.46.0:5 >=kde-frameworks/kjsembed-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/kscreenlocker-5.13.4:5 >=kde-plasma/kwin-5.13.4:5 >=kde-plasma/libksysguard-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5[jpeg] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.46.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.46.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.46.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdesu-5.46.0:5 >=kde-apps/kio-extras-17.12.3:5 >=kde-plasma/ksysguard-5.13.4:5 >=kde-plasma/milou-5.13.4:5 >=kde-plasma/plasma-integration-5.13.4:5 >=dev-qt/qdbus-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtpaths-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+REQUIRED_USE=gps? ( geolocation )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-workspace-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=958a76cb5aaf27336de7ee44c530c73d
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.3
deleted file mode 100644
index a18657b9a828..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Additional wallpapers for the Plasma workspace
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=GPL-2
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/plasma-workspace-wallpapers-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=189842381304d5baa13bc42dfdb0ddb1
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.4
new file mode 100644
index 000000000000..4fbe16cf9f5c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Additional wallpapers for the Plasma workspace
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=GPL-2
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-workspace-wallpapers-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=189842381304d5baa13bc42dfdb0ddb1
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.3 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.3
deleted file mode 100644
index cce1e4977cd0..000000000000
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-boot/plymouth sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma control module for Plymouth
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/plymouth-kcm.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.13.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/plymouth-kcm-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80e3cae09e6e4b2b7c840ce4dd99cc81
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.4 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.4
new file mode 100644
index 000000000000..cc3bcd7c7b8a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-boot/plymouth sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma control module for Plymouth
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/plymouth-kcm.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.13.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/plymouth-kcm-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=80e3cae09e6e4b2b7c840ce4dd99cc81
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.3 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.3
deleted file mode 100644
index e0505e7da96a..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=PolKit agent module for KDE Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/polkit-kde-agent-1-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=baccf1318cfd16b51009d71874e36a4f
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.4 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.4
new file mode 100644
index 000000000000..485eaf088e0e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=PolKit agent module for KDE Plasma
+EAPI=6
+HOMEPAGE=https://www.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/polkit-kde-agent-1-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=baccf1318cfd16b51009d71874e36a4f
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.13.3 b/metadata/md5-cache/kde-plasma/powerdevil-5.13.3
deleted file mode 100644
index 3c42220aa543..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5[policykit] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/libkscreen-5.13.3:5 >=kde-plasma/plasma-workspace-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.46.0:5 >=kde-frameworks/networkmanager-qt-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/powerdevil.git
-IUSE=brightness-control consolekit +wireless debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5[policykit] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/libkscreen-5.13.3:5 >=kde-plasma/plasma-workspace-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.46.0:5 >=kde-frameworks/networkmanager-qt-5.46.0:5 ) >=kde-plasma/kde-cli-tools-5.13.3:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/powerdevil-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=96e86f41303c2c97fb2f3467d4103bf2
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.13.4 b/metadata/md5-cache/kde-plasma/powerdevil-5.13.4
new file mode 100644
index 000000000000..3b2c32effd2f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5[policykit] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/libkscreen-5.13.4:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.46.0:5 >=kde-frameworks/networkmanager-qt-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Power management for KDE Plasma Shell
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/powerdevil.git
+IUSE=brightness-control consolekit +wireless debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5[policykit] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/libkscreen-5.13.4:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.46.0:5 >=kde-frameworks/networkmanager-qt-5.46.0:5 ) >=kde-plasma/kde-cli-tools-5.13.4:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/powerdevil-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=96e86f41303c2c97fb2f3467d4103bf2
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.3 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.3
deleted file mode 100644
index aef057ba7ab5..000000000000
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma control module for SDDM
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/sddm-kcm.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.13.3:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/sddm-kcm-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ea6912c8a78f1d0f346c2a08f71d50dc
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.4 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.4
new file mode 100644
index 000000000000..10b1a55d5ef9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma control module for SDDM
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/sddm-kcm.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.13.4:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/sddm-kcm-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ea6912c8a78f1d0f346c2a08f71d50dc
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.13.3 b/metadata/md5-cache/kde-plasma/systemsettings-5.13.3
deleted file mode 100644
index 16dc2d87c0b5..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 classic? ( >=kde-frameworks/khtml-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=System settings utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=classic gtk debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 classic? ( >=kde-frameworks/khtml-5.46.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.46.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.13.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/systemsettings-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=acef3411943f0cdf3d4c0209314283af
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.13.4 b/metadata/md5-cache/kde-plasma/systemsettings-5.13.4
new file mode 100644
index 000000000000..d7f3ffa9e643
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 classic? ( >=kde-frameworks/khtml-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=System settings utility
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=classic gtk debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 classic? ( >=kde-frameworks/khtml-5.46.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.46.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.13.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/systemsettings-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=acef3411943f0cdf3d4c0209314283af
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.13.3 b/metadata/md5-cache/kde-plasma/user-manager-5.13.3
deleted file mode 100644
index 6b3c3aa5c515..000000000000
--- a/metadata/md5-cache/kde-plasma/user-manager-5.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/libpwquality-1.3.0 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Simple system settings module to manage the users of your system
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.3/user-manager-5.13.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5303ae307bcec7f95030e927dfe2d521
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.13.4 b/metadata/md5-cache/kde-plasma/user-manager-5.13.4
new file mode 100644
index 000000000000..2679aa5ac655
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/libpwquality-1.3.0 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Simple system settings module to manage the users of your system
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.4/user-manager-5.13.4.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5303ae307bcec7f95030e927dfe2d521
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 92d3c586fe92..493073b41d9a 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/roundcube-1.3.7 b/metadata/md5-cache/mail-client/roundcube-1.3.7
new file mode 100644
index 000000000000..4f2995514480
--- /dev/null
+++ b/metadata/md5-cache/mail-client/roundcube-1.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
+EAPI=6
+HOMEPAGE=https://roundcube.net
+IUSE=change-password enigma ldap managesieve mysql postgres sqlite ssl spell vhosts
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
+RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml] >=dev-php/PEAR-Auth_SASL-1.1.0 >=dev-php/PEAR-Mail_Mime-1.10.0 >=dev-php/PEAR-Mail_mimeDecode-1.5.5 >=dev-php/PEAR-Net_IDNA2-0.2.0 >=dev-php/PEAR-Net_SMTP-1.7.1 virtual/httpd-php change-password? ( >=dev-php/PEAR-Net_Socket-1.2.1 dev-lang/php[sockets] ) enigma? ( >=dev-php/PEAR-Crypt_GPG-1.6.0 app-crypt/gnupg ) ldap? ( >=dev-php/PEAR-Net_LDAP2-2.2.0 dev-php/PEAR-Net_LDAP3 ) managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=1.3.7
+SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.3.7/roundcubemail-1.3.7-complete.tar.gz
+_eclasses_=webapp	6ae2395d7f341093c36057cb4f69101a
+_md5_=91e458265d011c2c0e9424f283904022
diff --git a/metadata/md5-cache/mail-client/thunderbird-45.8.0 b/metadata/md5-cache/mail-client/thunderbird-45.8.0
index c5cba8c8edd8..1b58e56d6fd9 100644
--- a/metadata/md5-cache/mail-client/thunderbird-45.8.0
+++ b/metadata/md5-cache/mail-client/thunderbird-45.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=system-harfbuzz? ( system-icu )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ar.xpi -> thunderbird-45.8.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ast.xpi -> thunderbird-45.8.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/be.xpi -> thunderbird-45.8.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/bg.xpi -> thunderbird-45.8.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-45.8.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/br.xpi -> thunderbird-45.8.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ca.xpi -> thunderbird-45.8.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/cs.xpi -> thunderbird-45.8.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/cy.xpi -> thunderbird-45.8.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/da.xpi -> thunderbird-45.8.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/de.xpi -> thunderbird-45.8.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/el.xpi -> thunderbird-45.8.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/en-GB.xpi -> thunderbird-45.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/es-AR.xpi -> thunderbird-45.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-45.8.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/et.xpi -> thunderbird-45.8.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/eu.xpi -> thunderbird-45.8.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/fi.xpi -> thunderbird-45.8.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/fr.xpi -> thunderbird-45.8.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-45.8.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-45.8.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/gd.xpi -> thunderbird-45.8.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/gl.xpi -> thunderbird-45.8.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/he.xpi -> thunderbird-45.8.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hr.xpi -> thunderbird-45.8.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hsb.xpi -> thunderbird-45.8.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hu.xpi -> thunderbird-45.8.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-45.8.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/id.xpi -> thunderbird-45.8.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/is.xpi -> thunderbird-45.8.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/it.xpi -> thunderbird-45.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ja.xpi -> thunderbird-45.8.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ko.xpi -> thunderbird-45.8.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/lt.xpi -> thunderbird-45.8.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-45.8.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/nl.xpi -> thunderbird-45.8.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-45.8.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-45.8.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pl.xpi -> thunderbird-45.8.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-45.8.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-45.8.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/rm.xpi -> thunderbird-45.8.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ro.xpi -> thunderbird-45.8.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ru.xpi -> thunderbird-45.8.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/si.xpi -> thunderbird-45.8.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sk.xpi -> thunderbird-45.8.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sl.xpi -> thunderbird-45.8.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sq.xpi -> thunderbird-45.8.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sr.xpi -> thunderbird-45.8.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-45.8.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-45.8.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/tr.xpi -> thunderbird-45.8.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/uk.xpi -> thunderbird-45.8.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/vi.xpi -> thunderbird-45.8.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-45.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-45.8.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/source/thunderbird-45.8.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-4.7.8.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-2.6-r1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-45.0-patches-12.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-45.0-patches-12.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-45.0-patches-12.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.45	a2be5f5e8620147b5a8e27fc6ccfab14	mozcoreconf-v4	45c0b61c53e2dbbcf728355c62f8de3c	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.45	a2be5f5e8620147b5a8e27fc6ccfab14	mozcoreconf-v4	45c0b61c53e2dbbcf728355c62f8de3c	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=93b44d1b89b24cb57e46dbd9f495b391
diff --git a/metadata/md5-cache/mail-client/thunderbird-52.5.2 b/metadata/md5-cache/mail-client/thunderbird-52.5.2
index c252aa15e5c3..b59d9fe4f357 100644
--- a/metadata/md5-cache/mail-client/thunderbird-52.5.2
+++ b/metadata/md5-cache/mail-client/thunderbird-52.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selin
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ar.xpi -> thunderbird-52.5.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ast.xpi -> thunderbird-52.5.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/be.xpi -> thunderbird-52.5.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/bg.xpi -> thunderbird-52.5.2-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.5.2-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/br.xpi -> thunderbird-52.5.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ca.xpi -> thunderbird-52.5.2-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/cs.xpi -> thunderbird-52.5.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/cy.xpi -> thunderbird-52.5.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/da.xpi -> thunderbird-52.5.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/de.xpi -> thunderbird-52.5.2-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/el.xpi -> thunderbird-52.5.2-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/en-GB.xpi -> thunderbird-52.5.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/es-AR.xpi -> thunderbird-52.5.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/es-ES.xpi -> thunderbird-52.5.2-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/et.xpi -> thunderbird-52.5.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/eu.xpi -> thunderbird-52.5.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/fi.xpi -> thunderbird-52.5.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/fr.xpi -> thunderbird-52.5.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.5.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.5.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/gd.xpi -> thunderbird-52.5.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/gl.xpi -> thunderbird-52.5.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/he.xpi -> thunderbird-52.5.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hr.xpi -> thunderbird-52.5.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hsb.xpi -> thunderbird-52.5.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hu.xpi -> thunderbird-52.5.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.5.2-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/id.xpi -> thunderbird-52.5.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/is.xpi -> thunderbird-52.5.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/it.xpi -> thunderbird-52.5.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ja.xpi -> thunderbird-52.5.2-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ko.xpi -> thunderbird-52.5.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/lt.xpi -> thunderbird-52.5.2-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.5.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/nl.xpi -> thunderbird-52.5.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.5.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.5.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pl.xpi -> thunderbird-52.5.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.5.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.5.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/rm.xpi -> thunderbird-52.5.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ro.xpi -> thunderbird-52.5.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ru.xpi -> thunderbird-52.5.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/si.xpi -> thunderbird-52.5.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sk.xpi -> thunderbird-52.5.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sl.xpi -> thunderbird-52.5.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sq.xpi -> thunderbird-52.5.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sr.xpi -> thunderbird-52.5.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.5.2-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.5.2-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/tr.xpi -> thunderbird-52.5.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/uk.xpi -> thunderbird-52.5.2-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/vi.xpi -> thunderbird-52.5.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.5.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.5.2-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/source/thunderbird-52.5.2.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-5.4.5.2.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-3.3.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b3b08c34adbe010367fa28d4f8bb217b
diff --git a/metadata/md5-cache/mail-client/thunderbird-52.9.0 b/metadata/md5-cache/mail-client/thunderbird-52.9.0
index cdf52802b14a..0ad7cd552eff 100644
--- a/metadata/md5-cache/mail-client/thunderbird-52.9.0
+++ b/metadata/md5-cache/mail-client/thunderbird-52.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selin
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/ar.xpi -> thunderbird-52.9.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/ast.xpi -> thunderbird-52.9.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/be.xpi -> thunderbird-52.9.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/bg.xpi -> thunderbird-52.9.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.9.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/br.xpi -> thunderbird-52.9.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/ca.xpi -> thunderbird-52.9.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/cs.xpi -> thunderbird-52.9.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/cy.xpi -> thunderbird-52.9.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/da.xpi -> thunderbird-52.9.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/de.xpi -> thunderbird-52.9.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/el.xpi -> thunderbird-52.9.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/en-GB.xpi -> thunderbird-52.9.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/es-AR.xpi -> thunderbird-52.9.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/es-ES.xpi -> thunderbird-52.9.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/et.xpi -> thunderbird-52.9.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/eu.xpi -> thunderbird-52.9.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/fi.xpi -> thunderbird-52.9.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/fr.xpi -> thunderbird-52.9.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.9.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.9.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/gd.xpi -> thunderbird-52.9.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/gl.xpi -> thunderbird-52.9.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/he.xpi -> thunderbird-52.9.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/hr.xpi -> thunderbird-52.9.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/hsb.xpi -> thunderbird-52.9.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/hu.xpi -> thunderbird-52.9.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.9.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/id.xpi -> thunderbird-52.9.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/is.xpi -> thunderbird-52.9.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/it.xpi -> thunderbird-52.9.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/ja.xpi -> thunderbird-52.9.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/ko.xpi -> thunderbird-52.9.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/lt.xpi -> thunderbird-52.9.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.9.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/nl.xpi -> thunderbird-52.9.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.9.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.9.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/pl.xpi -> thunderbird-52.9.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.9.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.9.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/rm.xpi -> thunderbird-52.9.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/ro.xpi -> thunderbird-52.9.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/ru.xpi -> thunderbird-52.9.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/si.xpi -> thunderbird-52.9.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/sk.xpi -> thunderbird-52.9.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/sl.xpi -> thunderbird-52.9.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/sq.xpi -> thunderbird-52.9.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/sr.xpi -> thunderbird-52.9.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.9.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.9.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/tr.xpi -> thunderbird-52.9.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/uk.xpi -> thunderbird-52.9.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/vi.xpi -> thunderbird-52.9.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.9.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.9.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/source/thunderbird-52.9.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-5.4.9.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-3.3.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=982b73f8f9332fb9e2fa56a9db506160
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-52.9.1 b/metadata/md5-cache/mail-client/thunderbird-bin-52.9.1
index f12a184c20f6..489086049eed 100644
--- a/metadata/md5-cache/mail-client/thunderbird-bin-52.9.1
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-52.9.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/freedesktop-icon-theme dev-libs/atk >=sys-apps/dbus-0.60 >=dev-l
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ar.xpi -> thunderbird-52.9.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ast.xpi -> thunderbird-52.9.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/be.xpi -> thunderbird-52.9.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/bg.xpi -> thunderbird-52.9.1-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.9.1-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/br.xpi -> thunderbird-52.9.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ca.xpi -> thunderbird-52.9.1-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/cs.xpi -> thunderbird-52.9.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/cy.xpi -> thunderbird-52.9.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/da.xpi -> thunderbird-52.9.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/de.xpi -> thunderbird-52.9.1-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/el.xpi -> thunderbird-52.9.1-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/en-GB.xpi -> thunderbird-52.9.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/es-AR.xpi -> thunderbird-52.9.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/es-ES.xpi -> thunderbird-52.9.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/et.xpi -> thunderbird-52.9.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/eu.xpi -> thunderbird-52.9.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/fi.xpi -> thunderbird-52.9.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/fr.xpi -> thunderbird-52.9.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.9.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.9.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/gd.xpi -> thunderbird-52.9.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/gl.xpi -> thunderbird-52.9.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/he.xpi -> thunderbird-52.9.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hr.xpi -> thunderbird-52.9.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hsb.xpi -> thunderbird-52.9.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hu.xpi -> thunderbird-52.9.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.9.1-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/id.xpi -> thunderbird-52.9.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/is.xpi -> thunderbird-52.9.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/it.xpi -> thunderbird-52.9.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ja.xpi -> thunderbird-52.9.1-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ko.xpi -> thunderbird-52.9.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/lt.xpi -> thunderbird-52.9.1-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.9.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/nl.xpi -> thunderbird-52.9.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.9.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.9.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pl.xpi -> thunderbird-52.9.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.9.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.9.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/rm.xpi -> thunderbird-52.9.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ro.xpi -> thunderbird-52.9.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ru.xpi -> thunderbird-52.9.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/si.xpi -> thunderbird-52.9.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sk.xpi -> thunderbird-52.9.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sl.xpi -> thunderbird-52.9.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sq.xpi -> thunderbird-52.9.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sr.xpi -> thunderbird-52.9.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.9.1-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.9.1-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/tr.xpi -> thunderbird-52.9.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/uk.xpi -> thunderbird-52.9.1-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/vi.xpi -> thunderbird-52.9.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.9.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.9.1-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/en-US/thunderbird-52.9.1.tar.bz2 -> thunderbird-bin_x86_64-52.9.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/en-US/thunderbird-52.9.1.tar.bz2 -> thunderbird-bin_i686-52.9.1.tar.bz2 ) https://dev.gentoo.org/~axs/distfiles/lightning-5.4.9.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fc0f2d3c786279ddcfa2b11a768e5ff3
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index c222610f8b8c..40b43893f8dc 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.6.5 b/metadata/md5-cache/mail-filter/rspamd-1.6.5
index f5013682a4df..703a6f5c8535 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.6.5
+++ b/metadata/md5-cache/mail-filter/rspamd-1.6.5
@@ -9,5 +9,5 @@ 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.5.tar.gz -> rspamd-1.6.5.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=702a475d0213a7f936f3972803484ca4
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.6.6 b/metadata/md5-cache/mail-filter/rspamd-1.6.6
index 5cf254808d55..346c9fd8c5db 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.6.6
+++ b/metadata/md5-cache/mail-filter/rspamd-1.6.6
@@ -9,5 +9,5 @@ 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	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=41740706fb4d088532b839027a857cb1
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.7.1 b/metadata/md5-cache/mail-filter/rspamd-1.7.1
index e9b5ed15d596..018ea70b0a7b 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.7.1
+++ b/metadata/md5-cache/mail-filter/rspamd-1.7.1
@@ -9,5 +9,5 @@ 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.7.1.tar.gz -> rspamd-1.7.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0fe42338f53d039c1be0709d6f1d3b58
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.7.2 b/metadata/md5-cache/mail-filter/rspamd-1.7.2
index 0be735c82d00..e49c48b34935 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.7.2
+++ b/metadata/md5-cache/mail-filter/rspamd-1.7.2
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libres
 REQUIRED_USE=torch? ( jit )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.7.2.tar.gz -> rspamd-1.7.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=111196b3c5266d13b55a8bcfa4a10cd2
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.7.5 b/metadata/md5-cache/mail-filter/rspamd-1.7.5
index fba12a92cd45..1aa01529a14d 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.7.5
+++ b/metadata/md5-cache/mail-filter/rspamd-1.7.5
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libres
 REQUIRED_USE=torch? ( jit )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.7.5.tar.gz -> rspamd-1.7.5.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=687b126d3e754c4291a5a5e8fd6dcf8e
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.7.7 b/metadata/md5-cache/mail-filter/rspamd-1.7.7
index c8b40e46c8be..53a68925b199 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.7.7
+++ b/metadata/md5-cache/mail-filter/rspamd-1.7.7
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libres
 REQUIRED_USE=torch? ( jit )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.7.7.tar.gz -> rspamd-1.7.7.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8c3a60b7d73352402e5701581c15082b
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.7.8 b/metadata/md5-cache/mail-filter/rspamd-1.7.8
index 8570b1c9f190..46577d9d4394 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.7.8
+++ b/metadata/md5-cache/mail-filter/rspamd-1.7.8
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libres
 REQUIRED_USE=torch? ( jit )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.7.8.tar.gz -> rspamd-1.7.8.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=69455554d9b83ec2227c0cc3a76b69b8
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.7.9 b/metadata/md5-cache/mail-filter/rspamd-1.7.9
index 68827f39cbe2..9ec79d959215 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.7.9
+++ b/metadata/md5-cache/mail-filter/rspamd-1.7.9
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libres
 REQUIRED_USE=torch? ( jit )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.7.9.tar.gz -> rspamd-1.7.9.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8c3a60b7d73352402e5701581c15082b
diff --git a/metadata/md5-cache/mail-filter/rspamd-9999 b/metadata/md5-cache/mail-filter/rspamd-9999
index 62cb4454ec40..c95ebe34968c 100644
--- a/metadata/md5-cache/mail-filter/rspamd-9999
+++ b/metadata/md5-cache/mail-filter/rspamd-9999
@@ -8,5 +8,5 @@ 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 net-libs/libnsl 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 )
 REQUIRED_USE=torch? ( jit )
 SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8c3a60b7d73352402e5701581c15082b
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 4dd554a09224..fba7ddbffbd5 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/inconsolata-20140821 b/metadata/md5-cache/media-fonts/inconsolata-20140821
index dd255d2d41b5..4b635822d888 100644
--- a/metadata/md5-cache/media-fonts/inconsolata-20140821
+++ b/metadata/md5-cache/media-fonts/inconsolata-20140821
@@ -4,10 +4,10 @@ DESCRIPTION=A sans-serif monotype font for code listings
 EAPI=5
 HOMEPAGE=https://fonts.google.com/specimen/Inconsolata
 IUSE=X
-KEYWORDS=amd64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=OFL-1.1
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/inconsolata-20140821.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bf6d59435025b5d8e042b2a6f758b3e6
+_md5_=d7a55f69f595dee2db1c17b6c9be05d5
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 6c6fd643cf6e..77a3e9f05cc9 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/argyllcms-1.9.2 b/metadata/md5-cache/media-gfx/argyllcms-1.9.2
index 644e1f1b81ce..d4674da65d56 100644
--- a/metadata/md5-cache/media-gfx/argyllcms-1.9.2
+++ b/metadata/md5-cache/media-gfx/argyllcms-1.9.2
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=http://www.argyllcms.com/Argyll_V1.9.2_src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6512a1324a951a5f2a3c9ee8c0838d5d
diff --git a/metadata/md5-cache/media-gfx/argyllcms-2.0.0 b/metadata/md5-cache/media-gfx/argyllcms-2.0.0
index 521ca07d23fc..a8418e390e80 100644
--- a/metadata/md5-cache/media-gfx/argyllcms-2.0.0
+++ b/metadata/md5-cache/media-gfx/argyllcms-2.0.0
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=http://www.argyllcms.com/Argyll_V2.0.0_src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0a256034f6f3e568ce30b3cf65cc23b5
diff --git a/metadata/md5-cache/media-gfx/argyllcms-2.0.1 b/metadata/md5-cache/media-gfx/argyllcms-2.0.1
index 23183a3f0520..1230904eee07 100644
--- a/metadata/md5-cache/media-gfx/argyllcms-2.0.1
+++ b/metadata/md5-cache/media-gfx/argyllcms-2.0.1
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=http://www.argyllcms.com/Argyll_V2.0.1_src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=136d688d053dfcbab2c5d6a630ac93d9
diff --git a/metadata/md5-cache/media-gfx/blender-2.72b-r4 b/metadata/md5-cache/media-gfx/blender-2.72b-r4
index 2b0d6fd80f20..7d73ec5b3c15 100644
--- a/metadata/md5-cache/media-gfx/blender-2.72b-r4
+++ b/metadata/md5-cache/media-gfx/blender-2.72b-r4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec
 REQUIRED_USE=python_targets_python3_4 player? ( game-engine ) redcode? ( jpeg2k ffmpeg ) cycles? ( boost openexr tiff ) nls? ( boost ) colorio? ( boost ) openal? ( boost ) game-engine? ( boost ) ?? ( ffmpeg libav )
 SLOT=0
 SRC_URI=https://download.blender.org/source/blender-2.72b.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e73c5287ca186e82f1cd2ebbac6e36df
diff --git a/metadata/md5-cache/media-gfx/blender-2.79 b/metadata/md5-cache/media-gfx/blender-2.79
index 33e0b1c64bc8..76aeacb5ccc8 100644
--- a/metadata/md5-cache/media-gfx/blender-2.79
+++ b/metadata/md5-cache/media-gfx/blender-2.79
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) player? ( game-engine !headless ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) opencl? ( cycles ) osl? ( cycles llvm )
 SLOT=0
 SRC_URI=https://download.blender.org/source/blender-2.79.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1bb68cfbea7abf92644c47cf6094243d
diff --git a/metadata/md5-cache/media-gfx/blender-2.79-r1 b/metadata/md5-cache/media-gfx/blender-2.79-r1
index 846e7841d7f3..f2cd9a222f34 100644
--- a/metadata/md5-cache/media-gfx/blender-2.79-r1
+++ b/metadata/md5-cache/media-gfx/blender-2.79-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) player? ( game-engine !headless ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) opencl? ( cycles ) osl? ( cycles llvm )
 SLOT=0
 SRC_URI=https://download.blender.org/source/blender-2.79.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=814952983e68a0c001e79a149a0cd9dc
diff --git a/metadata/md5-cache/media-gfx/darktable-2.2.5 b/metadata/md5-cache/media-gfx/darktable-2.2.5
index a54b34aa0c3d..b4c1d38dc8ca 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.2.5
+++ b/metadata/md5-cache/media-gfx/darktable-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.2.5/darktable-2.2.5.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.2.0/darktable-usermanual.pdf -> darktable-usermanual-2.2.0.pdf )
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=62b8a220b3d54a66a6203b2dbb03eaca
diff --git a/metadata/md5-cache/media-gfx/darktable-2.4.3 b/metadata/md5-cache/media-gfx/darktable-2.4.3
index 8dab8c495b90..3efe7569d4c7 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.4.3
+++ b/metadata/md5-cache/media-gfx/darktable-2.4.3
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.4.3/darktable-2.4.3.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.4.0/darktable-usermanual.pdf -> darktable-usermanual-2.4.0.pdf )
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dd969eb3ce4d1dd3aa98cc2e648872bb
diff --git a/metadata/md5-cache/media-gfx/darktable-2.4.4 b/metadata/md5-cache/media-gfx/darktable-2.4.4
index d627a320d767..199104884032 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.4.4
+++ b/metadata/md5-cache/media-gfx/darktable-2.4.4
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.4.4/darktable-2.4.4.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.4.0/darktable-usermanual.pdf -> darktable-usermanual-2.4.0.pdf )
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=427b4ae3b313c363312118f9c8218068
diff --git a/metadata/md5-cache/media-gfx/darktable-9999 b/metadata/md5-cache/media-gfx/darktable-9999
index 4364b8f3b467..bbcd00f099fd 100644
--- a/metadata/md5-cache/media-gfx/darktable-9999
+++ b/metadata/md5-cache/media-gfx/darktable-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3 CC-BY-3.0
 RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0663165c7b81d702752d61113247bffa
diff --git a/metadata/md5-cache/media-gfx/displaycal-3.6.1.1 b/metadata/md5-cache/media-gfx/displaycal-3.6.1.1
new file mode 100644
index 000000000000..b061eaa428bf
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/displaycal-3.6.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 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(-)] >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Display calibration and characterization powered by Argyll CMS
+EAPI=6
+HOMEPAGE=https://displaycal.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 >=dev-python/numpy-1.2.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.6.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bcf17d92dfb17e2638fab311133ebd33
diff --git a/metadata/md5-cache/media-gfx/eog-3.26.2 b/metadata/md5-cache/media-gfx/eog-3.26.2
new file mode 100644
index 000000000000..7ed090a2d09c
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/eog-3.26.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.42.0:2[dbus] >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=x11-libs/gtk+-3.22.0:3[introspection,X] >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] x11-libs/libX11 exif? ( >=media-libs/libexif-0.6.14 ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( media-libs/exempi:2 ) dev-libs/libxml2:2 >=dev-util/gtk-doc-am-1.16 dev-util/itstool >=sys-devel/gettext-0.19.7 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=The Eye of GNOME image viewer
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome
+IUSE=debug +exif +introspection +jpeg lcms +svg tiff xmp
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.42.0:2[dbus] >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=x11-libs/gtk+-3.22.0:3[introspection,X] >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] x11-libs/libX11 exif? ( >=media-libs/libexif-0.6.14 ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( media-libs/exempi:2 )
+REQUIRED_USE=exif? ( jpeg )
+SLOT=1
+SRC_URI=mirror://gnome/sources/eog/3.26/eog-3.26.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a48226865b7a501ce3efb90eb879d4b5
diff --git a/metadata/md5-cache/media-gfx/eog-plugins-3.26.3 b/metadata/md5-cache/media-gfx/eog-plugins-3.26.3
new file mode 100644
index 000000000000..6a4304247c1e
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/eog-plugins-3.26.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libpeas-0.7.4:= >=media-gfx/eog-3.15.90 >=x11-libs/gtk+-3.14:3 exif? ( >=media-libs/libexif-0.6.16 ) map? ( media-libs/libchamplain:0.12[gtk] >=media-libs/clutter-1.9.4:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 ) picasa? ( >=dev-libs/libgdata-0.9.1:= ) python? ( 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_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.32:2[dbus] dev-libs/libpeas:=[gtk,python,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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/gsettings-desktop-schemas media-gfx/eog[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) dev-libs/libxml2:2 >=sys-devel/gettext-0.19.7 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=Eye of GNOME plugins
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome/Plugins
+IUSE=+exif map picasa +python 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
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libpeas-0.7.4:= >=media-gfx/eog-3.15.90 >=x11-libs/gtk+-3.14:3 exif? ( >=media-libs/libexif-0.6.16 ) map? ( media-libs/libchamplain:0.12[gtk] >=media-libs/clutter-1.9.4:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 ) picasa? ( >=dev-libs/libgdata-0.9.1:= ) python? ( 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_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.32:2[dbus] dev-libs/libpeas:=[gtk,python,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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/gsettings-desktop-schemas media-gfx/eog[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] )
+REQUIRED_USE=map? ( exif ) python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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=0
+SRC_URI=mirror://gnome/sources/eog-plugins/3.26/eog-plugins-3.26.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=24b7a7a55af46e61697119cc23568696
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.26_p20180319 b/metadata/md5-cache/media-gfx/exiv2-0.26_p20180319
index 83b792e5b0f7..739d2986571b 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.26_p20180319
+++ b/metadata/md5-cache/media-gfx/exiv2-0.26_p20180319
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 SLOT=0/26
 SRC_URI=https://github.com/Exiv2/exiv2/tarball/876b1314ab892cbfa6672b6b94adbeb90db4211f -> exiv2-0.26_p20180319.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=85b8c4abe3d6d9d7931c6ed23a9129b6
+_md5_=1b85fe07c2a5ee400ac28909b7948ff4
diff --git a/metadata/md5-cache/media-gfx/freecad-0.16.6712 b/metadata/md5-cache/media-gfx/freecad-0.16.6712
deleted file mode 100644
index 6038fd87c77d..000000000000
--- a/metadata/md5-cache/media-gfx/freecad-0.16.6712
+++ /dev/null
@@ -1,15 +0,0 @@
-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_python3_7(-),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_python3_7(-),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_python3_7(-),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_python3_7(-),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_python3_7(-),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_python3_7(-),python_single_target_python2_7(+)] sys-devel/make >=dev-util/cmake-3.9.6 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_python3_7(-),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_python3_7(-),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_python3_7(-),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_python3_7(-),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_python3_7(-),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_python3_7(-),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_python3_7(-),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	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c0326610606cf964e1f597f3f481c6b5
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.30 b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.30
index bbc30e3732fb..eae4b92aa1ae 100644
--- a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.30
+++ b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.30
@@ -4,10 +4,10 @@ DESCRIPTION=Collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=http://www.graphicsmagick.org/
 IUSE=bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp perl png postscript q16 q32 static-libs svg test threads tiff truetype webp wmf X zlib
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0 ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
 SLOT=0/1.3
 SRC_URI=mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.30.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6d9f4501e7662fbd586027459ee37a80
+_md5_=d5ed1037826ad9f6e7bb06a5be3c3060
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.3 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.3
deleted file mode 100644
index bb35c9f92a56..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/6.9.10.3
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-3.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a97efdb8cbeb652c67b8191f49f48b56
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.5 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.5
deleted file mode 100644
index e948c25c08cc..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/6.9.10.5
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-5.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=851f7bcb394e87fcc2fa9f2939909344
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.6 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.6
deleted file mode 100644
index 8336832fc0d7..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/6.9.10.6
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0303c689b20fd538ca9391e9a737f747
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.7 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.7
deleted file mode 100644
index 1c918dbc9e91..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/6.9.10.7
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-7.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a97efdb8cbeb652c67b8191f49f48b56
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.8 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.8
index 514a4e7772f1..24498722985d 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.8
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.8
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv )
 SLOT=0/6.9.10.8
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-8.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a97efdb8cbeb652c67b8191f49f48b56
+_md5_=0808e5785cbc77356fba72085f3bd085
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.9.31 b/metadata/md5-cache/media-gfx/imagemagick-6.9.9.31
deleted file mode 100644
index 1b8da6446fab..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.9.31
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/6.9.9.31
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.9-31.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=dc2c2c0480f36c98a9d6874ab1702d34
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.9.40 b/metadata/md5-cache/media-gfx/imagemagick-6.9.9.40
deleted file mode 100644
index d2f6ff187bf1..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.9.40
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/6.9.9.40
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.9-40.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f45da85e71830bcdf13c51a9f462f97c
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.9.47 b/metadata/md5-cache/media-gfx/imagemagick-6.9.9.47
deleted file mode 100644
index 6ab6af34a588..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.9.47
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/6.9.9.47
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.9-47.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6da5ac84cf723e724aa371f086f8d320
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.7.19 b/metadata/md5-cache/media-gfx/imagemagick-7.0.7.19
deleted file mode 100644
index cb9e751e44e3..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.7.19
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/7.0.7.19
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.7-19.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=95041709a02619b50eca4a351b28d91b
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.7.28 b/metadata/md5-cache/media-gfx/imagemagick-7.0.7.28
deleted file mode 100644
index 67ce2c5a132d..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.7.28
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/7.0.7.28
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.7-28.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7f9b09fe89f63a7c42c7f56f7d6b22a7
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.7.35 b/metadata/md5-cache/media-gfx/imagemagick-7.0.7.35
deleted file mode 100644
index bd5098945004..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.7.35
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/7.0.7.35
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.7-35.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4251e8f3bc3b550fd52fc226d7cd82e2
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.3 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.3
deleted file mode 100644
index bd55f5b638f5..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/7.0.8.3
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-3.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aa7d252df6cb816d8555d3fc96f628c5
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.5 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.5
deleted file mode 100644
index e112bc1cba70..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/7.0.8.5
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-5.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0730c666fe34c86921029b2e991a6e6a
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.6 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.6
deleted file mode 100644
index 194a92177316..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/7.0.8.6
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f18bef82dda6733d535031f39827696b
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.7 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.7
deleted file mode 100644
index ba7cf87c6a7e..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/7.0.8.7
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-7.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aa7d252df6cb816d8555d3fc96f628c5
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.8 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.8
index 3e1bb00aee92..13dfff862a81 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.8
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.8
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv )
 SLOT=0/7.0.8.8
 SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-8.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aa7d252df6cb816d8555d3fc96f628c5
+_md5_=4b15557dd808d70212761c88017894bb
diff --git a/metadata/md5-cache/media-gfx/iscan-data-1.22.0.1 b/metadata/md5-cache/media-gfx/iscan-data-1.22.0.1
index 6621a23de9eb..870416f64071 100644
--- a/metadata/md5-cache/media-gfx/iscan-data-1.22.0.1
+++ b/metadata/md5-cache/media-gfx/iscan-data-1.22.0.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~flameeyes/avasys/iscan-data_1.22.0-1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=6e644500ad257edbceab9e7072e53d42
diff --git a/metadata/md5-cache/media-gfx/iscan-data-1.36.0.1 b/metadata/md5-cache/media-gfx/iscan-data-1.36.0.1
index 9a0d77e4bf4e..caf27662436d 100644
--- a/metadata/md5-cache/media-gfx/iscan-data-1.36.0.1
+++ b/metadata/md5-cache/media-gfx/iscan-data-1.36.0.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~idella4/tarballs//iscan-data_1.36.0-1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=5bd04a057d23d55244c443a9931d9083
diff --git a/metadata/md5-cache/media-gfx/libimagequant-2.11.7 b/metadata/md5-cache/media-gfx/libimagequant-2.11.7
index 35d18b932e69..87b7ea423568 100644
--- a/metadata/md5-cache/media-gfx/libimagequant-2.11.7
+++ b/metadata/md5-cache/media-gfx/libimagequant-2.11.7
@@ -3,9 +3,9 @@ DESCRIPTION=Palette quantization library that powers pngquant and other PNG opti
 EAPI=6
 HOMEPAGE=https://pngquant.org/lib/
 IUSE=cpu_flags_x86_sse2 debug openmp static-libs
-KEYWORDS=amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0/0
 SRC_URI=https://github.com/ImageOptim/libimagequant/archive/2.11.7.tar.gz -> libimagequant-2.11.7.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6e5a395bf12059eaee72ad1c81479c4a
+_md5_=067a2875e2cbe8efe49efce13fa30823
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.2.1-r2 b/metadata/md5-cache/media-gfx/mypaint-1.2.1-r2
new file mode 100644
index 000000000000..cc380634904c
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/mypaint-1.2.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=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_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/json-c-0.11:= media-libs/lcms:2 >=media-libs/libmypaint-1.3.0 media-libs/libpng:0= gnome-base/librsvg 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_python3_7(-),python_single_target_python2_7(+)] dev-lang/swig virtual/pkgconfig >=sys-apps/sed-4 dev-util/scons[python_targets_python2_7]
+DESCRIPTION=fast and easy graphics application for digital painters
+EAPI=6
+HOMEPAGE=http://mypaint.org/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=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_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/json-c-0.11:= media-libs/lcms:2 >=media-libs/libmypaint-1.3.0 media-libs/libpng:0= gnome-base/librsvg 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_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/mypaint/mypaint/releases/download/v1.2.1/mypaint-1.2.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f33f471bcdf75639597f5a047ab6c413
diff --git a/metadata/md5-cache/media-gfx/opentoonz-1.2.1 b/metadata/md5-cache/media-gfx/opentoonz-1.2.1
deleted file mode 100644
index e81186365fc2..000000000000
--- a/metadata/md5-cache/media-gfx/opentoonz-1.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2= >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut:= media-libs/freetype:2= media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.3.0 media-libs/libpng:= media-libs/libsdl2:= sci-libs/cblas-reference:= >=sci-libs/superlu-4.1:= sys-libs/zlib:= virtual/libusb:= virtual/opengl virtual/pkgconfig dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An open-source full-featured 2D animation creation software
-EAPI=6
-HOMEPAGE=https://github.com/opentoonz/opentoonz
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD libtiff
-RDEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2= >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut:= media-libs/freetype:2= media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.3.0 media-libs/libpng:= media-libs/libsdl2:= sci-libs/cblas-reference:= >=sci-libs/superlu-4.1:= sys-libs/zlib:= virtual/libusb:= virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.2.1.tar.gz -> opentoonz-1.2.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a26ab745597e0a0d27cd5fe6c6a27d91
diff --git a/metadata/md5-cache/media-gfx/opentoonz-1.2.1-r1 b/metadata/md5-cache/media-gfx/opentoonz-1.2.1-r1
new file mode 100644
index 000000000000..26cfdcfbc42f
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/opentoonz-1.2.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2= >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut:= media-libs/freetype:2= media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.3.0 media-libs/libpng:= media-libs/libsdl2:= sci-libs/cblas-reference:= >=sci-libs/superlu-4.1:= sys-libs/zlib:= virtual/libusb:= virtual/opengl virtual/pkgconfig dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=An open-source full-featured 2D animation creation software
+EAPI=6
+HOMEPAGE=https://github.com/opentoonz/opentoonz
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD libtiff
+RDEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2= >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut:= media-libs/freetype:2= media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.3.0 media-libs/libpng:= media-libs/libsdl2:= sci-libs/cblas-reference:= >=sci-libs/superlu-4.1:= sys-libs/zlib:= virtual/libusb:= virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.2.1.tar.gz -> opentoonz-1.2.1.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8a69f7c6dc18788ff37a9c25ea787147
diff --git a/metadata/md5-cache/media-gfx/openvdb-3.2.0 b/metadata/md5-cache/media-gfx/openvdb-3.2.0
deleted file mode 100644
index 7db985a67dd0..000000000000
--- a/metadata/md5-cache/media-gfx/openvdb-3.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-libs/zlib >=dev-libs/boost-1.62:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] media-libs/openexr dev-util/cppunit X? ( media-libs/glfw ) dev-libs/jemalloc python? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) openvdb-compression? ( >=dev-libs/c-blosc-1.5.0 ) dev-libs/log4cplus dev-cpp/tbb doc? ( app-doc/doxygen python? ( dev-python/pdoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ) sys-libs/zlib >=dev-libs/boost-1.62:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] media-libs/openexr dev-util/cppunit X? ( media-libs/glfw ) dev-libs/jemalloc python? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) openvdb-compression? ( >=dev-libs/c-blosc-1.5.0 ) dev-libs/log4cplus
-DESCRIPTION=Libs for the efficient manipulation of volumetric data
-EAPI=6
-HOMEPAGE=http://www.openvdb.org
-IUSE=+openvdb-compression doc python X python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-libs/zlib >=dev-libs/boost-1.62:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] media-libs/openexr dev-util/cppunit X? ( media-libs/glfw ) dev-libs/jemalloc python? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) openvdb-compression? ( >=dev-libs/c-blosc-1.5.0 ) dev-libs/log4cplus
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/dreamworksanimation/openvdb/archive/v3.2.0.tar.gz -> openvdb-3.2.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=894af55b1cf27231805e0af7e90e2460
diff --git a/metadata/md5-cache/media-gfx/openvdb-4.0.0 b/metadata/md5-cache/media-gfx/openvdb-4.0.0
deleted file mode 100644
index 9ef90015307f..000000000000
--- a/metadata/md5-cache/media-gfx/openvdb-4.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.62:=[python?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus media-libs/glfw:= media-libs/openexr:= sys-libs/zlib x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXcursor python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) dev-cpp/tbb doc? ( app-doc/doxygen python? ( dev-python/pdoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Libs for the efficient manipulation of volumetric data
-EAPI=6
-HOMEPAGE=http://www.openvdb.org
-IUSE=+abi3-compat doc python python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-libs/boost-1.62:=[python?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus media-libs/glfw:= media-libs/openexr:= sys-libs/zlib x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXcursor python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
-SLOT=0
-SRC_URI=https://github.com/dreamworksanimation/openvdb/archive/v4.0.0.tar.gz -> openvdb-4.0.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7496a20eb90716203e589af788bd7fa4
diff --git a/metadata/md5-cache/media-gfx/openvdb-4.0.2-r1 b/metadata/md5-cache/media-gfx/openvdb-4.0.2-r1
new file mode 100644
index 000000000000..a2db335ab476
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/openvdb-4.0.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/boost-1.62:=[python?,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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus media-libs/glfw:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr 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_python3_7(-),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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) dev-cpp/tbb virtual/pkgconfig doc? ( app-doc/doxygen[latex] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Libs for the efficient manipulation of volumetric data
+EAPI=6
+HOMEPAGE=http://www.openvdb.org
+IUSE=+abi3-compat doc python python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-libs/boost-1.62:=[python?,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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus media-libs/glfw:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr 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_python3_7(-),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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+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 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/dreamworksanimation/openvdb/archive/v4.0.2.tar.gz -> openvdb-4.0.2.tar.gz https://github.com/dracwyrm/gentoo-patches/raw/master/openvdb/openvdb-4.0.2-patchset-01.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=56eba0213f764901ac7ad1317bcf58c2
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r1 b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r1
index d8def05eee6a..40bf0e736777 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r1
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r1
@@ -10,5 +10,5 @@ RDEPEND=sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(
 REQUIRED_USE=sane_backends_mustek_usb2? ( threads ) sane_backends_kvs40xx? ( threads )
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/file/4224/sane-backends-1.0.27.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2ebdaf551d8cb66e15bd7edfe33f2324
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index df86afbba637..5846e39f9869 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/SoQt-1.5.0-r1 b/metadata/md5-cache/media-libs/SoQt-1.5.0-r1
deleted file mode 100644
index 10970f3db3d7..000000000000
--- a/metadata/md5-cache/media-libs/SoQt-1.5.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/coin-3.1.3 virtual/opengl dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422
-DESCRIPTION=The glue between Coin3D and Qt
-EAPI=5
-HOMEPAGE=https://bitbucket.org/Coin3D/soqt
-IUSE=debug doc static-libs
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 PEL )
-RDEPEND=>=media-libs/coin-3.1.3 virtual/opengl dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4
-SLOT=0
-SRC_URI=https://bitbucket.org/Coin3D/coin/downloads/SoQt-1.5.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b858ad138e5c364585beca8a83a13f20
diff --git a/metadata/md5-cache/media-libs/emfengine-0.8 b/metadata/md5-cache/media-libs/emfengine-0.8
deleted file mode 100644
index a287ba127381..000000000000
--- a/metadata/md5-cache/media-libs/emfengine-0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/libemf media-libs/libpng:0 app-arch/unzip
-DESCRIPTION=Native vector graphics file format on Windows
-EAPI=5
-HOMEPAGE=http://soft.proindependent.com/emf/index.html
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/libemf media-libs/libpng:0
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jelc/distfiles/EmfEngine-0.8-opensource.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=26a501d47223d8abb34f6a8d85f57db4
diff --git a/metadata/md5-cache/media-libs/graphene-1.8.2 b/metadata/md5-cache/media-libs/graphene-1.8.2
index 2168298bbc36..9a2310f0c29d 100644
--- a/metadata/md5-cache/media-libs/graphene-1.8.2
+++ b/metadata/md5-cache/media-libs/graphene-1.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=A thin layer of types for graphic libraries
 EAPI=6
 HOMEPAGE=https://ebassi.github.io/graphene/
 IUSE=cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection 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 ~sparc ~x86
+KEYWORDS=~amd64 ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/glib-2.30.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(-)?] introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0
 SRC_URI=https://github.com/ebassi/graphene/releases/download/1.8.2/graphene-1.8.2.tar.xz
 _eclasses_=meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eb7448d2af7ae9df217e3393c9ff13a9
+_md5_=f226439bff3d392fc00c399be3f0257a
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.2-r1 b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.2-r1
index 97c8337571ae..45f819bed853 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.2-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis 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 nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.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/gstreamer-1.14.2:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] 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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=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(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.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(-)?] ) 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(-)?] ) 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(-)?] ) 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(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,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(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,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.55[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) >=media-libs/graphene-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(-)?] media-libs/libpng: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/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(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,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(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,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.55[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) >=media-libs/graphene-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(-)?] media-libs/libpng: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/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(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.38.2-r1: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/gstreamer-1.2.4-r1: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(-)?]
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.2.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f439803ff607310a065e74ab45789c38
+_md5_=c21dc1562cacf2541e222d0a92cb9494
diff --git a/metadata/md5-cache/media-libs/gstreamer-0.10.36-r2 b/metadata/md5-cache/media-libs/gstreamer-0.10.36-r2
index 91556c400bd3..eb80c25305da 100644
--- a/metadata/md5-cache/media-libs/gstreamer-0.10.36-r2
+++ b/metadata/md5-cache/media-libs/gstreamer-0.10.36-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) !<media-libs/gst-plugins-base-0.10.26
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.36.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=647e385216df13d4a731bf147b4b6a36
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.12.4 b/metadata/md5-cache/media-libs/gstreamer-1.12.4
index 698337e337c4..ea6e21ffc08c 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.12.4
+++ b/metadata/md5-cache/media-libs/gstreamer-1.12.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.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(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,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/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,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=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.12.4.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5ef7e623db81cae4dc230fcf015b4eda
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.14.1 b/metadata/md5-cache/media-libs/gstreamer-1.14.1
index 4b6103b83164..8a03f740b263 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.14.1
+++ b/metadata/md5-cache/media-libs/gstreamer-1.14.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.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(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,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/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,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/gst-plugins-bad-1.13.1:1.0
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.14.1.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=bdf6f2f76f33e946a8657cca725e5c63
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.14.2 b/metadata/md5-cache/media-libs/gstreamer-1.14.2
index 33cd9276e093..c992ec650d2b 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.14.2
+++ b/metadata/md5-cache/media-libs/gstreamer-1.14.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.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(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,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/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,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/gst-plugins-bad-1.13.1:1.0
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.14.2.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=8b8098599f9aced78374eea878f26cb8
diff --git a/metadata/md5-cache/media-libs/libffado-2.4.0 b/metadata/md5-cache/media-libs/libffado-2.4.0
index 8368042384ad..a7c468c8f0ca 100644
--- a/metadata/md5-cache/media-libs/libffado-2.4.0
+++ b/metadata/md5-cache/media-libs/libffado-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 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=0
 SRC_URI=http://www.ffado.org/files/libffado-2.4.0.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=45b7d5f4194bfdc141478d241f7677fa
diff --git a/metadata/md5-cache/media-libs/libffado-2.4.1 b/metadata/md5-cache/media-libs/libffado-2.4.1
index 3e3d5d1d86cb..940ca1cafccd 100644
--- a/metadata/md5-cache/media-libs/libffado-2.4.1
+++ b/metadata/md5-cache/media-libs/libffado-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 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=0
 SRC_URI=http://www.ffado.org/files/libffado-2.4.1.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=5e36bb73936dd1ff777a6c7560a3addf
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.14 b/metadata/md5-cache/media-libs/libgphoto2-2.5.14
index 9e892d3fd821..2f6b758eba2b 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.14
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.9.1-r4: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/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(-)?] >=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.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(-)?] ) !<sys-fs/udev-201
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.14.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5707bec3bd7ad865a693884d157cea58
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.16 b/metadata/md5-cache/media-libs/libgphoto2-2.5.16
index 1ad0b4b5db26..ae3292d14fe0 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.16
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.16
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.9.1-r4: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/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(-)?] >=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.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(-)?] ) !<sys-fs/udev-201
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.16.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b52ba4a9943caa0a75eda083e89e07ee
diff --git a/metadata/md5-cache/media-libs/libgpod-0.8.3-r2 b/metadata/md5-cache/media-libs/libgpod-0.8.3-r2
index 95ef918abbe6..977acc644330 100644
--- a/metadata/md5-cache/media-libs/libgpod-0.8.3-r2
+++ b/metadata/md5-cache/media-libs/libgpod-0.8.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=app-pda/libplist-1.0:= >=dev-db/sqlite-3:3 >=dev-libs/glib-2.16:2 dev-
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkpod/libgpod-0.8.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d5c0a9cf1238cadd5f41e841904d67fc
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.14 b/metadata/md5-cache/media-libs/libmtp-1.1.14
index 53b2181399a0..82f898ac414a 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.14
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.14
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.14.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=29bc4933736ed9bf647410c80cda3618
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.15 b/metadata/md5-cache/media-libs/libmtp-1.1.15
index 11a0d61a36e8..b4618164637d 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.15
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.15
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.15.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c35bba4f118cf1c20543827732373739
diff --git a/metadata/md5-cache/media-libs/libmtp-9999 b/metadata/md5-cache/media-libs/libmtp-9999
index aec751175a92..5bbf3cc8ce82 100644
--- a/metadata/md5-cache/media-libs/libmtp-9999
+++ b/metadata/md5-cache/media-libs/libmtp-9999
@@ -7,5 +7,5 @@ IUSE=+crypt doc examples static-libs
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
 SLOT=0/9
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=baef03001443ca2120019357bcba1100
diff --git a/metadata/md5-cache/media-libs/libnjb-2.2.7 b/metadata/md5-cache/media-libs/libnjb-2.2.7
index 6a066bb9aaf4..5cb20150dbc3 100644
--- a/metadata/md5-cache/media-libs/libnjb-2.2.7
+++ b/metadata/md5-cache/media-libs/libnjb-2.2.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:0
 SLOT=0
 SRC_URI=mirror://sourceforge/libnjb/libnjb-2.2.7.tar.gz
-_eclasses_=libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=16e4d6b25b7e5aa4f73b362455811f20
diff --git a/metadata/md5-cache/media-libs/mesa-17.3.9 b/metadata/md5-cache/media-libs/mesa-17.3.9
index 2ecf0f6bab68..47c455c98eda 100644
--- a/metadata/md5-cache/media-libs/mesa-17.3.9
+++ b/metadata/md5-cache/media-libs/mesa-17.3.9
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ||
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.3.9.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	llvm	5c91ddccef25fc60a983057bf9507ead	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	llvm	5c91ddccef25fc60a983057bf9507ead	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=7558d5c05621e402eaf44fb58db1d61a
diff --git a/metadata/md5-cache/media-libs/mesa-18.0.5 b/metadata/md5-cache/media-libs/mesa-18.0.5
index b4dcfcaffc83..2061b88f4082 100644
--- a/metadata/md5-cache/media-libs/mesa-18.0.5
+++ b/metadata/md5-cache/media-libs/mesa-18.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ||
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-18.0.5.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	llvm	5c91ddccef25fc60a983057bf9507ead	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	llvm	5c91ddccef25fc60a983057bf9507ead	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=77b19267950dc4332b290373c1f0ff6e
diff --git a/metadata/md5-cache/media-libs/mesa-18.1.4 b/metadata/md5-cache/media-libs/mesa-18.1.4
index ee28e9f3bfbb..a7625b0f4d24 100644
--- a/metadata/md5-cache/media-libs/mesa-18.1.4
+++ b/metadata/md5-cache/media-libs/mesa-18.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ||
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-18.1.4.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	llvm	5c91ddccef25fc60a983057bf9507ead	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	llvm	5c91ddccef25fc60a983057bf9507ead	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=9ac55c0ea704f35783d66005cd65fb5d
diff --git a/metadata/md5-cache/media-libs/mesa-18.1.5 b/metadata/md5-cache/media-libs/mesa-18.1.5
index 2dd0d5d86a63..2adf307f4f84 100644
--- a/metadata/md5-cache/media-libs/mesa-18.1.5
+++ b/metadata/md5-cache/media-libs/mesa-18.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ||
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-18.1.5.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	llvm	5c91ddccef25fc60a983057bf9507ead	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	llvm	5c91ddccef25fc60a983057bf9507ead	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=9ac55c0ea704f35783d66005cd65fb5d
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 8a0365159df2..d0694d9843d6 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -9,5 +9,5 @@ RDEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/
 REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi ) ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium video_cards_vivante ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	llvm	5c91ddccef25fc60a983057bf9507ead	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	llvm	5c91ddccef25fc60a983057bf9507ead	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=4df8c3eb8d3ef82de5bbce4f38089777
diff --git a/metadata/md5-cache/media-libs/mlt-6.6.0-r1 b/metadata/md5-cache/media-libs/mlt-6.6.0-r1
index 1242d93013d7..dfb958635188 100644
--- a/metadata/md5-cache/media-libs/mlt-6.6.0-r1
+++ b/metadata/md5-cache/media-libs/mlt-6.6.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) sdl2? ( sdl )
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/archive/v6.6.0.tar.gz -> mlt-6.6.0.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	da74609cfc48267b7201d50b0367af82	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=11c49b4f36c49f222dc880e4015757d0
+_md5_=7cf8d5d20c0bfeaf07767b7f9ee847c0
diff --git a/metadata/md5-cache/media-libs/opencollada-1.6.62 b/metadata/md5-cache/media-libs/opencollada-1.6.62
index 613e29715681..69382909be90 100644
--- a/metadata/md5-cache/media-libs/opencollada-1.6.62
+++ b/metadata/md5-cache/media-libs/opencollada-1.6.62
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libpcre dev-libs/zziplib media-libs/lib3ds sys-libs/zlib dev-libs/libxml2 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=<dev-libs/libpcre-8.42 dev-libs/zziplib media-libs/lib3ds sys-libs/zlib dev-libs/libxml2 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Stream based read/write library for COLLADA files
 EAPI=6
 HOMEPAGE=http://www.opencollada.org/
 IUSE=static-libs
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=MIT
-RDEPEND=dev-libs/libpcre dev-libs/zziplib media-libs/lib3ds sys-libs/zlib dev-libs/libxml2
+RDEPEND=<dev-libs/libpcre-8.42 dev-libs/zziplib media-libs/lib3ds sys-libs/zlib dev-libs/libxml2
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCOLLADA/archive/v1.6.62.tar.gz -> opencollada-1.6.62.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=08e1e2edac12edbbc542e6d877206c66
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=17b73078d6c239a532c9d0c109e36361
diff --git a/metadata/md5-cache/media-libs/opencollada-1.6.63 b/metadata/md5-cache/media-libs/opencollada-1.6.63
new file mode 100644
index 000000000000..d92e3634e791
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opencollada-1.6.63
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libpcre dev-libs/libxml2 dev-libs/zziplib media-libs/lib3ds sys-libs/zlib virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Stream based read/write library for COLLADA files
+EAPI=6
+HOMEPAGE=http://www.opencollada.org/
+IUSE=static-libs
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libpcre dev-libs/libxml2 dev-libs/zziplib media-libs/lib3ds sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/OpenCOLLADA/archive/v1.6.63.tar.gz -> opencollada-1.6.63.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c268563f7a47d05165a455f290ea9edd
diff --git a/metadata/md5-cache/media-libs/opensubdiv-3.3.0 b/metadata/md5-cache/media-libs/opensubdiv-3.3.0
index 8ed08cc77433..3419dee2ebf6 100644
--- a/metadata/md5-cache/media-libs/opensubdiv-3.3.0
+++ b/metadata/md5-cache/media-libs/opensubdiv-3.3.0
@@ -10,4 +10,4 @@ RDEPEND=media-libs/glew:= media-libs/glfw:= cuda? ( dev-util/nvidia-cuda-toolkit
 SLOT=0
 SRC_URI=https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_3_0.tar.gz -> opensubdiv-3.3.0.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3befa2093c2d43c81167de05ad39e610
+_md5_=f45c41861fe1ef3004792cadaf325c3a
diff --git a/metadata/md5-cache/media-libs/opensubdiv-3.3.3 b/metadata/md5-cache/media-libs/opensubdiv-3.3.3
new file mode 100644
index 000000000000..111c173cd919
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opensubdiv-3.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=media-libs/glew:= media-libs/glfw:= cuda? ( dev-util/nvidia-cuda-toolkit:* ) opencl? ( virtual/opencl ) ptex? ( media-libs/ptex ) doc? ( dev-python/docutils app-doc/doxygen ) tbb? ( dev-cpp/tbb ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=An Open-Source subdivision surface library
+EAPI=6
+HOMEPAGE=http://graphics.pixar.com/opensubdiv/
+IUSE=cuda doc opencl openmp ptex tbb
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=media-libs/glew:= media-libs/glfw:= cuda? ( dev-util/nvidia-cuda-toolkit:* ) opencl? ( virtual/opencl ) ptex? ( media-libs/ptex )
+SLOT=0
+SRC_URI=https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_3_3.tar.gz -> opensubdiv-3.3.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e138a6bcfcf049bced70ce921ac0c6e7
diff --git a/metadata/md5-cache/media-libs/partio-1.5.0 b/metadata/md5-cache/media-libs/partio-1.5.0
new file mode 100644
index 000000000000..ed3d9168b171
--- /dev/null
+++ b/metadata/md5-cache/media-libs/partio-1.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] media-libs/freeglut sys-libs/zlib:= virtual/opengl dev-lang/swig:* doc? ( app-doc/doxygen[latex] ) dev-util/ninja >=dev-util/cmake-3.9.6
+DESCRIPTION=A library for particle IO and manipulation
+EAPI=6
+HOMEPAGE=https://www.disneyanimation.com/technology/partio.html
+IUSE=doc 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 ~x86
+LICENSE=BSD
+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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] media-libs/freeglut sys-libs/zlib:= virtual/opengl
+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=0
+SRC_URI=https://github.com/wdas/partio/archive/v1.5.0.tar.gz -> partio-1.5.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fca16bb76ddf3b52636f31bdc563d7f2
diff --git a/metadata/md5-cache/media-libs/quarter-1.0.0-r1 b/metadata/md5-cache/media-libs/quarter-1.0.0-r1
deleted file mode 100644
index 215e5a6f5468..000000000000
--- a/metadata/md5-cache/media-libs/quarter-1.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/coin-3.0.0[javascript] dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 virtual/opengl virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A glue between Nokia Qt4 and Coin3D
-EAPI=5
-HOMEPAGE=http://www.coin3d.org/lib/quarter
-IUSE=debug doc static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/coin-3.0.0[javascript] dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 virtual/opengl
-SLOT=0
-SRC_URI=ftp://ftp.coin3d.org/pub/coin/src/all/Quarter-1.0.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bc9a3d7569654bbd24db133e7b7e5e26
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index db5fc4fe39b1..5bbd8cc2be48 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.1
index cd62bd11a192..55ff05cb9ce6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.1
@@ -4,11 +4,11 @@ DESCRIPTION=Calculate Chromaprint fingerprint from audio files for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/chromaprint[abi_x86_32(-)?,abi_x86_64(-)?,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/glib-2.38.2-r1: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/gstreamer-1.2.4-r1: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(-)?] >=media-libs/gst-plugins-bad-1.14.1: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.1.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=04455b25dfea569e1b429b5a631112fc
+_md5_=6bab4b6a60827c87d45afeaa30e70282
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.2
index bc4b4bca8966..d90ba75cde8a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.2
@@ -4,11 +4,11 @@ DESCRIPTION=Calculate Chromaprint fingerprint from audio files for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/chromaprint[abi_x86_32(-)?,abi_x86_64(-)?,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/glib-2.38.2-r1: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/gstreamer-1.2.4-r1: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(-)?] >=media-libs/gst-plugins-bad-1.14.2: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.2.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=04455b25dfea569e1b429b5a631112fc
+_md5_=6bab4b6a60827c87d45afeaa30e70282
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.5 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.5
new file mode 100644
index 000000000000..148c39da8fda
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-17* media-video/rtmpdump sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Kodi's RTMP inputstream addon
+EAPI=6
+HOMEPAGE=https://github.com/notspiff/inputstream.rtmp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-17* media-video/rtmpdump
+SLOT=0
+SRC_URI=https://github.com/notspiff/inputstream.rtmp/archive/v1.0.5.tar.gz -> kodi-inputstream-rtmp-1.0.5.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	kodi-addon	0e7c54e54339006ad4f8a6cc2d67191c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7c068b2fbbadc93ff14c7d94e6f12657
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-0.0.5-r1 b/metadata/md5-cache/media-plugins/vdr-imonlcd-0.0.5-r1
index 6845f8d1edc8..f050b1aebd87 100644
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-0.0.5-r1
+++ b/metadata/md5-cache/media-plugins/vdr-imonlcd-0.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freetype >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/408/vdr-imonlcd-0.0.5.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	786b4f5aa9f17e2d5cec5e628f462c01
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	786b4f5aa9f17e2d5cec5e628f462c01
 _md5_=6913c02b9072468a724ecc971d920c2c
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.1 b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.1
index fbe1f43a3af3..0a31fcfbe6f1 100644
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freetype >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1327/vdr-imonlcd-1.0.1.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	786b4f5aa9f17e2d5cec5e628f462c01
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	786b4f5aa9f17e2d5cec5e628f462c01
 _md5_=ed341481962743282a93dab0478794a2
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2 b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
index 641922c2db9c..28588efd1c67 100644
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freetype >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2086/vdr-imonlcd-1.0.2.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	786b4f5aa9f17e2d5cec5e628f462c01
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	786b4f5aa9f17e2d5cec5e628f462c01
 _md5_=02ff8d4077d16f6379f2ddf428b88acc
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 8e3051709b7c..38b632b18bc0 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.1.2 b/metadata/md5-cache/media-sound/alsa-utils-1.1.2
index 9e9897f84290..18aa0d26f2ea 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.1.2
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.1.2 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) selinux? ( sec-policy/selinux-alsa )
 SLOT=0.9
 SRC_URI=mirror://alsaproject/utils/alsa-utils-1.1.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b268a07856029529526ccd3386e5a80a
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.1.4-r1 b/metadata/md5-cache/media-sound/alsa-utils-1.1.4-r1
index 655e9adcca1c..5d60b262df7c 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.1.4-r1
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.1.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.1.4 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) selinux? ( sec-policy/selinux-alsa )
 SLOT=0.9
 SRC_URI=mirror://alsaproject/utils/alsa-utils-1.1.4.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e4d36bbdf27b57c49b51d4bc2acbdd64
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.1.5 b/metadata/md5-cache/media-sound/alsa-utils-1.1.5
index 81e577efc344..d317c847bd12 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.1.5
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.1.5 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) selinux? ( sec-policy/selinux-alsa )
 SLOT=0.9
 SRC_URI=mirror://alsaproject/utils/alsa-utils-1.1.5.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e4d36bbdf27b57c49b51d4bc2acbdd64
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.1.6 b/metadata/md5-cache/media-sound/alsa-utils-1.1.6
index d89ccd953c9f..b35e47b15c07 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.1.6
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.1.6 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) selinux? ( sec-policy/selinux-alsa )
 SLOT=0.9
 SRC_URI=mirror://alsaproject/utils/alsa-utils-1.1.6.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=fe071f9b46dc42dedcfdf36185756ce3
diff --git a/metadata/md5-cache/media-sound/mumble-1.2.19 b/metadata/md5-cache/media-sound/mumble-1.2.19
deleted file mode 100644
index d4fab2062bfa..000000000000
--- a/metadata/md5-cache/media-sound/mumble-1.2.19
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=dev-libs/boost-1.41.0 !libressl? ( >=dev-libs/openssl-1.0.0b:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/opus-1.0.1 >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4[sqlite] dev-qt/qtsvg:4 dev-qt/qtxmlpatterns:4 alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:4 ) g15? ( app-misc/g15daemon ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( app-accessibility/speech-dispatcher ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat software
-EAPI=6
-HOMEPAGE=https://wiki.mumble.info
-IUSE=+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech zeroconf
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD MIT
-RDEPEND=>=dev-libs/boost-1.41.0 !libressl? ( >=dev-libs/openssl-1.0.0b:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/opus-1.0.1 >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4[sqlite] dev-qt/qtsvg:4 dev-qt/qtxmlpatterns:4 alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:4 ) g15? ( app-misc/g15daemon ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( app-accessibility/speech-dispatcher ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-SLOT=0
-SRC_URI=https://mumble.info/snapshot/mumble-1.2.19.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=77eca0523c77074eb147a89953ef13be
diff --git a/metadata/md5-cache/media-sound/murmur-1.2.19 b/metadata/md5-cache/media-sound/murmur-1.2.19
deleted file mode 100644
index e5560e1c0d4f..000000000000
--- a/metadata/md5-cache/media-sound/murmur-1.2.19
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= sys-apps/lsb-release >=sys-libs/libcap-2.15 dev-qt/qtcore:4[ssl] || ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] ) dev-qt/qtxmlpatterns:4 dbus? ( dev-qt/qtdbus:4 ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) >=dev-libs/boost-1.41.0 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat software
-EAPI=6
-HOMEPAGE=https://wiki.mumble.info
-IUSE=+dbus debug +ice pch zeroconf
-KEYWORDS=amd64 ~arm x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= sys-apps/lsb-release >=sys-libs/libcap-2.15 dev-qt/qtcore:4[ssl] || ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] ) dev-qt/qtxmlpatterns:4 dbus? ( dev-qt/qtdbus:4 ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-SLOT=0
-SRC_URI=https://mumble.info/snapshot/mumble-1.2.19.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=82e913f7f4af0ef5e6ccf9b017661c61
diff --git a/metadata/md5-cache/media-sound/pulseaudio-11.1 b/metadata/md5-cache/media-sound/pulseaudio-11.1
deleted file mode 100644
index 29602aacece1..000000000000
--- a/metadata/md5-cache/media-sound/pulseaudio-11.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] >=x11-libs/libxcb-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(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,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/libICE[abi_x86_32(-)?,abi_x86_64(-)?,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/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( >=sys-libs/libcap-2.22-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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.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(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( virtual/jack ) tcpd? ( sys-apps/tcp-wrappers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-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(-)?] ) gtk? ( x11-libs/gtk+:3 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/udev-143[hwdb(+)] ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=media-libs/speex-1.2.0 media-libs/speexdsp gdbm? ( sys-libs/gdbm:= ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) systemd? ( sys-apps/systemd: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(-)?] ) dev-libs/libltdl:0 selinux? ( sec-policy/selinux-pulseaudio ) sys-devel/m4 doc? ( app-doc/doxygen ) test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto >=x11-libs/libXtst-1.0.99.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/libatomic_ops virtual/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool >=sys-devel/gettext-0.18.1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=A networked sound server with an advanced plugin system
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
-IUSE=+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset +orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf kernel_linux abi_x86_32 abi_x86_64 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 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )
-PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] >=x11-libs/libxcb-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(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,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/libICE[abi_x86_32(-)?,abi_x86_64(-)?,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/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( >=sys-libs/libcap-2.22-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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.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(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( virtual/jack ) tcpd? ( sys-apps/tcp-wrappers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-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(-)?] ) gtk? ( x11-libs/gtk+:3 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/udev-143[hwdb(+)] ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=media-libs/speex-1.2.0 media-libs/speexdsp gdbm? ( sys-libs/gdbm:= ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) systemd? ( sys-apps/systemd: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(-)?] ) dev-libs/libltdl:0 selinux? ( sec-policy/selinux-pulseaudio ) equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) ) system-wide? ( alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-5 ) )
-REQUIRED_USE=bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth ) native-headset? ( bluetooth ) udev? ( || ( alsa oss ) )
-SLOT=0
-SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-11.1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8aeda95c78c993a787437a8467767026
diff --git a/metadata/md5-cache/media-sound/pulseaudio-11.1-r1 b/metadata/md5-cache/media-sound/pulseaudio-11.1-r1
index bd218acafe49..82713d4b6ac2 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-11.1-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-11.1-r1
@@ -11,5 +11,5 @@ RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-li
 REQUIRED_USE=bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth ) native-headset? ( bluetooth ) udev? ( || ( alsa oss ) )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-11.1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=49b52301e3b3c54815ee74a96955ab7d
diff --git a/metadata/md5-cache/media-sound/pulseaudio-12.2 b/metadata/md5-cache/media-sound/pulseaudio-12.2
index 19c062c40c1b..638977c764eb 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-12.2
+++ b/metadata/md5-cache/media-sound/pulseaudio-12.2
@@ -11,5 +11,5 @@ RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-li
 REQUIRED_USE=bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth ) native-headset? ( bluetooth ) realtime? ( dbus ) udev? ( || ( alsa oss ) )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-12.2.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=14b63fedb77fd1169cc2e87c2c8734b8
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.2.3 b/metadata/md5-cache/media-sound/pulseeffects-4.2.3
deleted file mode 100644
index 4567a5dea0e5..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-4.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 dev-util/itstool media-libs/libebur128 >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
-DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
-EAPI=6
-HOMEPAGE=https://github.com/wwmm/pulseeffects
-IUSE=bs2b calf mda-lv2 rubberband
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 dev-util/itstool media-libs/libebur128 media-sound/pulseaudio
-SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.2.3.tar.gz -> pulseeffects-4.2.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6545defc10f0952af96e98cb1833e2b7
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.2.4 b/metadata/md5-cache/media-sound/pulseeffects-4.2.4
new file mode 100644
index 000000000000..f9cc737c2028
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 dev-util/itstool media-libs/libebur128 >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
+EAPI=6
+HOMEPAGE=https://github.com/wwmm/pulseeffects
+IUSE=bs2b calf mda-lv2 rubberband
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 dev-util/itstool media-libs/libebur128 media-sound/pulseaudio
+SLOT=0
+SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.2.4.tar.gz -> pulseeffects-4.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6545defc10f0952af96e98cb1833e2b7
diff --git a/metadata/md5-cache/media-sound/sox-14.4.2-r1 b/metadata/md5-cache/media-sound/sox-14.4.2-r1
index 55e312c8dbab..949443a08f93 100644
--- a/metadata/md5-cache/media-sound/sox-14.4.2-r1
+++ b/metadata/md5-cache/media-sound/sox-14.4.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The swiss army knife of sound processing programs
 EAPI=6
 HOMEPAGE=http://sox.sourceforge.net
 IUSE=alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libltdl:0= >=media-sound/gsm-1.0.12-r1 alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ao? ( media-libs/libao ) encode? ( >=media-sound/lame-3.98.4 ) flac? ( >=media-libs/flac-1.1.3 ) id3tag? ( media-libs/libid3tag ) ladspa? ( media-libs/ladspa-sdk ) mad? ( media-libs/libmad ) ogg? ( media-libs/libogg media-libs/libvorbis ) opus? ( media-libs/opus media-libs/opusfile ) png? ( media-libs/libpng:0= sys-libs/zlib ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.11 ) twolame? ( media-sound/twolame ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=mirror://sourceforge/sox/sox-14.4.2.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b19433120391b09c6e8db58844b393eb
+_md5_=fee6ae06b36e1dd59f939e325478ec13
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.72 b/metadata/md5-cache/media-sound/spotify-1.0.72
index f7a414423960..c76c7d6c05a9 100644
--- a/metadata/md5-cache/media-sound/spotify-1.0.72
+++ b/metadata/md5-cache/media-sound/spotify-1.0.72
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/nss gnome-base/gconf gnome-extra/zenity media-libs/alsa-lib med
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=911f48dc08fb924fd138217c68d59f9c
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.80 b/metadata/md5-cache/media-sound/spotify-1.0.80
index 7346a3eb82fa..ad552a04f5b9 100644
--- a/metadata/md5-cache/media-sound/spotify-1.0.80
+++ b/metadata/md5-cache/media-sound/spotify-1.0.80
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0 dev-libs/nss gnome-base/gconf gnome-extra/zenity medi
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.80.480.g51b03ac3-13_amd64.deb
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b51615c7e1a3d1acf400106c5f6255a8
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 14228bfe6424..f0157b40e125 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/kodi-17.3-r1 b/metadata/md5-cache/media-tv/kodi-17.3-r1
index 63ead74b5ca5..b6a69154d381 100644
--- a/metadata/md5-cache/media-tv/kodi-17.3-r1
+++ b/metadata/md5-cache/media-tv/kodi-17.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.6-Krypton.tar.gz -> ffmpeg-kodi-3.1.6-Krypton.tar.gz ) https://github.com/xbmc/xbmc/archive/17.3-Krypton.tar.gz -> kodi-17.3.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.3-generated-addons.tar.xz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8b21cd594b67da7d13d91a894d96f405
diff --git a/metadata/md5-cache/media-tv/kodi-17.5-r1 b/metadata/md5-cache/media-tv/kodi-17.5-r1
index 3ce14167d221..bd062c8c5244 100644
--- a/metadata/md5-cache/media-tv/kodi-17.5-r1
+++ b/metadata/md5-cache/media-tv/kodi-17.5-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.5-Krypton.tar.gz -> kodi-17.5.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.5-generated-addons.tar.xz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=eb69a2ad52e7e85df2dd482f16f2c256
diff --git a/metadata/md5-cache/media-tv/kodi-17.6 b/metadata/md5-cache/media-tv/kodi-17.6
index 836f185d5900..c71c72dc80de 100644
--- a/metadata/md5-cache/media-tv/kodi-17.6
+++ b/metadata/md5-cache/media-tv/kodi-17.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=14fd0cfced65ac93767d4972740f7e0d
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r1 b/metadata/md5-cache/media-tv/kodi-17.6-r1
index f65cd70cf61f..d70e2b81ee69 100644
--- a/metadata/md5-cache/media-tv/kodi-17.6-r1
+++ b/metadata/md5-cache/media-tv/kodi-17.6-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=68b18b5016b8df354c0f4c29d4813053
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r2 b/metadata/md5-cache/media-tv/kodi-17.6-r2
index 669190839242..cbf7e589bfe8 100644
--- a/metadata/md5-cache/media-tv/kodi-17.6-r2
+++ b/metadata/md5-cache/media-tv/kodi-17.6-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7a7f6cd2203d14c1dab06af1f63ce372
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r3 b/metadata/md5-cache/media-tv/kodi-17.6-r3
index 69fdb4106429..9b8384d7bf1b 100644
--- a/metadata/md5-cache/media-tv/kodi-17.6-r3
+++ b/metadata/md5-cache/media-tv/kodi-17.6-r3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f735121cb35b8ddab15390625d3e2882
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r4 b/metadata/md5-cache/media-tv/kodi-17.6-r4
index b657749d245f..5558bb135dba 100644
--- a/metadata/md5-cache/media-tv/kodi-17.6-r4
+++ b/metadata/md5-cache/media-tv/kodi-17.6-r4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4cda64a665e5322fccaa7e208fd784c9
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index d8298b1fe8bc..8034c540495a 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -9,5 +9,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 gbm? ( gles ) || ( gles opengl ) ^^ ( gbm wayland X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.1-Leia-Alpha-1.tar.gz -> libdvdcss-1.4.1-Leia-Alpha-1.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-1.tar.gz -> libdvdread-6.0.0-Leia-Alpha-1.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-1.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-1.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0.1-Leia-Alpha3-1.tar.gz -> ffmpeg-kodi-4.0.1-Leia-Alpha3-1.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=454d62f3dfdda2404d1c6d7d6bbaef7b
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.11.3 b/metadata/md5-cache/media-tv/plex-media-server-1.11.3
index fffa79332496..bde3e2d390db 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.11.3
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.11.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server/1.11.3.4803-c40bba82e/plexmediaserver_1.11.3.4803-c40bba82e_amd64.deb )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4afccc5a7dc49bc6d2b875fe4e12a82e
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.12.3 b/metadata/md5-cache/media-tv/plex-media-server-1.12.3
index df28274721e7..8a739ef0f293 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.12.3
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.12.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server/1.12.3.4973-215c28d86/plexmediaserver_1.12.3.4973-215c28d86_amd64.deb )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b7b5a19f174acb9d7cd0b2fc284b3adb
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r1 b/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r1
index 8517510a62db..331ca99ba1b1 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r1
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server/1.13.2.5154-fd05be322/plexmediaserver_1.13.2.5154-fd05be322_amd64.deb )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=82cacdd653d4fefaa5bb13c675fa728d
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.10.1 b/metadata/md5-cache/media-tv/v4l-utils-1.10.1
index 24701568eb05..f2adb8314863 100644
--- a/metadata/md5-cache/media-tv/v4l-utils-1.10.1
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.10.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=media-libs/libv4l-1.10.1 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 virtual/opengl media-libs/alsa-lib ) udev? ( virtual/libudev ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-1.10.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6b813071150794eab837062b97686dfc
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.12.3 b/metadata/md5-cache/media-tv/v4l-utils-1.12.3
index 849a01a1879a..b1d6e5b64aac 100644
--- a/metadata/md5-cache/media-tv/v4l-utils-1.12.3
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=media-libs/libv4l-1.12.3 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 virtual/opengl media-libs/alsa-lib ) virtual/libudev !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-1.12.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf55ff616478680d7bf3596c73acc3e2
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.12.5 b/metadata/md5-cache/media-tv/v4l-utils-1.12.5
index 849562238740..2cb229bdff8d 100644
--- a/metadata/md5-cache/media-tv/v4l-utils-1.12.5
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.12.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=media-libs/libv4l-1.12.5 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 virtual/opengl media-libs/alsa-lib ) virtual/libudev !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-1.12.5.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf55ff616478680d7bf3596c73acc3e2
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.14.1 b/metadata/md5-cache/media-tv/v4l-utils-1.14.1
index ba7473593ec1..446587073880 100644
--- a/metadata/md5-cache/media-tv/v4l-utils-1.14.1
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.14.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=media-libs/libv4l-1.14.1 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 virtual/opengl media-libs/alsa-lib ) virtual/libudev !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-1.14.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c522d7aae9c17199b4896b7bbcbbf4a1
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index f900b9f245a0..6bde4cd5018f 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/isight-firmware-tools-1.6-r1 b/metadata/md5-cache/media-video/isight-firmware-tools-1.6-r1
index bb91298f09ae..8af55ab1c632 100644
--- a/metadata/md5-cache/media-video/isight-firmware-tools-1.6-r1
+++ b/metadata/md5-cache/media-video/isight-firmware-tools-1.6-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 virtual/libusb:0 virtual/udev
 SLOT=0
 SRC_URI=https://launchpad.net/isight-firmware-tools/main/1.6/+download/isight-firmware-tools-1.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=b9b1703ef672c832a735c0e100c9456a
diff --git a/metadata/md5-cache/media-video/kino-1.3.4-r1 b/metadata/md5-cache/media-video/kino-1.3.4-r1
index e57b8b092a80..446bc30adfab 100644
--- a/metadata/md5-cache/media-video/kino-1.3.4-r1
+++ b/metadata/md5-cache/media-video/kino-1.3.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.6.0:2 >=gnome-base/libglade-2.5.0 >=dev-libs/glib-2:2 x11-libs/libXv dev-libs/libxml2:2 media-libs/audiofile >=sys-libs/libraw1394-1.0.0 >=sys-libs/libavc1394-0.4.1 >=media-libs/libdv-0.103 media-libs/libsamplerate media-libs/libiec61883 media-libs/libv4l:0= alsa? ( >=media-libs/alsa-lib-1.0.9 ) !libav? ( >=media-video/ffmpeg-3:0= ) libav? ( media-video/libav:0= ) quicktime? ( >=media-libs/libquicktime-0.9.5 ) media-video/mjpegtools media-sound/rawrec dvdr? ( media-video/dvdauthor app-cdr/dvd+rw-tools ) gpac? ( media-video/gpac ) lame? ( media-sound/lame ) sox? ( media-sound/sox ) vorbis? ( media-sound/vorbis-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/kino/kino-1.3.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=3ca1bd4715f3bfbe2b632601681a57bf
diff --git a/metadata/md5-cache/media-video/mpv-0.27.2 b/metadata/md5-cache/media-video/mpv-0.27.2
index f1f335be30b3..cd8b887d1cac 100644
--- a/metadata/md5-cache/media-video/mpv-0.27.2
+++ b/metadata/md5-cache/media-video/mpv-0.27.2
@@ -10,5 +10,5 @@ RDEPEND=!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] )
 REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav opengl ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.27.2.tar.gz -> mpv-0.27.2.tar.gz https://dev.gentoo.org/~kensington/distfiles/mpv-0.27.2-patches-r0.tar.xz https://waf.io/waf-1.9.8
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b847debd15978a0ab61da538cab0d52f
diff --git a/metadata/md5-cache/media-video/mpv-0.28.2 b/metadata/md5-cache/media-video/mpv-0.28.2
index 20c9ddf14004..65f99856f0a6 100644
--- a/metadata/md5-cache/media-video/mpv-0.28.2
+++ b/metadata/md5-cache/media-video/mpv-0.28.2
@@ -10,5 +10,5 @@ RDEPEND=!libav? ( >=media-video/ffmpeg-4.0:0=[encode?,threads,vaapi?,vdpau?] ) l
 REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav opengl ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) vulkan? ( || ( X wayland ) ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.28.2.tar.gz -> mpv-0.28.2.tar.gz https://waf.io/waf-1.9.8
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=469d8909e26be670e97ecfc2d1ff8b83
diff --git a/metadata/md5-cache/media-video/mpv-0.29.0 b/metadata/md5-cache/media-video/mpv-0.29.0
index 0af92bdf875b..d6072c05c742 100644
--- a/metadata/md5-cache/media-video/mpv-0.29.0
+++ b/metadata/md5-cache/media-video/mpv-0.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] alsa? ( >=medi
 REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( opengl ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) vulkan? ( || ( X wayland ) ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.29.0.tar.gz -> mpv-0.29.0.tar.gz https://waf.io/waf-2.0.9
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c10e1c96e8f3fee91b6d3142656ca253
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index c25a1816e5af..8725b6c103c0 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -9,5 +9,5 @@ RDEPEND=>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] alsa? ( >=medi
 REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( opengl ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) vulkan? ( || ( X wayland ) ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://waf.io/waf-2.0.9
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6e29c2ba421c362ca17ded7771e983da
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index e79f8598ce4a..ca954f5cacfc 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/icinga-1.14.2 b/metadata/md5-cache/net-analyzer/icinga-1.14.2
index 4ac61e1036bd..a2fdd47f9f33 100644
--- a/metadata/md5-cache/net-analyzer/icinga-1.14.2
+++ b/metadata/md5-cache/net-analyzer/icinga-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) perl? ( dev-lang/p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/icinga/icinga-core/archive/v1.14.2/icinga-1.14.2.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=0f3dc0dd05f9dd25a984a8e5a41ef491
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.9.0-r1 b/metadata/md5-cache/net-analyzer/icinga2-2.9.0-r1
deleted file mode 100644
index 506c0f036058..000000000000
--- a/metadata/md5-cache/net-analyzer/icinga2-2.9.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.58-r1 console? ( dev-libs/libedit ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) sys-devel/bison >=sys-devel/flex-2.5.35 apache2? ( =www-servers/apache-2* ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=Distributed, general purpose, network monitoring engine
-EAPI=6
-HOMEPAGE=http://icinga.org/icinga2
-IUSE=+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax apache2
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.58-r1 console? ( dev-libs/libedit ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) classicui? ( net-analyzer/icinga[web] ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=!minimal? ( || ( mysql postgres ) )
-SLOT=0
-SRC_URI=https://github.com/Icinga/icinga2/archive/v2.9.0.tar.gz -> icinga2-2.9.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a0fce248d073c6fb84ee7d06b64cfbb8
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.9.1 b/metadata/md5-cache/net-analyzer/icinga2-2.9.1
index 54d2dd5f6ceb..dda78f6eddec 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.9.1
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.9.1
@@ -11,4 +11,4 @@ REQUIRED_USE=!minimal? ( || ( mysql postgres ) )
 SLOT=0
 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.9.1.tar.gz -> icinga2-2.9.1.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a0fce248d073c6fb84ee7d06b64cfbb8
+_md5_=6d6804aaaa0124c6a63ea8cd9791a8bf
diff --git a/metadata/md5-cache/net-analyzer/icinga2-9999 b/metadata/md5-cache/net-analyzer/icinga2-9999
index 14da70ca2257..ef6e8e26ede2 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-9999
+++ b/metadata/md5-cache/net-analyzer/icinga2-9999
@@ -9,4 +9,4 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=
 REQUIRED_USE=!minimal? ( || ( mysql postgres ) )
 SLOT=0
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a0fce248d073c6fb84ee7d06b64cfbb8
+_md5_=6d6804aaaa0124c6a63ea8cd9791a8bf
diff --git a/metadata/md5-cache/net-analyzer/nessus-agent-bin-6.11.2 b/metadata/md5-cache/net-analyzer/nessus-agent-bin-6.11.2
index 0fca226e7bd8..5e9a990370ea 100644
--- a/metadata/md5-cache/net-analyzer/nessus-agent-bin-6.11.2
+++ b/metadata/md5-cache/net-analyzer/nessus-agent-bin-6.11.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=NessusAgent-6.11.2-es7.x86_64.rpm
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d832ede8b042b92bdbc949cfb82ab6fd
diff --git a/metadata/md5-cache/net-analyzer/nessus-agent-bin-7.0.0 b/metadata/md5-cache/net-analyzer/nessus-agent-bin-7.0.0
index 7a0f68fca46e..56ebfbab0148 100644
--- a/metadata/md5-cache/net-analyzer/nessus-agent-bin-7.0.0
+++ b/metadata/md5-cache/net-analyzer/nessus-agent-bin-7.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=NessusAgent-7.0.0-es7.x86_64.rpm
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d832ede8b042b92bdbc949cfb82ab6fd
diff --git a/metadata/md5-cache/net-analyzer/nessus-bin-6.10.5 b/metadata/md5-cache/net-analyzer/nessus-bin-6.10.5
index 15663b72e2fd..ab1f75dd3be8 100644
--- a/metadata/md5-cache/net-analyzer/nessus-bin-6.10.5
+++ b/metadata/md5-cache/net-analyzer/nessus-bin-6.10.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=Nessus-6.10.5-es7.x86_64.rpm
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7e7394043fcfdf258712cea66763bd8d
diff --git a/metadata/md5-cache/net-analyzer/ostinato-0.5.1 b/metadata/md5-cache/net-analyzer/ostinato-0.5.1
deleted file mode 100644
index 2021cc2e1489..000000000000
--- a/metadata/md5-cache/net-analyzer/ostinato-0.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/protobuf:= net-libs/libpcap dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4
-DESCRIPTION=A packet generator and analyzer
-EAPI=5
-HOMEPAGE=https://ostinato.org
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/protobuf:= net-libs/libpcap dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4
-SLOT=0
-SRC_URI=https://ostinato.googlecode.com/files/ostinato-src-0.5.1.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	qt4-r2	abc6b1cb07c6a6149cedafc57b0525fb	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1aae4c3e1991ee4e1e8903700abe6889
diff --git a/metadata/md5-cache/net-analyzer/ostinato-0.8 b/metadata/md5-cache/net-analyzer/ostinato-0.8
deleted file mode 100644
index a37a0dc3dab4..000000000000
--- a/metadata/md5-cache/net-analyzer/ostinato-0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/protobuf:= net-libs/libpcap dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4
-DESCRIPTION=A packet generator and analyzer
-EAPI=5
-HOMEPAGE=https://ostinato.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/protobuf:= net-libs/libpcap dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4
-SLOT=0
-SRC_URI=https://bintray.com/pstavirs/ostinato/download_file?file_path=ostinato-src-0.8.tar.gz -> ostinato-0.8.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	qt4-r2	abc6b1cb07c6a6149cedafc57b0525fb	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=31a7ae6f7be708af1963a45191a92858
diff --git a/metadata/md5-cache/net-analyzer/ostinato-0.9 b/metadata/md5-cache/net-analyzer/ostinato-0.9
deleted file mode 100644
index 4231b73bedc7..000000000000
--- a/metadata/md5-cache/net-analyzer/ostinato-0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-libs/protobuf:= >=net-libs/libpcap-1.8.1-r2 dev-qt/qtscript:4 dev-qt/qtcore:4 dev-qt/qtgui:4
-DESCRIPTION=A packet generator and analyzer
-EAPI=6
-HOMEPAGE=https://ostinato.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/protobuf:= >=net-libs/libpcap-1.8.1-r2 dev-qt/qtscript:4 dev-qt/qtcore:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=https://github.com/pstavirs/ostinato/archive/v0.9.tar.gz -> ostinato-0.9.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6e4d61b449d87cae44aa7a13485515b6
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.23 b/metadata/md5-cache/net-analyzer/zabbix-2.2.23
new file mode 100644
index 000000000000..73c70f994d60
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.2.23
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-2.2.23.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	6ae2395d7f341093c36057cb4f69101a
+_md5_=16410f8ce332f16d18f35ea383d8776d
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.20 b/metadata/md5-cache/net-analyzer/zabbix-3.0.20
new file mode 100644
index 000000000000..7a5745250700
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-3.0.20
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.0.20.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	6ae2395d7f341093c36057cb4f69101a
+_md5_=f28af2e5f7118902ec993e88c63c78f8
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.12 b/metadata/md5-cache/net-analyzer/zabbix-3.4.12
new file mode 100644
index 000000000000..d17b561a12fe
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-3.4.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.4.12.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	6ae2395d7f341093c36057cb4f69101a
+_md5_=9acf0f7d74ccdec6e0f5d90dcf49c142
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 7aa084e50ce2..6eee10017b72 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/psad-2.4.3 b/metadata/md5-cache/net-firewall/psad-2.4.3
deleted file mode 100644
index 1195e44823fc..000000000000
--- a/metadata/md5-cache/net-firewall/psad-2.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
-DESCRIPTION=Port Scanning Attack Detection daemon
-EAPI=5
-HOMEPAGE=https://www.cipherdyne.org/psad/
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Bit-Vector dev-perl/Date-Calc dev-perl/NetAddr-IP dev-perl/Unix-Syslog net-firewall/iptables net-misc/whois virtual/logger virtual/mailx virtual/perl-Storable dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://www.cipherdyne.org/psad/download/psad-2.4.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5afa9f2739a8d9b6f73f143af1b75aba
diff --git a/metadata/md5-cache/net-firewall/psad-2.4.4 b/metadata/md5-cache/net-firewall/psad-2.4.4
deleted file mode 100644
index 6011247e7e3a..000000000000
--- a/metadata/md5-cache/net-firewall/psad-2.4.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
-DESCRIPTION=Port Scanning Attack Detection daemon
-EAPI=6
-HOMEPAGE=https://www.cipherdyne.org/psad/
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Bit-Vector dev-perl/Date-Calc dev-perl/NetAddr-IP dev-perl/Unix-Syslog net-firewall/iptables net-misc/whois virtual/logger virtual/mailx virtual/perl-Storable dev-lang/perl:=
-SLOT=0
-SRC_URI=https://www.cipherdyne.org/psad/download/psad-2.4.4.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=1dac9a100dd035a5d348bc4266cb725c
diff --git a/metadata/md5-cache/net-firewall/psad-2.4.6 b/metadata/md5-cache/net-firewall/psad-2.4.6
new file mode 100644
index 000000000000..a7fe876a5245
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/psad-2.4.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Port Scanning Attack Detection daemon
+EAPI=6
+HOMEPAGE=https://www.cipherdyne.org/psad/
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-perl/Bit-Vector dev-perl/Date-Calc dev-perl/NetAddr-IP dev-perl/Unix-Syslog net-firewall/iptables net-misc/whois virtual/logger virtual/mailx virtual/perl-Storable dev-lang/perl:=
+SLOT=0
+SRC_URI=https://www.cipherdyne.org/psad/download/psad-2.4.6.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=f2da7abf2961c1386400ec09f3c4ac0f
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.0.5 b/metadata/md5-cache/net-firewall/shorewall-5.2.0.5
new file mode 100644
index 000000000000..e8da7407fd0f
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/shorewall-5.2.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A high-level tool for configuring Netfilter
+EAPI=6
+HOMEPAGE=http://www.shorewall.net/
+IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux kernel_linux
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
+REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
+SLOT=0
+SRC_URI=http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-core-5.2.0.5.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-5.2.0.5.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall6-5.2.0.5.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-lite-5.2.0.5.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall6-lite-5.2.0.5.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-init-5.2.0.5.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-docs-html-5.2.0.5.tar.bz2 )
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=035b86132f05d41c34ff6a7066b3d954
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 4ad690115f95..7eb5101542e4 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/minio-2018.08.02.23.11.36 b/metadata/md5-cache/net-fs/minio-2018.08.02.23.11.36
new file mode 100644
index 000000000000..d63eccc03ce2
--- /dev/null
+++ b/metadata/md5-cache/net-fs/minio-2018.08.02.23.11.36
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=An Amazon S3 compatible object storage server
+EAPI=6
+HOMEPAGE=https://github.com/minio/minio
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-08-02T23-11-36Z.tar.gz -> minio-2018.08.02.23.11.36.tar.gz
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=be8d9d04282265121090d61a710b0b61
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 080adb43732f..f78a9232c966 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.34.0 b/metadata/md5-cache/net-ftp/filezilla-3.34.0
index 9ca6705a51fd..d2ded19e302d 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.34.0
+++ b/metadata/md5-cache/net-ftp/filezilla-3.34.0
@@ -4,10 +4,10 @@ DESCRIPTION=FTP client with lots of useful features and an intuitive interface
 EAPI=6
 HOMEPAGE=https://filezilla-project.org/
 IUSE=dbus nls test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.12.3 >=dev-libs/pugixml-1.7 net-dns/libidn:= >=net-libs/gnutls-3.4.15 >=x11-libs/wxGTK-3.0.4:3.0[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=https://dl2.cdn.filezilla-project.org/client/FileZilla_3.34.0_src.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=905c019687ee5d1c9c5fbc226cb00217
+_md5_=8410167ffadd3fb45d2e726056edf033
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.35.2 b/metadata/md5-cache/net-ftp/filezilla-3.35.2
new file mode 100644
index 000000000000..4f1fec941490
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/filezilla-3.35.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm prepare pretend
+DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.13.0 >=dev-libs/pugixml-1.7 net-dns/libidn:= >=net-libs/gnutls-3.4.15 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( >=dev-util/cppunit-1.13.0 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=FTP client with lots of useful features and an intuitive interface
+EAPI=6
+HOMEPAGE=https://filezilla-project.org/
+IUSE=dbus nls test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.13.0 >=dev-libs/pugixml-1.7 net-dns/libidn:= >=net-libs/gnutls-3.4.15 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
+SLOT=0
+SRC_URI=https://dl2.cdn.filezilla-project.org/client/FileZilla_3.35.2_src.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5b174fbe3b9c50ae9865aa5051df48bd
diff --git a/metadata/md5-cache/net-ftp/lftp-4.8.2 b/metadata/md5-cache/net-ftp/lftp-4.8.2
deleted file mode 100644
index 869edffeba1e..000000000000
--- a/metadata/md5-cache/net-ftp/lftp-4.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2 ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 ) =sys-devel/libtool-2* app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
-EAPI=6
-HOMEPAGE=https://lftp.tech/
-IUSE=convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2 ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://lftp.tech/ftp/lftp-4.8.2.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d69adb5266814d0a4da5d4c32713109a
diff --git a/metadata/md5-cache/net-ftp/lftp-4.8.3 b/metadata/md5-cache/net-ftp/lftp-4.8.3
deleted file mode 100644
index 7c376016fd32..000000000000
--- a/metadata/md5-cache/net-ftp/lftp-4.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2 ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 ) =sys-devel/libtool-2* app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
-EAPI=6
-HOMEPAGE=https://lftp.tech/
-IUSE=convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2 ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://lftp.tech/ftp/lftp-4.8.3.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d69adb5266814d0a4da5d4c32713109a
diff --git a/metadata/md5-cache/net-ftp/lftp-4.8.4 b/metadata/md5-cache/net-ftp/lftp-4.8.4
new file mode 100644
index 000000000000..7deeb3757449
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/lftp-4.8.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2 ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 ) =sys-devel/libtool-2* app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
+EAPI=6
+HOMEPAGE=https://lftp.tech/
+IUSE=convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2 ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://lftp.tech/ftp/lftp-4.8.4.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d69adb5266814d0a4da5d4c32713109a
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 4c0e4f5d84a2..fa337d489ba6 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.14.4 b/metadata/md5-cache/net-im/signal-desktop-bin-1.14.4
deleted file mode 100644
index dbb1a39f2b92..000000000000
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
-EAPI=6
-HOMEPAGE=https://signal.org/ https://github.com/WhisperSystems/Signal-Desktop
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=gnome-base/gconf:2 dev-libs/nss x11-libs/gtk+:3[X] x11-libs/libXScrnSaver x11-libs/libXtst net-print/cups
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.14.4_amd64.deb
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=095dc5f02023f302a39a6196606c2469
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.15.2 b/metadata/md5-cache/net-im/signal-desktop-bin-1.15.2
new file mode 100644
index 000000000000..e515840d74c3
--- /dev/null
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.15.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
+EAPI=6
+HOMEPAGE=https://signal.org/ https://github.com/WhisperSystems/Signal-Desktop
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=gnome-base/gconf:2 dev-libs/nss x11-libs/gtk+:3[X] x11-libs/libXScrnSaver x11-libs/libXtst net-print/cups
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.15.2_amd64.deb
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d3675e752f7adf8dc8753a4cda320644
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.18.0.6 b/metadata/md5-cache/net-im/skypeforlinux-8.18.0.6
deleted file mode 100644
index 30c43546b2fb..000000000000
--- a/metadata/md5-cache/net-im/skypeforlinux-8.18.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=>=sys-apps/sed-4 >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Instant messaging client, with support for audio and video
-EAPI=6
-HOMEPAGE=https://www.skype.com/
-IUSE=pax_kernel abi_x86_64
-KEYWORDS=~amd64 -*
-LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:2[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
-REQUIRED_USE=|| ( abi_x86_64 )
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.18.0.6-1.x86_64.rpm
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ba8418b71f52ce9ff95fc668698d3769
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.20.0.9 b/metadata/md5-cache/net-im/skypeforlinux-8.20.0.9
deleted file mode 100644
index bf0b0d26fb37..000000000000
--- a/metadata/md5-cache/net-im/skypeforlinux-8.20.0.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=>=sys-apps/sed-4 >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Instant messaging client, with support for audio and video
-EAPI=6
-HOMEPAGE=https://www.skype.com/
-IUSE=pax_kernel abi_x86_64
-KEYWORDS=~amd64 -*
-LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:2[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
-REQUIRED_USE=|| ( abi_x86_64 )
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.20.0.9-1.x86_64.rpm
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ba8418b71f52ce9ff95fc668698d3769
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.22.0.2 b/metadata/md5-cache/net-im/skypeforlinux-8.22.0.2
index 4663bcfb5cf8..d24ae45d66d5 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.22.0.2
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.22.0.2
@@ -4,12 +4,12 @@ DESCRIPTION=Instant messaging client, with support for audio and video
 EAPI=6
 HOMEPAGE=https://www.skype.com/
 IUSE=pax_kernel abi_x86_64
-KEYWORDS=~amd64 -*
+KEYWORDS=-* ~amd64
 LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
 RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:2[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
 REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.22.0.2-1.x86_64.rpm
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b6d271722a768ddddd4e5e4490cf9d5c
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=402170f9b2c0db6d15e684cd46ba6c6b
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.25.0.5 b/metadata/md5-cache/net-im/skypeforlinux-8.25.0.5
index 2d13e0dc398e..1649bcea4499 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.25.0.5
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.25.0.5
@@ -4,12 +4,12 @@ DESCRIPTION=Instant messaging client, with support for audio and video
 EAPI=6
 HOMEPAGE=https://www.skype.com/
 IUSE=pax_kernel abi_x86_64
-KEYWORDS=~amd64 -*
+KEYWORDS=-* ~amd64
 LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
 RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:2[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
 REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.25.0.5-1.x86_64.rpm
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b6d271722a768ddddd4e5e4490cf9d5c
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=402170f9b2c0db6d15e684cd46ba6c6b
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.27.0.85 b/metadata/md5-cache/net-im/skypeforlinux-8.27.0.85
new file mode 100644
index 000000000000..38124b9df7e2
--- /dev/null
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.27.0.85
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=>=sys-apps/sed-4 >=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Instant messaging client, with support for audio and video
+EAPI=6
+HOMEPAGE=https://www.skype.com/
+IUSE=pax_kernel abi_x86_64
+KEYWORDS=-* ~amd64
+LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:2[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
+REQUIRED_USE=|| ( abi_x86_64 )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.27.0.85-1.x86_64.rpm
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=402170f9b2c0db6d15e684cd46ba6c6b
diff --git a/metadata/md5-cache/net-im/slack-bin-3.1.1 b/metadata/md5-cache/net-im/slack-bin-3.1.1
index ed807f34a028..8de098765c25 100644
--- a/metadata/md5-cache/net-im/slack-bin-3.1.1
+++ b/metadata/md5-cache/net-im/slack-bin-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.1.1-amd64.deb
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a9d1b6d49f82113bb1d0b74590e64e14
diff --git a/metadata/md5-cache/net-im/slack-bin-3.2.1 b/metadata/md5-cache/net-im/slack-bin-3.2.1
index 7844c2eadb3e..c9a8475c3d2b 100644
--- a/metadata/md5-cache/net-im/slack-bin-3.2.1
+++ b/metadata/md5-cache/net-im/slack-bin-3.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.2.1-amd64.deb
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=71f92fca0a1b11952d5439dc5fe7fce7
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 5b5b1b7dd434..b3b145a7ce9d 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/quassel-0.12.5-r2 b/metadata/md5-cache/net-irc/quassel-0.12.5-r2
index a3cd023fef4f..0f5a5440e2bf 100644
--- a/metadata/md5-cache/net-irc/quassel-0.12.5-r2
+++ b/metadata/md5-cache/net-irc/quassel-0.12.5-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( dev
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) dbus? ( || ( X monolithic ) ) kde? ( || ( X monolithic ) dbus phonon ) phonon? ( || ( X monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
 SLOT=0
 SRC_URI=http://quassel-irc.org/pub/quassel-0.12.5.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5d2cadb11de285d591d1af4020e23b41
diff --git a/metadata/md5-cache/net-irc/quassel-0.13_rc1 b/metadata/md5-cache/net-irc/quassel-0.13_rc1
index 4f641f277198..622c41a98b45 100644
--- a/metadata/md5-cache/net-irc/quassel-0.13_rc1
+++ b/metadata/md5-cache/net-irc/quassel-0.13_rc1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( dev
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) dbus ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
 SLOT=0
 SRC_URI=http://quassel-irc.org/pub/quassel-0.13-rc1.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8d5e6f8b53232145a284385c27b3d519
diff --git a/metadata/md5-cache/net-irc/quassel-9999 b/metadata/md5-cache/net-irc/quassel-9999
index c55fc488dd1a..3d3b96d7ea10 100644
--- a/metadata/md5-cache/net-irc/quassel-9999
+++ b/metadata/md5-cache/net-irc/quassel-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5(+),ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5(+),ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) dbus ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
 SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7ef436d4f4288014121fcf2d63e18c9e
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 8df8e809300d..df82518c378d 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libbtbb-2018.08.1 b/metadata/md5-cache/net-libs/libbtbb-2018.08.1
new file mode 100644
index 000000000000..bf3c0a416434
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libbtbb-2018.08.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=extras? ( 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_python3_7(-),python_single_target_python2_7(+)] ) wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= ) wireshark-plugins? ( dev-libs/glib virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A library to decode Bluetooth baseband packets
+EAPI=6
+HOMEPAGE=http://libbtbb.sourceforge.net/
+IUSE=extras static-libs wireshark-plugins python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=extras? ( 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_python3_7(-),python_single_target_python2_7(+)] ) wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= )
+REQUIRED_USE=extras? ( python_targets_python2_7 )
+SLOT=0/2018.08.1
+SRC_URI=https://github.com/greatscottgadgets/libbtbb/archive/2018-08-R1.tar.gz -> libbtbb-2018-08-R1.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ef1f971c97501338b6a2d9dc48f9ad27
diff --git a/metadata/md5-cache/net-libs/libhackrf-2017.02.1 b/metadata/md5-cache/net-libs/libhackrf-2017.02.1
index 6a9d625b72a4..8cb1f0f68fbc 100644
--- a/metadata/md5-cache/net-libs/libhackrf-2017.02.1
+++ b/metadata/md5-cache/net-libs/libhackrf-2017.02.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:1
 SLOT=0/2017.02.1
 SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2017.02.1/hackrf-2017.02.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2cbe8a981009a8aab72a90ecde4ff531
diff --git a/metadata/md5-cache/net-libs/libhackrf-2018.01.1 b/metadata/md5-cache/net-libs/libhackrf-2018.01.1
index ab3b7fcea78d..bfc2b140bed2 100644
--- a/metadata/md5-cache/net-libs/libhackrf-2018.01.1
+++ b/metadata/md5-cache/net-libs/libhackrf-2018.01.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:1
 SLOT=0/2018.01.1
 SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2018.01.1/hackrf-2018.01.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0d064fc08311dab033e7bcea2445bef9
diff --git a/metadata/md5-cache/net-libs/libhackrf-9999 b/metadata/md5-cache/net-libs/libhackrf-9999
index d096af37b452..8b5e59e9575b 100644
--- a/metadata/md5-cache/net-libs/libhackrf-9999
+++ b/metadata/md5-cache/net-libs/libhackrf-9999
@@ -7,5 +7,5 @@ IUSE=+udev
 LICENSE=BSD
 RDEPEND=virtual/libusb:1
 SLOT=0/9999
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2cbe8a981009a8aab72a90ecde4ff531
diff --git a/metadata/md5-cache/net-libs/neon-0.30.2 b/metadata/md5-cache/net-libs/neon-0.30.2
index 47dd97f4047c..bb33fd4feb29 100644
--- a/metadata/md5-cache/net-libs/neon-0.30.2
+++ b/metadata/md5-cache/net-libs/neon-0.30.2
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=expat? ( dev-libs/expat: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(-)?] ) !expat? ( 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(-)?] ) gnutls? ( app-misc/ca-certificates net-libs/gnutls: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(-)?] pkcs11? ( dev-libs/pakchois: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? ( ssl? ( 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(-)?] ) !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(-)?] ) pkcs11? ( dev-libs/pakchois: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(-)?] ) ) ) kerberos? ( virtual/krb5: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(-)?] ) libproxy? ( net-libs/libproxy: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(-)?] ) nls? ( virtual/libintl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib: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/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=HTTP and WebDAV client library
 EAPI=6
-HOMEPAGE=http://www.webdav.org/neon/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-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
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=expat? ( dev-libs/expat: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(-)?] ) !expat? ( 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(-)?] ) gnutls? ( app-misc/ca-certificates net-libs/gnutls: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(-)?] pkcs11? ( dev-libs/pakchois: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? ( ssl? ( 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(-)?] ) !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(-)?] ) pkcs11? ( dev-libs/pakchois: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(-)?] ) ) ) kerberos? ( virtual/krb5: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(-)?] ) libproxy? ( net-libs/libproxy: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(-)?] ) nls? ( virtual/libintl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib: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(-)?] )
 RESTRICT=test
 SLOT=0/27
-SRC_URI=http://www.webdav.org/neon/neon-0.30.2.tar.gz
+SRC_URI=mirror://gentoo/neon-0.30.2.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=328f031a12c54af2aaaccd90e62b97c7
+_md5_=0bb01d127c94e1e9ee1fc60ac228e461
diff --git a/metadata/md5-cache/net-libs/nodejs-0.12.18 b/metadata/md5-cache/net-libs/nodejs-0.12.18
index b4b8ce182811..815139bca449 100644
--- a/metadata/md5-cache/net-libs/nodejs-0.12.18
+++ b/metadata/md5-cache/net-libs/nodejs-0.12.18
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=http://nodejs.org/dist/v0.12.18/node-v0.12.18.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=82f10cdcc0105aa66cd2b006857d2792
diff --git a/metadata/md5-cache/net-libs/nodejs-10.6.0-r1 b/metadata/md5-cache/net-libs/nodejs-10.6.0-r1
deleted file mode 100644
index b3c28b5ef080..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-10.6.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.21.0:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=6
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.21.0:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
-REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v10.6.0/node-v10.6.0.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=752d22d3c182337e01754e2daf5ca5fc
diff --git a/metadata/md5-cache/net-libs/nodejs-10.7.0-r1 b/metadata/md5-cache/net-libs/nodejs-10.7.0-r1
index f335091128a2..f82f14d64fef 100644
--- a/metadata/md5-cache/net-libs/nodejs-10.7.0-r1
+++ b/metadata/md5-cache/net-libs/nodejs-10.7.0-r1
@@ -7,8 +7,8 @@ IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap te
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=dev-libs/libuv-1.22.0:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-62.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
-REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v10.7.0/node-v10.7.0.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91217205f3eb4dc70f0a1e8bbde8e2bf
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=790afc015bf9b7753d9693484a6b0e43
diff --git a/metadata/md5-cache/net-libs/nodejs-10.8.0 b/metadata/md5-cache/net-libs/nodejs-10.8.0
new file mode 100644
index 000000000000..aeb52e42880f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-10.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.22.0:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-62.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=6
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=dev-libs/libuv-1.22.0:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-62.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v10.8.0/node-v10.8.0.tar.xz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=790afc015bf9b7753d9693484a6b0e43
diff --git a/metadata/md5-cache/net-libs/nodejs-4.8.7 b/metadata/md5-cache/net-libs/nodejs-4.8.7
index d66f354ce31b..f4add3ec3f98 100644
--- a/metadata/md5-cache/net-libs/nodejs-4.8.7
+++ b/metadata/md5-cache/net-libs/nodejs-4.8.7
@@ -10,5 +10,5 @@ RDEPEND=icu? ( >=dev-libs/icu-55:= ) npm? ( python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v4.8.7/node-v4.8.7.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6eb85605ea762eda91e1a70b10b59a6a
diff --git a/metadata/md5-cache/net-libs/nodejs-4.9.1 b/metadata/md5-cache/net-libs/nodejs-4.9.1
index ceeb35518656..9519c77979ca 100644
--- a/metadata/md5-cache/net-libs/nodejs-4.9.1
+++ b/metadata/md5-cache/net-libs/nodejs-4.9.1
@@ -10,5 +10,5 @@ RDEPEND=icu? ( >=dev-libs/icu-55:= ) npm? ( python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v4.9.1/node-v4.9.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=12bb40bb6f3f426c5f4beb071d7e6f84
diff --git a/metadata/md5-cache/net-libs/nodejs-6.11.5 b/metadata/md5-cache/net-libs/nodejs-6.11.5
index a14d7f65dd9b..cf58ee2b1755 100644
--- a/metadata/md5-cache/net-libs/nodejs-6.11.5
+++ b/metadata/md5-cache/net-libs/nodejs-6.11.5
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v6.11.5/node-v6.11.5.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=362a2752f8723607deca357f14846368
diff --git a/metadata/md5-cache/net-libs/nodejs-6.14.1 b/metadata/md5-cache/net-libs/nodejs-6.14.1
index acfaeed14eb7..6024a5a821c4 100644
--- a/metadata/md5-cache/net-libs/nodejs-6.14.1
+++ b/metadata/md5-cache/net-libs/nodejs-6.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libuv-1.16.1:= >=net-libs/http-parser-2.7.0:= sys-libs/zlib i
 REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v6.14.1/node-v6.14.1.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf387445870d7d0736c52bd1fc3bfd83
diff --git a/metadata/md5-cache/net-libs/nodejs-6.14.3 b/metadata/md5-cache/net-libs/nodejs-6.14.3
index a8dad6a48733..23e36f417f14 100644
--- a/metadata/md5-cache/net-libs/nodejs-6.14.3
+++ b/metadata/md5-cache/net-libs/nodejs-6.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libuv-1.16.1:= >=net-libs/http-parser-2.7.0:= sys-libs/zlib i
 REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v6.14.3/node-v6.14.3.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=692e3d8e47e3d973cc0392e45f81ee2d
diff --git a/metadata/md5-cache/net-libs/nodejs-8.11.1 b/metadata/md5-cache/net-libs/nodejs-8.11.1
index e033ec2988e8..5fae2fbdac5c 100644
--- a/metadata/md5-cache/net-libs/nodejs-8.11.1
+++ b/metadata/md5-cache/net-libs/nodejs-8.11.1
@@ -7,9 +7,9 @@ IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap te
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=dev-libs/libuv-1.19.1:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.25.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
-REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v8.11.1/node-v8.11.1.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=988593024bfdd909bad7a75086331bac
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8e56d850b9fac7175ccc93174c9ea45c
diff --git a/metadata/md5-cache/net-libs/nodejs-8.11.3 b/metadata/md5-cache/net-libs/nodejs-8.11.3
index 15e9e90ad9fc..21338fd88078 100644
--- a/metadata/md5-cache/net-libs/nodejs-8.11.3
+++ b/metadata/md5-cache/net-libs/nodejs-8.11.3
@@ -7,9 +7,9 @@ IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap te
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=dev-libs/libuv-1.19.1:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.32.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
-REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v8.11.3/node-v8.11.3.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d5605d21f4739f02402fe2bae7a8839c
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f5a8655472f10aaf4758bc7dbb23fc54
diff --git a/metadata/md5-cache/net-libs/nodejs-9.11.2 b/metadata/md5-cache/net-libs/nodejs-9.11.2
index 97d6a31a167f..e1df78feed87 100644
--- a/metadata/md5-cache/net-libs/nodejs-9.11.2
+++ b/metadata/md5-cache/net-libs/nodejs-9.11.2
@@ -7,8 +7,8 @@ IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap te
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=dev-libs/libuv-1.19.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.32.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
-REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v9.11.2/node-v9.11.2.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3c439ddb537a3cce7590ab3dfb75c407
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=84f7de8d4d031e8085f76b75c5445a98
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index 976a75cb05fb..b398c8dab34f 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=dev-libs/libuv-1.19.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) npm? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] )
 REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
 SLOT=0
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f965f9a0f2fec0a6980db087efb28236
diff --git a/metadata/md5-cache/net-libs/phodav-2.2 b/metadata/md5-cache/net-libs/phodav-2.2
index a34ff30cda5d..381a83a865e3 100644
--- a/metadata/md5-cache/net-libs/phodav-2.2
+++ b/metadata/md5-cache/net-libs/phodav-2.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.51:2 >=net-libs/libsoup-2.48:2.4 dev-libs/libxml2 zeroconf? ( net-dns/avahi )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/phodav/2.2/phodav-2.2.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a3bbb5b81632a57c6992221b45d8791a
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.18.6 b/metadata/md5-cache/net-libs/webkit-gtk-2.18.6
index 6febf1a30dfa..e4918cbe2da4 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.18.6
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.18.6
@@ -11,5 +11,5 @@ REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl ) introspection? ( gstr
 RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.18.6.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	da74609cfc48267b7201d50b0367af82	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	da74609cfc48267b7201d50b0367af82	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c2b7c13d84d022b73fe5f3e84474efa5
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.20.3 b/metadata/md5-cache/net-libs/webkit-gtk-2.20.3
deleted file mode 100644
index 2558ef387e1b..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.20.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.10.2:=[X?] >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 >=dev-lang/perl-5.10 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig dev-lang/perl virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open source web browser engine
-EAPI=6
-HOMEPAGE=https://www.webkitgtk.org
-IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.10.2:=[X?] >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage )
-REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl !opengl ) introspection? ( gstreamer ) nsplugin? ( X ) webgl? ( gstreamer || ( gles2 opengl ) ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=4/37
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.20.3.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	da74609cfc48267b7201d50b0367af82	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a698f77f698236c73bc0ca997e8a71b
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.20.4 b/metadata/md5-cache/net-libs/webkit-gtk-2.20.4
new file mode 100644
index 000000000000..54ec824fb03d
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.20.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.10.2:=[X?] >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 >=dev-lang/perl-5.10 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig dev-lang/perl virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open source web browser engine
+EAPI=6
+HOMEPAGE=https://www.webkitgtk.org
+IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X test
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.10.2:=[X?] >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage )
+REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl !opengl ) introspection? ( gstreamer ) nsplugin? ( X ) webgl? ( gstreamer || ( gles2 opengl ) ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.20.4.tar.xz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	da74609cfc48267b7201d50b0367af82	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=27f81a7f80d86a0c2d834dffefe38c1e
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 29413befa124..10930c571e40 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.29.1 b/metadata/md5-cache/net-mail/dovecot-2.2.29.1
deleted file mode 100644
index 291fe8302d3d..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.2.29.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=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:= ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
-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 cydir imapc +maildir mbox mdbox pop3c sdbox 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
-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
-SLOT=0
-SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.29.1.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.18.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.18.tar.gz )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=299cdc5d64cb0657c7c24b4a2730200c
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.32 b/metadata/md5-cache/net-mail/dovecot-2.2.32
deleted file mode 100644
index 92ee55489171..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.2.32
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=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:= ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
-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
-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.32.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.20.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.20.tar.gz )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ede2a89017503b07ba9b9eabcfe03325
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.35 b/metadata/md5-cache/net-mail/dovecot-2.2.35
deleted file mode 100644
index 6ceaf7d7eced..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.2.35
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=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:= ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
-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
-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.35.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.23.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.23.tar.gz )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=49e1ff80bc595a3757fc87549dd95245
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.0.1 b/metadata/md5-cache/net-mail/dovecot-2.3.0.1
deleted file mode 100644
index c15c700e67cd..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.3.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) 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:* ) !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:= virtual/pkgconfig
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=6
-HOMEPAGE=https://www.dovecot.org/
-IUSE=kerberos ldap lua mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) 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:* ) !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
-SLOT=0
-SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.0.1.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.0.1.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.0.1.tar.gz )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c761a077959c7fbac01d7e05cf1cab12
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.1 b/metadata/md5-cache/net-mail/dovecot-2.3.1
deleted file mode 100644
index 51b34bfa8945..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) 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:* ) !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:= virtual/pkgconfig
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=6
-HOMEPAGE=https://www.dovecot.org/
-IUSE=kerberos ldap lua mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) 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:* ) !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
-SLOT=0
-SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.1.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.1.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.1.tar.gz )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=787d8b327f86f1f3f60bd2133f704a93
diff --git a/metadata/md5-cache/net-mail/notmuch-0.23.7 b/metadata/md5-cache/net-mail/notmuch-0.23.7
index 8b8d96d71553..2f3dad7ba3fb 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.23.7
+++ b/metadata/md5-cache/net-mail/notmuch-0.23.7
@@ -10,5 +10,5 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmim
 REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 ) ) test? ( crypt emacs python valgrind )
 SLOT=0/4
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.23.7.tar.gz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=db38fd968d2b57fc8dffd3260bdb7bc0
diff --git a/metadata/md5-cache/net-mail/notmuch-0.24.2 b/metadata/md5-cache/net-mail/notmuch-0.24.2
index f531a2720488..988beeac4b8f 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.24.2
+++ b/metadata/md5-cache/net-mail/notmuch-0.24.2
@@ -10,5 +10,5 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmim
 REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( crypt emacs python valgrind )
 SLOT=0/4
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.24.2.tar.gz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=04b14e588c1a297268a028690e520853
diff --git a/metadata/md5-cache/net-mail/notmuch-0.25.3 b/metadata/md5-cache/net-mail/notmuch-0.25.3
index c0d8caa866f6..f348a8aa7e28 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.25.3
+++ b/metadata/md5-cache/net-mail/notmuch-0.25.3
@@ -10,5 +10,5 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmim
 REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( crypt emacs python valgrind )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.25.3.tar.gz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6382974132dcfb6fc58c13b4dcc510eb
diff --git a/metadata/md5-cache/net-mail/notmuch-0.26.1 b/metadata/md5-cache/net-mail/notmuch-0.26.1
index e62c991c52c3..854432ddbf16 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.26.1
+++ b/metadata/md5-cache/net-mail/notmuch-0.26.1
@@ -10,5 +10,5 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmim
 REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( crypt emacs python valgrind )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.26.1.tar.gz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ad09c982ac37ce791dbcf348115b6fbd
diff --git a/metadata/md5-cache/net-mail/notmuch-0.26.2 b/metadata/md5-cache/net-mail/notmuch-0.26.2
index d3ac55ab8679..993af398e178 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.26.2
+++ b/metadata/md5-cache/net-mail/notmuch-0.26.2
@@ -10,5 +10,5 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmim
 REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( crypt emacs python valgrind )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.26.2.tar.gz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ad09c982ac37ce791dbcf348115b6fbd
diff --git a/metadata/md5-cache/net-mail/notmuch-0.27 b/metadata/md5-cache/net-mail/notmuch-0.27
index 94c9d18d945a..c3e74a4e70ee 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.27
+++ b/metadata/md5-cache/net-mail/notmuch-0.27
@@ -10,5 +10,5 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 || ( >=dev-libs
 REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( crypt emacs python valgrind )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.27.tar.gz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7da66ff8738ecdbb4f3717f253ea5089
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 4169a7b66395..0866ac0ba8e7 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/cadaver-0.23.3 b/metadata/md5-cache/net-misc/cadaver-0.23.3
index fb8adf3ea850..3746cb148c29 100644
--- a/metadata/md5-cache/net-misc/cadaver-0.23.3
+++ b/metadata/md5-cache/net-misc/cadaver-0.23.3
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure prepare
 DEPEND=>=net-libs/neon-0.27.0 sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Command-line WebDAV client
 EAPI=6
-HOMEPAGE=http://www.webdav.org/cadaver
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=nls
 KEYWORDS=~amd64 ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/neon-0.27.0
 SLOT=0
-SRC_URI=http://www.webdav.org/cadaver/cadaver-0.23.3.tar.gz
+SRC_URI=mirror://gentoo/cadaver-0.23.3.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c31c55270600a06c588c94b883951159
+_md5_=6ebb41dbe94114c77276a48797228864
diff --git a/metadata/md5-cache/net-misc/calicoctl-3.1.3 b/metadata/md5-cache/net-misc/calicoctl-3.1.3
new file mode 100644
index 000000000000..f253e2f0e1ae
--- /dev/null
+++ b/metadata/md5-cache/net-misc/calicoctl-3.1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=CLI to manage Calico network and security policy
+EAPI=6
+HOMEPAGE=https://github.com/projectcalico/calicoctl
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/projectcalico/calicoctl/archive/v3.1.3.tar.gz -> calicoctl-3.1.3.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/armon/go-radix/archive/1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz -> github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz -> github.com-dgrijalva-jwt-go-d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/eapache/channels/archive/47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz -> github.com-eapache-channels-47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz https://github.com/eapache/queue/archive/093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz -> github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/fsnotify/fsnotify/archive/c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz -> github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/925471ac9e2131377a91e1595defec898166fe49.tar.gz -> github.com-google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz -> github.com-googleapis-gnostic-68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/hashicorp/hcl/archive/ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz -> github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/influxdata/influxdb/archive/0253f6fe05e8aa5d5382ef7a05d5c956a11fac94.tar.gz -> github.com-influxdata-influxdb-0253f6fe05e8aa5d5382ef7a05d5c956a11fac94.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/magiconair/properties/archive/c2353362d570a7bfa228149c62842019201cfb71.tar.gz -> github.com-magiconair-properties-c2353362d570a7bfa228149c62842019201cfb71.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/mattn/go-runewidth/archive/ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb.tar.gz -> github.com-mattn-go-runewidth-ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mcuadros/go-version/archive/88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz -> github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz https://github.com/mitchellh/go-ps/archive/4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz -> github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz https://github.com/mitchellh/mapstructure/archive/bb74f1db0675b241733089d5a1faa5dd8b0ef57b.tar.gz -> github.com-mitchellh-mapstructure-bb74f1db0675b241733089d5a1faa5dd8b0ef57b.tar.gz https://github.com/olekukonko/tablewriter/archive/d4647c9c7a84d847478d890b816b7d8b62b0b279.tar.gz -> github.com-olekukonko-tablewriter-d4647c9c7a84d847478d890b816b7d8b62b0b279.tar.gz https://github.com/onsi/ginkgo/archive/fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz -> github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz https://github.com/onsi/gomega/archive/62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz -> github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz https://github.com/osrg/gobgp/archive/bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz -> github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/pelletier/go-toml/archive/66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12.tar.gz -> github.com-pelletier-go-toml-66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz -> github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz -> github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/afero/archive/63644898a8da0bc22138abf860edaf5277b6102e.tar.gz -> github.com-spf13-afero-63644898a8da0bc22138abf860edaf5277b6102e.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/spf13/viper/archive/15738813a09db5c8e5b60a19d67d3f9bd38da3a4.tar.gz -> github.com-spf13-viper-15738813a09db5c8e5b60a19d67d3f9bd38da3a4.tar.gz https://github.com/termie/go-shutil/archive/bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz -> github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz https://github.com/vishvananda/netlink/archive/fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz -> github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/golang/crypto/archive/9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz -> github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz -> github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz -> github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-tomb/tomb/archive/d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz -> github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz -> github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz https://github.com/kubernetes/apimachinery/archive/40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz -> github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/0c329704159e3b051aafac400b15baacf2a94a04.tar.gz -> github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=d08ad9cd19694d04d29027157df140c8
diff --git a/metadata/md5-cache/net-misc/dropbox-45.3.88 b/metadata/md5-cache/net-misc/dropbox-45.3.88
index 6b015ff1c1d5..2705c3cba818 100644
--- a/metadata/md5-cache/net-misc/dropbox-45.3.88
+++ b/metadata/md5-cache/net-misc/dropbox-45.3.88
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-45.3.88.tar.gz ) amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-45.3.88.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8358a4d3b6e41b249a851cad54058595
diff --git a/metadata/md5-cache/net-misc/dropbox-48.3.56 b/metadata/md5-cache/net-misc/dropbox-48.3.56
index 89bb471cb4b8..01965949f33b 100644
--- a/metadata/md5-cache/net-misc/dropbox-48.3.56
+++ b/metadata/md5-cache/net-misc/dropbox-48.3.56
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-48.3.56.tar.gz ) amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-48.3.56.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=48295a3b1ed5866f35d03b5d3fa3a3ff
diff --git a/metadata/md5-cache/net-misc/felix-3.1.3 b/metadata/md5-cache/net-misc/felix-3.1.3
new file mode 100644
index 000000000000..4e120153ba1e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/felix-3.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=Calico's per-host agent, responsible for programming routes and security policy
+EAPI=6
+HOMEPAGE=https://github.com/projectcalico/felix
+IUSE=+bird
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/ipset bird? ( net-misc/bird )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/projectcalico/felix/archive/3.1.3.tar.gz -> felix-3.1.3.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/containernetworking/cni/archive/137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz -> github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/emicklei/go-restful/archive/777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz -> github.com-emicklei-go-restful-777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz -> github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz https://github.com/go-ini/ini/archive/06f5f3d67269ccec1fe5fe4134ba6e982984f7f5.tar.gz -> github.com-go-ini-ini-06f5f3d67269ccec1fe5fe4134ba6e982984f7f5.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz -> github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/gxed/eventfd/archive/80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz -> github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz https://github.com/gxed/GoEndian/archive/0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz -> github.com-gxed-GoEndian-0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/ipfs/go-log/archive/b9df188d0fae32d69c1a519fa81741668a12f55a.tar.gz -> github.com-ipfs-go-log-b9df188d0fae32d69c1a519fa81741668a12f55a.tar.gz https://github.com/jbenet/go-reuseport/archive/7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz -> github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz https://github.com/jbenet/go-sockaddr/archive/2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz -> github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kardianos/osext/archive/ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz -> github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/mattn/go-colorable/archive/efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz -> github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/Microsoft/go-winio/archive/78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz -> github.com-Microsoft-go-winio-78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz https://github.com/Microsoft/hcsshim/archive/34a629f78a5d50f7de07727e41a948685c45e026.tar.gz -> github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.gz https://github.com/mipearson/rfw/archive/6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz -> github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz https://github.com/onsi/ginkgo/archive/fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz -> github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz https://github.com/onsi/gomega/archive/62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz -> github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz https://github.com/opentracing/opentracing-go/archive/6c572c00d1830223701e155de97408483dfcd14a.tar.gz -> github.com-opentracing-opentracing-go-6c572c00d1830223701e155de97408483dfcd14a.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz -> github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz https://github.com/projectcalico/typha/archive/5374e9f32bde159a4aa19c821618920f491004be.tar.gz -> github.com-projectcalico-typha-5374e9f32bde159a4aa19c821618920f491004be.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz -> github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz -> github.com-vishvananda-netlink-dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/whyrusleeping/go-logging/archive/0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz -> github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz https://github.com/golang/crypto/archive/ab813273cd59e1333f7ae7bff5d027d4aadf528c.tar.gz -> github.com-golang-crypto-ab813273cd59e1333f7ae7bff5d027d4aadf528c.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz -> github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz https://github.com/golang/text/archive/4ee4af566555f5fbe026368b75596286a312663a.tar.gz -> github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz https://github.com/golang/appengine/archive/b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz -> github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz -> github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz https://github.com/kubernetes/apimachinery/archive/40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz -> github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/0c329704159e3b051aafac400b15baacf2a94a04.tar.gz -> github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=38433d7e4c34ce525f37136a4086f717
diff --git a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc3 b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc3
new file mode 100644
index 000000000000..42e9f3924519
--- /dev/null
+++ b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc3
@@ -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:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile ) virtual/pkgconfig client? ( X? ( doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Free implementation of the Remote Desktop Protocol
+EAPI=6
+HOMEPAGE=http://www.freerdp.com/
+IUSE=alsa +client cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
+SLOT=0/2
+SRC_URI=https://pub.freerdp.com/releases/freerdp-2.0.0-rc3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c751cf7dbc26b39ed9e36cff0615be16
diff --git a/metadata/md5-cache/net-misc/ipmiview-2.14.0.180213 b/metadata/md5-cache/net-misc/ipmiview-2.14.0.180213
deleted file mode 100644
index 938d28158c52..000000000000
--- a/metadata/md5-cache/net-misc/ipmiview-2.14.0.180213
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch preinst prepare setup unpack
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A GUI application that allows to manage multiple target systems through BMC
-EAPI=6
-HOMEPAGE=https://www.supermicro.com/
-IUSE=elibc_FreeBSD
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=supermicro
-RDEPEND=net-misc/stunnel virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist fetch mirror strip
-SLOT=0
-SRC_URI=amd64? ( ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_2.14.0_build.180213_bundleJRE_Linux_x64.tar.gz ) x86? ( ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_2.14.0_build.180213_bundleJRE_Linux.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=35b67893dc7a20992125d96b6b9916fd
diff --git a/metadata/md5-cache/net-misc/ipmiview-2.14.0.180213-r1 b/metadata/md5-cache/net-misc/ipmiview-2.14.0.180213-r1
new file mode 100644
index 000000000000..a17a3e5478d3
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ipmiview-2.14.0.180213-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install nofetch preinst prepare setup unpack
+DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A GUI application that allows to manage multiple target systems through BMC
+EAPI=6
+HOMEPAGE=https://www.supermicro.com/
+IUSE=elibc_FreeBSD
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=supermicro
+RDEPEND=net-misc/stunnel virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist fetch mirror strip
+SLOT=0
+SRC_URI=amd64? ( ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_2.14.0_build.180213_bundleJRE_Linux_x64.tar.gz ) x86? ( ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_2.14.0_build.180213_bundleJRE_Linux.tar.gz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=28b8d4248394b9daedbcbd37b62ce244
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.0.0 b/metadata/md5-cache/net-misc/kafka-bin-2.0.0
new file mode 100644
index 000000000000..f6e02bfd73ef
--- /dev/null
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=|| ( virtual/jre:1.8 )
+DESCRIPTION=A high-throughput distributed messaging system
+EAPI=6
+HOMEPAGE=http://kafka.apache.org/
+IUSE=internal-zookeeper
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=|| ( virtual/jre:1.8 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=mirror://apache/kafka/2.0.0/kafka_2.12-2.0.0.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a32a015b8d849f635a7fae23ab647459
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.33 b/metadata/md5-cache/net-misc/memcached-1.4.33
deleted file mode 100644
index 28d42fe7f9f8..000000000000
--- a/metadata/md5-cache/net-misc/memcached-1.4.33
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-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
-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.33.tar.gz https://www.memcached.org/files/old/memcached-1.4.33.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3c7ee4c550263b34e1b38b4f93b6be90
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.5 b/metadata/md5-cache/net-misc/memcached-1.5.5
deleted file mode 100644
index 876fcc7c7115..000000000000
--- a/metadata/md5-cache/net-misc/memcached-1.5.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-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
-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.5.tar.gz https://www.memcached.org/files/old/memcached-1.5.5.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d13a89ab4cd13563e5d3c00ddbd2a7e8
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.6 b/metadata/md5-cache/net-misc/memcached-1.5.6
deleted file mode 100644
index bc19436e35a1..000000000000
--- a/metadata/md5-cache/net-misc/memcached-1.5.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-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
-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	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e0c4082691e53399e4572c188c7c52fe
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.7 b/metadata/md5-cache/net-misc/memcached-1.5.7
deleted file mode 100644
index 83590fdb9b31..000000000000
--- a/metadata/md5-cache/net-misc/memcached-1.5.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-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
-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.7.tar.gz https://www.memcached.org/files/old/memcached-1.5.7.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d13a89ab4cd13563e5d3c00ddbd2a7e8
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.8 b/metadata/md5-cache/net-misc/memcached-1.5.8
deleted file mode 100644
index 21e95e4fbc41..000000000000
--- a/metadata/md5-cache/net-misc/memcached-1.5.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-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
-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.8.tar.gz https://www.memcached.org/files/old/memcached-1.5.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d13a89ab4cd13563e5d3c00ddbd2a7e8
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.6.12 b/metadata/md5-cache/net-misc/modemmanager-1.6.12
index 24889e818359..f5748c89a8f9 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.6.12
+++ b/metadata/md5-cache/net-misc/modemmanager-1.6.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36.0:2 >=virtual/libgudev-230:= introspection? ( >=dev
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.6.12.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4d0807bc0d59a7e53dcfdc421c7f88d7
diff --git a/metadata/md5-cache/net-misc/netifrc-0.2.2 b/metadata/md5-cache/net-misc/netifrc-0.2.2
index 5894561e5b0d..33a20da3d0f4 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.2.2
+++ b/metadata/md5-cache/net-misc/netifrc-0.2.2
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=!<sys-fs/udev-init-scripts-26-r1 !<sys-fs/udev-172 >=sys-apps/openrc-0.12 !<sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.2.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=07734400697d21ef27d7c77350da3920
diff --git a/metadata/md5-cache/net-misc/netifrc-0.2.3 b/metadata/md5-cache/net-misc/netifrc-0.2.3
index 70b57df6acbe..83d3a9ca31f2 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.2.3
+++ b/metadata/md5-cache/net-misc/netifrc-0.2.3
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=!<sys-fs/udev-init-scripts-26-r1 !<sys-fs/udev-172 >=sys-apps/openrc-0.12 !<sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.2.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1b3a8c0d2c3edb0bdb8e36db3bbc90ea
diff --git a/metadata/md5-cache/net-misc/netifrc-0.2.4 b/metadata/md5-cache/net-misc/netifrc-0.2.4
index 74d31dae7dab..97381eda25a4 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.2.4
+++ b/metadata/md5-cache/net-misc/netifrc-0.2.4
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=!<sys-fs/udev-init-scripts-26-r1 !<sys-fs/udev-172 >=sys-apps/openrc-0.12 !<sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.2.4.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c62b7f82898dab85975c2f397181584e
diff --git a/metadata/md5-cache/net-misc/netifrc-0.3.1 b/metadata/md5-cache/net-misc/netifrc-0.3.1
index 1e8204bc7315..91e68ed99a20 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.3.1
+++ b/metadata/md5-cache/net-misc/netifrc-0.3.1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.3.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=74743dff7008a0780ff7aadd64e972a3
diff --git a/metadata/md5-cache/net-misc/netifrc-0.4.0 b/metadata/md5-cache/net-misc/netifrc-0.4.0
index 96eaee2024f9..64d531a7268f 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.4.0
+++ b/metadata/md5-cache/net-misc/netifrc-0.4.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.4.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=74743dff7008a0780ff7aadd64e972a3
diff --git a/metadata/md5-cache/net-misc/netifrc-0.4.0-r1 b/metadata/md5-cache/net-misc/netifrc-0.4.0-r1
index f2a3b84df350..5f37d7293769 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.4.0-r1
+++ b/metadata/md5-cache/net-misc/netifrc-0.4.0-r1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.4.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=940c1f9a274b7d88359305ce3356d827
diff --git a/metadata/md5-cache/net-misc/netifrc-0.5.0 b/metadata/md5-cache/net-misc/netifrc-0.5.0
index 8ee128fb0d30..b34e3c5b858e 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.5.0
+++ b/metadata/md5-cache/net-misc/netifrc-0.5.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.5.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fef931e52c425da83d6d790e336f9821
diff --git a/metadata/md5-cache/net-misc/netifrc-0.5.1 b/metadata/md5-cache/net-misc/netifrc-0.5.1
index a687e7c90a34..90a58d6c39d7 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.5.1
+++ b/metadata/md5-cache/net-misc/netifrc-0.5.1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.5.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fe892514049ef1de1a7cc0eace15954b
diff --git a/metadata/md5-cache/net-misc/netifrc-0.6.0 b/metadata/md5-cache/net-misc/netifrc-0.6.0
index 535ce4f60779..40488cc0203e 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.6.0
+++ b/metadata/md5-cache/net-misc/netifrc-0.6.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.6.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fef931e52c425da83d6d790e336f9821
diff --git a/metadata/md5-cache/net-misc/netifrc-0.6.1 b/metadata/md5-cache/net-misc/netifrc-0.6.1
index 5f88968a2263..b575108eb5e4 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.6.1
+++ b/metadata/md5-cache/net-misc/netifrc-0.6.1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/netifrc.git/snapshot/netifrc-0.6.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e889f404ac90094f56cd7d605158b997
diff --git a/metadata/md5-cache/net-misc/netifrc-9999 b/metadata/md5-cache/net-misc/netifrc-9999
index 101eb53fb48d..54b68094295c 100644
--- a/metadata/md5-cache/net-misc/netifrc-9999
+++ b/metadata/md5-cache/net-misc/netifrc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
 LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fef931e52c425da83d6d790e336f9821
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.10.10 b/metadata/md5-cache/net-misc/networkmanager-1.10.10
index 54dfb4a3cfec..8ed98293ea94 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.10.10
+++ b/metadata/md5-cache/net-misc/networkmanager-1.10.10
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.10/NetworkManager-1.10.10.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=225d59b38099f618794862f85653909d
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.10.6 b/metadata/md5-cache/net-misc/networkmanager-1.10.6
index 2516de730466..c122062b9843 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.10.6
+++ b/metadata/md5-cache/net-misc/networkmanager-1.10.6
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.10/NetworkManager-1.10.6.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cf308bac9807d6e7d13d274733897153
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.4.4-r1 b/metadata/md5-cache/net-misc/networkmanager-1.4.4-r1
index ebbb41e29828..56d1eb028368 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.4.4-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-1.4.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.4/NetworkManager-1.4.4.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0961436b60da6e21fa1eaaf68dddc173
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.8.4 b/metadata/md5-cache/net-misc/networkmanager-1.8.4
index f27018efdf7b..f6c68fb793e5 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.8.4
+++ b/metadata/md5-cache/net-misc/networkmanager-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.8/NetworkManager-1.8.4.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cde36408c088e17e3d86a20fcdcfa38e
diff --git a/metadata/md5-cache/net-misc/openssh-7.7_p1-r103 b/metadata/md5-cache/net-misc/openssh-7.7_p1-r103
deleted file mode 100644
index d049c9320a01..000000000000
--- a/metadata/md5-cache/net-misc/openssh-7.7_p1-r103
+++ /dev/null
@@ -1,13 +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: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=https://www.openssh.com/
-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
-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.7p1.tar.gz https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-patches-1.1.tar.xz sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-sctp-1.1.patch.xz ) hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-hpnssh14v15-gentoo2.patch.xz ) ldap? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-ldap-20180327.patch.xz ) X509? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-x509-11.3.1.patch.xz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=058915d8f23acffa4d02d7b0e14c8772
diff --git a/metadata/md5-cache/net-misc/openssh-7.7_p1-r7 b/metadata/md5-cache/net-misc/openssh-7.7_p1-r7
new file mode 100644
index 000000000000..a2c51de70d00
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openssh-7.7_p1-r7
@@ -0,0 +1,15 @@
+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 ) 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: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=https://www.openssh.com/
+IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux 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 ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
+REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !sctp ssl ) test? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.7p1.tar.gz https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-patches-1.1.tar.xz sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-sctp-1.1.patch.xz ) hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-hpnssh14v15-gentoo2.patch.xz ) X509? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-x509-11.3.1.patch.xz )
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5deacee7f412c7710b7484470526fe67
diff --git a/metadata/md5-cache/net-misc/remmina-1.2.0_rc24 b/metadata/md5-cache/net-misc/remmina-1.2.0_rc24
index 7cb6099bc7f5..a8285807ded3 100644
--- a/metadata/md5-cache/net-misc/remmina-1.2.0_rc24
+++ b/metadata/md5-cache/net-misc/remmina-1.2.0_rc24
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc0 ) gnome-keyring? ( app-crypt/libsecret ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc0 <net-misc/freerdp-2.0.0_rc3 ) gnome-keyring? ( app-crypt/libsecret ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
 DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
 EAPI=6
 HOMEPAGE=https://remmina.org/
 IUSE=ayatana crypt rdp gnome-keyring nls spice ssh telepathy vnc zeroconf
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc0 ) gnome-keyring? ( app-crypt/libsecret ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) virtual/freedesktop-icon-theme
+RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc0 <net-misc/freerdp-2.0.0_rc3 ) gnome-keyring? ( app-crypt/libsecret ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://github.com/FreeRDP/Remmina/archive/v1.2.0-rcgit.24.tar.gz -> remmina-1.2.0_rc24.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f6143dfa2f30222e7d22205722b2dbcd
+_md5_=9c2f2a27cf93738c06d263a482c380b1
diff --git a/metadata/md5-cache/net-misc/remmina-1.2.0_rc29-r1 b/metadata/md5-cache/net-misc/remmina-1.2.0_rc29-r1
deleted file mode 100644
index 8b75eff2ad83..000000000000
--- a/metadata/md5-cache/net-misc/remmina-1.2.0_rc29-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc0 ) gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) dev-util/intltool net-libs/libsoup virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
-EAPI=6
-HOMEPAGE=https://remmina.org/
-IUSE=ayatana crypt rdp gnome-keyring libressl nls spice ssh telepathy vnc zeroconf
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc0 ) gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=https://github.com/FreeRDP/Remmina/archive/v1.2.0-rcgit.29.tar.gz -> remmina-1.2.0_rc29.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c4b6e5e4ca24ef2671b97ff1debabbdf
diff --git a/metadata/md5-cache/net-misc/remmina-1.2.30.1 b/metadata/md5-cache/net-misc/remmina-1.2.30.1
deleted file mode 100644
index 3b0e87e29f28..000000000000
--- a/metadata/md5-cache/net-misc/remmina-1.2.30.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2 ) gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
-EAPI=6
-HOMEPAGE=https://remmina.org/
-IUSE=ayatana crypt examples gnome-keyring libressl nls spice ssh rdp telepathy vnc zeroconf
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2 ) gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=https://github.com/FreeRDP/Remmina/archive/v1.2.30.1.tar.gz -> Remmina-1.2.30.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f8fcef83407452a0587bcb8386b4e85
diff --git a/metadata/md5-cache/net-misc/remmina-1.2.31.2 b/metadata/md5-cache/net-misc/remmina-1.2.31.2
new file mode 100644
index 000000000000..b8c889678fcc
--- /dev/null
+++ b/metadata/md5-cache/net-misc/remmina-1.2.31.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/glib:2 dev-libs/json-glib net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2 ) gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
+EAPI=6
+HOMEPAGE=https://remmina.org/
+IUSE=ayatana crypt examples gnome-keyring libressl nls spice ssh rdp telepathy vnc zeroconf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+-with-openssl-exception
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2 ) gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=https://github.com/FreeRDP/Remmina/archive/v1.2.31.2.tar.gz -> Remmina-1.2.31.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f8fcef83407452a0587bcb8386b4e85
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.33-r2 b/metadata/md5-cache/net-misc/spice-gtk-0.33-r2
deleted file mode 100644
index 3ad688c7ace5..000000000000
--- a/metadata/md5-cache/net-misc/spice-gtk-0.33-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio[glib] ) gstvideo? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gstaudio? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus gtk3? ( x11-libs/gtk+:3[introspection?] ) >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.2 virtual/jpeg:0= sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=dev-libs/glib-2.43.90:2 >=net-libs/libsoup-2.49.91 ) >=app-emulation/spice-protocol-0.12.12 dev-perl/Text-CSV >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
-EAPI=6
-HOMEPAGE=https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/
-IUSE=dbus gstaudio gstvideo gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio[glib] ) gstvideo? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gstaudio? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus gtk3? ( x11-libs/gtk+:3[introspection?] ) >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.2 virtual/jpeg:0= sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=dev-libs/glib-2.43.90:2 >=net-libs/libsoup-2.49.91 )
-REQUIRED_USE=?? ( pulseaudio gstaudio )
-SLOT=0
-SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.33.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f2ebcbedcd3ecadcc4a8dc561ead3c9
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1 b/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
new file mode 100644
index 000000000000..4c3b209458cd
--- /dev/null
+++ b/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( virtual/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 xorgmodule? ( =x11-base/xorg-server-1.20* ) drm? ( x11-libs/libdrm ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xinerama? ( x11-libs/libXinerama ) nls? ( sys-devel/gettext ) java? ( >=virtual/jdk-1.5 ) x11-base/xorg-proto media-libs/fontconfig x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXft x11-libs/libXi server? ( dev-libs/libbsd x11-libs/libxkbfile x11-libs/libxshmfence virtual/pkgconfig media-fonts/font-util x11-misc/util-macros >=x11-libs/xtrans-1.3.3 opengl? ( >=media-libs/mesa-10.3.4-r1 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.9.6 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Remote desktop viewer display system
+EAPI=6
+HOMEPAGE=http://www.tigervnc.org
+IUSE=dri3 +drm gnutls java libressl nls +opengl pam server xinerama +xorgmodule elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( virtual/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 xorgmodule? ( =x11-base/xorg-server-1.20* ) drm? ( x11-libs/libdrm ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xinerama? ( x11-libs/libXinerama ) !net-misc/tightvnc !net-misc/vnc !net-misc/xf4vnc java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.9.0.tar.gz -> tigervnc-1.9.0.tar.gz server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.20.0.tar.bz2 )
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1af07681d846aedfb510391c347c3601
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.07.21 b/metadata/md5-cache/net-misc/youtube-dl-2018.07.21
deleted file mode 100644
index 8a6b916ef679..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2018.07.21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst 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(-)] test? ( dev-python/nose[coverage(+)] ) 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=Download videos from YouTube.com (and more sites...)
-EAPI=6
-HOMEPAGE=https://rg3.github.com/youtube-dl/
-IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-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(-)] 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://youtube-dl.org/downloads/2018.07.21/youtube-dl-2018.07.21.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=31e1b5039d70c0829fe39d5512ab45ea
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.08.04 b/metadata/md5-cache/net-misc/youtube-dl-2018.08.04
new file mode 100644
index 000000000000..860e3f389daf
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2018.08.04
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst 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(-)] test? ( dev-python/nose[coverage(+)] ) 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=Download videos from YouTube.com (and more sites...)
+EAPI=6
+HOMEPAGE=https://rg3.github.com/youtube-dl/
+IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+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(-)] 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://youtube-dl.org/downloads/2018.08.04/youtube-dl-2018.08.04.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a8a2975a8e92c7b73a3705e631401199
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index d8c2ebd96ef1..dea22232ebe6 100644
--- a/metadata/md5-cache/net-news/Manifest.gz
+++ b/metadata/md5-cache/net-news/Manifest.gz
diff --git a/metadata/md5-cache/net-news/liferea-1.12.1 b/metadata/md5-cache/net-news/liferea-1.12.1
index 5898526fb505..c12f5e0f3504 100644
--- a/metadata/md5-cache/net-news/liferea-1.12.1
+++ b/metadata/md5-cache/net-news/liferea-1.12.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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=0
 SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12.1/liferea-1.12.1.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5c7e91d27f808c5a1d8a0b17537ebfe3
diff --git a/metadata/md5-cache/net-news/liferea-1.12.2 b/metadata/md5-cache/net-news/liferea-1.12.2
index ed0c187ded9b..fdf1b6bb4179 100644
--- a/metadata/md5-cache/net-news/liferea-1.12.2
+++ b/metadata/md5-cache/net-news/liferea-1.12.2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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=0
 SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12.2/liferea-1.12.2.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1b1baaa3c1270974bf104a7595d48069
diff --git a/metadata/md5-cache/net-news/liferea-1.12.3 b/metadata/md5-cache/net-news/liferea-1.12.3
index 8f5afcabf67a..9a50bda53f47 100644
--- a/metadata/md5-cache/net-news/liferea-1.12.3
+++ b/metadata/md5-cache/net-news/liferea-1.12.3
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12.3/liferea-1.12.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9ae2d926a13fab586012f9426b3a9c79
diff --git a/metadata/md5-cache/net-news/liferea-1.12_rc3 b/metadata/md5-cache/net-news/liferea-1.12_rc3
index 573cfd7c9781..44c2bc0a8384 100644
--- a/metadata/md5-cache/net-news/liferea-1.12_rc3
+++ b/metadata/md5-cache/net-news/liferea-1.12_rc3
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12-rc3/liferea-1.12-rc3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b6a57620e49d6a7404727a636ea5f931
diff --git a/metadata/md5-cache/net-news/liferea-1.12_rc3-r1 b/metadata/md5-cache/net-news/liferea-1.12_rc3-r1
index d3b4808af8c0..f512a97eeff6 100644
--- a/metadata/md5-cache/net-news/liferea-1.12_rc3-r1
+++ b/metadata/md5-cache/net-news/liferea-1.12_rc3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12-rc3/liferea-1.12-rc3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cccfb71cf8e1b9e33e25cd56d9012286
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 44e96a7a3790..273bcfe1606f 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.15 b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.15
deleted file mode 100644
index 9d77b17f8ee2..000000000000
--- a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Main implementation of IPFS
-EAPI=6
-HOMEPAGE=https://ipfs.io/
-KEYWORDS=-* ~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=sys-fs/fuse
-SLOT=0
-SRC_URI=amd64? ( https://dist.ipfs.io/go-ipfs/v0.4.15/go-ipfs_v0.4.15_linux-amd64.tar.gz ) x86? ( https://dist.ipfs.io/go-ipfs/v0.4.15/go-ipfs_v0.4.15_linux-386.tar.gz ) arm? ( https://dist.ipfs.io/go-ipfs/v0.4.15/go-ipfs_v0.4.15_linux-arm.tar.gz ) https://raw.githubusercontent.com/ipfs/go-ipfs/v0.4.15/misc/completion/ipfs-completion.bash -> go-ipfs-bin-0.4.15.bash
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f622369109aba99f26b4bd88b98641b7
diff --git a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.15-r1 b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.15-r1
new file mode 100644
index 000000000000..d318ac60514a
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.15-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst preinst
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Main implementation of IPFS
+EAPI=6
+HOMEPAGE=https://ipfs.io/
+KEYWORDS=-* ~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=sys-fs/fuse
+SLOT=0
+SRC_URI=amd64? ( https://dist.ipfs.io/go-ipfs/v0.4.15/go-ipfs_v0.4.15_linux-amd64.tar.gz ) x86? ( https://dist.ipfs.io/go-ipfs/v0.4.15/go-ipfs_v0.4.15_linux-386.tar.gz ) arm? ( https://dist.ipfs.io/go-ipfs/v0.4.15/go-ipfs_v0.4.15_linux-arm.tar.gz ) https://raw.githubusercontent.com/ipfs/go-ipfs/v0.4.15/misc/completion/ipfs-completion.bash -> go-ipfs-bin-0.4.15.bash
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=9b63e72c07ca1710e634d8904e68443b
diff --git a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.17 b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.17
new file mode 100644
index 000000000000..5541a856ec5e
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.17
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst preinst
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Main implementation of IPFS
+EAPI=6
+HOMEPAGE=https://ipfs.io/
+KEYWORDS=-* ~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=sys-fs/fuse
+SLOT=0
+SRC_URI=amd64? ( https://dist.ipfs.io/go-ipfs/v0.4.17/go-ipfs_v0.4.17_linux-amd64.tar.gz ) x86? ( https://dist.ipfs.io/go-ipfs/v0.4.17/go-ipfs_v0.4.17_linux-386.tar.gz ) arm? ( https://dist.ipfs.io/go-ipfs/v0.4.17/go-ipfs_v0.4.17_linux-arm.tar.gz ) https://raw.githubusercontent.com/ipfs/go-ipfs/v0.4.17/misc/completion/ipfs-completion.bash -> go-ipfs-bin-0.4.17.bash
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=9b63e72c07ca1710e634d8904e68443b
diff --git a/metadata/md5-cache/net-p2p/resilio-sync-2.5.12 b/metadata/md5-cache/net-p2p/resilio-sync-2.5.12
index d56ff62e4036..2d1a44ca8b10 100644
--- a/metadata/md5-cache/net-p2p/resilio-sync-2.5.12
+++ b/metadata/md5-cache/net-p2p/resilio-sync-2.5.12
@@ -10,5 +10,5 @@ RDEPEND=virtual/tmpfiles
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.5.12-1_amd64.deb ) x86? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.5.12-1_i386.deb )
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=630950300abc8cdddaaf066acc01d470
diff --git a/metadata/md5-cache/net-p2p/transmission-2.94 b/metadata/md5-cache/net-p2p/transmission-2.94
index 782fda6a9210..e1268e5e6c4e 100644
--- a/metadata/md5-cache/net-p2p/transmission-2.94
+++ b/metadata/md5-cache/net-p2p/transmission-2.94
@@ -4,11 +4,11 @@ DESCRIPTION=A Fast, Easy and Free BitTorrent client
 EAPI=6
 HOMEPAGE=http://www.transmissionbt.com/
 IUSE=ayatana gtk libressl lightweight systemd qt5 xfs
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 RDEPEND=>=dev-libs/libevent-2.0.10:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) systemd? ( >=sys-apps/systemd-209:= )
 REQUIRED_USE=ayatana? ( gtk )
 SLOT=0
 SRC_URI=https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e1b009edeb28eebd348537ed1cdbc7c9
+_md5_=caec70b03e3faa58800909bc176cd030
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 4e21001d3a55..58a1f972d5b4 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/hplip-3.17.10 b/metadata/md5-cache/net-print/hplip-3.17.10
index 7c3d31c72f9f..43ba250ff81e 100644
--- a/metadata/md5-cache/net-print/hplip-3.17.10
+++ b/metadata/md5-cache/net-print/hplip-3.17.10
@@ -10,5 +10,5 @@ RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic]
 REQUIRED_USE=!minimal? ( ^^ ( 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=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.17.10.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.17.9-patches-1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=652b2320da3d9ce23b96fd7814566395
diff --git a/metadata/md5-cache/net-print/hplip-3.18.6 b/metadata/md5-cache/net-print/hplip-3.18.6
index a0f69f504b59..797aa3582b9a 100644
--- a/metadata/md5-cache/net-print/hplip-3.18.6
+++ b/metadata/md5-cache/net-print/hplip-3.18.6
@@ -10,5 +10,5 @@ RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic]
 REQUIRED_USE=!minimal? ( ^^ ( 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=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.18.6.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.3-patches-2.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=2f43d20ea4dbf6c6ec034747ba732e41
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.17.10 b/metadata/md5-cache/net-print/hplip-plugin-3.17.10
index ff561b0ee7d6..a8bd1a61ea34 100644
--- a/metadata/md5-cache/net-print/hplip-plugin-3.17.10
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.17.10
@@ -9,5 +9,5 @@ RDEPEND=~net-print/hplip-3.17.10 virtual/udev
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-3.17.10-plugin.run
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44
 _md5_=638637f27d510d641a924af20f6ff808
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.18.6 b/metadata/md5-cache/net-print/hplip-plugin-3.18.6
index dc5ecb89e8ad..df64cd97aa9b 100644
--- a/metadata/md5-cache/net-print/hplip-plugin-3.18.6
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.18.6
@@ -9,5 +9,5 @@ RDEPEND=~net-print/hplip-3.18.6 virtual/udev
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-3.18.6-plugin.run
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44
 _md5_=085cfe9561e7fe5a8ebc3082a18dd411
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 8b0697b7346b..9f7175d05912 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.13 b/metadata/md5-cache/net-proxy/haproxy-1.8.13
index 3fda97aa6208..f6ccc3d6bd29 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.13
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.13
@@ -4,11 +4,11 @@ DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=6
 HOMEPAGE=http://www.haproxy.org
 IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.13.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b84c8d95972675fd4b84c28a701ffa45
+_md5_=4ae09ffc430d5fbb9f1dcfbc17e2b888
diff --git a/metadata/md5-cache/net-voip/Manifest.gz b/metadata/md5-cache/net-voip/Manifest.gz
index bbed6de1e4f3..0308ab8712e1 100644
--- a/metadata/md5-cache/net-voip/Manifest.gz
+++ b/metadata/md5-cache/net-voip/Manifest.gz
diff --git a/metadata/md5-cache/net-voip/linphone-3.6.1 b/metadata/md5-cache/net-voip/linphone-3.6.1
index 4c706982bc17..993df21107fd 100644
--- a/metadata/md5-cache/net-voip/linphone-3.6.1
+++ b/metadata/md5-cache/net-voip/linphone-3.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/mediastreamer-2.9.0[ipv6?,upnp?,video?] >=net-libs/libeXosip-4.0.0 >=net-libs/libosip-4.0.0 >=net-libs/ortp-0.22.0 virtual/udev gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 assistant? ( >=net-libs/libsoup-2.26 ) libnotify? ( x11-libs/libnotify ) ) gsm-nonstandard? ( >=media-libs/mediastreamer-2.9.0[gsm] ) ncurses? ( sys-libs/readline:0 sys-libs/ncurses ) sqlite? ( dev-db/sqlite:3 ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) tools? ( dev-libs/libxml2 ) upnp? ( net-libs/libupnp ) video? ( >=media-libs/mediastreamer-2.9.0[v4l] )
 SLOT=0
 SRC_URI=mirror://nongnu/linphone/3.6.x/sources/linphone-3.6.1.tar.gz https://dev.gentoo.org/~hasufell/distfiles/linphone-3.6.1-exosip-4.patch
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=eb6945737e15558fb05dfdd7a7921560
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 8a7b9e268f0d..8123c6a412ba 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/libreswan-3.25 b/metadata/md5-cache/net-vpn/libreswan-3.25
index 7e23f0df95d7..d3452c938cee 100644
--- a/metadata/md5-cache/net-vpn/libreswan-3.25
+++ b/metadata/md5-cache/net-vpn/libreswan-3.25
@@ -4,10 +4,10 @@ DESCRIPTION=IPsec implementation for Linux, fork of Openswan
 EAPI=6
 HOMEPAGE=https://libreswan.org/
 IUSE=caps curl dnssec ldap pam seccomp selinux systemd test
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2 BSD-4 RSA DES
 RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=https://download.libreswan.org/libreswan-3.25.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d797bb8a4bce2ad6f4c11955d0ead2a2
+_md5_=f8c908e96fc1bee717e4630ebd4ca6fc
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.4.5_rc-r1 b/metadata/md5-cache/net-vpn/tor-0.3.4.5_rc-r1
deleted file mode 100644
index 3b66ee4dedc1..000000000000
--- a/metadata/md5-cache/net-vpn/tor-0.3.4.5_rc-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) virtual/pkgconfig
-DESCRIPTION=Anonymizing overlay network for TCP
-EAPI=6
-HOMEPAGE=http://www.torproject.org/
-IUSE=caps libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
-LICENSE=BSD GPL-2
-RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
-SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.3.4.5-rc.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.4.5-rc.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3f459759c2b81504bcd9342c97640041
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.4.6_rc b/metadata/md5-cache/net-vpn/tor-0.3.4.6_rc
new file mode 100644
index 000000000000..2f1247345452
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tor-0.3.4.6_rc
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install setup
+DEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) virtual/pkgconfig
+DESCRIPTION=Anonymizing overlay network for TCP
+EAPI=6
+HOMEPAGE=http://www.torproject.org/
+IUSE=caps libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
+LICENSE=BSD GPL-2
+RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
+SLOT=0
+SRC_URI=https://www.torproject.org/dist/tor-0.3.4.6-rc.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.4.6-rc.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3f459759c2b81504bcd9342c97640041
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 526cf17f006d..3c0bef67ff69 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/aircrack-ng-1.3 b/metadata/md5-cache/net-wireless/aircrack-ng-1.3
deleted file mode 100644
index 1fd096d4408e..000000000000
--- a/metadata/md5-cache/net-wireless/aircrack-ng-1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=net-libs/libpcap dev-libs/openssl:0= netlink? ( dev-libs/libnl:3 ) pcre? ( dev-libs/libpcre ) airdrop-ng? ( 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(-)] ) airgraph-ng? ( 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(-)] ) experimental? ( sys-libs/zlib ) sqlite? ( >=dev-db/sqlite-3.4 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=WLAN tools for breaking 802.11 WEP/WPA keys
-EAPI=6
-HOMEPAGE=http://www.aircrack-ng.org
-IUSE=+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-PDEPEND=kernel_linux? ( net-wireless/iw net-wireless/wireless-tools sys-apps/ethtool sys-apps/usbutils sys-apps/pciutils ) sys-apps/hwids airdrop-ng? ( net-wireless/lorcon[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-RDEPEND=net-libs/libpcap dev-libs/openssl:0= netlink? ( dev-libs/libnl:3 ) pcre? ( dev-libs/libpcre ) airdrop-ng? ( 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(-)] ) airgraph-ng? ( 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(-)] ) experimental? ( sys-libs/zlib ) sqlite? ( >=dev-db/sqlite-3.4 )
-REQUIRED_USE=airdrop-ng? ( || ( python_targets_python2_7 ) ) airgraph-ng? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://github.com/aircrack-ng/aircrack-ng/archive/1.3.tar.gz -> aircrack-ng-1.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=87c8ecac836eedc64bf89382b15a7a7a
diff --git a/metadata/md5-cache/net-wireless/aircrack-ng-1.3-r1 b/metadata/md5-cache/net-wireless/aircrack-ng-1.3-r1
new file mode 100644
index 000000000000..3eb6f4138730
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-1.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=net-libs/libpcap dev-libs/openssl:0= netlink? ( dev-libs/libnl:3 ) pcre? ( dev-libs/libpcre ) airdrop-ng? ( 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(-)] ) airgraph-ng? ( 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(-)] ) experimental? ( sys-libs/zlib ) sqlite? ( >=dev-db/sqlite-3.4 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=WLAN tools for breaking 802.11 WEP/WPA keys
+EAPI=6
+HOMEPAGE=http://www.aircrack-ng.org
+IUSE=+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+PDEPEND=kernel_linux? ( net-wireless/iw net-wireless/wireless-tools sys-apps/ethtool sys-apps/usbutils sys-apps/pciutils ) sys-apps/hwids airdrop-ng? ( net-wireless/lorcon[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+RDEPEND=net-libs/libpcap dev-libs/openssl:0= netlink? ( dev-libs/libnl:3 ) pcre? ( dev-libs/libpcre ) airdrop-ng? ( 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(-)] ) airgraph-ng? ( 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(-)] ) experimental? ( sys-libs/zlib ) sqlite? ( >=dev-db/sqlite-3.4 )
+REQUIRED_USE=airdrop-ng? ( || ( python_targets_python2_7 ) ) airgraph-ng? ( || ( python_targets_python2_7 ) )
+SLOT=0
+SRC_URI=https://github.com/aircrack-ng/aircrack-ng/archive/1.3.tar.gz -> aircrack-ng-1.3.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bf8f6ae243df59bcd4a7d773b4ef22c8
diff --git a/metadata/md5-cache/net-wireless/bladerf-2016.06 b/metadata/md5-cache/net-wireless/bladerf-2016.06
index 88a7efe51fe6..ddd5a1c1f6b2 100644
--- a/metadata/md5-cache/net-wireless/bladerf-2016.06
+++ b/metadata/md5-cache/net-wireless/bladerf-2016.06
@@ -10,5 +10,5 @@ PDEPEND=>=net-wireless/bladerf-firmware-2.0.0 >=net-wireless/bladerf-fpga-0.6.0
 RDEPEND=>=dev-libs/libusb-1.0.16 tecla? ( dev-libs/libtecla )
 SLOT=0/2016.06
 SRC_URI=https://github.com/Nuand/bladeRF/archive/2016.06.tar.gz -> bladerf-2016.06.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3b65149cbff5fe1afae0bd3f8351a4ba
diff --git a/metadata/md5-cache/net-wireless/bladerf-2017.12_rc1 b/metadata/md5-cache/net-wireless/bladerf-2017.12_rc1
index d7762e7b4f16..129faafa65a5 100644
--- a/metadata/md5-cache/net-wireless/bladerf-2017.12_rc1
+++ b/metadata/md5-cache/net-wireless/bladerf-2017.12_rc1
@@ -10,5 +10,5 @@ PDEPEND=>=net-wireless/bladerf-firmware-2.0.0 >=net-wireless/bladerf-fpga-0.6.0
 RDEPEND=>=dev-libs/libusb-1.0.16 tecla? ( dev-libs/libtecla )
 SLOT=0/2017.12_rc1
 SRC_URI=https://github.com/Nuand/bladeRF/archive/2017.12-rc1.tar.gz -> bladerf-2017.12_rc1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=07895438ec0b6898cb493665e0531ae9
diff --git a/metadata/md5-cache/net-wireless/bladerf-9999 b/metadata/md5-cache/net-wireless/bladerf-9999
index eb08146ff1ca..d128fd8bb880 100644
--- a/metadata/md5-cache/net-wireless/bladerf-9999
+++ b/metadata/md5-cache/net-wireless/bladerf-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 PDEPEND=>=net-wireless/bladerf-firmware-2.0.0 >=net-wireless/bladerf-fpga-0.6.0
 RDEPEND=>=dev-libs/libusb-1.0.16 tecla? ( dev-libs/libtecla )
 SLOT=0/9999
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3b65149cbff5fe1afae0bd3f8351a4ba
diff --git a/metadata/md5-cache/net-wireless/bluez-5.49-r1 b/metadata/md5-cache/net-wireless/bluez-5.49-r1
index 7966cff810b5..b21df5670def 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.49-r1
+++ b/metadata/md5-cache/net-wireless/bluez-5.49-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 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	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6c2f815d0bc3ae77a71aa28c23c54500
diff --git a/metadata/md5-cache/net-wireless/bluez-5.50 b/metadata/md5-cache/net-wireless/bluez-5.50
index 7d379f956055..43ba1e0f65d8 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.50
+++ b/metadata/md5-cache/net-wireless/bluez-5.50
@@ -4,11 +4,11 @@ DESCRIPTION=Bluetooth Tools and System Daemons for Linux
 EAPI=6
 HOMEPAGE=http://www.bluez.org
 IUSE=alsa +btpclient 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 ~hppa ~mips ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~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 ) btpclient? ( >=dev-libs/ell-0.3 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.3 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_python3_7(-),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_python3_7(-),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_python3_7(-),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.50.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=30bdce589e3548c0e10bb736205ddfa0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=d6608a29c9be7214e067d6471de60257
diff --git a/metadata/md5-cache/net-wireless/crda-1.1.3-r1 b/metadata/md5-cache/net-wireless/crda-1.1.3-r1
index 57da1f5d931c..89383467b2f1 100644
--- a/metadata/md5-cache/net-wireless/crda-1.1.3-r1
+++ b/metadata/md5-cache/net-wireless/crda-1.1.3-r1
@@ -8,5 +8,5 @@ LICENSE=ISC
 RDEPEND=dev-libs/openssl:0 dev-libs/libnl:3 net-wireless/wireless-regdb
 SLOT=0
 SRC_URI=http://linuxwireless.org/download/crda/crda-1.1.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5648d9655cafc1bde9f5e31a3c5a5204
diff --git a/metadata/md5-cache/net-wireless/crda-3.18-r1 b/metadata/md5-cache/net-wireless/crda-3.18-r1
index 3e7fd5e1a904..5aea27dd3c7b 100644
--- a/metadata/md5-cache/net-wireless/crda-3.18-r1
+++ b/metadata/md5-cache/net-wireless/crda-3.18-r1
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=!gcrypt? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) gcrypt? ( dev-libs/libgcrypt:0 ) dev-libs/libnl:3 net-wireless/wireless-regdb
 SLOT=0
 SRC_URI=http://linuxwireless.org/download/crda/crda-3.18.tar.xz mirror://kernel/software/network/crda/crda-3.18.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=51e93166b51b3c91883db29d7051b076
diff --git a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.20.1 b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.20.1
index cc4a045c7936..dfa16ef41372 100644
--- a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.20.1
+++ b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.20.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.38:2 media-libs/libcanberra[gtk3] >=x11-libs/gtk+-3.12:3[introspection?] x11-libs/libnotify virtual/udev introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) >=net-wireless/bluez-5
 SLOT=2/13
 SRC_URI=mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=78493f9629a1c5af4f71df22c22310fc
diff --git a/metadata/md5-cache/net-wireless/gobi_loader-0.7-r2 b/metadata/md5-cache/net-wireless/gobi_loader-0.7-r2
index b263d16b62da..5bb313808832 100644
--- a/metadata/md5-cache/net-wireless/gobi_loader-0.7-r2
+++ b/metadata/md5-cache/net-wireless/gobi_loader-0.7-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0
 SLOT=0
 SRC_URI=https://www.codon.org.uk/~mjg59/gobi_loader/download/gobi_loader-0.7.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=6c66d780597a3f7a5a63a8e83037bf38
diff --git a/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r6 b/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r6
index 124cd7425a48..d1bd7567ede2 100644
--- a/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r6
+++ b/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=sys-apps/pciutils-2.2.7-r1 sys-process/procps sys-apps/setserial sys-apps/grep virtual/udev
 SLOT=0
 SRC_URI=mirror://sourceforge/irda/irda-utils-0.9.18.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fa3b9f40f8a020a46922211039a940e7
diff --git a/metadata/md5-cache/net-wireless/kismet-2018.08_beta1-r1 b/metadata/md5-cache/net-wireless/kismet-2018.08_beta1-r1
deleted file mode 100644
index 1a8287f27c34..000000000000
--- a/metadata/md5-cache/net-wireless/kismet-2018.08_beta1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install preinst prepare setup
-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_python3_7(-),python_single_target_python2_7(+)] net-misc/networkmanager:= dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) dev-libs/protobuf-c:= sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=IEEE 802.11 wireless LAN sniffer
-EAPI=6
-HOMEPAGE=https://www.kismetwireless.net
-IUSE=lm_sensors networkmanager +pcre selinux +suid python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-misc/networkmanager:= dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) dev-libs/protobuf-c:= sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) selinux? ( sec-policy/selinux-kismet )
-SLOT=0/2018.08_beta1
-SRC_URI=https://www.kismetwireless.net/code/kismet-2018-08-BETA1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=77cb84c4bb5481edfeab63098954a896
diff --git a/metadata/md5-cache/net-wireless/kismet-2018.08_beta1-r2 b/metadata/md5-cache/net-wireless/kismet-2018.08_beta1-r2
new file mode 100644
index 000000000000..45d44d617ceb
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/kismet-2018.08_beta1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install preinst prepare setup
+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_python3_7(-),python_single_target_python2_7(+)] net-misc/networkmanager:= dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) dev-libs/protobuf-c:= sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=IEEE 802.11 wireless LAN sniffer
+EAPI=6
+HOMEPAGE=https://www.kismetwireless.net
+IUSE=lm_sensors networkmanager +pcre selinux +suid python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-misc/networkmanager:= dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) dev-libs/protobuf-c:= sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) selinux? ( sec-policy/selinux-kismet )
+SLOT=0/2018.08_beta1
+SRC_URI=https://www.kismetwireless.net/code/kismet-2018-08-BETA1.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=35005dcb114e710dd4d70bf3b8344a4c
diff --git a/metadata/md5-cache/net-wireless/kismet-9999 b/metadata/md5-cache/net-wireless/kismet-9999
index dd6e73b4e34f..1a61e5292d31 100644
--- a/metadata/md5-cache/net-wireless/kismet-9999
+++ b/metadata/md5-cache/net-wireless/kismet-9999
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 RESTRICT=strip
 SLOT=0/9999
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=77cb84c4bb5481edfeab63098954a896
+_md5_=35005dcb114e710dd4d70bf3b8344a4c
diff --git a/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1 b/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
index 8562919fe93f..d9e6e0087639 100644
--- a/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
+++ b/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://madwimax.googlecode.com/files/madwimax-0.1.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=d3c3d892f5865b3c656203697a0ac0b4
diff --git a/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1 b/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
index 0e4b877588a6..f5540f672e53 100644
--- a/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
+++ b/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
@@ -10,5 +10,5 @@ PDEPEND=media-sound/sox sys-apps/pv
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://git.osmocom.org/osmo-fl2k/snapshot/v0.1.1.tar.gz -> osmo-fl2k-0.1.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e3cc55fd56ae9956c36042de19fe36e7
diff --git a/metadata/md5-cache/net-wireless/osmo-fl2k-9999 b/metadata/md5-cache/net-wireless/osmo-fl2k-9999
index a1f32eea02d1..7e8a6d5c2721 100644
--- a/metadata/md5-cache/net-wireless/osmo-fl2k-9999
+++ b/metadata/md5-cache/net-wireless/osmo-fl2k-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PDEPEND=media-sound/sox sys-apps/pv
 RDEPEND=virtual/libusb:1
 SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dce6d84e8f9a80aac0fc61d23f00a327
diff --git a/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2 b/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2
index 5fbe115f3909..7067c0b03197 100644
--- a/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2
+++ b/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses ) gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=https://www.kismetwireless.net/code/spectools-2011-08-R1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=38a04e5c9ef258d878700b7273891ea6
diff --git a/metadata/md5-cache/net-wireless/spectools-2011.08.1_p20140618-r1 b/metadata/md5-cache/net-wireless/spectools-2011.08.1_p20140618-r1
index 9656cf6bd6d9..fa2597f19e37 100644
--- a/metadata/md5-cache/net-wireless/spectools-2011.08.1_p20140618-r1
+++ b/metadata/md5-cache/net-wireless/spectools-2011.08.1_p20140618-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/spectools-2011-08-R1_p20140618.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a846f7e68649251b5200926e458954e9
diff --git a/metadata/md5-cache/net-wireless/spectools-2016.01.1 b/metadata/md5-cache/net-wireless/spectools-2016.01.1
index f3fd94dd4ea1..c1680e80de7e 100644
--- a/metadata/md5-cache/net-wireless/spectools-2016.01.1
+++ b/metadata/md5-cache/net-wireless/spectools-2016.01.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango dev-libs/glib:= )
 SLOT=0
 SRC_URI=https://www.kismetwireless.net/code/spectools-2016-01-R1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f45f1d2c49da82e37edb1f600bcd9b1d
diff --git a/metadata/md5-cache/net-wireless/spectools-9999 b/metadata/md5-cache/net-wireless/spectools-9999
index b135bb82f29f..5e101e318f13 100644
--- a/metadata/md5-cache/net-wireless/spectools-9999
+++ b/metadata/md5-cache/net-wireless/spectools-9999
@@ -7,5 +7,5 @@ IUSE=debug +ncurses +gtk
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango dev-libs/glib:= )
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c9219b884d6f2eafc860febfed26c9e
diff --git a/metadata/md5-cache/net-wireless/ubertooth-2017.03.2-r1 b/metadata/md5-cache/net-wireless/ubertooth-2017.03.2-r1
index 57e103de693d..fa1eeed6e467 100644
--- a/metadata/md5-cache/net-wireless/ubertooth-2017.03.2-r1
+++ b/metadata/md5-cache/net-wireless/ubertooth-2017.03.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-2017.03.2:=[static-libs?] static-libs? ( dev-libs/libusb[static-libs] ) virtual/libusb:1= udev? ( virtual/udev )
 SLOT=0
 SRC_URI=https://github.com/greatscottgadgets/ubertooth/releases/download/2017-03-R2/ubertooth-2017-03-R2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4455f7e4254d7bd638fe5f44be7e9909
diff --git a/metadata/md5-cache/net-wireless/ubertooth-2018.08.1 b/metadata/md5-cache/net-wireless/ubertooth-2018.08.1
new file mode 100644
index 000000000000..20dd98f6a947
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/ubertooth-2018.08.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-2018.08.1:=[static-libs?] static-libs? ( dev-libs/libusb[static-libs] ) virtual/libusb:1= sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=open source wireless development platform suitable for Bluetooth experimentation
+EAPI=6
+HOMEPAGE=http://ubertooth.sourceforge.net/
+IUSE=+bluez static-libs +ubertooth1-firmware +udev
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-2018.08.1:=[static-libs?] static-libs? ( dev-libs/libusb[static-libs] ) virtual/libusb:1= udev? ( virtual/udev )
+SLOT=0
+SRC_URI=https://github.com/greatscottgadgets/ubertooth/releases/download/2018-08-R1/ubertooth-2018-08-R1.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4455f7e4254d7bd638fe5f44be7e9909
diff --git a/metadata/md5-cache/net-wireless/ubertooth-9999 b/metadata/md5-cache/net-wireless/ubertooth-9999
index e5b67b14926e..c05892de2788 100644
--- a/metadata/md5-cache/net-wireless/ubertooth-9999
+++ b/metadata/md5-cache/net-wireless/ubertooth-9999
@@ -7,5 +7,5 @@ IUSE=+bluez static-libs +ubertooth1-firmware +udev
 LICENSE=GPL-2
 RDEPEND=bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-9999:=[static-libs?] static-libs? ( dev-libs/libusb[static-libs] ) virtual/libusb:1= udev? ( virtual/udev )
 SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4455f7e4254d7bd638fe5f44be7e9909
diff --git a/metadata/md5-cache/net-wireless/unifi-5.9.20-r1 b/metadata/md5-cache/net-wireless/unifi-5.9.20-r1
new file mode 100644
index 000000000000..6288ca2978d1
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-5.9.20-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=app-arch/unzip virtual/pkgconfig
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=6
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/5.9
+SRC_URI=https://dl.ubnt.com/unifi/5.9.20-5975c092ea/UniFi.unix.zip -> unifi-5.9.20.zip
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=9823e6f4a4e533ed66653382f3d52b6e
diff --git a/metadata/md5-cache/net-wireless/wpa_supplicant-9999 b/metadata/md5-cache/net-wireless/wpa_supplicant-9999
new file mode 100644
index 000000000000..213b5354fe3d
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/wpa_supplicant-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( dev-libs/libnl:3 net-wireless/crda eap-sim? ( sys-apps/pcsc-lite ) ) !kernel_linux? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) ssl? ( gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) ) !ssl? ( dev-libs/libtommath ) virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=IEEE 802.1X/WPA supplicant for secure wireless transfers
+EAPI=6
+HOMEPAGE=https://w1.fi/wpa_supplicant/
+IUSE=ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p privsep ps3 qt5 readline selinux smartcard ssl suiteb tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD
+LICENSE=|| ( GPL-2 BSD )
+RDEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( dev-libs/libnl:3 net-wireless/crda eap-sim? ( sys-apps/pcsc-lite ) ) !kernel_linux? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) ssl? ( gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) ) !ssl? ( dev-libs/libtommath ) selinux? ( sec-policy/selinux-networkmanager )
+REQUIRED_USE=smartcard? ( ssl )
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=306619514832f24619955cf81d9837b0
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index c63c97a6b6ec..b3aa37a3029f 100644
--- a/metadata/md5-cache/ros-meta/Manifest.gz
+++ b/metadata/md5-cache/ros-meta/Manifest.gz
diff --git a/metadata/md5-cache/ros-meta/navigation-1.16.2 b/metadata/md5-cache/ros-meta/navigation-1.16.2
new file mode 100644
index 000000000000..06b474c7b7c9
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/navigation-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/clear_costmap_recovery dev-ros/costmap_2d dev-ros/dwa_local_planner dev-ros/fake_localization dev-ros/global_planner dev-ros/map_server dev-ros/move_base dev-ros/move_slow_and_clear dev-ros/nav_core dev-ros/navfn dev-ros/rotate_recovery dev-ros/voxel_grid sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=2D navigation stack
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/navigation https://github.com/ros-planning/navigation
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD LGPL-2.1
+RDEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/clear_costmap_recovery dev-ros/costmap_2d dev-ros/dwa_local_planner dev-ros/fake_localization dev-ros/global_planner dev-ros/map_server dev-ros/move_base dev-ros/move_slow_and_clear dev-ros/nav_core dev-ros/navfn dev-ros/rotate_recovery dev-ros/voxel_grid python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=786c31944b12e560ea7c03483dea2fbf
diff --git a/metadata/md5-cache/ros-meta/qt_gui_core-0.3.10 b/metadata/md5-cache/ros-meta/qt_gui_core-0.3.10
new file mode 100644
index 000000000000..bc489351899d
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/qt_gui_core-0.3.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Integration of the ROS package system and ROS-specific plugins for a Qt-based GUI
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/qt_gui_core https://github.com/ros-visualization/qt_gui_core
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.10.tar.gz -> qt_gui_core-0.3.10.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9474bbfd421e8314f94e28a5afc2847c
diff --git a/metadata/md5-cache/ros-meta/qt_gui_core-0.3.9 b/metadata/md5-cache/ros-meta/qt_gui_core-0.3.9
new file mode 100644
index 000000000000..d5027b2b207f
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/qt_gui_core-0.3.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Integration of the ROS package system and ROS-specific plugins for a Qt-based GUI
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/qt_gui_core https://github.com/ros-visualization/qt_gui_core
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.9.tar.gz -> qt_gui_core-0.3.9.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9474bbfd421e8314f94e28a5afc2847c
diff --git a/metadata/md5-cache/ros-meta/ros_comm-1.14.3 b/metadata/md5-cache/ros-meta/ros_comm-1.14.3
new file mode 100644
index 000000000000..62451ccb9a02
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/ros_comm-1.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice sys-devel/make >=dev-util/cmake-3.9.6 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS communications-related packages
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/ros_comm https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ros-catkin	9bfc81c7bcb0c745ec749fd1918c599b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=931d58054888fa4c05377dd3f5da80ee
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index eee73b764664..5ea45c773286 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/geda-1.9.2-r1 b/metadata/md5-cache/sci-electronics/geda-1.9.2-r1
index 04eafb736326..899e57e4645f 100644
--- a/metadata/md5-cache/sci-electronics/geda-1.9.2-r1
+++ b/metadata/md5-cache/sci-electronics/geda-1.9.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GPL Electronic Design Automation (gEDA):gaf core package
 EAPI=6
 HOMEPAGE=http://wiki.geda-project.org/geda:gaf
 IUSE=debug doc examples nls stroke threads
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango >=x11-libs/cairo-1.2.0 x11-libs/gdk-pixbuf >=dev-scheme/guile-2.0.0 nls? ( virtual/libintl ) stroke? ( >=dev-libs/libstroke-0.5.1 ) sci-electronics/electronics-menu
 SLOT=0
 SRC_URI=http://ftp.geda-project.org/geda-gaf/unstable/v1.9/1.9.2/geda-gaf-1.9.2.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ff1e2a564c4afc7f4296c3625f7b0118
+_md5_=06824e0508b8807c9446e11a69d53eef
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 21a00e41a28b..69ccbc25b7ea 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r2 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r2
index f81a015105b7..b8a982e72c08 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r2
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r2
@@ -10,5 +10,5 @@ RDEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-gl
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) )
 SLOT=0/23
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b3fe4914c5e3b731f28511a76c943823
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-9999 b/metadata/md5-cache/sci-geosciences/gpsd-9999
index 25790303cf51..c138c367a8a1 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-9999
+++ b/metadata/md5-cache/sci-geosciences/gpsd-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) 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(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) )
 SLOT=0/23
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-2	45ff482316b52b3f96ff6b7309b77f03	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-2	45ff482316b52b3f96ff6b7309b77f03	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=afc626a8f2a187e5e1ac2b5c70cbecf0
diff --git a/metadata/md5-cache/sci-geosciences/mapnik-3.0.18 b/metadata/md5-cache/sci-geosciences/mapnik-3.0.18
new file mode 100644
index 000000000000..a78a4f3ebc47
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/mapnik-3.0.18
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=dev-libs/boost-1.48:=[threads] dev-libs/icu:= sys-libs/zlib media-libs/freetype media-libs/harfbuzz dev-libs/libxml2 media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= media-libs/libwebp sci-libs/proj media-fonts/dejavu x11-libs/agg[truetype] cairo? ( x11-libs/cairo dev-cpp/cairomm ) osmfonts? ( media-fonts/dejavu media-fonts/noto media-fonts/noto-cjk media-fonts/unifont ) postgres? ( >=dev-db/postgresql-8.3:* ) gdal? ( sci-libs/gdal ) sqlite? ( dev-db/sqlite:3 ) dev-util/scons[python_targets_python2_7]
+DESCRIPTION=A Free Toolkit for developing mapping applications
+EAPI=6
+HOMEPAGE=http://www.mapnik.org/
+IUSE=cairo debug doc gdal osmfonts postgres sqlite
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-libs/boost-1.48:=[threads] dev-libs/icu:= sys-libs/zlib media-libs/freetype media-libs/harfbuzz dev-libs/libxml2 media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= media-libs/libwebp sci-libs/proj media-fonts/dejavu x11-libs/agg[truetype] cairo? ( x11-libs/cairo dev-cpp/cairomm ) osmfonts? ( media-fonts/dejavu media-fonts/noto media-fonts/noto-cjk media-fonts/unifont ) postgres? ( >=dev-db/postgresql-8.3:* ) gdal? ( sci-libs/gdal ) sqlite? ( dev-db/sqlite:3 )
+SLOT=0
+SRC_URI=https://github.com/mapnik/mapnik/releases/download/v3.0.18/mapnik-v3.0.18.tar.bz2 -> mapnik-3.0.18.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=98aa3ccabdbbaa18fe91178fb6cd3ffe
diff --git a/metadata/md5-cache/sci-geosciences/mapnik-3.0.9 b/metadata/md5-cache/sci-geosciences/mapnik-3.0.9
deleted file mode 100644
index 51a8ab4f5d7c..000000000000
--- a/metadata/md5-cache/sci-geosciences/mapnik-3.0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-libs/boost-1.48[threads] dev-libs/icu:= sys-libs/zlib media-libs/freetype media-libs/harfbuzz dev-libs/libxml2 media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= media-libs/libwebp sci-libs/proj media-fonts/dejavu x11-libs/agg[truetype] cairo? ( x11-libs/cairo dev-cpp/cairomm ) postgres? ( >=dev-db/postgresql-8.3:* ) gdal? ( sci-libs/gdal ) sqlite? ( dev-db/sqlite:3 ) dev-util/scons[python_targets_python2_7]
-DESCRIPTION=A Free Toolkit for developing mapping applications
-EAPI=6
-HOMEPAGE=http://www.mapnik.org/
-IUSE=cairo debug doc gdal postgres sqlite
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-libs/boost-1.48[threads] dev-libs/icu:= sys-libs/zlib media-libs/freetype media-libs/harfbuzz dev-libs/libxml2 media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= media-libs/libwebp sci-libs/proj media-fonts/dejavu x11-libs/agg[truetype] cairo? ( x11-libs/cairo dev-cpp/cairomm ) postgres? ( >=dev-db/postgresql-8.3:* ) gdal? ( sci-libs/gdal ) sqlite? ( dev-db/sqlite:3 )
-SLOT=0
-SRC_URI=https://github.com/mapnik/mapnik/archive/v3.0.9.tar.gz -> mapnik-3.0.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c3b6072934ea683c96d52ecfd0567df5
diff --git a/metadata/md5-cache/sci-geosciences/mapnik-3.0.9-r1 b/metadata/md5-cache/sci-geosciences/mapnik-3.0.9-r1
index 18c51d411663..aafd706931cb 100644
--- a/metadata/md5-cache/sci-geosciences/mapnik-3.0.9-r1
+++ b/metadata/md5-cache/sci-geosciences/mapnik-3.0.9-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-libs/boost-1.48[threads] dev-libs/icu:= sys-libs/zlib media-libs/freetype media-libs/harfbuzz dev-libs/libxml2 media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= media-libs/libwebp sci-libs/proj media-fonts/dejavu x11-libs/agg[truetype] cairo? ( x11-libs/cairo dev-cpp/cairomm ) postgres? ( >=dev-db/postgresql-8.3:* ) gdal? ( sci-libs/gdal ) sqlite? ( dev-db/sqlite:3 ) dev-util/scons[python_targets_python2_7]
+DEPEND=>=dev-libs/boost-1.48:=[threads] dev-libs/icu:= sys-libs/zlib media-libs/freetype media-libs/harfbuzz dev-libs/libxml2 media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= media-libs/libwebp sci-libs/proj media-fonts/dejavu x11-libs/agg[truetype] cairo? ( x11-libs/cairo dev-cpp/cairomm ) postgres? ( >=dev-db/postgresql-8.3:* ) gdal? ( sci-libs/gdal ) sqlite? ( dev-db/sqlite:3 ) dev-util/scons[python_targets_python2_7]
 DESCRIPTION=A Free Toolkit for developing mapping applications
 EAPI=6
 HOMEPAGE=http://www.mapnik.org/
 IUSE=cairo debug doc gdal postgres sqlite
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=>=dev-libs/boost-1.48[threads] dev-libs/icu:= sys-libs/zlib media-libs/freetype media-libs/harfbuzz dev-libs/libxml2 media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= media-libs/libwebp sci-libs/proj media-fonts/dejavu x11-libs/agg[truetype] cairo? ( x11-libs/cairo dev-cpp/cairomm ) postgres? ( >=dev-db/postgresql-8.3:* ) gdal? ( sci-libs/gdal ) sqlite? ( dev-db/sqlite:3 )
+RDEPEND=>=dev-libs/boost-1.48:=[threads] dev-libs/icu:= sys-libs/zlib media-libs/freetype media-libs/harfbuzz dev-libs/libxml2 media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= media-libs/libwebp sci-libs/proj media-fonts/dejavu x11-libs/agg[truetype] cairo? ( x11-libs/cairo dev-cpp/cairomm ) postgres? ( >=dev-db/postgresql-8.3:* ) gdal? ( sci-libs/gdal ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=https://github.com/mapnik/mapnik/archive/v3.0.9.tar.gz -> mapnik-3.0.9.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ce0e0587ecdd8af76235195283ae0203
+_md5_=9274f6b75d3a95d9e59e1ef5d395294d
diff --git a/metadata/md5-cache/sci-geosciences/merkaartor-0.18.3-r3 b/metadata/md5-cache/sci-geosciences/merkaartor-0.18.3-r3
new file mode 100644
index 000000000000..7286b421122d
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/merkaartor-0.18.3-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtsingleapplication[X,qt5(+)] >=sci-libs/gdal-1.6.0 >=sci-libs/proj-4.6 sys-libs/zlib exif? ( media-gfx/exiv2:= ) gps? ( >=sci-geosciences/gpsd-3.17-r2 ) libproxy? ( net-libs/libproxy ) dev-qt/linguist-tools:5 virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Qt based map editor for the openstreetmap.org project
+EAPI=6
+HOMEPAGE=http://www.merkaartor.be https://github.com/openstreetmap/merkaartor
+IUSE=debug exif gps libproxy
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtsingleapplication[X,qt5(+)] >=sci-libs/gdal-1.6.0 >=sci-libs/proj-4.6 sys-libs/zlib exif? ( media-gfx/exiv2:= ) gps? ( >=sci-geosciences/gpsd-3.17-r2 ) libproxy? ( net-libs/libproxy )
+SLOT=0
+SRC_URI=https://github.com/openstreetmap/merkaartor/archive/0.18.3.tar.gz -> merkaartor-0.18.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9d00a1febdbfe5c56c20efc1f8e86d3f
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 7f38b26ce551..9aae60cd6b3f 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/gdal-2.3.0-r1 b/metadata/md5-cache/sci-libs/gdal-2.3.0-r1
index 321fddd7f143..d3487c589351 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.3.0-r1
+++ b/metadata/md5-cache/sci-libs/gdal-2.3.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python2_7 python_target
 SLOT=0/2.3
 SRC_URI=http://download.osgeo.org/gdal/2.3.0/gdal-2.3.0.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1522542f253fd41180d519ff616396af
+_md5_=87062473c571df8482ff4a8fdc91a380
diff --git a/metadata/md5-cache/sci-libs/gsl-2.5 b/metadata/md5-cache/sci-libs/gsl-2.5
new file mode 100644
index 000000000000..2356dd3af219
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/gsl-2.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare pretend test
+DEPEND=cblas-external? ( virtual/cblas:= ) app-eselect/eselect-cblas virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The GNU Scientific Library
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/gsl/
+IUSE=cblas-external +deprecated static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=cblas-external? ( virtual/cblas:= )
+SLOT=0/23
+SRC_URI=mirror://gnu/gsl/gsl-2.5.tar.gz https://dev.gentoo.org/~mgorny/dist/gsl-2.3-cblas.patch.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=e1c51044ffc5e1ec0346af4cd26d2253
diff --git a/metadata/md5-cache/sci-libs/indilib-1.6.0 b/metadata/md5-cache/sci-libs/indilib-1.6.0
index b6cd7178317a..c19e694c8871 100644
--- a/metadata/md5-cache/sci-libs/indilib-1.6.0
+++ b/metadata/md5-cache/sci-libs/indilib-1.6.0
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/gsl:= sci-libs/libnova sys-libs/zlib:= virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora )
 SLOT=0/1
 SRC_URI=https://github.com/indilib/indi/releases/download/v1.6.0/libindi_1.6.0.tar.gz -> indilib-1.6.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=43046ef73049d0972c111b5aadfe3cb5
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-4.1.0 b/metadata/md5-cache/sci-libs/linux-gpib-4.1.0
index cb20a7420e1e..b322700751d2 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-4.1.0
+++ b/metadata/md5-cache/sci-libs/linux-gpib-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:1
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.1.0.tar.gz firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=95894bc38bf1120ca7edcc52cc0e8796
diff --git a/metadata/md5-cache/sci-libs/tensorflow-1.10.0_rc1 b/metadata/md5-cache/sci-libs/tensorflow-1.10.0_rc1
new file mode 100644
index 000000000000..59aabd19bd1c
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/tensorflow-1.10.0_rc1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare pretend setup unpack
+DEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite >=dev-libs/jsoncpp-1.8.4 dev-libs/libpcre >=dev-libs/protobuf-3.6.0 >=dev-libs/re2-0.2018.04.01 media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 net-misc/curl sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0[profiler] >=dev-libs/cudnn-6.0 ) jemalloc? ( >=dev-libs/jemalloc-4.4.0 ) mpi? ( virtual/mpi ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/absl-py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/astor[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] system-libs? ( >=dev-libs/flatbuffers-1.8.0 ) ) system-libs? ( dev-libs/nsync >=net-libs/grpc-1.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) !python? ( dev-lang/python ) app-arch/unzip >=dev-util/bazel-0.16.0 dev-java/java-config dev-python/mock dev-lang/nasm dev-lang/swig dev-python/cython
+DESCRIPTION=Computation framework using data flow graphs for scalable machine learning
+EAPI=6
+HOMEPAGE=https://www.tensorflow.org/
+IUSE=cuda jemalloc mpi +python +system-libs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite >=dev-libs/jsoncpp-1.8.4 dev-libs/libpcre >=dev-libs/protobuf-3.6.0 >=dev-libs/re2-0.2018.04.01 media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 net-misc/curl sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0[profiler] >=dev-libs/cudnn-6.0 ) jemalloc? ( >=dev-libs/jemalloc-4.4.0 ) mpi? ( virtual/mpi ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/absl-py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/astor[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] system-libs? ( >=dev-libs/flatbuffers-1.8.0 ) ) system-libs? ( dev-libs/nsync >=net-libs/grpc-1.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.10.0-rc1.tar.gz -> tensorflow-1.10.0_rc1.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-1.10.0_rc1.tar.bz2 http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz https://bitbucket.org/eigen/eigen/get/fd6845384b86.tar.gz -> eigen-fd6845384b86.tar.gz https://github.com/abseil/abseil-cpp/archive/9613678332c976568272c8f4a78631a29159271d.tar.gz -> abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/protobuf/archive/v3.6.0.tar.gz -> protobuf-3.6.0.tar.gz jemalloc? ( https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz -> jemalloc-4.4.0.tar.gz ) cuda? ( https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/abseil/abseil-py/archive/pypi-v0.2.2.tar.gz -> abseil-py-0.2.2.tar.gz https://github.com/googleapis/googleapis/archive/f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip -> googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/f875700a023bdd706333cde45aee8758b272c357.tar.gz -> google-cloud-cpp-f875700a023bdd706333cde45aee8758b272c357.tar.gz https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz https://github.com/llvm-mirror/llvm/archive/bd8c8d759852871609ba2e4e79868420f751949d.tar.gz -> llvm-bd8c8d759852871609ba2e4e79868420f751949d.tar.gz https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz !system-libs? ( https://github.com/google/flatbuffers/archive/v1.9.0.tar.gz -> flatbuffers-1.9.0.tar.gz ) ) !system-libs? ( https://github.com/google/nsync/archive/1.20.1.tar.gz -> nsync-1.20.1.tar.gz https://github.com/grpc/grpc/archive/v1.13.0.tar.gz -> grpc-1.13.0.tar.gz )
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a454913e455f02dce2a6f8beea9bcd1f
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 500fcbebb7f2..8f04c0126a17 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/gimps-28.10-r1 b/metadata/md5-cache/sci-mathematics/gimps-28.10-r1
index 9c6b215d453b..008e2ab0e279 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-28.10-r1
+++ b/metadata/md5-cache/sci-mathematics/gimps-28.10-r1
@@ -8,5 +8,5 @@ LICENSE=GIMPS
 RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=amd64? ( ftp://mersenne.org/gimps/p95v2810.linux64.tar.gz ) x86? ( ftp://mersenne.org/gimps/p95v2810.linux32.tar.gz )
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=ac90d9dde2f1adb111b07612081b2cd0
diff --git a/metadata/md5-cache/sci-mathematics/gimps-29.4.7 b/metadata/md5-cache/sci-mathematics/gimps-29.4.7
index 6c7de8c410f5..f26d3dec2546 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-29.4.7
+++ b/metadata/md5-cache/sci-mathematics/gimps-29.4.7
@@ -8,5 +8,5 @@ LICENSE=GIMPS
 RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2
 SLOT=0
 SRC_URI=amd64? ( ftp://mersenne.org/gimps/p95v294b7.linux64.tar.gz ) x86? ( ftp://mersenne.org/gimps/p95v294b7.linux32.tar.gz )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=5ee9e6d080d3d6a3adc36688e112c93f
diff --git a/metadata/md5-cache/sci-mathematics/gimps-29.4.8 b/metadata/md5-cache/sci-mathematics/gimps-29.4.8
index b8f1345455b9..f340f252a316 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-29.4.8
+++ b/metadata/md5-cache/sci-mathematics/gimps-29.4.8
@@ -8,5 +8,5 @@ LICENSE=GIMPS
 RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2
 SLOT=0
 SRC_URI=amd64? ( ftp://mersenne.org/gimps/p95v294b8.linux64.tar.gz )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=fabc35efa1b3a651b1e93fef37bed314
diff --git a/metadata/md5-cache/sci-mathematics/octave-4.2.2 b/metadata/md5-cache/sci-mathematics/octave-4.2.2
index f88db4ee7fbf..ea7f67661676 100644
--- a/metadata/md5-cache/sci-mathematics/octave-4.2.2
+++ b/metadata/md5-cache/sci-mathematics/octave-4.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)] ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) openssl? ( dev-libs/openssl:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/4.2.2
 SRC_URI=mirror://gnu/octave/octave-4.2.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bf1fd05dbee71f004608b039098b75c9
diff --git a/metadata/md5-cache/sci-mathematics/octave-4.4.0 b/metadata/md5-cache/sci-mathematics/octave-4.4.0
index e07924d0d176..17590ba577e4 100644
--- a/metadata/md5-cache/sci-mathematics/octave-4.4.0
+++ b/metadata/md5-cache/sci-mathematics/octave-4.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/4.4.0
 SRC_URI=mirror://gnu/octave/octave-4.4.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7f9a9f64ad5d84af544f0bbbc35d1dbc
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.1.383-r1 b/metadata/md5-cache/sci-mathematics/rstudio-1.1.383-r1
index b6fb10631509..2e1949ecf4b7 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-1.1.383-r1
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.1.383-r1
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.0 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v1.1.383.tar.gz -> rstudio-1.1.383.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d24005a258f2ee6c7bf337e815b46226
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.1.453 b/metadata/md5-cache/sci-mathematics/rstudio-1.1.453
index 5f0f6f58fb36..5cd746fb174b 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-1.1.453
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.1.453
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=>=app-text/pandoc-1.19.2.1 dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v1.1.453.tar.gz -> rstudio-1.1.453.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2a3cb8f17249bb6837c34b465b4a507c
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 46d01096694c..f1d5e73498db 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/veusz-2.1.1 b/metadata/md5-cache/sci-visualization/veusz-2.1.1
deleted file mode 100644
index 8143d0c9906c..000000000000
--- a/metadata/md5-cache/sci-visualization/veusz-2.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/PyQt5[widgets,svg,printsupport,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(-)] 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/sip[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(-)] doc? ( dev-python/sphinx[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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=sys-apps/sed-4
-DESCRIPTION=Qt scientific plotting package with good Postscript output
-EAPI=6
-HOMEPAGE=https://veusz.github.io/
-IUSE=dbus doc emf fits hdf5 minuit python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/PyQt5[widgets,svg,printsupport,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(-)] dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) emf? ( dev-python/pyemf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) fits? ( dev-python/astropy[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(-)] ) hdf5? ( dev-python/h5py[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(-)] ) minuit? ( || ( dev-python/iminuit[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/pyminuit[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/veusz/veusz/releases/download/veusz-2.1.1/veusz-2.1.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2789c839f68c556456fee42989ffb96e
diff --git a/metadata/md5-cache/sci-visualization/veusz-2.2.2 b/metadata/md5-cache/sci-visualization/veusz-2.2.2
deleted file mode 100644
index ec2c05a248fd..000000000000
--- a/metadata/md5-cache/sci-visualization/veusz-2.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/PyQt5[widgets,svg,printsupport,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(-)] 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/sip[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(-)] doc? ( dev-python/sphinx[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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=sys-apps/sed-4
-DESCRIPTION=Qt scientific plotting package with good Postscript output
-EAPI=6
-HOMEPAGE=https://veusz.github.io/
-IUSE=dbus doc emf fits hdf5 minuit python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/PyQt5[widgets,svg,printsupport,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(-)] dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) emf? ( dev-python/pyemf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) fits? ( dev-python/astropy[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(-)] ) hdf5? ( dev-python/h5py[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(-)] ) minuit? ( || ( dev-python/iminuit[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/pyminuit[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/veusz/veusz/releases/download/veusz-2.2.2/veusz-2.2.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2789c839f68c556456fee42989ffb96e
diff --git a/metadata/md5-cache/sci-visualization/veusz-3.0.1 b/metadata/md5-cache/sci-visualization/veusz-3.0.1
new file mode 100644
index 000000000000..7f5051ea2d59
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/veusz-3.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-python/PyQt5[widgets,svg,printsupport,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(-)] 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/sip[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(-)] doc? ( dev-python/sphinx[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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=sys-apps/sed-4
+DESCRIPTION=Qt scientific plotting package with good Postscript output
+EAPI=6
+HOMEPAGE=https://veusz.github.io/
+IUSE=dbus doc emf fits hdf5 minuit python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-python/PyQt5[widgets,svg,printsupport,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(-)] dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) emf? ( dev-python/pyemf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) fits? ( dev-python/astropy[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(-)] ) hdf5? ( dev-python/h5py[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(-)] ) minuit? ( || ( dev-python/iminuit[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/pyminuit[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/veusz/veusz/releases/download/veusz-3.0.1/veusz-3.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=898fb564ccbf2c3e7f69da3c0bd939ab
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index afd425e924d4..c737b6ea6ba8 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/biosdevname-0.7.2 b/metadata/md5-cache/sys-apps/biosdevname-0.7.2
index 4b9c010161ef..36adba8f543e 100644
--- a/metadata/md5-cache/sys-apps/biosdevname-0.7.2
+++ b/metadata/md5-cache/sys-apps/biosdevname-0.7.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev
 SLOT=0
 SRC_URI=http://linux.dell.com/biosdevname/biosdevname-0.7.2/biosdevname-0.7.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=7efc4fd7f204fed432f186ca68c360ab
diff --git a/metadata/md5-cache/sys-apps/dbus-1.12.10 b/metadata/md5-cache/sys-apps/dbus-1.12.10
new file mode 100644
index 000000000000..149ddd9e8ca1
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/dbus-1.12.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/expat-2.1.0 selinux? ( sys-libs/libselinux ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) app-text/xmlto app-text/docbook-xml-dtd:4.4 dev-libs/expat sys-devel/autoconf-archive virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( >=dev-libs/glib-2.40:2 || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A message bus system, a simple way for applications to talk to each other
+EAPI=6
+HOMEPAGE=https://dbus.freedesktop.org/
+IUSE=debug doc elogind selinux static-libs systemd test user-session X kernel_linux 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
+LICENSE=|| ( AFL-2.1 GPL-2 )
+RDEPEND=>=dev-libs/expat-2.1.0 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.12.10.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1
+_md5_=effe809549ec18a13e7d7c188cc8d521
diff --git a/metadata/md5-cache/sys-apps/dbus-1.12.6 b/metadata/md5-cache/sys-apps/dbus-1.12.6
deleted file mode 100644
index 83e279cbed83..000000000000
--- a/metadata/md5-cache/sys-apps/dbus-1.12.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/expat-2.1.0 selinux? ( sys-libs/libselinux ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) app-text/xmlto app-text/docbook-xml-dtd:4.4 dev-libs/expat sys-devel/autoconf-archive virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( >=dev-libs/glib-2.40:2 || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A message bus system, a simple way for applications to talk to each other
-EAPI=6
-HOMEPAGE=https://dbus.freedesktop.org/
-IUSE=debug doc elogind selinux static-libs systemd test user-session X kernel_linux 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
-LICENSE=|| ( AFL-2.1 GPL-2 )
-RDEPEND=>=dev-libs/expat-2.1.0 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.12.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1
-_md5_=396249f1984e9cafa323e04a3e6c1b57
diff --git a/metadata/md5-cache/sys-apps/exa-0.8.0 b/metadata/md5-cache/sys-apps/exa-0.8.0
index 6071c75b500c..8379713a5f28 100644
--- a/metadata/md5-cache/sys-apps/exa-0.8.0
+++ b/metadata/md5-cache/sys-apps/exa-0.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=virtual/rust-1.17 >=dev-util/cargo-0.13.0
+DEPEND=>=virtual/rust-1.17
 DESCRIPTION=A modern replacement for 'ls' written in Rust
 EAPI=6
 HOMEPAGE=https://the.exa.website/
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/rust-1.17
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/ansi_term/0.8.0/download -> ansi_term-0.8.0.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/byteorder/0.4.2/download -> byteorder-0.4.2.crate https://crates.io/api/v1/crates/cmake/0.1.25/download -> cmake-0.1.25.crate https://crates.io/api/v1/crates/conv/0.3.3/download -> conv-0.3.3.crate https://crates.io/api/v1/crates/custom_derive/0.1.7/download -> custom_derive-0.1.7.crate https://crates.io/api/v1/crates/datetime/0.4.5/download -> datetime-0.4.5.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/exa/0.8.0/download -> exa-0.8.0.crate https://crates.io/api/v1/crates/gcc/0.3.53/download -> gcc-0.3.53.crate https://crates.io/api/v1/crates/getopts/0.2.14/download -> getopts-0.2.14.crate https://crates.io/api/v1/crates/git2/0.6.8/download -> git2-0.6.8.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/iso8601/0.1.1/download -> iso8601-0.1.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/lazy_static/0.2.8/download -> lazy_static-0.2.8.crate https://crates.io/api/v1/crates/libc/0.2.30/download -> libc-0.2.30.crate https://crates.io/api/v1/crates/libgit2-sys/0.6.14/download -> libgit2-sys-0.6.14.crate https://crates.io/api/v1/crates/libz-sys/1.0.16/download -> libz-sys-1.0.16.crate https://crates.io/api/v1/crates/locale/0.2.2/download -> locale-0.2.2.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/magenta/0.1.1/download -> magenta-0.1.1.crate https://crates.io/api/v1/crates/magenta-sys/0.1.1/download -> magenta-sys-0.1.1.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/1.2.4/download -> nom-1.2.4.crate https://crates.io/api/v1/crates/num/0.1.40/download -> num-0.1.40.crate https://crates.io/api/v1/crates/num-bigint/0.1.40/download -> num-bigint-0.1.40.crate https://crates.io/api/v1/crates/num-complex/0.1.40/download -> num-complex-0.1.40.crate https://crates.io/api/v1/crates/num-integer/0.1.35/download -> num-integer-0.1.35.crate https://crates.io/api/v1/crates/num-iter/0.1.34/download -> num-iter-0.1.34.crate https://crates.io/api/v1/crates/num-rational/0.1.39/download -> num-rational-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.1.40/download -> num-traits-0.1.40.crate https://crates.io/api/v1/crates/num_cpus/1.6.2/download -> num_cpus-1.6.2.crate https://crates.io/api/v1/crates/number_prefix/0.2.7/download -> number_prefix-0.2.7.crate https://crates.io/api/v1/crates/pad/0.1.4/download -> pad-0.1.4.crate https://crates.io/api/v1/crates/percent-encoding/1.0.0/download -> percent-encoding-1.0.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/rand/0.3.16/download -> rand-0.3.16.crate https://crates.io/api/v1/crates/redox_syscall/0.1.31/download -> redox_syscall-0.1.31.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.7/download -> scoped_threadpool-0.1.7.crate https://crates.io/api/v1/crates/term_grid/0.1.6/download -> term_grid-0.1.6.crate https://crates.io/api/v1/crates/term_size/0.3.0/download -> term_size-0.3.0.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.5/download -> unicode-normalization-0.1.5.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/url/1.5.1/download -> url-1.5.1.crate https://crates.io/api/v1/crates/users/0.5.3/download -> users-0.5.3.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/vcpkg/0.2.2/download -> vcpkg-0.2.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 https://crates.io/api/v1/crates/zoneinfo_compiled/0.4.5/download -> zoneinfo_compiled-0.4.5.crate
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	959846e2836f8244430c9582dd6493af	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	3e38275395b24dfed9849a57ba58a486	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=8ed9a2b34b7e1df772ae393a9f6d65fc
diff --git a/metadata/md5-cache/sys-apps/fd-7.0.0 b/metadata/md5-cache/sys-apps/fd-7.0.0
index 5c58179ef74b..0c1d19adc277 100644
--- a/metadata/md5-cache/sys-apps/fd-7.0.0
+++ b/metadata/md5-cache/sys-apps/fd-7.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=virtual/rust-1.20.0 >=dev-util/cargo-0.13.0
+DEPEND=>=virtual/rust-1.20.0
 DESCRIPTION=Alternative to find that provides sensible defaults for 80% of the use cases
 EAPI=6
 HOMEPAGE=https://github.com/sharkdp/fd
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=virtual/rust-1.20.0
 SLOT=0
 SRC_URI=https://github.com/sharkdp/fd/archive/v7.0.0.tar.gz -> fd-7.0.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.8/download -> atty-0.2.8.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/cfg-if/0.1.2/download -> cfg-if-0.1.2.crate https://crates.io/api/v1/crates/clap/2.31.1/download -> clap-2.31.1.crate https://crates.io/api/v1/crates/crossbeam/0.3.2/download -> crossbeam-0.3.2.crate https://crates.io/api/v1/crates/ctrlc/3.1.0/download -> ctrlc-3.1.0.crate https://crates.io/api/v1/crates/diff/0.1.11/download -> diff-0.1.11.crate https://crates.io/api/v1/crates/fd-find/7.0.0/download -> fd-find-7.0.0.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/globset/0.3.0/download -> globset-0.3.0.crate https://crates.io/api/v1/crates/ignore/0.4.1/download -> ignore-0.4.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/lazy_static/1.0.0/download -> lazy_static-1.0.0.crate https://crates.io/api/v1/crates/libc/0.2.39/download -> libc-0.2.39.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/nix/0.9.0/download -> nix-0.9.0.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/rand/0.4.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.37/download -> redox_syscall-0.1.37.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.8/download -> regex-0.2.8.crate https://crates.io/api/v1/crates/regex-syntax/0.5.2/download -> regex-syntax-0.5.2.crate https://crates.io/api/v1/crates/remove_dir_all/0.3.0/download -> remove_dir_all-0.3.0.crate https://crates.io/api/v1/crates/same-file/1.0.2/download -> same-file-1.0.2.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/tempdir/0.3.6/download -> tempdir-0.3.6.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/thread_local/0.3.5/download -> thread_local-0.3.5.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.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/vec_map/0.8.0/download -> vec_map-0.8.0.crate https://crates.io/api/v1/crates/version_check/0.1.3/download -> version_check-0.1.3.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.1.4/download -> walkdir-2.1.4.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.4/download -> winapi-0.3.4.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	959846e2836f8244430c9582dd6493af	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	3e38275395b24dfed9849a57ba58a486	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=7a00dea14b2d62370fb0bae87256fb3a
diff --git a/metadata/md5-cache/sys-apps/frandom-1.1 b/metadata/md5-cache/sys-apps/frandom-1.1
index 5ab0b874b59f..6c5c1b64ef54 100644
--- a/metadata/md5-cache/sys-apps/frandom-1.1
+++ b/metadata/md5-cache/sys-apps/frandom-1.1
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/frandom//frandom-1.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=de0d164228bb386ad341920090146e2f
diff --git a/metadata/md5-cache/sys-apps/gradm-3.1.201603152148 b/metadata/md5-cache/sys-apps/gradm-3.1.201603152148
index 817974d7aeaa..85bebe715c4b 100644
--- a/metadata/md5-cache/sys-apps/gradm-3.1.201603152148
+++ b/metadata/md5-cache/sys-apps/gradm-3.1.201603152148
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-3.1-201603152148.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e1d89e233f61db45dd5b1983832c37e1
diff --git a/metadata/md5-cache/sys-apps/gradm-3.1.201607172312 b/metadata/md5-cache/sys-apps/gradm-3.1.201607172312
index 0d2e51dcd867..d758fa3bf1f4 100644
--- a/metadata/md5-cache/sys-apps/gradm-3.1.201607172312
+++ b/metadata/md5-cache/sys-apps/gradm-3.1.201607172312
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-3.1-201607172312.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e1d89e233f61db45dd5b1983832c37e1
diff --git a/metadata/md5-cache/sys-apps/gradm-3.1.201608131257 b/metadata/md5-cache/sys-apps/gradm-3.1.201608131257
index 739646316c88..4eed69ca113d 100644
--- a/metadata/md5-cache/sys-apps/gradm-3.1.201608131257
+++ b/metadata/md5-cache/sys-apps/gradm-3.1.201608131257
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-3.1-201608131257.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=791dd913aacbf02e76e37cf68a4adc44
diff --git a/metadata/md5-cache/sys-apps/gradm-3.1.201708012022 b/metadata/md5-cache/sys-apps/gradm-3.1.201708012022
index b53aab01c8e0..d8096df5a992 100644
--- a/metadata/md5-cache/sys-apps/gradm-3.1.201708012022
+++ b/metadata/md5-cache/sys-apps/gradm-3.1.201708012022
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-3.1-201708012022.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=791dd913aacbf02e76e37cf68a4adc44
diff --git a/metadata/md5-cache/sys-apps/habitat-0.54.0 b/metadata/md5-cache/sys-apps/habitat-0.54.0
index 4e5311c4b10c..395fa0d5ae83 100644
--- a/metadata/md5-cache/sys-apps/habitat-0.54.0
+++ b/metadata/md5-cache/sys-apps/habitat-0.54.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare test
-DEPEND=dev-util/cargo >=virtual/rust-1.23 >=net-libs/zeromq-3.2 virtual/pkgconfig
+DEPEND=virtual/cargo >=virtual/rust-1.23 >=net-libs/zeromq-3.2 virtual/pkgconfig
 DESCRIPTION=Application automation framework
 EAPI=6
 HOMEPAGE=https://github.com/habitat-sh/habitat https://habitat.sh
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/habitat-sh/habitat/archive/0.54.0.tar.gz -> habitat-0.54.0.tar.gz https://dev.gentoo.org/~mrueg/files/habitat-cargo-0.54.0.tar.xz
-_md5_=7200ba615699ae7907fce229b911f972
+_md5_=d103fbb3db7320e4f70a1ac5ceb31be3
diff --git a/metadata/md5-cache/sys-apps/hponcfg-4.6.0.0 b/metadata/md5-cache/sys-apps/hponcfg-4.6.0.0
index ca6e878db4a3..974716062a3a 100644
--- a/metadata/md5-cache/sys-apps/hponcfg-4.6.0.0
+++ b/metadata/md5-cache/sys-apps/hponcfg-4.6.0.0
@@ -8,5 +8,5 @@ LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 )
 SLOT=0
 SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/x86_64/current/hponcfg-4.6.0-0.x86_64.rpm ) x86? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/i686/current/hponcfg-4.6.0-0.i386.rpm )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=6fa45d35789eadd1f05d0c6ed48b59b5
diff --git a/metadata/md5-cache/sys-apps/hponcfg-5.2.0.0 b/metadata/md5-cache/sys-apps/hponcfg-5.2.0.0
index 313012e4e95d..51609c3ecf08 100644
--- a/metadata/md5-cache/sys-apps/hponcfg-5.2.0.0
+++ b/metadata/md5-cache/sys-apps/hponcfg-5.2.0.0
@@ -8,5 +8,5 @@ LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 )
 SLOT=0
 SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/current/hponcfg-5.2.0-0.x86_64.rpm )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=06dddc7def164acb284a0fb13995a78c
diff --git a/metadata/md5-cache/sys-apps/hwids-20170328 b/metadata/md5-cache/sys-apps/hwids-20170328
index 896db1a87ace..837c4fdf298a 100644
--- a/metadata/md5-cache/sys-apps/hwids-20170328
+++ b/metadata/md5-cache/sys-apps/hwids-20170328
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD ) public-domain
 RDEPEND=!<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
 SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20170328.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=def9f50dc80fc5fad12e9bda234ca021
diff --git a/metadata/md5-cache/sys-apps/hwids-20170715 b/metadata/md5-cache/sys-apps/hwids-20170715
index 92f898c47d70..37cdedf18d5f 100644
--- a/metadata/md5-cache/sys-apps/hwids-20170715
+++ b/metadata/md5-cache/sys-apps/hwids-20170715
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD ) public-domain
 RDEPEND=!<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
 SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20170715.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=dfda810d04bc5df6cd2550b8ed6b1145
diff --git a/metadata/md5-cache/sys-apps/hwids-20171003 b/metadata/md5-cache/sys-apps/hwids-20171003
index 341399feb28e..420e64652477 100644
--- a/metadata/md5-cache/sys-apps/hwids-20171003
+++ b/metadata/md5-cache/sys-apps/hwids-20171003
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD ) public-domain
 RDEPEND=udev? ( virtual/udev ) !<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
 SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20171003.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=ad119962dece0525d064991c0e005255
diff --git a/metadata/md5-cache/sys-apps/hwids-20180315 b/metadata/md5-cache/sys-apps/hwids-20180315
index f376cd0986b7..d95db52c7473 100644
--- a/metadata/md5-cache/sys-apps/hwids-20180315
+++ b/metadata/md5-cache/sys-apps/hwids-20180315
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD ) public-domain
 RDEPEND=udev? ( virtual/udev ) !<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
 SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20180315.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=f189083c5cdcee57a8b51c96aa5d3ef5
diff --git a/metadata/md5-cache/sys-apps/hwids-20180518 b/metadata/md5-cache/sys-apps/hwids-20180518
index 3cae65c82c80..06cd27fdafd3 100644
--- a/metadata/md5-cache/sys-apps/hwids-20180518
+++ b/metadata/md5-cache/sys-apps/hwids-20180518
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD ) public-domain
 RDEPEND=udev? ( virtual/udev ) !<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
 SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20180518.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=f189083c5cdcee57a8b51c96aa5d3ef5
diff --git a/metadata/md5-cache/sys-apps/hwids-99999999 b/metadata/md5-cache/sys-apps/hwids-99999999
index 4f5086f3b279..55d7f5992ee2 100644
--- a/metadata/md5-cache/sys-apps/hwids-99999999
+++ b/metadata/md5-cache/sys-apps/hwids-99999999
@@ -7,5 +7,5 @@ IUSE=+net +pci +udev +usb
 LICENSE=|| ( GPL-2 BSD ) public-domain
 RDEPEND=udev? ( virtual/udev ) !<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=1ca59e3ace5beef66b1bdba43c8f5758
diff --git a/metadata/md5-cache/sys-apps/lomoco-1.0-r9 b/metadata/md5-cache/sys-apps/lomoco-1.0-r9
index 66d318b0bbea..4b704cad2353 100644
--- a/metadata/md5-cache/sys-apps/lomoco-1.0-r9
+++ b/metadata/md5-cache/sys-apps/lomoco-1.0-r9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0
 SLOT=0
 SRC_URI=http://www.lomoco.org/lomoco-1.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=305bb90aebed04283926571fb8802a50
diff --git a/metadata/md5-cache/sys-apps/memtest86+-5.01-r4 b/metadata/md5-cache/sys-apps/memtest86+-5.01-r4
index c1f77b18461a..9b9b4a47748a 100644
--- a/metadata/md5-cache/sys-apps/memtest86+-5.01-r4
+++ b/metadata/md5-cache/sys-apps/memtest86+-5.01-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Memory tester based on memtest86
 EAPI=6
 HOMEPAGE=http://www.memtest.org/
 IUSE=+boot floppy iso serial
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* ~amd64 x86
 LICENSE=GPL-2
 RDEPEND=floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )
 SLOT=0
 SRC_URI=http://www.memtest.org/download/5.01/memtest86+-5.01.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0568cf696ca85dc59afe70247875bdb2
+_md5_=78e7a828f0d11ac586a4183bcdf80d2b
diff --git a/metadata/md5-cache/sys-apps/onerng-3.6 b/metadata/md5-cache/sys-apps/onerng-3.6
index 043028edaa0d..caf1a9024256 100644
--- a/metadata/md5-cache/sys-apps/onerng-3.6
+++ b/metadata/md5-cache/sys-apps/onerng-3.6
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=app-crypt/gnupg dev-python/python-gnupg[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(-)] sys-apps/rng-tools sys-process/at virtual/udev
 SLOT=0
 SRC_URI=https://github.com/OneRNG/onerng.github.io/raw/master/sw/onerng_3.6.orig.tar.gz -> onerng-3.6.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=2ccad4d592a8f24f78a1d785c32e2f61
diff --git a/metadata/md5-cache/sys-apps/openrc-0.38.1 b/metadata/md5-cache/sys-apps/openrc-0.38.1
deleted file mode 100644
index d4898e008c9d..000000000000
--- a/metadata/md5-cache/sys-apps/openrc-0.38.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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.38.1.tar.gz -> openrc-0.38.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56f477c4c2fb5b26c180f420b63574b2
diff --git a/metadata/md5-cache/sys-apps/openrc-0.38.2 b/metadata/md5-cache/sys-apps/openrc-0.38.2
new file mode 100644
index 000000000000..0c87d9f7f2cf
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.38.2
@@ -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.38.2.tar.gz -> openrc-0.38.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=56f477c4c2fb5b26c180f420b63574b2
diff --git a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1 b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
index b940ff2e9bc6..685b3a03a6a4 100644
--- a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
+++ b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/modutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pcmciautils/pcmciautils_018.orig.tar.gz mirror://debian/pool/main/p/pcmciautils/pcmciautils_018-8.debian.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c7c54118ec30b09fb1266d3f8b968747
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.22 b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.22
index ee96930cab3e..507d17415886 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.22
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.22
@@ -10,5 +10,5 @@ RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-a
 REQUIRED_USE=^^ ( udev libusb ) 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=0
 SRC_URI=https://pcsclite.apdu.fr/files/pcsc-lite-1.8.22.tar.bz2
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=7481ca5d3dede3f3fbb0b9a71f306fec
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.23 b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.23
index 5586f23ec0b8..4f70f94a188c 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.23
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.23
@@ -10,5 +10,5 @@ RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-a
 REQUIRED_USE=^^ ( udev libusb ) 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=0
 SRC_URI=https://pcsclite.apdu.fr/files/pcsc-lite-1.8.23.tar.bz2
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6f64eb1b4818389e1eef0f912c935392
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.13-r1 b/metadata/md5-cache/sys-apps/portage-2.3.13-r1
index 972c9ce236d4..6cdad4c74cbd 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.13-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.3.13-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.13.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.13.tar.bz2
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=70a76cdb6d86061850524f83544dd3bf
+_md5_=196298e75480c9df7ba226f01c7fc45f
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.19-r1 b/metadata/md5-cache/sys-apps/portage-2.3.19-r1
index 6f5f3f22e7db..30fc5e7ce450 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.19-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.3.19-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.19.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.19.tar.bz2
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e28075e7282815311f4e7fca6a4daedb
+_md5_=a46c299f4bc66f9dd42bc0803b9e047c
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 a6ff5b2eecb5..733027656bdc 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.24-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.3.24-r1
@@ -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	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8aaf3c57786ea5e3648af3332569fd62
+_md5_=f607b372ae2911add7cdb51e1a962b36
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.40-r1 b/metadata/md5-cache/sys-apps/portage-2.3.40-r1
index 96b25259ad59..29bdf976b44b 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.40-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.3.40-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.40.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.40.tar.bz2 https://github.com/gentoo/portage/compare/b7f94fccf4163364ab7b4c4f0dcd42b8847f03e0...937d0156aa060bdba9095313dedbb62e0a993aea.patch -> portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch https://github.com/gentoo/portage/compare/937d0156aa060bdba9095313dedbb62e0a993aea...1fc628eead43fa5da4b142479aa004ded8acceab.patch -> portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dc1a7c756491b42e5e0d5f5f50201cfb
+_md5_=04a173d059b8bafeb3c19e7b83baef6a
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.43-r1 b/metadata/md5-cache/sys-apps/portage-2.3.43-r1
deleted file mode 100644
index 0ddca3d7ae71..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.3.43-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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_targets_python3_7(-)?,-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_single_target_python3_7(-)] virtual/pkgconfig
-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 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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-12.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-crypt/openpgp-keys-gentoo-release >=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_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) 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 !<app-portage/repoman-2.3.10 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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_targets_python3_7(-)?,-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_single_target_python3_7(-)]
-REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.3.43.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.43.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fbe8e2db4e71f8603807942148f28c76
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.44 b/metadata/md5-cache/sys-apps/portage-2.3.44
index da808c143db7..76118918ac62 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.44
+++ b/metadata/md5-cache/sys-apps/portage-2.3.44
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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_targets_python3_7(-)?,-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_single_target_python3_7(-)] virtual/pkgconfig
 DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=5
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.44.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.44.tar.bz2
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d63906736f1563dc5a8b0fa02e2080fc
+_md5_=875d460aad7cdafbdae192beae0bfda0
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.45 b/metadata/md5-cache/sys-apps/portage-2.3.45
new file mode 100644
index 000000000000..842e00a6fa80
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.45
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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_targets_python3_7(-)?,-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_single_target_python3_7(-)] virtual/pkgconfig
+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 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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-12.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-crypt/openpgp-keys-gentoo-release >=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_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) 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 !<app-portage/repoman-2.3.10 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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_targets_python3_7(-)?,-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_single_target_python3_7(-)]
+REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.45.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.45.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=875d460aad7cdafbdae192beae0bfda0
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.8 b/metadata/md5-cache/sys-apps/portage-2.3.8
index 0060451dbc4a..dbdadac97261 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.8
+++ b/metadata/md5-cache/sys-apps/portage-2.3.8
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.8.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.8.tar.bz2
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1185660bdebc508b93738bde149a51cd
+_md5_=7b7f1167aa64fc70b8d34c827ae06f88
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index b726c75598ac..ca49efe4911d 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEFINED_PHASES=compile configure install preinst prepare setup test unpack
 DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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_targets_python3_7(-)?,-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_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=6
@@ -10,4 +10,4 @@ RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ab3a5e1dbd0c1d021efd3976d34a840b
+_md5_=8e1d071d285d27ddfc82a283eb9cc2dd
diff --git a/metadata/md5-cache/sys-apps/razercfg-0.39-r1 b/metadata/md5-cache/sys-apps/razercfg-0.39-r1
index dfa6063b8d72..7ff9bb916864 100644
--- a/metadata/md5-cache/sys-apps/razercfg-0.39-r1
+++ b/metadata/md5-cache/sys-apps/razercfg-0.39-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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=0
 SRC_URI=https://bues.ch/razercfg/razercfg-0.39.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7603b79e75a68e4b6aeba48ec347da71
diff --git a/metadata/md5-cache/sys-apps/ripgrep-0.8.1-r2 b/metadata/md5-cache/sys-apps/ripgrep-0.8.1-r2
index cf0cdcecfc57..6005aeed67b0 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-0.8.1-r2
+++ b/metadata/md5-cache/sys-apps/ripgrep-0.8.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=virtual/rust-1.20 app-text/asciidoc >=dev-util/cargo-0.13.0
+DEPEND=>=virtual/rust-1.20 app-text/asciidoc
 DESCRIPTION=a search tool that combines the usability of ag with the raw speed of grep
 EAPI=6
 HOMEPAGE=https://github.com/BurntSushi/ripgrep
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( MIT Unlicense )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/ansi_term/0.10.2/download -> ansi_term-0.10.2.crate https://crates.io/api/v1/crates/atty/0.2.6/download -> atty-0.2.6.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/bytecount/0.3.1/download -> bytecount-0.3.1.crate https://crates.io/api/v1/crates/cfg-if/0.1.2/download -> cfg-if-0.1.2.crate https://crates.io/api/v1/crates/clap/2.30.0/download -> clap-2.30.0.crate https://crates.io/api/v1/crates/crossbeam/0.3.2/download -> crossbeam-0.3.2.crate https://crates.io/api/v1/crates/encoding_rs/0.7.2/download -> encoding_rs-0.7.2.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.3.0/download -> globset-0.3.0.crate https://crates.io/api/v1/crates/grep/0.1.8/download -> grep-0.1.8.crate https://crates.io/api/v1/crates/ignore/0.4.1/download -> ignore-0.4.1.crate https://crates.io/api/v1/crates/lazy_static/1.0.0/download -> lazy_static-1.0.0.crate https://crates.io/api/v1/crates/libc/0.2.36/download -> libc-0.2.36.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/memmap/0.6.2/download -> memmap-0.6.2.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/rand/0.3.22/download -> rand-0.3.22.crate https://crates.io/api/v1/crates/rand/0.4.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.37/download -> redox_syscall-0.1.37.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.6/download -> regex-0.2.6.crate https://crates.io/api/v1/crates/regex-syntax/0.4.2/download -> regex-syntax-0.4.2.crate https://crates.io/api/v1/crates/ripgrep/0.8.1/download -> ripgrep-0.8.1.crate https://crates.io/api/v1/crates/same-file/1.0.2/download -> same-file-1.0.2.crate https://crates.io/api/v1/crates/simd/0.2.1/download -> simd-0.2.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/tempdir/0.3.5/download -> tempdir-0.3.5.crate https://crates.io/api/v1/crates/termcolor/0.3.5/download -> termcolor-0.3.5.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/thread_local/0.3.5/download -> thread_local-0.3.5.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.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/walkdir/2.1.4/download -> walkdir-2.1.4.crate https://crates.io/api/v1/crates/winapi/0.3.4/download -> winapi-0.3.4.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/0.1.6/download -> wincolor-0.1.6.crate
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	959846e2836f8244430c9582dd6493af	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	3e38275395b24dfed9849a57ba58a486	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=27585d0d3928df428bc522248a1be9e1
diff --git a/metadata/md5-cache/sys-apps/ripgrep-0.9.0 b/metadata/md5-cache/sys-apps/ripgrep-0.9.0
new file mode 100644
index 000000000000..1515f0934e98
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ripgrep-0.9.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=virtual/rust-1.20 doc? ( app-text/asciidoc )
+DESCRIPTION=a search tool that combines the usability of ag with the raw speed of grep
+EAPI=6
+HOMEPAGE=https://github.com/BurntSushi/ripgrep
+IUSE=doc debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Unlicense )
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.6/download -> aho-corasick-0.6.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/bytecount/0.3.1/download -> bytecount-0.3.1.crate https://crates.io/api/v1/crates/cfg-if/0.1.4/download -> cfg-if-0.1.4.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/crossbeam/0.3.2/download -> crossbeam-0.3.2.crate https://crates.io/api/v1/crates/encoding_rs/0.8.4/download -> encoding_rs-0.8.4.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.1/download -> encoding_rs_io-0.1.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.4.1/download -> globset-0.4.1.crate https://crates.io/api/v1/crates/grep/0.1.9/download -> grep-0.1.9.crate https://crates.io/api/v1/crates/ignore/0.4.3/download -> ignore-0.4.3.crate https://crates.io/api/v1/crates/lazy_static/1.0.2/download -> lazy_static-1.0.2.crate https://crates.io/api/v1/crates/libc/0.2.42/download -> libc-0.2.42.crate https://crates.io/api/v1/crates/log/0.4.3/download -> log-0.4.3.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/memmap/0.6.2/download -> memmap-0.6.2.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/rand/0.4.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.0.2/download -> regex-1.0.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.2/download -> regex-syntax-0.6.2.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/ripgrep/0.9.0/download -> ripgrep-0.9.0.crate https://crates.io/api/v1/crates/same-file/1.0.2/download -> same-file-1.0.2.crate https://crates.io/api/v1/crates/simd/0.2.2/download -> simd-0.2.2.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/termcolor/1.0.1/download -> termcolor-1.0.1.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.5/download -> thread_local-0.3.5.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.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/walkdir/2.1.4/download -> walkdir-2.1.4.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.0/download -> wincolor-1.0.0.crate
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	3e38275395b24dfed9849a57ba58a486	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ad3f7bd9b26288b5b9b60021b0401c88
diff --git a/metadata/md5-cache/sys-apps/roccat-tools-5.7.0 b/metadata/md5-cache/sys-apps/roccat-tools-5.7.0
index 7de11ca06c48..adaab336ff11 100644
--- a/metadata/md5-cache/sys-apps/roccat-tools-5.7.0
+++ b/metadata/md5-cache/sys-apps/roccat-tools-5.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=dev-libs/libgaminggear-0.15.1 sys-apps/dbus x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 virtual/libgudev:= virtual/libusb:1 input_devices_roccat_ryosmk? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) input_devices_roccat_ryosmkfx? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) input_devices_roccat_ryostkl? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/roccat/roccat-tools-5.7.0.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d15d32def03a3cbf7584e913604289e3
diff --git a/metadata/md5-cache/sys-apps/s390-tools-1.36.1-r1 b/metadata/md5-cache/sys-apps/s390-tools-1.36.1-r1
index 417f864f9c63..65ef01101f76 100644
--- a/metadata/md5-cache/sys-apps/s390-tools-1.36.1-r1
+++ b/metadata/md5-cache/sys-apps/s390-tools-1.36.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=fuse? ( sys-fs/fuse ) ncurses? ( sys-libs/ncurses:0= ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib ) >=sys-apps/util-linux-2.30
 SLOT=0
 SRC_URI=https://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/s390-tools-1.36.1.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=10f689e1b9457f98bf01b9b0e8536b5c
diff --git a/metadata/md5-cache/sys-apps/s390-tools-2.2.0 b/metadata/md5-cache/sys-apps/s390-tools-2.2.0
index 140e32197c87..9bc44689c4e2 100644
--- a/metadata/md5-cache/sys-apps/s390-tools-2.2.0
+++ b/metadata/md5-cache/sys-apps/s390-tools-2.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 MIT
 RDEPEND=fuse? ( sys-fs/fuse:= ) ncurses? ( sys-libs/ncurses:0= ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/ibm-s390-tools/s390-tools/archive/v2.2.0.tar.gz -> s390-tools-2.2.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=cf37e0788bd5df69e9f31dfb9bfaafd0
diff --git a/metadata/md5-cache/sys-apps/s390-tools-2.4.0 b/metadata/md5-cache/sys-apps/s390-tools-2.4.0
index e2cefb464ae5..2327fe749bcf 100644
--- a/metadata/md5-cache/sys-apps/s390-tools-2.4.0
+++ b/metadata/md5-cache/sys-apps/s390-tools-2.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 MIT
 RDEPEND=fuse? ( sys-fs/fuse:= ) ncurses? ( sys-libs/ncurses:0= ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/ibm-s390-tools/s390-tools/archive/v2.4.0.tar.gz -> s390-tools-2.4.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=9cb35816477a1a9dd66cfce2e94e0b17
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.12 b/metadata/md5-cache/sys-apps/sandbox-2.12
index b7cc732868b2..f1ed23ad1e33 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.12
+++ b/metadata/md5-cache/sys-apps/sandbox-2.12
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/sandbox-2.12.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1de6ad6ddc8083c8b6d35cfa214487d9
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.13 b/metadata/md5-cache/sys-apps/sandbox-2.13
index 30474528355f..2106ff613fca 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.13
+++ b/metadata/md5-cache/sys-apps/sandbox-2.13
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/sandbox-2.13.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=85c5e4e2c57ba282e7576c228825db88
diff --git a/metadata/md5-cache/sys-apps/smcipmitool-2.19.0.171201 b/metadata/md5-cache/sys-apps/smcipmitool-2.19.0.171201
deleted file mode 100644
index 368b0b9ca98e..000000000000
--- a/metadata/md5-cache/sys-apps/smcipmitool-2.19.0.171201
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm prerm setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=An out-of-band utility for interfacing with SuperBlade and IPMI devices via CLI
-EAPI=6
-HOMEPAGE=https://www.supermicro.com/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=supermicro
-RDEPEND=net-misc/stunnel sys-libs/ncurses:5 virtual/jre >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-RESTRICT=bindist fetch mirror strip
-SLOT=0
-SRC_URI=amd64? ( ftp://ftp.supermicro.com/utility/SMCIPMItool/Linux/SMCIPMITool_2.19.0_build.171201_bundleJRE_Linux_x64.tar.gz ) x86? ( ftp://ftp.supermicro.com/utility/SMCIPMItool/Linux/SMCIPMITool_2.19.0_build.171201_bundleJRE_Linux.tar.gz )
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	java-vm-2	771452d15e0b51ec559962d22c627449	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ab5d947c9bada81ff1a120844455acc8
diff --git a/metadata/md5-cache/sys-apps/smcipmitool-2.20.0.180525 b/metadata/md5-cache/sys-apps/smcipmitool-2.20.0.180525
new file mode 100644
index 000000000000..2de4d1fe7a38
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/smcipmitool-2.20.0.180525
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install nofetch preinst prepare setup unpack
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=An out-of-band utility for interfacing with SuperBlade and IPMI devices via CLI
+EAPI=6
+HOMEPAGE=https://www.supermicro.com/
+IUSE=elibc_FreeBSD
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=supermicro
+RDEPEND=net-misc/stunnel sys-libs/ncurses:5 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist fetch mirror strip
+SLOT=0
+SRC_URI=amd64? ( ftp://ftp.supermicro.com/utility/SMCIPMItool/Linux/SMCIPMITool_2.20.0_build.180525_bundleJRE_Linux_x64.tar.gz ) x86? ( ftp://ftp.supermicro.com/utility/SMCIPMItool/Linux/SMCIPMITool_2.20.0_build.180525_bundleJRE_Linux.tar.gz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b2a32aa83bf52c1c5d5deaaa6a0688d2
diff --git a/metadata/md5-cache/sys-apps/systemd-236-r5 b/metadata/md5-cache/sys-apps/systemd-236-r5
index 7c8efc71d151..381f2cefb4f7 100644
--- a/metadata/md5-cache/sys-apps/systemd-236-r5
+++ b/metadata/md5-cache/sys-apps/systemd-236-r5
@@ -12,5 +12,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-236-patches-2.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f8c61e42536a9341244791197f369df3
diff --git a/metadata/md5-cache/sys-apps/systemd-238-r7 b/metadata/md5-cache/sys-apps/systemd-238-r7
index da3a658c53cb..791394c46ca1 100644
--- a/metadata/md5-cache/sys-apps/systemd-238-r7
+++ b/metadata/md5-cache/sys-apps/systemd-238-r7
@@ -12,5 +12,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v238/systemd-238.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-238-patches-1.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e442fae1eef6275896f5a8c7e3d68d03
diff --git a/metadata/md5-cache/sys-apps/systemd-239 b/metadata/md5-cache/sys-apps/systemd-239
index 09ade6151e62..473e17aa2c07 100644
--- a/metadata/md5-cache/sys-apps/systemd-239
+++ b/metadata/md5-cache/sys-apps/systemd-239
@@ -12,5 +12,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v239/systemd-239.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a76694014326d5e74c21ce16782eade7
diff --git a/metadata/md5-cache/sys-apps/systemd-239-r1 b/metadata/md5-cache/sys-apps/systemd-239-r1
index 4e6415141e85..7c41f59ff50f 100644
--- a/metadata/md5-cache/sys-apps/systemd-239-r1
+++ b/metadata/md5-cache/sys-apps/systemd-239-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v239/systemd-239.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-239-patches-0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=874f7837f2b1fd332ad02d42dc4cbae7
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 1ab4c5a9e7a8..35603dd5ddd9 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d74a1c0a005794a0152a25ca5e008201
diff --git a/metadata/md5-cache/sys-apps/systemd-readahead-216 b/metadata/md5-cache/sys-apps/systemd-readahead-216
index 6668572e3e8f..c07e6a14ee29 100644
--- a/metadata/md5-cache/sys-apps/systemd-readahead-216
+++ b/metadata/md5-cache/sys-apps/systemd-readahead-216
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=sys-apps/systemd-217:=
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/systemd/systemd-216.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=f68dfcc1e09501212ac6c2ad78d3b03b
diff --git a/metadata/md5-cache/sys-apps/uam-0.3.2 b/metadata/md5-cache/sys-apps/uam-0.3.2
index ac77b8415dcc..3b7a98748b7e 100644
--- a/metadata/md5-cache/sys-apps/uam-0.3.2
+++ b/metadata/md5-cache/sys-apps/uam-0.3.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/udev
 SLOT=0
 SRC_URI=https://github.com/mgorny/uam/releases/download/uam-0.3.2/uam-0.3.2.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=219ff4f4cf3cd3ad2d2a33058e619fcc
diff --git a/metadata/md5-cache/sys-apps/uam-0.3.2-r1 b/metadata/md5-cache/sys-apps/uam-0.3.2-r1
index e961ce1b2ca8..db8f6413549e 100644
--- a/metadata/md5-cache/sys-apps/uam-0.3.2-r1
+++ b/metadata/md5-cache/sys-apps/uam-0.3.2-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/udev
 SLOT=0
 SRC_URI=https://github.com/mgorny/uam/releases/download/uam-0.3.2/uam-0.3.2.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=e01929d43d3dcf33d80c622fefd12b28
diff --git a/metadata/md5-cache/sys-apps/uam-9999 b/metadata/md5-cache/sys-apps/uam-9999
index 0dc200905c9c..dab80fb18d93 100644
--- a/metadata/md5-cache/sys-apps/uam-9999
+++ b/metadata/md5-cache/sys-apps/uam-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/mgorny/uam/
 LICENSE=BSD
 RDEPEND=virtual/udev
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=17801f9ed904af7bf94ddff914c9afdc
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6
index 9a4582e848a4..583480286288 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.2.6.tar.bz2 http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20151101.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b1f808a269756023894198cf4fc968aa
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0
index d8522fcb515f..3dec7eca5347 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.3.0.tar.bz2 http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20160112.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5ed014e1ae2c532656ff7eb4132444b6
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1
index 9b98a0deaa8e..3d264382354a 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.4.0.tar.bz2 http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20160803.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b79ac9467acc2b30fb41189558c638ea
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2
index 555f9c0ff0b5..486cbc9de13b 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.5.2.tar.bz2 http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20170806.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f066460a877e34614a3c9c036374c768
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 9d3a089f6ff3..d477c7245a41 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/elogind-235.2-r2 b/metadata/md5-cache/sys-auth/elogind-235.2-r2
index f6f0fc12a69f..b65a21eb6b6c 100644
--- a/metadata/md5-cache/sys-auth/elogind-235.2-r2
+++ b/metadata/md5-cache/sys-auth/elogind-235.2-r2
@@ -10,5 +10,5 @@ PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
 RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v235.2.tar.gz -> elogind-235.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fb5605f6056614ba4309ea90ed09932f
diff --git a/metadata/md5-cache/sys-auth/elogind-235.5 b/metadata/md5-cache/sys-auth/elogind-235.5
index 3f7bc98a8963..81d8820aa181 100644
--- a/metadata/md5-cache/sys-auth/elogind-235.5
+++ b/metadata/md5-cache/sys-auth/elogind-235.5
@@ -10,5 +10,5 @@ PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
 RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v235.5.tar.gz -> elogind-235.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d3793e95d099923d7ccee2a60f62a985
diff --git a/metadata/md5-cache/sys-auth/elogind-238.1 b/metadata/md5-cache/sys-auth/elogind-238.1
index 9bdc42222a09..2718ca5038bf 100644
--- a/metadata/md5-cache/sys-auth/elogind-238.1
+++ b/metadata/md5-cache/sys-auth/elogind-238.1
@@ -10,5 +10,5 @@ PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
 RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v238.1.tar.gz -> elogind-238.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ab4c2f89d1fb53ca356078a9a53cee30
diff --git a/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1 b/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1
index 31bb71c445ea..520506ea0429 100644
--- a/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1
+++ b/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-crypt/qca[qt5(+)] dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 sys-auth/libfprint sys-auth/polkit-qt[qt5(+)] sys-libs/pam x11-libs/libX11 x11-libs/libfakekey dev-libs/libusb !sys-auth/thinkfinger
 SLOT=0
 SRC_URI=https://github.com/maksbotan/fingerprint-gui/archive/v1.09-qt5.tar.gz -> fingerprint-gui-1.09.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=850533891b3eb0d29c844c65f672f461
diff --git a/metadata/md5-cache/sys-auth/libfprint-0.4.0-r1 b/metadata/md5-cache/sys-auth/libfprint-0.4.0-r1
index 8dcbe289b691..155e0b092b55 100644
--- a/metadata/md5-cache/sys-auth/libfprint-0.4.0-r1
+++ b/metadata/md5-cache/sys-auth/libfprint-0.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 dev-libs/nss || ( virtual/imagemagick-tools x11-libs/gdk-pixbuf )
 SLOT=0
 SRC_URI=https://cgit.freedesktop.org/libfprint/libfprint/snapshot/v_0_4_0.tar.bz2 -> libfprint-0.4.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cc384d45f31ebf98aa879110bb0f5c6b
diff --git a/metadata/md5-cache/sys-auth/libfprint-0.5.0-r2 b/metadata/md5-cache/sys-auth/libfprint-0.5.0-r2
index aa8dc395b7c5..79cc4e572940 100644
--- a/metadata/md5-cache/sys-auth/libfprint-0.5.0-r2
+++ b/metadata/md5-cache/sys-auth/libfprint-0.5.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 dev-libs/nss || ( virtual/imagemagick-tools x11-libs/gdk-pixbuf )
 SLOT=0
 SRC_URI=https://cgit.freedesktop.org/libfprint/libfprint/snapshot/v_0_5_0.tar.bz2 -> libfprint-0.5.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
 _md5_=39d45c2d780be1793d4022987dc5c253
diff --git a/metadata/md5-cache/sys-auth/libfprint-0.5.1-r2 b/metadata/md5-cache/sys-auth/libfprint-0.5.1-r2
index a5a8faa8ce38..bc6d39e46108 100644
--- a/metadata/md5-cache/sys-auth/libfprint-0.5.1-r2
+++ b/metadata/md5-cache/sys-auth/libfprint-0.5.1-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 dev-libs/glib:2 dev-libs/nss || ( virtual/imagemagick-tools x11-libs/gdk-pixbuf )
 SLOT=0
 SRC_URI=https://cgit.freedesktop.org/libfprint/libfprint/snapshot/v_0_5_1.tar.bz2 -> libfprint-0.5.1.tar.bz2 https://dev.gentoo.org/~patrick/libfprint-0.5.1-add-vfs5011-driver.patch
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
 _md5_=9b948e104b55af1dff7814e8823b522b
diff --git a/metadata/md5-cache/sys-auth/libfprint-0.6.0-r2 b/metadata/md5-cache/sys-auth/libfprint-0.6.0-r2
index 4795ac17aa05..128c218ea78f 100644
--- a/metadata/md5-cache/sys-auth/libfprint-0.6.0-r2
+++ b/metadata/md5-cache/sys-auth/libfprint-0.6.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 dev-libs/glib:2 dev-libs/nss x11-libs/pixman
 SLOT=0
 SRC_URI=https://cgit.freedesktop.org/libfprint/libfprint/snapshot/V_0_6_0.tar.bz2 -> libfprint-0.6.0.tar.bz2 https://dev.gentoo.org/~xmw/libfprint-0.6.0_vfs0050.patch.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
 _md5_=499bdd8559ec32dfc0e4458ef0b47be9
diff --git a/metadata/md5-cache/sys-auth/munge-0.5.11-r1 b/metadata/md5-cache/sys-auth/munge-0.5.11-r1
deleted file mode 100644
index e2eb39af6e38..000000000000
--- a/metadata/md5-cache/sys-auth/munge-0.5.11-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An authentication service for creating and validating credentials
-EAPI=5
-HOMEPAGE=https://github.com/dun/munge
-IUSE=gcrypt
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0 )
-SLOT=0
-SRC_URI=https://github.com/dun/munge/releases/download/munge-0.5.11/munge-0.5.11.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e980422fd3fad099015ee8f7ed25169d
diff --git a/metadata/md5-cache/sys-auth/munge-0.5.12 b/metadata/md5-cache/sys-auth/munge-0.5.12
deleted file mode 100644
index c3eaa63318ab..000000000000
--- a/metadata/md5-cache/sys-auth/munge-0.5.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An authentication service for creating and validating credentials
-EAPI=6
-HOMEPAGE=https://github.com/dun/munge
-IUSE=gcrypt
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0 )
-SLOT=0
-SRC_URI=https://github.com/dun/munge/releases/download/munge-0.5.12/munge-0.5.12.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=76909c30cd9c01e062fd972bc92fac02
diff --git a/metadata/md5-cache/sys-auth/polkit-0.113-r4 b/metadata/md5-cache/sys-auth/polkit-0.113-r4
index d2bf96eb0377..ef6e24bf2197 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.113-r4
+++ b/metadata/md5-cache/sys-auth/polkit-0.113-r4
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/spidermonkey:0/mozjs185[-debug] dev-libs/glib:2 dev-libs/expat
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.113.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a5c130e1f044e578ac7ad01682eaed50
diff --git a/metadata/md5-cache/sys-auth/polkit-0.114 b/metadata/md5-cache/sys-auth/polkit-0.114
index 827708f1fba7..e8fc5bdbf177 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.114
+++ b/metadata/md5-cache/sys-auth/polkit-0.114
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/spidermonkey:52[-debug] dev-libs/glib:2 dev-libs/expat elogind?
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.114.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=eb8c18380ad634d522a1fec0720663d3
diff --git a/metadata/md5-cache/sys-auth/polkit-0.115 b/metadata/md5-cache/sys-auth/polkit-0.115
index 10ed9d8edb97..3b7a14428c0a 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.115
+++ b/metadata/md5-cache/sys-auth/polkit-0.115
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/spidermonkey:52[-debug] dev-libs/glib:2 dev-libs/expat elogind?
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.115.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=eb8c18380ad634d522a1fec0720663d3
diff --git a/metadata/md5-cache/sys-auth/sakcl-0.1.0 b/metadata/md5-cache/sys-auth/sakcl-0.1.0
new file mode 100644
index 000000000000..9b6c6b81923a
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/sakcl-0.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl )
+DESCRIPTION=OpenSSH AuthorizedKeysCmd provider utilizing LDAP
+EAPI=6
+HOMEPAGE=https://gitlab.com/cardoe/sakcl
+IUSE=libressl debug
+KEYWORDS=~amd64
+LICENSE=|| ( MIT Apache-2.0 )
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.7/download -> arrayvec-0.4.7.crate https://crates.io/api/v1/crates/atty/0.2.10/download -> atty-0.2.10.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/byteorder/1.2.3/download -> byteorder-1.2.3.crate https://crates.io/api/v1/crates/bytes/0.4.8/download -> bytes-0.4.8.crate https://crates.io/api/v1/crates/cc/1.0.15/download -> cc-1.0.15.crate https://crates.io/api/v1/crates/cfg-if/0.1.3/download -> cfg-if-0.1.3.crate https://crates.io/api/v1/crates/clap/2.31.2/download -> clap-2.31.2.crate https://crates.io/api/v1/crates/core-foundation/0.2.3/download -> core-foundation-0.2.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.2.3/download -> core-foundation-sys-0.2.3.crate https://crates.io/api/v1/crates/crossbeam-deque/0.3.1/download -> crossbeam-deque-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.4.1/download -> crossbeam-epoch-0.4.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.3.2/download -> crossbeam-utils-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.21/download -> futures-0.1.21.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.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/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/lazy_static/1.0.0/download -> lazy_static-1.0.0.crate https://crates.io/api/v1/crates/lazycell/0.6.0/download -> lazycell-0.6.0.crate https://crates.io/api/v1/crates/lber/0.1.6/download -> lber-0.1.6.crate https://crates.io/api/v1/crates/ldap3/0.6.0/download -> ldap3-0.6.0.crate https://crates.io/api/v1/crates/libc/0.2.41/download -> libc-0.2.41.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/mio/0.6.14/download -> mio-0.6.14.crate https://crates.io/api/v1/crates/mio-uds/0.6.6/download -> mio-uds-0.6.6.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/native-tls/0.1.5/download -> native-tls-0.1.5.crate https://crates.io/api/v1/crates/net2/0.2.32/download -> net2-0.2.32.crate https://crates.io/api/v1/crates/nodrop/0.1.12/download -> nodrop-0.1.12.crate https://crates.io/api/v1/crates/nom/2.2.1/download -> nom-2.2.1.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/openssl/0.9.24/download -> openssl-0.9.24.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.31/download -> openssl-sys-0.9.31.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.11/download -> pkg-config-0.3.11.crate https://crates.io/api/v1/crates/proc-macro2/0.3.8/download -> proc-macro2-0.3.8.crate https://crates.io/api/v1/crates/proc-macro2/0.4.3/download -> proc-macro2-0.4.3.crate https://crates.io/api/v1/crates/quote/0.5.2/download -> quote-0.5.2.crate https://crates.io/api/v1/crates/quote/0.6.2/download -> quote-0.6.2.crate https://crates.io/api/v1/crates/rand/0.3.22/download -> rand-0.3.22.crate https://crates.io/api/v1/crates/rand/0.4.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.38/download -> redox_syscall-0.1.38.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/sakcl/0.1.0/download -> sakcl-0.1.0.crate https://crates.io/api/v1/crates/schannel/0.1.12/download -> schannel-0.1.12.crate https://crates.io/api/v1/crates/scoped-tls/0.1.2/download -> scoped-tls-0.1.2.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/security-framework/0.1.16/download -> security-framework-0.1.16.crate https://crates.io/api/v1/crates/security-framework-sys/0.1.16/download -> security-framework-sys-0.1.16.crate https://crates.io/api/v1/crates/serde/1.0.60/download -> serde-1.0.60.crate https://crates.io/api/v1/crates/serde_derive/1.0.60/download -> serde_derive-1.0.60.crate https://crates.io/api/v1/crates/slab/0.3.0/download -> slab-0.3.0.crate https://crates.io/api/v1/crates/slab/0.4.0/download -> slab-0.4.0.crate https://crates.io/api/v1/crates/smallvec/0.2.1/download -> smallvec-0.2.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/structopt/0.2.8/download -> structopt-0.2.8.crate https://crates.io/api/v1/crates/structopt-derive/0.2.8/download -> structopt-derive-0.2.8.crate https://crates.io/api/v1/crates/syn/0.13.11/download -> syn-0.13.11.crate https://crates.io/api/v1/crates/syn/0.14.0/download -> syn-0.14.0.crate https://crates.io/api/v1/crates/take/0.1.0/download -> take-0.1.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/tokio/0.1.6/download -> tokio-0.1.6.crate https://crates.io/api/v1/crates/tokio-core/0.1.17/download -> tokio-core-0.1.17.crate https://crates.io/api/v1/crates/tokio-executor/0.1.2/download -> tokio-executor-0.1.2.crate https://crates.io/api/v1/crates/tokio-fs/0.1.0/download -> tokio-fs-0.1.0.crate https://crates.io/api/v1/crates/tokio-io/0.1.6/download -> tokio-io-0.1.6.crate https://crates.io/api/v1/crates/tokio-proto/0.1.1/download -> tokio-proto-0.1.1.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.1/download -> tokio-reactor-0.1.1.crate https://crates.io/api/v1/crates/tokio-service/0.1.0/download -> tokio-service-0.1.0.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.0/download -> tokio-tcp-0.1.0.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.3/download -> tokio-threadpool-0.1.3.crate https://crates.io/api/v1/crates/tokio-timer/0.2.3/download -> tokio-timer-0.2.3.crate https://crates.io/api/v1/crates/tokio-tls/0.1.4/download -> tokio-tls-0.1.4.crate https://crates.io/api/v1/crates/tokio-udp/0.1.0/download -> tokio-udp-0.1.0.crate https://crates.io/api/v1/crates/tokio-uds/0.1.7/download -> tokio-uds-0.1.7.crate https://crates.io/api/v1/crates/tokio-uds-proto/0.1.1/download -> tokio-uds-proto-0.1.1.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.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/url/1.7.0/download -> url-1.7.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.3/download -> vcpkg-0.2.3.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.4/download -> winapi-0.3.4.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate
+_eclasses_=cargo	3e38275395b24dfed9849a57ba58a486	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=b576997cb48b87f829ffa665d5efce4e
diff --git a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0 b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0
new file mode 100644
index 000000000000..7db9d8443d68
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/docopt[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/pyldap[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/logger dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[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/pytest-describe[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/pytest-mock[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=Utility to manage SSH public keys stored in LDAP
+EAPI=6
+HOMEPAGE=https://github.com/jirutka/ssh-ldap-pubkey
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/docopt[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/pyldap[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/logger !net-misc/openssh[ldap] 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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jirutka/ssh-ldap-pubkey/archive/v1.3.0.tar.gz -> ssh-ldap-pubkey-1.3.0.tar.gz
+_eclasses_=distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=83e87f54731794577c8a84162fb5284c
diff --git a/metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0 b/metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0
index 94c2a1ba0fba..8d8e0885932e 100644
--- a/metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0
+++ b/metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/pcsc-lite
 SLOT=0
 SRC_URI=http://yubico.github.io/ykneo-ccid-tools/releases/ykneo-ccid-tools-0.0.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=014ab1716523fce31c34d58461e8b866
diff --git a/metadata/md5-cache/sys-auth/ykpers-1.18.0 b/metadata/md5-cache/sys-auth/ykpers-1.18.0
index 58c10ae10569..2eb0f783b4ab 100644
--- a/metadata/md5-cache/sys-auth/ykpers-1.18.0
+++ b/metadata/md5-cache/sys-auth/ykpers-1.18.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=sys-auth/libyubikey-1.6 virtual/libusb:1 consolekit? ( sys-auth/consolekit[acl] )
 SLOT=0
 SRC_URI=https://github.com/Yubico/yubikey-personalization/archive/v1.18.0.tar.gz -> ykpers-1.18.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=eb177a600f22ee8e8db80c177fca8558
diff --git a/metadata/md5-cache/sys-auth/ykpers-1.18.1 b/metadata/md5-cache/sys-auth/ykpers-1.18.1
index 0cf5b53a6706..dc3378bcf9d4 100644
--- a/metadata/md5-cache/sys-auth/ykpers-1.18.1
+++ b/metadata/md5-cache/sys-auth/ykpers-1.18.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=sys-auth/libyubikey-1.6 virtual/libusb:1 consolekit? ( sys-auth/consolekit[acl] )
 SLOT=0
 SRC_URI=https://github.com/Yubico/yubikey-personalization/archive/v1.18.1.tar.gz -> ykpers-1.18.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=ea29d35025842b44a801d1e02e6a7bb4
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index fa26988a7473..991c9d19d96d 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/hpacucli-9.30.15.0 b/metadata/md5-cache/sys-block/hpacucli-9.30.15.0
index 2eecb49825e6..acd70b6bdc08 100644
--- a/metadata/md5-cache/sys-block/hpacucli-9.30.15.0
+++ b/metadata/md5-cache/sys-block/hpacucli-9.30.15.0
@@ -8,5 +8,5 @@ LICENSE=hp-proliant-essentials
 RDEPEND=sys-apps/coreutils sys-process/procps >=sys-apps/util-linux-2.20.1
 SLOT=0
 SRC_URI=amd64? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p1257348637/v77370/hpacucli-9.30-15.0.x86_64.rpm ) x86? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p414707558/v77371/hpacucli-9.30-15.0.i386.rpm )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=16e2666efaaffdca8ffa6e9bcdfda432
diff --git a/metadata/md5-cache/sys-block/hpacucli-9.40.12.0 b/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
index fd791ad45a4d..d4cd9e5b5d72 100644
--- a/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
+++ b/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
@@ -8,5 +8,5 @@ LICENSE=hp-proliant-essentials
 RDEPEND=sys-apps/coreutils sys-process/procps >=sys-apps/util-linux-2.20.1
 SLOT=0
 SRC_URI=amd64? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p1257348637/v80070/hpacucli-9.40-12.0.x86_64.rpm ) x86? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p414707558/v80071/hpacucli-9.40-12.0.i386.rpm )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=2eaf5c83ce7e781a71a3e76d877d41ef
diff --git a/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1 b/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
index 89fc5e4d6317..942a0182ec39 100644
--- a/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
+++ b/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
@@ -8,5 +8,5 @@ LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 ) >=sys-libs/libunwind-0.99 >=sys-process/procps-3.3.6
 SLOT=0
 SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/x86_64/current/hpssacli-2.40-13.0.x86_64.rpm ) x86? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/i686/current/hpssacli-2.40-13.0.i386.rpm )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=d456bb38892284aa5efcbf5124872a28
diff --git a/metadata/md5-cache/sys-block/hpssacli-3.10.3.0 b/metadata/md5-cache/sys-block/hpssacli-3.10.3.0
index 938146053acd..5ee269973be2 100644
--- a/metadata/md5-cache/sys-block/hpssacli-3.10.3.0
+++ b/metadata/md5-cache/sys-block/hpssacli-3.10.3.0
@@ -8,5 +8,5 @@ LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 ) >=sys-libs/libunwind-0.99 >=sys-process/procps-3.3.6
 SLOT=0
 SRC_URI=https://downloads.linux.hpe.com/SDR/repo/spp/2017.10.1/packages/ssacli-3.10-3.0.x86_64.rpm
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=7952d95d2be8a71833dcf1e6aee5fdf6
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1 b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
index 105d2b3bf580..390eb051c6ac 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=slp? ( net-libs/openslp ) sys-fs/lsscsi sys-apps/util-linux
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-873.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=da7c7150bbcacd3198827ca93becf054
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r2 b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r2
index 0d8f5a2e3ec2..fb6e85dc0c8a 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r2
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r2
@@ -10,5 +10,5 @@ RDEPEND=slp? ( net-libs/openslp ) infiniband? ( sys-fabric/ofed ) sys-fs/lsscsi
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-873.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=6d54242a66d0751b632825b4d8586bb0
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r3 b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r3
index 5079dbe65488..dfaa828b3fe5 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r3
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r3
@@ -10,5 +10,5 @@ RDEPEND=slp? ( net-libs/openslp ) infiniband? ( sys-fabric/ofed ) sys-fs/lsscsi
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-873.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=24c732e22e00a72d5cf80be77e7d6910
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.874 b/metadata/md5-cache/sys-block/open-iscsi-2.0.874
index 017db63f8d5e..6a572f5bc398 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.874
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.874
@@ -10,5 +10,5 @@ RDEPEND=sys-block/open-isns:= slp? ( net-libs/openslp ) infiniband? ( sys-fabric
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.874.tar.gz -> open-iscsi-2.0.874.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e9adc89fc46d22c507955c6c42b500d8
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r1 b/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r1
index 0d0ddb99f14f..ede2ae28392b 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r1
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-block/open-isns:= slp? ( net-libs/openslp ) infiniband? ( sys-fabric
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.874.tar.gz -> open-iscsi-2.0.874.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e582c4e658e2d930d98b4899381790ab
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r2 b/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r2
index 4c9786a5535a..a4ebe348fda5 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r2
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-block/open-isns:= infiniband? ( sys-fabric/ofed ) sys-fs/lsscsi sys-
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.874.tar.gz -> open-iscsi-2.0.874.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=08cf26201848e0fcf18510b8c9edfb1c
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.875 b/metadata/md5-cache/sys-block/open-iscsi-2.0.875
index 339ba4571ff0..9845ba8a7f83 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.875
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.875
@@ -10,5 +10,5 @@ RDEPEND=sys-block/open-isns:= infiniband? ( sys-fabric/ofed ) sys-kernel/linux-h
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.875.tar.gz -> open-iscsi-2.0.875.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=bc6d9784a31630148e800537d18cc614
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.876 b/metadata/md5-cache/sys-block/open-iscsi-2.0.876
index 74c6121f0444..3bb0bfddd75b 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.876
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.876
@@ -10,5 +10,5 @@ RDEPEND=sys-block/open-isns:= infiniband? ( sys-fabric/ofed ) sys-kernel/linux-h
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.876.tar.gz -> open-iscsi-2.0.876.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=22eb823edfa4a5edda7efdda0e40aa90
diff --git a/metadata/md5-cache/sys-block/storcli-1.19.04 b/metadata/md5-cache/sys-block/storcli-1.19.04
index bc06666e56a5..19e4e4e0db65 100644
--- a/metadata/md5-cache/sys-block/storcli-1.19.04
+++ b/metadata/md5-cache/sys-block/storcli-1.19.04
@@ -6,5 +6,5 @@ KEYWORDS=-* amd64 x86
 LICENSE=Avago LSI BSD
 SLOT=0/6.11
 SRC_URI=http://docs.avagotech.com/docs-and-downloads/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.19.04_StorCLI.zip -> storcli-1.19.04.zip
-_eclasses_=pax-utils	b963274a93e76570a88168c1f1db4cd7
+_eclasses_=pax-utils	e85f015e815dd463b0c206d781ef45a5
 _md5_=731e4ef95d026508d9f574a6f773f8b0
diff --git a/metadata/md5-cache/sys-block/storcli-1.20.15 b/metadata/md5-cache/sys-block/storcli-1.20.15
index 9d31eaf5708f..55200462ea99 100644
--- a/metadata/md5-cache/sys-block/storcli-1.20.15
+++ b/metadata/md5-cache/sys-block/storcli-1.20.15
@@ -6,5 +6,5 @@ KEYWORDS=-* amd64 x86
 LICENSE=Avago LSI BSD
 SLOT=0/6.12
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.20.15_StorCLI.zip -> storcli-1.20.15.zip
-_eclasses_=pax-utils	b963274a93e76570a88168c1f1db4cd7
+_eclasses_=pax-utils	e85f015e815dd463b0c206d781ef45a5
 _md5_=af9c809625dd570b3ae567c9d7ed8431
diff --git a/metadata/md5-cache/sys-block/storcli-1.21.06 b/metadata/md5-cache/sys-block/storcli-1.21.06
index 9da953d1083c..8a148a9194da 100644
--- a/metadata/md5-cache/sys-block/storcli-1.21.06
+++ b/metadata/md5-cache/sys-block/storcli-1.21.06
@@ -6,5 +6,5 @@ KEYWORDS=-* amd64 x86
 LICENSE=Avago LSI BSD
 SLOT=0/6.13
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.21.16_StorCLI.zip -> storcli-1.21.06.zip https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.21.06_StorCLI.txt -> storcli-1.21.06_readme.txt
-_eclasses_=pax-utils	b963274a93e76570a88168c1f1db4cd7
+_eclasses_=pax-utils	e85f015e815dd463b0c206d781ef45a5
 _md5_=53ac17b9516366894a2ddcfa444919a8
diff --git a/metadata/md5-cache/sys-block/storcli-1.23.02 b/metadata/md5-cache/sys-block/storcli-1.23.02
index f2d8ed427d69..312a5cd9c64c 100644
--- a/metadata/md5-cache/sys-block/storcli-1.23.02
+++ b/metadata/md5-cache/sys-block/storcli-1.23.02
@@ -6,5 +6,5 @@ KEYWORDS=-* amd64 x86
 LICENSE=Avago LSI BSD
 SLOT=0/6.14
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.23.02_StorCLI.zip -> storcli-1.23.02.zip https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.23.02_StorCLI.txt -> storcli-1.23.02_readme.txt
-_eclasses_=pax-utils	b963274a93e76570a88168c1f1db4cd7
+_eclasses_=pax-utils	e85f015e815dd463b0c206d781ef45a5
 _md5_=d352d852ec45eb41bda35f3a2480a9de
diff --git a/metadata/md5-cache/sys-block/storcli-7.0504 b/metadata/md5-cache/sys-block/storcli-7.0504
index 9824bcdb2845..e410464061ba 100644
--- a/metadata/md5-cache/sys-block/storcli-7.0504
+++ b/metadata/md5-cache/sys-block/storcli-7.0504
@@ -6,5 +6,5 @@ KEYWORDS=-* ~amd64 ~x86
 LICENSE=Avago LSI BSD
 SLOT=0/7.5
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.0504.0000.0000_Unified_StorCLI.zip -> storcli-7.0504.zip
-_eclasses_=pax-utils	b963274a93e76570a88168c1f1db4cd7
+_eclasses_=pax-utils	e85f015e815dd463b0c206d781ef45a5
 _md5_=835f1668904379bc429ffe7a8b129241
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index a8e353b05173..56ead284fa48 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r16 b/metadata/md5-cache/sys-boot/grub-0.97-r16
index 752702c8df02..091562205952 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r16
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r16
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) !sys-boot/grub:2[-multislot]
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.14.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8fe39d9e6ea74ed8555b0d4e15424edf
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r18 b/metadata/md5-cache/sys-boot/grub-0.97-r18
index 5372f2ec26ae..13b7079eb75f 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r18
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) !sys-boot/grub:2[-multislot]
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.15.tar.bz2 https://dev.gentoo.org/~whissi/dist/grub/grub-0.97-patches-1.15.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a3704d68dc8e49492a672fc4de4ce94e
diff --git a/metadata/md5-cache/sys-boot/grub-2.02-r1 b/metadata/md5-cache/sys-boot/grub-2.02-r1
index 6a0f70c412a0..0374efde729d 100644
--- a/metadata/md5-cache/sys-boot/grub-2.02-r1
+++ b/metadata/md5-cache/sys-boot/grub-2.02-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) g
 RESTRICT=strip !test? ( test )
 SLOT=2/2.02-r1
 SRC_URI=mirror://gnu/grub/grub-2.02.tar.xz fonts? ( mirror://gnu/unifont/unifont-9.0.06/unifont-9.0.06.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4595e12d29ee95de670cdb35decbe51a
diff --git a/metadata/md5-cache/sys-boot/grub-2.02-r2 b/metadata/md5-cache/sys-boot/grub-2.02-r2
index 4bf0a61520a6..6fede1a501a1 100644
--- a/metadata/md5-cache/sys-boot/grub-2.02-r2
+++ b/metadata/md5-cache/sys-boot/grub-2.02-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) g
 RESTRICT=strip !test? ( test )
 SLOT=2/2.02-r2
 SRC_URI=mirror://gnu/grub/grub-2.02.tar.xz fonts? ( mirror://gnu/unifont/unifont-9.0.06/unifont-9.0.06.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5bb1572b50c80a06a0e758ff778fd582
diff --git a/metadata/md5-cache/sys-boot/grub-9999 b/metadata/md5-cache/sys-boot/grub-9999
index 48f9a7eac48c..f3b828552c0d 100644
--- a/metadata/md5-cache/sys-boot/grub-9999
+++ b/metadata/md5-cache/sys-boot/grub-9999
@@ -10,5 +10,5 @@ REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) g
 RESTRICT=strip !test? ( test )
 SLOT=2/9999
 SRC_URI=fonts? ( mirror://gnu/unifont/unifont-9.0.06/unifont-9.0.06.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=92c2e85bdd82485e63329d8443497c16
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 23f97e9f7af6..3471adaaff8f 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.10-r2 b/metadata/md5-cache/sys-cluster/ceph-10.2.10-r2
index 674d5c4d3431..bfa92668e139 100644
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.10-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.10-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-10.2.10.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=d670b5355b15cca9aae5c8e20b38e6bc
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.3-r2 b/metadata/md5-cache/sys-cluster/ceph-10.2.3-r2
index 7dc2d7b13d0b..a11e2176e7c3 100644
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.3-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-10.2.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=8e73e46a89afd9efc56d032add61b1d7
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.5 b/metadata/md5-cache/sys-cluster/ceph-12.2.5
index 261d4a18d901..c1ed8f92393e 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.5
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.5.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=667bddd9552d3b74cdf772f58a5506d3
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.7 b/metadata/md5-cache/sys-cluster/ceph-12.2.7
index 8f66ad82fc90..4552ff092e97 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.7
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.7
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.7.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a82872dc562beeaae5b742a3a5035580
diff --git a/metadata/md5-cache/sys-cluster/ceph-13.2.1 b/metadata/md5-cache/sys-cluster/ceph-13.2.1
index 65ebe9d71f61..701e814c2b53 100644
--- a/metadata/md5-cache/sys-cluster/ceph-13.2.1
+++ b/metadata/md5-cache/sys-cluster/ceph-13.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-13.2.1.tar.gz mgr-frontend? ( mirror://gentoo/ceph-13.2.1-frontend-node-modules.tar.xz )
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=67ff9dd1db779e2cb6db79a006db42a8
diff --git a/metadata/md5-cache/sys-cluster/drbd-utils-8.9.3 b/metadata/md5-cache/sys-cluster/drbd-utils-8.9.3
index 52cc28a8b151..137eb25d559b 100644
--- a/metadata/md5-cache/sys-cluster/drbd-utils-8.9.3
+++ b/metadata/md5-cache/sys-cluster/drbd-utils-8.9.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=heartbeat? ( sys-cluster/heartbeat ) pacemaker? ( sys-cluster/pacemaker ) udev? ( virtual/udev ) !!sys-cluster/drbd
 SLOT=0
 SRC_URI=http://oss.linbit.com/drbd/drbd-utils-8.9.3.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=eb03c6673101d59ae14813838209cbf3
diff --git a/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6 b/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6
index 27fb2138e781..cb575cb1d08c 100644
--- a/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6
+++ b/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=heartbeat? ( sys-cluster/heartbeat ) pacemaker? ( sys-cluster/pacemaker ) udev? ( virtual/udev ) !!sys-cluster/drbd
 SLOT=0
 SRC_URI=http://oss.linbit.com/drbd/drbd-utils-8.9.6.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=af33470d0727191c518a3f3edb675c2a
diff --git a/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6-r1 b/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6-r1
index 88feb6a8b42d..3da7b20eee41 100644
--- a/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6-r1
+++ b/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=heartbeat? ( sys-cluster/heartbeat ) pacemaker? ( sys-cluster/pacemaker ) udev? ( virtual/udev ) !!sys-cluster/drbd
 SLOT=0
 SRC_URI=http://oss.linbit.com/drbd/drbd-utils-8.9.6.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=dd36617da7f6dffc48e714f1f135dbb2
diff --git a/metadata/md5-cache/sys-cluster/knem-1.1.1 b/metadata/md5-cache/sys-cluster/knem-1.1.1
index 672ef13c983a..0641ee201b07 100644
--- a/metadata/md5-cache/sys-cluster/knem-1.1.1
+++ b/metadata/md5-cache/sys-cluster/knem-1.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://runtime.bordeaux.inria.fr/knem/download/knem-1.1.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=144181cf8a433f5d1086f308647f41f1
diff --git a/metadata/md5-cache/sys-cluster/knem-9999 b/metadata/md5-cache/sys-cluster/knem-9999
index e77a56464ced..0b602d3b00d5 100644
--- a/metadata/md5-cache/sys-cluster/knem-9999
+++ b/metadata/md5-cache/sys-cluster/knem-9999
@@ -7,5 +7,5 @@ IUSE=debug modules kernel_linux kernel_linux kernel_linux
 LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-2	45ff482316b52b3f96ff6b7309b77f03	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-2	45ff482316b52b3f96ff6b7309b77f03	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=144181cf8a433f5d1086f308647f41f1
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.10 b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.10
new file mode 100644
index 000000000000..b3678a4033d7
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Proxy service
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.10.tar.gz -> kubernetes-1.9.10.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.9.10 b/metadata/md5-cache/sys-cluster/kubelet-1.9.10
new file mode 100644
index 000000000000..eaecf14fdbb2
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.9.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Node Agent
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.10.tar.gz -> kubernetes-1.9.10.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/open-mx-1.5.4 b/metadata/md5-cache/sys-cluster/open-mx-1.5.4
index 6aa9eb43871b..466581f908c9 100644
--- a/metadata/md5-cache/sys-cluster/open-mx-1.5.4
+++ b/metadata/md5-cache/sys-cluster/open-mx-1.5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://gforge.inria.fr/frs/download.php/34371/open-mx-1.5.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5ed87fbc4dd733c7af066e6ed48fb376
diff --git a/metadata/md5-cache/sys-cluster/pconsole-1.0-r3 b/metadata/md5-cache/sys-cluster/pconsole-1.0-r3
deleted file mode 100644
index 52715086d02b..000000000000
--- a/metadata/md5-cache/sys-cluster/pconsole-1.0-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=Tool for managing multiple xterms simultaneously
-EAPI=2
-HOMEPAGE=http://www.heiho.net/pconsole/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/ssh
-SLOT=0
-SRC_URI=http://www.xs4all.nl/~walterj/pconsole/pconsole-1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4346aefce4855f5a79a3bc459d78154e
diff --git a/metadata/md5-cache/sys-cluster/pconsole-1.0-r4 b/metadata/md5-cache/sys-cluster/pconsole-1.0-r4
new file mode 100644
index 000000000000..43541f6750a6
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/pconsole-1.0-r4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Tool for managing multiple xterms simultaneously
+EAPI=7
+HOMEPAGE=https://github.com/walterdejong/pconsole
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.xs4all.nl/~walterj/pconsole/pconsole-1.0.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=3c332afca05591515653da6e28ff595f
diff --git a/metadata/md5-cache/sys-cluster/teleport-2.5.8 b/metadata/md5-cache/sys-cluster/teleport-2.5.8
deleted file mode 100644
index f823d9fb9145..000000000000
--- a/metadata/md5-cache/sys-cluster/teleport-2.5.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=app-arch/zip >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=Modern SSH server for teams managing distributed infrastructure
-EAPI=6
-HOMEPAGE=https://gravitational.com/teleport
-KEYWORDS=~amd64 ~arm
-LICENSE=Apache-2.0
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/gravitational/teleport/archive/v2.5.8.tar.gz -> teleport-2.5.8.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=af54b0ebba0ae2932a1efb9713b1bd4c
diff --git a/metadata/md5-cache/sys-cluster/teleport-2.6.7 b/metadata/md5-cache/sys-cluster/teleport-2.6.7
index 9a56d65517cd..246f827a7aac 100644
--- a/metadata/md5-cache/sys-cluster/teleport-2.6.7
+++ b/metadata/md5-cache/sys-cluster/teleport-2.6.7
@@ -11,4 +11,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/gravitational/teleport/archive/v2.6.7.tar.gz -> teleport-2.6.7.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=08987f776267ac7714b3d71310f81996
+_md5_=ab657325f8d9faae6266739d57e32a4e
diff --git a/metadata/md5-cache/sys-cluster/teleport-2.7.1 b/metadata/md5-cache/sys-cluster/teleport-2.7.1
new file mode 100644
index 000000000000..5839b28ac928
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/teleport-2.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=app-arch/zip >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=Modern SSH server for teams managing distributed infrastructure
+EAPI=6
+HOMEPAGE=https://gravitational.com/teleport
+IUSE=pam
+KEYWORDS=~amd64 ~arm
+LICENSE=Apache-2.0
+RDEPEND=pam? ( sys-libs/pam )
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/gravitational/teleport/archive/v2.7.1.tar.gz -> teleport-2.7.1.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ab657325f8d9faae6266739d57e32a4e
diff --git a/metadata/md5-cache/sys-cluster/vzctl-4.9.4 b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
index d8eebe656ba2..722c88a361e6 100644
--- a/metadata/md5-cache/sys-cluster/vzctl-4.9.4
+++ b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables sys-apps/ed >=sys-apps/iproute2-3.3.0 >=sys-fs/vzquota-3.1 ploop? ( >=sys-cluster/ploop-1.13 sys-block/parted sys-fs/quota dev-libs/libxml2 ) >=dev-libs/libcgroup-0.38 vzmigrate? ( net-misc/openssh net-misc/rsync[xattr,acl] app-arch/tar[xattr,acl] net-misc/bridge-utils virtual/awk ) virtual/udev sys-apps/attr
 SLOT=0
 SRC_URI=http://download.openvz.org/utils/vzctl/4.9.4/src/vzctl-4.9.4.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=767cf1c299446e147d8b21c0991b4749
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13
new file mode 100644
index 000000000000..f2fc03a7a644
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install 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_python2_7(-)]
+DESCRIPTION=A high-performance coordination service for distributed applications.
+EAPI=5
+HOMEPAGE=http://zookeeper.apache.org/
+IUSE=python_targets_python2_7 elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.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 )
+RESTRICT=mirror binchecks
+SLOT=0
+SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.13/zookeeper-3.4.13.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c5eae12a978c83abe943970845e293f7
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 88577b87531f..a8ce7bf402c0 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/binutils-2.31 b/metadata/md5-cache/sys-devel/binutils-2.31
deleted file mode 100644
index 8099ef0812b8..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-2.31
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170422 sys-devel/gnuconfig
-DESCRIPTION=Tools necessary to build programs
-EAPI=6
-HOMEPAGE=https://sourceware.org/binutils/
-IUSE=+cxx doc multitarget +nls static-libs test
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-SLOT=2.31
-SRC_URI=mirror://gnu/binutils/binutils-2.31.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.31-patches-1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e4da5ff44288353fe6c8a044d173c9fa
diff --git a/metadata/md5-cache/sys-devel/binutils-2.31.1 b/metadata/md5-cache/sys-devel/binutils-2.31.1
index 75e39ccc00c2..6ff1d38decae 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.31.1
+++ b/metadata/md5-cache/sys-devel/binutils-2.31.1
@@ -4,9 +4,10 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=6
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=+cxx doc multitarget +nls static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.31
 SRC_URI=mirror://gnu/binutils/binutils-2.31.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.31.1-patches-1.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a315337b88c5a486021b91d88be96971
+_md5_=7681f2b054d0f189056bbc54234e39df
diff --git a/metadata/md5-cache/sys-devel/binutils-2.31.9999 b/metadata/md5-cache/sys-devel/binutils-2.31.9999
deleted file mode 100644
index 6e1fe55dde2d..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-2.31.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170422 sys-devel/gnuconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Tools necessary to build programs
-EAPI=6
-HOMEPAGE=https://sourceware.org/binutils/
-IUSE=+cxx doc multitarget +nls static-libs test
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-SLOT=2.31
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/binutils-9999-patches-1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3039e08168a6eae7dffe6c8b2bb1f6dd
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.31 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.31
deleted file mode 100644
index bac14eab193b..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.31
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=sys-libs/binutils-libs-2.31 >=app-portage/elt-patches-20170422 sys-devel/gnuconfig
-DESCRIPTION=Tools necessary to build programs
-EAPI=6
-HOMEPAGE=https://sourceware.org/binutils/
-IUSE=+cxx doc multitarget +nls static-libs test
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-SLOT=2.31
-SRC_URI=mirror://gnu/binutils/binutils-2.31.tar.xz https://sourceware.org/pub/binutils/releases/binutils-2.31.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.31-patches-1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4322fa8a159a21bf34e00c1200828884
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.31.1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.31.1
index 971899d501d7..a81295ea5635 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.31.1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.31.1
@@ -4,9 +4,10 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=6
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=+cxx doc multitarget +nls static-libs test
+KEYWORDS=-* ~hppa
 LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.31
 SRC_URI=mirror://gnu/binutils/binutils-2.31.1.tar.xz https://sourceware.org/pub/binutils/releases/binutils-2.31.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.31.1-patches-1.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=08ac1750c0ff4a7078c8d60939d6f2f1
+_md5_=338b78aa7b37f83b193c8016fd13622e
diff --git a/metadata/md5-cache/sys-devel/clang-4.0.1 b/metadata/md5-cache/sys-devel/clang-4.0.1
index 55401a90efec..09fc7605752e 100644
--- a/metadata/md5-cache/sys-devel/clang-4.0.1
+++ b/metadata/md5-cache/sys-devel/clang-4.0.1
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-4.0.1:4=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGP
 REQUIRED_USE=python_targets_python2_7 || ( 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_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=4
 SRC_URI=https://releases.llvm.org/4.0.1/cfe-4.0.1.src.tar.xz https://releases.llvm.org/4.0.1/clang-tools-extra-4.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-4.0.1.tar.bz2 ) test? ( https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz )
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7849f02330391c293f9519350f361b34
diff --git a/metadata/md5-cache/sys-devel/clang-5.0.2 b/metadata/md5-cache/sys-devel/clang-5.0.2
index 36ee304f0e45..6f7881de0f22 100644
--- a/metadata/md5-cache/sys-devel/clang-5.0.2
+++ b/metadata/md5-cache/sys-devel/clang-5.0.2
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-5.0.2:5=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGP
 REQUIRED_USE=python_targets_python2_7 || ( 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 )
 SLOT=5
 SRC_URI=https://releases.llvm.org/5.0.2/cfe-5.0.2.src.tar.xz https://releases.llvm.org/5.0.2/clang-tools-extra-5.0.2.src.tar.xz test? ( https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.2-manpages.tar.bz2 )
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ded06e01e880daf8a50d44d485811c7c
diff --git a/metadata/md5-cache/sys-devel/clang-6.0.1 b/metadata/md5-cache/sys-devel/clang-6.0.1
index 8e9ec73da375..d5656e93df6b 100644
--- a/metadata/md5-cache/sys-devel/clang-6.0.1
+++ b/metadata/md5-cache/sys-devel/clang-6.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMD
 RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=https://releases.llvm.org/6.0.1/cfe-6.0.1.src.tar.xz https://releases.llvm.org/6.0.1/clang-tools-extra-6.0.1.src.tar.xz test? ( https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-6.0.1-manpages.tar.bz2 )
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8ea61e33f59148dda04e293ea0363a56
diff --git a/metadata/md5-cache/sys-devel/clang-6.0.9999 b/metadata/md5-cache/sys-devel/clang-6.0.9999
index 1aa6005c396e..456826d1e511 100644
--- a/metadata/md5-cache/sys-devel/clang-6.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-6.0.9999
@@ -10,5 +10,5 @@ RDEPEND=~sys-devel/llvm-6.0.9999:6=[debug=,llvm_targets_AArch64?,llvm_targets_AM
 REQUIRED_USE=python_targets_python2_7 || ( 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 )
 RESTRICT=!test? ( test )
 SLOT=6
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b00ffda5e360f19e1aef7f4af1507ba8
diff --git a/metadata/md5-cache/sys-devel/clang-7.0.9999 b/metadata/md5-cache/sys-devel/clang-7.0.9999
index 7500f341c312..f58a0312a6b1 100644
--- a/metadata/md5-cache/sys-devel/clang-7.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-7.0.9999
@@ -10,5 +10,5 @@ RDEPEND=~sys-devel/llvm-7.0.9999:7=[debug=,llvm_targets_AArch64?,llvm_targets_AM
 REQUIRED_USE=python_targets_python2_7 || ( 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 )
 RESTRICT=!test? ( test )
 SLOT=7
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1834d3f870de4b40e30b814a55f862b0
diff --git a/metadata/md5-cache/sys-devel/clang-9999 b/metadata/md5-cache/sys-devel/clang-9999
index 0b5f70e9cc68..4f63631f777a 100644
--- a/metadata/md5-cache/sys-devel/clang-9999
+++ b/metadata/md5-cache/sys-devel/clang-9999
@@ -10,5 +10,5 @@ RDEPEND=~sys-devel/llvm-9999:8=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU
 REQUIRED_USE=python_targets_python2_7 || ( 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 llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly )
 RESTRICT=!test? ( test )
 SLOT=8
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=46ae44e1b1f7f89acad15472b5b4bc4a
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 3786ff43b976..31be7ee3fa42 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 7a24a6fc60b0..0ab0a789beef 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 1363e5f93323..be3d30ec7b73 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 04460cc1618a..e427c57914ca 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 bb06c4c2098f..bd28ce969da4 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 d08a41cf1d47..f8e28e6f2b67 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 37522c04253e..8aedbb41501c 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 661c7f9adba5..6e527aaf5ac9 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 018b74285d9b..50c79c35c466 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 258818b21901..fb905a6c1a32 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 14ba24ff08ac..b3096cf514c5 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 7c6e58f8ae17..3b996cc335ff 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 7a8dcd3ff230..83b92e17d080 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 95a03c2b2bdf..6f9b5463d2bc 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
+++ b/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=8b617c83460b0f4d7d4b401964f7e6fd
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 6d767f4a882b..f3f424ef9e7f 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e8c07f4b3f1057325c5297a300d7a3e3
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0-r2 b/metadata/md5-cache/sys-devel/gcc-6.4.0-r2
index 1a620bb19c60..90e01b3c6949 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 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.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=4227f450ff359a3aebb3024baa5da548
diff --git a/metadata/md5-cache/sys-devel/gcc-7.3.0-r3 b/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
index 263bf68fef68..4b918614ec7d 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
+++ b/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 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.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.4.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=fc920887384a82d75b82fbbeb12b6334
diff --git a/metadata/md5-cache/sys-devel/gcc-8.1.0-r3 b/metadata/md5-cache/sys-devel/gcc-8.1.0-r3
index 7e7224121522..88d48e67909d 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.1.0-r3
+++ b/metadata/md5-cache/sys-devel/gcc-8.1.0-r3
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=8.1.0
 SRC_URI=mirror://gnu/gcc/gcc-8.1.0/gcc-8.1.0.tar.xz mirror://gentoo/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.1.0-patches-1.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=d036954d6de0101bc93704180a24d76e
diff --git a/metadata/md5-cache/sys-devel/gcc-8.2.0 b/metadata/md5-cache/sys-devel/gcc-8.2.0
index 59bd41fea5ae..6f5c817c3253 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.2.0
+++ b/metadata/md5-cache/sys-devel/gcc-8.2.0
@@ -9,6 +9,6 @@ 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:0= )
 RESTRICT=strip
 SLOT=8.2.0
-SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.1.0-patches-1.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=32ada8ae6efc51d40d2a82e9fd41c94e
+SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.2.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.2.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.2.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.2.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.2.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.2.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.2.0-patches-1.0.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=75bcdc3d0b073bde0de4343ca21f5b18
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 fc15983073f9..e91ee600d365 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	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=9d045438c8d24fad84c5133405ed383f
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.1.2 b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
index e1f751d9f4da..6944e708e60a 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 c2b04edd4b1a..6e762e8b6845 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 615a09e08a4d..9cd9ba23c910 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 967353e0d39d..f219c6e69cf5 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 05a4cd120026..ead3c4618b56 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 8eceb049215c..1020ffe2d36f 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 ca679702e93b..1d8a40fc67fe 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 c302c93a9a4e..ef813458a21e 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 345647bb5864..24dca8b06c5c 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 793a8f3c8a70..2385a16d92cc 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 d1b74863b5b7..dbcdadda6fff 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 f4bacc01afb3..31426fa36b5c 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 ae412301df88..a6d79dd2f92b 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 4c6d87a9602e..f02b6cd5eab1 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 a55fc55b8e43..b072976f6c65 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 f3013ac41c37..8e1068ea6e84 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 361ec116fc89..37314647831f 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _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 db13b2febbf7..3d5ddf4f62b2 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=f98c36a1ee211609b51b9550d5ec4aa4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-8.2.0 b/metadata/md5-cache/sys-devel/kgcc64-8.2.0
index 9829458f7f1f..0b55954dfdbd 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-8.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-8.2.0
@@ -10,5 +10,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=8.2.0
 SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.1.0-patches-1.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	4cc484f0fa892a21beb896d872b0da57	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=4cb1d9d85f4546a85589d19c1abefacf
diff --git a/metadata/md5-cache/sys-devel/llvm-3.4.2-r100 b/metadata/md5-cache/sys-devel/llvm-3.4.2-r100
index d9dddc22c0d4..e0bb047461da 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.4.2-r100
+++ b/metadata/md5-cache/sys-devel/llvm-3.4.2-r100
@@ -10,5 +10,5 @@ PDEPEND=clang? ( =sys-devel/clang-3.4.2-r100 )
 RDEPEND=sys-libs/zlib:0= libffi? ( >=virtual/libffi-3.0.13-r1:0= ) clang? ( !<=sys-devel/clang-3.4.2-r99 !>=sys-devel/clang-9999 )
 SLOT=0/3.4
 SRC_URI=https://llvm.org/releases/3.4.2/llvm-3.4.2.src.tar.gz clang? ( https://llvm.org/releases/3.4/compiler-rt-3.4.src.tar.gz https://llvm.org/releases/3.4.2/cfe-3.4.2.src.tar.gz ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-3.4-manpages.tar.bz2 https://dev.gentoo.org/~mgorny/dist/llvm/llvm-3.4.2-patchset.tar.gz https://dev.gentoo.org/~grobian/distfiles/llvm-3.4-patchset-darwin-leopard.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=04e3f490d715ab8b01c8adbe5eb56c50
diff --git a/metadata/md5-cache/sys-devel/llvm-3.5.2-r100 b/metadata/md5-cache/sys-devel/llvm-3.5.2-r100
index e5bf03b3a9ce..6e20901d5601 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.5.2-r100
+++ b/metadata/md5-cache/sys-devel/llvm-3.5.2-r100
@@ -10,5 +10,5 @@ PDEPEND=clang? ( =sys-devel/clang-3.5.2-r100 )
 RDEPEND=sys-libs/zlib:0= libffi? ( >=virtual/libffi-3.0.13-r1:0= ) clang? ( !<=sys-devel/clang-3.5.2-r99 !>=sys-devel/clang-9999 )
 SLOT=0/3.5
 SRC_URI=https://llvm.org/releases/3.5.2/llvm-3.5.2.src.tar.xz clang? ( https://llvm.org/releases/3.5.2/compiler-rt-3.5.2.src.tar.xz https://llvm.org/releases/3.5.2/cfe-3.5.2.src.tar.xz ) https://dev.gentoo.org/~voyageur/distfiles/llvm-3.5.0-manpages.tar.bz2 https://dev.gentoo.org/~mgorny/dist/llvm/llvm-3.5.2-patchset.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f7f612b76607f98d38b712ffe569c699
diff --git a/metadata/md5-cache/sys-devel/llvm-3.6.2-r100 b/metadata/md5-cache/sys-devel/llvm-3.6.2-r100
index 927674969d1e..2f8c90ac0e9f 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.6.2-r100
+++ b/metadata/md5-cache/sys-devel/llvm-3.6.2-r100
@@ -10,5 +10,5 @@ PDEPEND=clang? ( =sys-devel/clang-3.6.2-r100 )
 RDEPEND=sys-libs/zlib:0= libffi? ( >=virtual/libffi-3.0.13-r1:0= ) clang? ( !<=sys-devel/clang-3.6.2-r99 !>=sys-devel/clang-9999 )
 SLOT=0/3.6
 SRC_URI=https://llvm.org/releases/3.6.2/llvm-3.6.2.src.tar.xz clang? ( https://llvm.org/releases/3.6.2/compiler-rt-3.6.2.src.tar.xz https://llvm.org/releases/3.6.2/cfe-3.6.2.src.tar.xz ) https://dev.gentoo.org/~voyageur/distfiles/llvm-3.6.1-manpages.tar.bz2 https://dev.gentoo.org/~mgorny/dist/llvm/llvm-3.6.2-patchset.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cbc2e15354e954a7e9bbd03cdfb3571f
diff --git a/metadata/md5-cache/sys-devel/llvm-3.7.1-r3 b/metadata/md5-cache/sys-devel/llvm-3.7.1-r3
index 36196c0d5600..6ca22d6f98f5 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.7.1-r3
+++ b/metadata/md5-cache/sys-devel/llvm-3.7.1-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
 SLOT=0/3.7.1
 SRC_URI=https://llvm.org/releases/3.7.1/llvm-3.7.1.src.tar.xz clang? ( https://llvm.org/releases/3.7.1/compiler-rt-3.7.1.src.tar.xz https://llvm.org/releases/3.7.1/cfe-3.7.1.src.tar.xz https://llvm.org/releases/3.7.1/clang-tools-extra-3.7.1.src.tar.xz ) lldb? ( https://llvm.org/releases/3.7.1/lldb-3.7.1.src.tar.xz ) !doc? ( https://dev.gentoo.org/~voyageur/distfiles/llvm-3.7.0-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-3.7.1-patchset.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ff30859020fca8f8c7c11e62fc67943e
diff --git a/metadata/md5-cache/sys-devel/llvm-3.9.1-r1 b/metadata/md5-cache/sys-devel/llvm-3.9.1-r1
index 76acd31eff82..b91cdd735bd5 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.9.1-r1
+++ b/metadata/md5-cache/sys-devel/llvm-3.9.1-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) multitarget? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=0/3.9.1
 SRC_URI=https://llvm.org/releases/3.9.1/llvm-3.9.1.src.tar.xz clang? ( https://llvm.org/releases/3.9.1/compiler-rt-3.9.1.src.tar.xz https://llvm.org/releases/3.9.1/cfe-3.9.1.src.tar.xz https://llvm.org/releases/3.9.1/clang-tools-extra-3.9.1.src.tar.xz ) lldb? ( https://llvm.org/releases/3.9.1/lldb-3.9.1.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-3.9.0_rc3-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-3.9.1-patchset.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=37d8c466527964e286895075d8e35dcb
diff --git a/metadata/md5-cache/sys-devel/llvm-4.0.1-r1 b/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
index 2518466c850e..f3c4ea0fbfb1 100644
--- a/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
+++ b/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( d
 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_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=4
 SRC_URI=https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-4.0.1.tar.bz2 )
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=851c072b4030e5a4e2c943b1c3adc5f4
diff --git a/metadata/md5-cache/sys-devel/llvm-5.0.2 b/metadata/md5-cache/sys-devel/llvm-5.0.2
index 1697430522b1..441a9f973ff7 100644
--- a/metadata/md5-cache/sys-devel/llvm-5.0.2
+++ b/metadata/md5-cache/sys-devel/llvm-5.0.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( d
 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 )
 SLOT=5
 SRC_URI=https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.1-patchset.tar.bz2 !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.2-manpages.tar.bz2 )
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7948fd9dce1ff89c5020be442ab06a5b
diff --git a/metadata/md5-cache/sys-devel/llvm-6.0.1 b/metadata/md5-cache/sys-devel/llvm-6.0.1
index 1432226eff95..aa4625a1be9f 100644
--- a/metadata/md5-cache/sys-devel/llvm-6.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-6.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-6.0.1-manpages.tar.bz2 )
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2ae722ea642e049b7dd3cf1f6ebd9f9a
diff --git a/metadata/md5-cache/sys-devel/llvm-6.0.9999 b/metadata/md5-cache/sys-devel/llvm-6.0.9999
index 54e60228a7ec..0ef15b38415a 100644
--- a/metadata/md5-cache/sys-devel/llvm-6.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-6.0.9999
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( d
 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 )
 RESTRICT=!test? ( test )
 SLOT=6
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=94b4aae004bf349ce8e5a43b9eab959f
diff --git a/metadata/md5-cache/sys-devel/llvm-7.0.9999 b/metadata/md5-cache/sys-devel/llvm-7.0.9999
index 0435c33dd5b7..fba42a49064e 100644
--- a/metadata/md5-cache/sys-devel/llvm-7.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-7.0.9999
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( d
 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 )
 RESTRICT=!test? ( test )
 SLOT=7
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8fd6e1774b08ad4ff99a6b1b5db8ba53
diff --git a/metadata/md5-cache/sys-devel/llvm-9999 b/metadata/md5-cache/sys-devel/llvm-9999
index e165173368fe..467e9c6501ea 100644
--- a/metadata/md5-cache/sys-devel/llvm-9999
+++ b/metadata/md5-cache/sys-devel/llvm-9999
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( d
 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 llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly )
 RESTRICT=!test? ( test )
 SLOT=8
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=53f334787d9cb4acc87af3fbad97de55
diff --git a/metadata/md5-cache/sys-devel/make-4.1-r1 b/metadata/md5-cache/sys-devel/make-4.1-r1
deleted file mode 100644
index 706249c2a374..000000000000
--- a/metadata/md5-cache/sys-devel/make-4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=guile? ( >=dev-scheme/guile-1.8 ) nls? ( sys-devel/gettext )
-DESCRIPTION=Standard tool to compile source trees
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/make/make.html
-IUSE=guile nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+
-RDEPEND=guile? ( >=dev-scheme/guile-1.8 ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu//make/make-4.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=84e7393c7bbd5b12c132472e25a58c47
diff --git a/metadata/md5-cache/sys-devel/make-4.2.1 b/metadata/md5-cache/sys-devel/make-4.2.1
deleted file mode 100644
index 6ca6738ca810..000000000000
--- a/metadata/md5-cache/sys-devel/make-4.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( sys-devel/gettext )
-DESCRIPTION=Standard tool to compile source trees
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/make/make.html
-IUSE=guile nls static
-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=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu//make/make-4.2.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e5b5d6dd023ab46baa20311f62f4671
diff --git a/metadata/md5-cache/sys-devel/make-4.2.1-r2 b/metadata/md5-cache/sys-devel/make-4.2.1-r2
deleted file mode 100644
index 8130e93455ce..000000000000
--- a/metadata/md5-cache/sys-devel/make-4.2.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( sys-devel/gettext )
-DESCRIPTION=Standard tool to compile source trees
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/make/make.html
-IUSE=guile nls static
-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=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu//make/make-4.2.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b05cfc7ab68c09f1db85d5ff9d90c150
diff --git a/metadata/md5-cache/sys-devel/make-4.2.1-r3 b/metadata/md5-cache/sys-devel/make-4.2.1-r3
index c4c887041434..14e39e34d457 100644
--- a/metadata/md5-cache/sys-devel/make-4.2.1-r3
+++ b/metadata/md5-cache/sys-devel/make-4.2.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Standard tool to compile source trees
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/make/make.html
 IUSE=guile nls static
-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=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-4.2.1.tar.bz2
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f4846bcd2c4cb9c4ad2771f972a4c184
+_md5_=846bb7a55d31f2868fa663b9f73c400d
diff --git a/metadata/md5-cache/sys-fabric/Manifest.gz b/metadata/md5-cache/sys-fabric/Manifest.gz
index d63de4048012..ce1d6354e3f0 100644
--- a/metadata/md5-cache/sys-fabric/Manifest.gz
+++ b/metadata/md5-cache/sys-fabric/Manifest.gz
diff --git a/metadata/md5-cache/sys-fabric/infinipath-psm-3.2 b/metadata/md5-cache/sys-fabric/infinipath-psm-3.2
index 6ac87300aca3..286bbc4b3622 100644
--- a/metadata/md5-cache/sys-fabric/infinipath-psm-3.2
+++ b/metadata/md5-cache/sys-fabric/infinipath-psm-3.2
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/infinipath-psm:0 !sys-fabric/infinipath-psm:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=9635e09ab70f1fc2148f68c9ff4db65e
diff --git a/metadata/md5-cache/sys-fabric/ofed-3.12_rc1 b/metadata/md5-cache/sys-fabric/ofed-3.12_rc1
index 3ca12ee6defd..afaca3a0fe31 100644
--- a/metadata/md5-cache/sys-fabric/ofed-3.12_rc1
+++ b/metadata/md5-cache/sys-fabric/ofed-3.12_rc1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=!sys-fabric/openib !sys-fabric/openib-files sys-fabric/libibcm:3.12 sys-fabric/libibmad:3.12 sys-fabric/libibumad:3.12 sys-fabric/librdmacm:3.12 dapl? ( sys-fabric/dapl:3.12 ) diags? ( sys-fabric/infiniband-diags:3.12 ) ibacm? ( sys-fabric/ibacm:3.12 ) mstflint? ( sys-fabric/mstflint:3.12 ) opensm? ( sys-fabric/opensm:3.12 ) perftest? ( sys-fabric/perftest:3.12 ) qperf? ( sys-fabric/qperf:3.12 ) srp? ( sys-fabric/srptools:3.12 ) rds? ( sys-fabric/rds-tools:3.12 ) ofed_drivers_cxgb3? ( sys-fabric/libcxgb3:3.12 ) ofed_drivers_cxgb4? ( sys-fabric/libcxgb4:3.12 ) ofed_drivers_ehca? ( sys-fabric/libehca:3.12 ) ofed_drivers_ipath? ( sys-fabric/libipathverbs:3.12 ) ofed_drivers_mlx4? ( sys-fabric/libmlx4:3.12 ) ofed_drivers_mlx5? ( sys-fabric/libmlx5:3.12 ) ofed_drivers_mthca? ( sys-fabric/libmthca:3.12 ) ofed_drivers_nes? ( sys-fabric/libnes:3.12 ) ofed_drivers_ocrdma? ( sys-fabric/libocrdma:3.12 ) ofed_drivers_psm? ( sys-fabric/infinipath-psm:3.12 ) !sys-fabric/ofed:0 !sys-fabric/ofed:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e02bc3f334a7a7b70c1d6ceae828c59f
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 4cd26b785b85..37348cb241c6 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.29 b/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.29
index 4961a302fa49..24376a85d5e4 100644
--- a/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.29
+++ b/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.29
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=alsa_cards_usb-usx2y? ( sys-apps/fxload ) alsa_cards_hdsp? ( media-sound/alsa-tools ) alsa_cards_hdspm? ( media-sound/alsa-tools )
 SLOT=0
 SRC_URI=mirror://alsaproject/firmware/alsa-firmware-1.0.29.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=ca0f8a96c6582c6e3b39ea0a49aa97df
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20180728 b/metadata/md5-cache/sys-firmware/intel-microcode-20180728
deleted file mode 100644
index f33a1b51ada9..000000000000
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20180728
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
-DEPEND=sys-apps/iucode_tool
-DESCRIPTION=Intel IA32/IA64 microcode update data
-EAPI=6
-HOMEPAGE=http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=27945
-IUSE=hostonly initramfs +split-ucode vanilla kernel_linux
-KEYWORDS=-* amd64 x86
-LICENSE=intel-ucode
-RDEPEND=!<sys-apps/microcode-ctl-1.17-r2 hostonly? ( sys-apps/iucode_tool )
-REQUIRED_USE=|| ( initramfs split-ucode )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://downloadmirror.intel.com/27945/eng/microcode-20180703.tgz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20180728.tar.xz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d08907a5d9eb899feb38d3c09ad8b2a6
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20180804 b/metadata/md5-cache/sys-firmware/intel-microcode-20180804
new file mode 100644
index 000000000000..a58f251e6666
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20180804
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
+DEPEND=sys-apps/iucode_tool
+DESCRIPTION=Intel IA32/IA64 microcode update data
+EAPI=6
+HOMEPAGE=http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=27945
+IUSE=hostonly initramfs +split-ucode vanilla kernel_linux
+KEYWORDS=-* amd64 x86
+LICENSE=intel-ucode
+RDEPEND=!<sys-apps/microcode-ctl-1.17-r2 hostonly? ( sys-apps/iucode_tool )
+REQUIRED_USE=|| ( initramfs split-ucode )
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://downloadmirror.intel.com/27945/eng/microcode-20180703.tgz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20180804.tar.xz
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5e6eada1b928c1559659b9ea808b5194
diff --git a/metadata/md5-cache/sys-firmware/midisport-firmware-1.2 b/metadata/md5-cache/sys-firmware/midisport-firmware-1.2
index 1e3c792cbcb3..5df5de086e4a 100644
--- a/metadata/md5-cache/sys-firmware/midisport-firmware-1.2
+++ b/metadata/md5-cache/sys-firmware/midisport-firmware-1.2
@@ -9,5 +9,5 @@ LICENSE=Midisport
 RDEPEND=sys-apps/fxload virtual/udev
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/usb-midi-fw/midisport-firmware-1.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=292cbf787ef3e518b41a41646fbfd2cd
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index f0b6c134364a..1be92c1d8fd1 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-1.0.5 b/metadata/md5-cache/sys-fs/bcache-tools-1.0.5
index 8b5a67e7090e..6be5c919995d 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-1.0.5
+++ b/metadata/md5-cache/sys-fs/bcache-tools-1.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.24
 SLOT=0
 SRC_URI=https://github.com/g2p/bcache-tools/archive/v1.0.5.tar.gz -> bcache-tools-1.0.5.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=5bdd18a868926c3f7e72df7c9d814574
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-1.0.8 b/metadata/md5-cache/sys-fs/bcache-tools-1.0.8
index c37a01a61949..cacfccba9910 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-1.0.8
+++ b/metadata/md5-cache/sys-fs/bcache-tools-1.0.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.24
 SLOT=0
 SRC_URI=https://github.com/g2p/bcache-tools/archive/v1.0.8.tar.gz -> bcache-tools-1.0.8.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=5bdd18a868926c3f7e72df7c9d814574
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-1.0.8_p20140220-r1 b/metadata/md5-cache/sys-fs/bcache-tools-1.0.8_p20140220-r1
index c59577f00b15..0cce3317063a 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-1.0.8_p20140220-r1
+++ b/metadata/md5-cache/sys-fs/bcache-tools-1.0.8_p20140220-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/g2p/bcache-tools/archive/v1.0.8.tar.gz -> bcache-tools-1.0.8_p20140220.tgz https://dev.gentoo.org/~jlec/distfiles/bcache-status-20140220.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=81ae3bdea7d5ef13b7f7a3533a664fec
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-9999 b/metadata/md5-cache/sys-fs/bcache-tools-9999
index 04d44a6915d2..8ab12d94e392 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-9999
+++ b/metadata/md5-cache/sys-fs/bcache-tools-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://bcache.evilpiepirate.org/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.24
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=977caf5e701a4f3deadf704d879ed8af
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-4.17 b/metadata/md5-cache/sys-fs/btrfs-progs-4.17
deleted file mode 100644
index 10066898360b..000000000000
--- a/metadata/md5-cache/sys-fs/btrfs-progs-4.17
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( 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_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) >=app-text/asciidoc-8.6.0 app-text/docbook-xml-dtd:4.5 app-text/xmlto python? ( dev-python/setuptools[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
-DESCRIPTION=Btrfs filesystem utilities
-EAPI=6
-HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert python reiserfs static static-libs +zstd 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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( 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_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zstd? ( app-arch/zstd:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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 ) )
-RESTRICT=test
-SLOT=0/0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.17.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f331804cb1c8f2509785f0f3af1f8228
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-4.17-r1 b/metadata/md5-cache/sys-fs/btrfs-progs-4.17-r1
new file mode 100644
index 000000000000..cf5b97794baf
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-4.17-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( 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_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) >=app-text/asciidoc-8.6.0 app-text/docbook-xml-dtd:4.5 app-text/xmlto python? ( dev-python/setuptools[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
+DESCRIPTION=Btrfs filesystem utilities
+EAPI=6
+HOMEPAGE=https://btrfs.wiki.kernel.org
+IUSE=+convert python reiserfs static static-libs +zstd 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( 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_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zstd? ( app-arch/zstd:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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 ) )
+RESTRICT=test
+SLOT=0/0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.17.tar.xz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=4cee44ca2495bdf2f7280d2d6e3e8207
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-4.17.1 b/metadata/md5-cache/sys-fs/btrfs-progs-4.17.1
new file mode 100644
index 000000000000..863fe84405a5
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-4.17.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( 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_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) >=app-text/asciidoc-8.6.0 app-text/docbook-xml-dtd:4.5 app-text/xmlto python? ( dev-python/setuptools[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
+DESCRIPTION=Btrfs filesystem utilities
+EAPI=6
+HOMEPAGE=https://btrfs.wiki.kernel.org
+IUSE=+convert python reiserfs static static-libs +zstd 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( 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_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zstd? ( app-arch/zstd:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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 ) )
+RESTRICT=test
+SLOT=0/0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.17.1.tar.xz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=bec180c6709efdce4035389037ab8d4d
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-9999 b/metadata/md5-cache/sys-fs/btrfs-progs-9999
index 0dc6c096537e..515ee861987c 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-9999
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_
 RESTRICT=test
 SLOT=0/0
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f331804cb1c8f2509785f0f3af1f8228
+_md5_=f9441f19a9acd2da5b420e82dc37b1a7
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.0.4 b/metadata/md5-cache/sys-fs/cryptsetup-2.0.4
new file mode 100644
index 000000000000..2e74bdad9d9a
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup test
+DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) python? ( python_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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(+)?,python_single_target_python3_7(+)?] ) virtual/pkgconfig static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Tool to setup encrypted devices with dm-crypt
+EAPI=6
+HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
+IUSE=+gcrypt kernel nettle openssl +argon2 libressl nls pwquality python reencrypt static static-libs +udev urandom python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) python? ( python_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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(+)?,python_single_target_python3_7(+)?] )
+REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) 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 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) static? ( !gcrypt )
+SLOT=0/12
+SRC_URI=mirror://kernel/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.4.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8c73e617fd5c3d65080b2b40768e1b78
diff --git a/metadata/md5-cache/sys-fs/dd-rescue-1.99.8 b/metadata/md5-cache/sys-fs/dd-rescue-1.99.8
index c489889d96d1..3afea7de2224 100644
--- a/metadata/md5-cache/sys-fs/dd-rescue-1.99.8
+++ b/metadata/md5-cache/sys-fs/dd-rescue-1.99.8
@@ -4,10 +4,10 @@ DESCRIPTION=Similar to dd but can copy from source with errors
 EAPI=6
 HOMEPAGE=http://www.garloff.de/kurt/linux/ddrescue/
 IUSE=cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-1.99.8.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8bdab2cb902d5e30e02ea59ee8f1b0cf
+_md5_=ce420926ee87cf15cefbd8cb718736e9
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.7 b/metadata/md5-cache/sys-fs/fuse-2.9.7
index e0782d31f425..4d9e3e305609 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.7
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.7/fuse-2.9.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9bab9ce3b8600f4e4dde59b50fe1dbe0
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.7-r1 b/metadata/md5-cache/sys-fs/fuse-2.9.7-r1
index 90bfa4998e1e..7e2d3bd9867e 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.7-r1
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.7-r1
@@ -10,5 +10,5 @@ PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
 RDEPEND=sys-fs/fuse-common
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.7/fuse-2.9.7.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=ecfcb5a05a54f574dc6c17954196281d
diff --git a/metadata/md5-cache/sys-fs/fuse-3.2.1 b/metadata/md5-cache/sys-fs/fuse-3.2.1
index 93ffd72094c5..bac359e7cace 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.2.1
+++ b/metadata/md5-cache/sys-fs/fuse-3.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-fs/fuse-common
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.1/fuse-3.2.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68ade9b2bd36d430ab98b3cdeb3eb253
diff --git a/metadata/md5-cache/sys-fs/fuse-3.2.2 b/metadata/md5-cache/sys-fs/fuse-3.2.2
index 5ff4de869d63..961af1101b1d 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.2.2
+++ b/metadata/md5-cache/sys-fs/fuse-3.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-fs/fuse-common
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.2/fuse-3.2.2.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68ade9b2bd36d430ab98b3cdeb3eb253
diff --git a/metadata/md5-cache/sys-fs/fuse-3.2.3 b/metadata/md5-cache/sys-fs/fuse-3.2.3
index 19a5d55635ac..d1a3b890cbea 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.2.3
+++ b/metadata/md5-cache/sys-fs/fuse-3.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-fs/fuse-common
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.3/fuse-3.2.3.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68ade9b2bd36d430ab98b3cdeb3eb253
diff --git a/metadata/md5-cache/sys-fs/fuse-common-3.2.1 b/metadata/md5-cache/sys-fs/fuse-common-3.2.1
index 0096a3383da2..64701e5f14d2 100644
--- a/metadata/md5-cache/sys-fs/fuse-common-3.2.1
+++ b/metadata/md5-cache/sys-fs/fuse-common-3.2.1
@@ -9,5 +9,5 @@ RDEPEND=!<sys-fs/fuse-2.9.7-r1:0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.1/fuse-3.2.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=82c376e48a6682b488715dcbaddfd5b4
diff --git a/metadata/md5-cache/sys-fs/fuse-common-3.2.2 b/metadata/md5-cache/sys-fs/fuse-common-3.2.2
index 57cb08a18a4e..d4dd8df025b9 100644
--- a/metadata/md5-cache/sys-fs/fuse-common-3.2.2
+++ b/metadata/md5-cache/sys-fs/fuse-common-3.2.2
@@ -9,5 +9,5 @@ RDEPEND=!<sys-fs/fuse-2.9.7-r1:0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.2/fuse-3.2.2.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bf587c968b0b081195389e77441659d1
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.116 b/metadata/md5-cache/sys-fs/lvm2-2.02.116
index 4c495e44a089..a1b3956cd288 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.116
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) systemd? ( udev ) static? ( !udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.116.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.116.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3064d59513eb33e8d1d7d92fdf73ccfe
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r1 b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r1
index e530f700a4f1..376963ff05cf 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r1
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r1
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.116.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.116.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c76da5dc33593eb3083154996f355063
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r2 b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r2
index f4e0240a884b..639ea980bd1f 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r2
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.116.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.116.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0eab6f475ebde990e1e4fc70b1199478
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r4 b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r4
index dddde72313a4..81cf13e455ef 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r4
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r4
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.116.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.116.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b0f12d7b5152d256f739969ab28a9c40
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r5 b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r5
index 7404fcfcb076..aea76e53b6ff 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r5
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r5
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.116.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.116.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c49a6999dae241aec43a4fa3dd6b8be8
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r6 b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r6
index 17ac1e4d2b68..5ac64f3f15ee 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r6
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r6
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.116.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.116.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c6151e89c9cab33301bccf82aa70e5c
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.136 b/metadata/md5-cache/sys-fs/lvm2-2.02.136
index 3e9ff10472df..12650c86f382 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.136
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.136
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.136.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.136.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7ab928db33978510a8fba50b2ceff195
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.136-r1 b/metadata/md5-cache/sys-fs/lvm2-2.02.136-r1
index 3f604cfac71e..25cf625c12a7 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.136-r1
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.136-r1
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.136.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.136.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ef52e51d0c275848cc1ca9a425a5d165
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.136-r2 b/metadata/md5-cache/sys-fs/lvm2-2.02.136-r2
index fea46c2332cb..71b123143668 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.136-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.136-r2
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.136.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.136.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=86b7edf4077d1af2f77a5b19c76390a1
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.139 b/metadata/md5-cache/sys-fs/lvm2-2.02.139
index b53133b9ce0d..13a2b4542675 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.139
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.139
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.139.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.139.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=71c76d3de2f39660604e3afe8f38c78d
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.139-r1 b/metadata/md5-cache/sys-fs/lvm2-2.02.139-r1
index 2295d261c7de..011f4c9828a7 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.139-r1
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.139-r1
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.139.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.139.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7dca9af105be5b79d91109dbb7d483f1
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.145 b/metadata/md5-cache/sys-fs/lvm2-2.02.145
index 7c98dc46e001..f50073bbf48c 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.145
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.145
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.145.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.145.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c2ae65681fa4fb9105cb4bf5f8773260
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.145-r1 b/metadata/md5-cache/sys-fs/lvm2-2.02.145-r1
index dd38bc833253..345336d8791f 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.145-r1
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.145-r1
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.145.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.145.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1d5d1187d5e92f1cda1ebfb7b6f0b72d
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.145-r2 b/metadata/md5-cache/sys-fs/lvm2-2.02.145-r2
index 2c3f44c21ef1..cc58185e2248 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.145-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.145-r2
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.145.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.145.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e1fd129f9313582c858adc93cc8e1cea
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.166 b/metadata/md5-cache/sys-fs/lvm2-2.02.166
index 761d6549c68d..e0d4507d09a0 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.166
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.166
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.166.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.166.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=db1248412ef35963b9d8e5f538986080
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.166-r2 b/metadata/md5-cache/sys-fs/lvm2-2.02.166-r2
index e875e017798c..806b0d9ecb40 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.166-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.166-r2
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.166.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.166.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bf1e12d6212c3b25cf546bad26c65cfe
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.171 b/metadata/md5-cache/sys-fs/lvm2-2.02.171
deleted file mode 100644
index e9baed1fd271..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.171
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 sys-devel/autoconf-archive static? ( selinux? ( sys-libs/libselinux[static-libs] ) udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) >=sys-apps/util-linux-2.16[static-libs] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1: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=User-land utilities for LVM2 (device-mapper) software
-EAPI=6
-HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin ) systemd? ( udev ) clvm? ( !systemd )
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.171.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.171.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f948f6f44d61e4e5c9327186ee0c2f4
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.172 b/metadata/md5-cache/sys-fs/lvm2-2.02.172
deleted file mode 100644
index 177c77d33630..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.172
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 sys-devel/autoconf-archive static? ( selinux? ( sys-libs/libselinux[static-libs] ) udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) >=sys-apps/util-linux-2.16[static-libs] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1: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=User-land utilities for LVM2 (device-mapper) software
-EAPI=6
-HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin ) systemd? ( udev ) clvm? ( !systemd )
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.172.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.172.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2e4f6212f4ec716d5f9ccedd7f0ea2a
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.173 b/metadata/md5-cache/sys-fs/lvm2-2.02.173
index e83935c0cdca..94357b253188 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.173
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.173
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.173.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.173.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f2e4f6212f4ec716d5f9ccedd7f0ea2a
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.181 b/metadata/md5-cache/sys-fs/lvm2-2.02.181
new file mode 100644
index 000000000000..38fb0d6efdbe
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.181
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 sys-devel/autoconf-archive static? ( selinux? ( sys-libs/libselinux[static-libs] ) udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) >=sys-apps/util-linux-2.16[static-libs] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1: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=User-land utilities for LVM2 (device-mapper) software
+EAPI=6
+HOMEPAGE=https://sourceware.org/lvm2/
+IUSE=readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
+REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin ) systemd? ( udev ) clvm? ( !systemd )
+SLOT=0
+SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.181.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.181.tgz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7a48fb6b34da48bf684e6b02c8e9fbeb
diff --git a/metadata/md5-cache/sys-fs/mdadm-3.4 b/metadata/md5-cache/sys-fs/mdadm-3.4
index bbd180ddc326..ff130e40cd13 100644
--- a/metadata/md5-cache/sys-fs/mdadm-3.4
+++ b/metadata/md5-cache/sys-fs/mdadm-3.4
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/util-linux-2.16
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/raid/mdadm/mdadm-3.4.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_3.3.4-1.1.debian.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8b24489e3da59d03b5a1d3afd4b5cc28
diff --git a/metadata/md5-cache/sys-fs/mdadm-4.0 b/metadata/md5-cache/sys-fs/mdadm-4.0
index 993ae4a1a707..52fa51a19d64 100644
--- a/metadata/md5-cache/sys-fs/mdadm-4.0
+++ b/metadata/md5-cache/sys-fs/mdadm-4.0
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/util-linux-2.16
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/raid/mdadm/mdadm-4.0.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_3.4-4.debian.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0da0ab21eb348b76b3a63c7939a9aec1
diff --git a/metadata/md5-cache/sys-fs/mdadm-4.1_rc1 b/metadata/md5-cache/sys-fs/mdadm-4.1_rc1
index 76073c7a91bb..21b0118c9b67 100644
--- a/metadata/md5-cache/sys-fs/mdadm-4.1_rc1
+++ b/metadata/md5-cache/sys-fs/mdadm-4.1_rc1
@@ -9,5 +9,5 @@ RDEPEND=>=sys-apps/util-linux-2.16
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/raid/mdadm/mdadm-4.1-rc1.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_4.0-2.debian.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0151e001aef86f43aabb2923833cf2f5
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.5.0-r1 b/metadata/md5-cache/sys-fs/multipath-tools-0.5.0-r1
index f9196086f994..0d51132d3654 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.5.0-r1
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio sys-libs/readline systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-0.5.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aa60bc1ee279f31a216871aa1d8e44a8
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1 b/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
index 5775cb3f32d9..d4a56570250d 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio dev-libs/userspace-rcu sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.6.4;sf=tgz -> multipath-tools-0.6.4.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
 _md5_=743a0ba01f7f047ad9b1757ab2ca119a
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.7.6 b/metadata/md5-cache/sys-fs/multipath-tools-0.7.6
index 6e22d04bd8c6..d70eec9de0a2 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.7.6
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu >=sys-fs/lvm2-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.7.6;sf=tgz -> multipath-tools-0.7.6.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
 _md5_=84fb8fa2387d63103f18e4e68bd1bc61
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.7.7 b/metadata/md5-cache/sys-fs/multipath-tools-0.7.7
index fa30e8fb26b7..4c907891d7aa 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.7.7
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu >=sys-fs/lvm2-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.7.7;sf=tgz -> multipath-tools-0.7.7.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
 _md5_=84fb8fa2387d63103f18e4e68bd1bc61
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2 b/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2
index 027f8e9f191a..11b99f5208bd 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-apps/util-linux-2.20.1-r2 !sys-fs/ntfsprogs ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0 <sys-fs/fuse-3.0.0_pre )
 SLOT=0/87
 SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2016.2.22.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fb29659dfd07e615cc0e7776d275c501
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r1 b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r1
index a52372f32592..dfb77daed248 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r1
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-apps/util-linux-2.20.1-r2 !sys-fs/ntfsprogs ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0:0 )
 SLOT=0/88
 SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2017.3.23.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ab69faf4e0d37db76794a487504b3c0d
diff --git a/metadata/md5-cache/sys-fs/udev-236-r1 b/metadata/md5-cache/sys-fs/udev-236-r1
index 7a7be22b6480..fa5b34589ac2 100644
--- a/metadata/md5-cache/sys-fs/udev-236-r1
+++ b/metadata/md5-cache/sys-fs/udev-236-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=f17be813122ebd8c7c08193ae0dcfdc5
diff --git a/metadata/md5-cache/sys-fs/udev-238 b/metadata/md5-cache/sys-fs/udev-238
index 9089020e11cd..d94deaa541f1 100644
--- a/metadata/md5-cache/sys-fs/udev-238
+++ b/metadata/md5-cache/sys-fs/udev-238
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v238.tar.gz -> systemd-238.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=978b9da378a96bb1481cf05b6d828c1f
diff --git a/metadata/md5-cache/sys-fs/udev-239 b/metadata/md5-cache/sys-fs/udev-239
index 9430867f7f9b..28ba6383c02c 100644
--- a/metadata/md5-cache/sys-fs/udev-239
+++ b/metadata/md5-cache/sys-fs/udev-239
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v239.tar.gz -> systemd-239.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=02c09d6d952198662b497b7320126ce0
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 72c0c0b404f5..1f7cd1e17e83 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -9,5 +9,5 @@ PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	8f6de46b0aa318aea0e8cac62ece098b	linux-info	915cae3d7d636732918d18827fb1c226	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	8f6de46b0aa318aea0e8cac62ece098b	linux-info	915cae3d7d636732918d18827fb1c226	meson	219a0c7b8a0e2ea86faec46f940bca86	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=1c9f2ce87f3fe65b7301691f7b5121f9
diff --git a/metadata/md5-cache/sys-fs/udisks-1.0.5-r2 b/metadata/md5-cache/sys-fs/udisks-1.0.5-r2
index 9dfa0935a267..72cf33bf38dc 100644
--- a/metadata/md5-cache/sys-fs/udisks-1.0.5-r2
+++ b/metadata/md5-cache/sys-fs/udisks-1.0.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=sys-apps/dbus-1.6 >=sys-apps/sg3_utils-1.27.20090411 >=sys-block/parted-3 >=sys-fs/lvm2-2.02.66 virtual/libgudev:= virtual/libudev:= virtual/udev selinux? ( sec-policy/selinux-devicekit ) >=sys-apps/util-linux-2.20.1-r2 virtual/eject remote-access? ( net-dns/avahi )
 SLOT=0
 SRC_URI=https://hal.freedesktop.org/releases/udisks-1.0.5.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1eff6a8af3e8ca9366835aa28f61ae5b
diff --git a/metadata/md5-cache/sys-fs/udisks-2.1.8 b/metadata/md5-cache/sys-fs/udisks-2.1.8
index ecfa4f4f0a89..550fc1b39ef1 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.1.8
+++ b/metadata/md5-cache/sys-fs/udisks-2.1.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=virtual/libgudev-165:= virtual/udev acl? ( virtual/acl ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) systemd? ( >=sys-apps/systemd-209 ) >=sys-apps/util-linux-2.20.1-r2 >=sys-block/parted-3 virtual/eject cryptsetup? ( sys-fs/cryptsetup[udev(+)] sys-fs/lvm2[udev(+)] ) gptfdisk? ( >=sys-apps/gptfdisk-0.8 ) selinux? ( sec-policy/selinux-devicekit )
 SLOT=2
 SRC_URI=https://udisks.freedesktop.org/releases/udisks-2.1.8.tar.bz2
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9801a814eedac69d8dffe0f67750cea6
diff --git a/metadata/md5-cache/sys-fs/udisks-2.7.4-r1 b/metadata/md5-cache/sys-fs/udisks-2.7.4-r1
index 4f009551513b..b159bc45f731 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.7.4-r1
+++ b/metadata/md5-cache/sys-fs/udisks-2.7.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.1
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/archive/udisks-2.7.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=44ce09959f1c87c9cb49290739d8521c
diff --git a/metadata/md5-cache/sys-fs/udisks-2.7.6 b/metadata/md5-cache/sys-fs/udisks-2.7.6
index 035194fccdd6..28ea3612ae5f 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.7.6
+++ b/metadata/md5-cache/sys-fs/udisks-2.7.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.1
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.7.6/udisks-2.7.6.tar.bz2
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4ddae6d1091d371a4af5a3591426159f
diff --git a/metadata/md5-cache/sys-fs/udisks-2.7.7 b/metadata/md5-cache/sys-fs/udisks-2.7.7
index be6bc3c170de..8c61c791d585 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.7.7
+++ b/metadata/md5-cache/sys-fs/udisks-2.7.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.1
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.7.7/udisks-2.7.7.tar.bz2
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fe24e66f431dd649ac6f9b12f34cc098
diff --git a/metadata/md5-cache/sys-fs/vhba-20170610 b/metadata/md5-cache/sys-fs/vhba-20170610
index f265f5e901df..a43f787689f0 100644
--- a/metadata/md5-cache/sys-fs/vhba-20170610
+++ b/metadata/md5-cache/sys-fs/vhba-20170610
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/udev kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/cdemu/vhba-module-20170610.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1c832cd772b32c68202e71356e35f554
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.5.11-r2 b/metadata/md5-cache/sys-fs/zfs-0.6.5.11-r2
index 304ef4f17127..c4731396c246 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.5.11-r2
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.5.11-r2
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.11/zfs-0.6.5.11.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=31e592fa5315ff950006264b2e45b9b1
diff --git a/metadata/md5-cache/sys-fs/zfs-0.7.8 b/metadata/md5-cache/sys-fs/zfs-0.7.8
index da37f7667bf2..1b1a824c7dd9 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.7.8
+++ b/metadata/md5-cache/sys-fs/zfs-0.7.8
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.8/zfs-0.7.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd423644e8b4c253609d720c81abd7d2
diff --git a/metadata/md5-cache/sys-fs/zfs-0.7.9 b/metadata/md5-cache/sys-fs/zfs-0.7.9
index 74ad6ebdd98d..a28f3885017b 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.7.9
+++ b/metadata/md5-cache/sys-fs/zfs-0.7.9
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=69d636bbd6a7d8dcdaf9e1b697b4e30c
diff --git a/metadata/md5-cache/sys-fs/zfs-0.7.9999 b/metadata/md5-cache/sys-fs/zfs-0.7.9999
index b03a508ee806..036ab9d8fb30 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.7.9999
+++ b/metadata/md5-cache/sys-fs/zfs-0.7.9999
@@ -8,5 +8,5 @@ LICENSE=BSD-2 CDDL MIT
 RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.7.9999* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 ) kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=64f036c041c4fc87dc4a171c255d9d26
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index bf800e1fb13b..cd7956f9c49d 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD-2 CDDL MIT
 RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-9999* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 ) kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a768d68aec940cfa4a6172413557336a
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 8b2b97024eb5..01d0f0b1e89a 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.60 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.60
new file mode 100644
index 000000000000..cf493d965e89
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.60
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Gentoo's genpatches for Linux 4.14, with Con Kolivas' MuQSS process scheduler.
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=experimental symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( 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.60
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-65.base.tar.xz mirror://gentoo/genpatches-4.14-65.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-65.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=c2558a45c8d5e928fbd8fa2e52277185
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.117 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.117
new file mode 100644
index 000000000000..f55d7aa23d8f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.117
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Gentoo's genpatches for Linux 4.9, with Con Kolivas' MuQSS process scheduler.
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=experimental symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( 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.117
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-120.base.tar.xz mirror://gentoo/genpatches-4.9-120.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-120.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=70e72a40be84371a7a1ee5d96c5c03a8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.61 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.61
new file mode 100644
index 000000000000..dc13cbf44598
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.61
@@ -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.61
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-66.base.tar.xz mirror://gentoo/genpatches-4.14-66.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-66.experimental.tar.xz )
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=1813b5d93604c077636b3ec30c059b79
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.0 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.0
deleted file mode 100644
index ff798061c94c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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.17 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.17.0
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/genpatches-4.17-1.base.tar.xz mirror://gentoo/genpatches-4.17-1.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.17-1.experimental.tar.xz )
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=64f95520f10539239587c226bc507508
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.1
deleted file mode 100644
index 722cba06e700..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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.17 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.17.1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/genpatches-4.17-2.base.tar.xz mirror://gentoo/genpatches-4.17-2.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.17-2.experimental.tar.xz )
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=80d4f7d96806386060ce18c79ca2e303
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.13 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.13
new file mode 100644
index 000000000000..3815cdb7ae34
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.13
@@ -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.17 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.17.13
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/genpatches-4.17-14.base.tar.xz mirror://gentoo/genpatches-4.17-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.17-14.experimental.tar.xz )
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a8d34ea98c0cc4a5ed7358acdd5c95ea
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.2 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.2
deleted file mode 100644
index d555c40d0767..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.2
+++ /dev/null
@@ -1,14 +0,0 @@
-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.17 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.17.2
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/genpatches-4.17-3.base.tar.xz mirror://gentoo/genpatches-4.17-3.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.17-3.experimental.tar.xz )
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=20c5110586a9fc7067a07f1000b848ca
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.3 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.3
deleted file mode 100644
index 8f821a6e5230..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.3
+++ /dev/null
@@ -1,14 +0,0 @@
-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.17 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.17.3
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/genpatches-4.17-4.base.tar.xz mirror://gentoo/genpatches-4.17-4.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.17-4.experimental.tar.xz )
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=63cdecf3626b818ffdff0fa31cb88e8b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.4
deleted file mode 100644
index 3bb99a1ac773..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.4
+++ /dev/null
@@ -1,14 +0,0 @@
-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.17 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.17.4
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/genpatches-4.17-5.base.tar.xz mirror://gentoo/genpatches-4.17-5.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.17-5.experimental.tar.xz )
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6bea8e192f77c4242b166a40ed9684b4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.5 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.5
deleted file mode 100644
index 4e16c59b51bc..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.5
+++ /dev/null
@@ -1,14 +0,0 @@
-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.17 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.17.5
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/genpatches-4.17-6.base.tar.xz mirror://gentoo/genpatches-4.17-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.17-6.experimental.tar.xz )
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b6c437218cb4b973071fe424bd3b4fc3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.6 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.6
deleted file mode 100644
index ff18e0eadbf9..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.6
+++ /dev/null
@@ -1,14 +0,0 @@
-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.17 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.17.6
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/genpatches-4.17-7.base.tar.xz mirror://gentoo/genpatches-4.17-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.17-7.experimental.tar.xz )
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a1064b05850d38e4612246437dad8fa6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.7
deleted file mode 100644
index 8df0b357d631..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.7
+++ /dev/null
@@ -1,14 +0,0 @@
-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.17 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.17.7
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/genpatches-4.17-8.base.tar.xz mirror://gentoo/genpatches-4.17-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.17-8.experimental.tar.xz )
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=138b4353d041ca74eb8162b8e62ecacc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.8 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.8
deleted file mode 100644
index 4921c81dcdb3..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.8
+++ /dev/null
@@ -1,14 +0,0 @@
-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.17 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.17.8
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/genpatches-4.17-9.base.tar.xz mirror://gentoo/genpatches-4.17-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.17-9.experimental.tar.xz )
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=543d660fdd06d635ae8d29e99fd093ad
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.9 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.9
deleted file mode 100644
index ebfaf95b3aba..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.9
+++ /dev/null
@@ -1,14 +0,0 @@
-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.17 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.17.9
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/genpatches-4.17-10.base.tar.xz mirror://gentoo/genpatches-4.17-10.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.17-10.experimental.tar.xz )
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4c0f63249ab1a389ff31e618fa810787
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.146 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.146
new file mode 100644
index 000000000000..dcac7bac37ab
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.146
@@ -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.146
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-147.base.tar.xz mirror://gentoo/genpatches-4.4-147.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-147.experimental.tar.xz )
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ce40691365ba7eb18c551f6825f88f2c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.118 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.118
new file mode 100644
index 000000000000..95ba13e957bd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.118
@@ -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.118
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-121.base.tar.xz mirror://gentoo/genpatches-4.9-121.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-121.experimental.tar.xz )
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=123fec3f7c04aaac5ec2e7719115837c
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.18_rc8 b/metadata/md5-cache/sys-kernel/git-sources-4.18_rc8
new file mode 100644
index 000000000000..b80ebde48377
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.18_rc8
@@ -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=6
+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.18_rc8
+SRC_URI=https://git.kernel.org/torvalds/p/v4.18-rc8/v4.17 -> patch-4.18-rc8.patch mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=88962f53a32b068e90b7446b9c6d27d5
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.117_p104 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.117_p104
new file mode 100644
index 000000000000..7f3d1b01d32a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.18.117_p104
@@ -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 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 3.18 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=3.18.117_p104
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.117.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-3.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.117-rt104.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.117-rt104.patch.xz
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ce7ec4b4d727cc6673b1465a873586a4
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.59_p37 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.59_p37
new file mode 100644
index 000000000000..5d57cb84e4ce
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.59_p37
@@ -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 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.14 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( 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.59_p37
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.59.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://kernel/linux/kernel/projects/rt/4.14/patch-4.14.59-rt37.patch.xz mirror://kernel/linux/kernel/projects/rt/4.14/older/patch-4.14.59-rt37.patch.xz
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ae042b057632e118c858d57c024d4fdf
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.16.12_p5 b/metadata/md5-cache/sys-kernel/rt-sources-4.16.12_p5
deleted file mode 100644
index cd3d25145237..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.16.12_p5
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Full Linux 4.16 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-IUSE=symlink build deblob
-KEYWORDS=~amd64
-LICENSE=GPL-2 !deblob? ( 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.12_p5
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.12.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.16-gnu/deblob-4.16 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.16-gnu/deblob-check -> deblob-check-4.16 ) mirror://kernel/linux/kernel/projects/rt/4.16/patch-4.16.12-rt5.patch.xz mirror://kernel/linux/kernel/projects/rt/4.16/older/patch-4.16.12-rt5.patch.xz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=175fbf54f3a05c771dc5d3487a9f75e3
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12 b/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12
new file mode 100644
index 000000000000..8fbbc1598697
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12
@@ -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 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.16 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( 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.18_p12
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.18.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.16-gnu/deblob-4.16 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.16-gnu/deblob-check -> deblob-check-4.16 ) mirror://kernel/linux/kernel/projects/rt/4.16/patch-4.16.18-rt12.patch.xz mirror://kernel/linux/kernel/projects/rt/4.16/older/patch-4.16.18-rt12.patch.xz
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ae042b057632e118c858d57c024d4fdf
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.145_p162 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.145_p162
new file mode 100644
index 000000000000..32f824819ace
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.145_p162
@@ -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 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.4 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( 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.145_p162
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.145.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) mirror://kernel/linux/kernel/projects/rt/4.4/patch-4.4.145-rt162.patch.xz mirror://kernel/linux/kernel/projects/rt/4.4/older/patch-4.4.145-rt162.patch.xz
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ce7ec4b4d727cc6673b1465a873586a4
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93
new file mode 100644
index 000000000000..ef712f326a32
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93
@@ -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 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.9 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( 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.115_p93
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.115.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://kernel/linux/kernel/projects/rt/4.9/patch-4.9.115-rt93.patch.xz mirror://kernel/linux/kernel/projects/rt/4.9/older/patch-4.9.115-rt93.patch.xz
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ce7ec4b4d727cc6673b1465a873586a4
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.59 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.59
deleted file mode 100644
index 5fc1d6f0d631..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.59
+++ /dev/null
@@ -1,14 +0,0 @@
-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 for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-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.59
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.59.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.61 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.61
new file mode 100644
index 000000000000..17cb83f5b5a9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.61
@@ -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 for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+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.61
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.61.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.17.11 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.17.11
deleted file mode 100644
index ee1d1f1dbdf4..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.17.11
+++ /dev/null
@@ -1,14 +0,0 @@
-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 for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-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.17.11
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.17.11.xz mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.17.13 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.17.13
new file mode 100644
index 000000000000..4e41794db71b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.17.13
@@ -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 for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+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.17.13
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.17.13.xz mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.145 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.145
deleted file mode 100644
index fd74d504a474..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.145
+++ /dev/null
@@ -1,14 +0,0 @@
-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 for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-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.145
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.145.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.146 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.146
new file mode 100644
index 000000000000..889b6b66d3ca
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.146
@@ -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 for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+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.146
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.146.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.116 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.116
deleted file mode 100644
index a328fa090670..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.116
+++ /dev/null
@@ -1,14 +0,0 @@
-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 for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-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.116
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.116.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.118 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.118
new file mode 100644
index 000000000000..b5c27201d94e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.118
@@ -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 for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+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.118
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.118.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	a06444ab36072f336c630b44b641ba95	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 737c6fa7010b..75025d87af34 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.31 b/metadata/md5-cache/sys-libs/binutils-libs-2.31
deleted file mode 100644
index 9524db5e3d18..000000000000
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.31
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)?] >=sys-apps/texinfo-4.7 nls? ( sys-devel/gettext )
-DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external packages
-EAPI=6
-HOMEPAGE=https://sourceware.org/binutils/
-IUSE=64-bit-bfd multitarget nls 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
-LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5 nls? ( !<sys-devel/gdb-7.10-r1[nls] )
-SLOT=0/2.31
-SRC_URI=mirror://gnu/binutils/binutils-2.31.tar.xz mirror://gentoo/binutils-2.31-patches-1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=47e76152976d040df2efe93ce73c78bc
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.31.1 b/metadata/md5-cache/sys-libs/binutils-libs-2.31.1
index 44d526449dd5..70186fa6922d 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.31.1
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.31.1
@@ -4,9 +4,10 @@ DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external
 EAPI=6
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=64-bit-bfd multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5 nls? ( !<sys-devel/gdb-7.10-r1[nls] )
 SLOT=0/2.31.1
 SRC_URI=mirror://gnu/binutils/binutils-2.31.1.tar.xz mirror://gentoo/binutils-2.31.1-patches-1.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=47e76152976d040df2efe93ce73c78bc
+_md5_=b5c78e56ea76c49b7a3e2fa7383a79ab
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.17 b/metadata/md5-cache/sys-libs/gdbm-1.17
index a71f6a97f1bf..d781fad93729 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.17
+++ b/metadata/md5-cache/sys-libs/gdbm-1.17
@@ -10,4 +10,4 @@ RDEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 SLOT=0/6
 SRC_URI=mirror://gnu/gdbm/gdbm-1.17.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b437e7d8381bfb0eb739646448575a33
+_md5_=16694ad1eb2d49830dab53303ac86f38
diff --git a/metadata/md5-cache/sys-libs/glibc-2.27-r6 b/metadata/md5-cache/sys-libs/glibc-2.27-r6
new file mode 100644
index 000000000000..05aa72c32890
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.27-r6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend test unpack
+DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 sys-devel/bison !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 !<sys-devel/bison-2.7 doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.9 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
+DESCRIPTION=GNU libc C library
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libc/
+IUSE=audit caps compile-locales doc gd hardened headers-only +multiarch multilib nscd profile selinux suid systemtap vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+PDEPEND=!vanilla? ( sys-libs/timezone-data )
+RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
+RESTRICT=strip
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.27.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.27-patches-3.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0529e2b0a70bec08f0b56f3dc496048f
diff --git a/metadata/md5-cache/sys-libs/libosinfo-1.1.0 b/metadata/md5-cache/sys-libs/libosinfo-1.1.0
index 7ee208f161a8..4f9f058eb054 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-1.1.0
+++ b/metadata/md5-cache/sys-libs/libosinfo-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36.0:2 >=net-libs/libsoup-2.42:2.4 >=dev-libs/libxml2-
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/libosinfo-1.1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4167758e903e9f325c68c864f34860e8
diff --git a/metadata/md5-cache/sys-libs/libosinfo-1.2.0 b/metadata/md5-cache/sys-libs/libosinfo-1.2.0
index e657ea3be31b..c074648ef71b 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-1.2.0
+++ b/metadata/md5-cache/sys-libs/libosinfo-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36.0:2 >=dev-libs/libxml2-2.6.0 >=dev-libs/libxslt-1.0
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/libosinfo-1.2.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=238f57cf6a73202cc851be424f51de90
diff --git a/metadata/md5-cache/sys-libs/libvpd-2.2.4 b/metadata/md5-cache/sys-libs/libvpd-2.2.4
index 76a8d40092f3..7a859371cf34 100644
--- a/metadata/md5-cache/sys-libs/libvpd-2.2.4
+++ b/metadata/md5-cache/sys-libs/libvpd-2.2.4
@@ -9,5 +9,5 @@ LICENSE=IBM
 RDEPEND=>=dev-db/sqlite-3.7.8 sys-libs/zlib
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/linux-diag/files/libvpd/2.2.4/libvpd-2.2.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f56dede703168c54e44fa041ede69f87
diff --git a/metadata/md5-cache/sys-libs/libvpd-2.2.5 b/metadata/md5-cache/sys-libs/libvpd-2.2.5
index 0d5906568daa..412845cd6980 100644
--- a/metadata/md5-cache/sys-libs/libvpd-2.2.5
+++ b/metadata/md5-cache/sys-libs/libvpd-2.2.5
@@ -9,5 +9,5 @@ LICENSE=IBM
 RDEPEND=>=dev-db/sqlite-3.7.8 sys-libs/zlib
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/linux-diag/files/libvpd/2.2.5/libvpd-2.2.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f56dede703168c54e44fa041ede69f87
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 5ed0a861a079..cb242984adab 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/acpi_call-3.17 b/metadata/md5-cache/sys-power/acpi_call-3.17
new file mode 100644
index 000000000000..d7d3d3c3c757
--- /dev/null
+++ b/metadata/md5-cache/sys-power/acpi_call-3.17
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup unpack
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=A kernel module that enables you to call ACPI methods
+EAPI=6
+HOMEPAGE=https://github.com/teleshoes/acpi_call
+IUSE=kernel_linux kernel_linux kernel_linux
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://github.com/teleshoes/acpi_call/archive/3.17.tar.gz -> acpi_call-3.17.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=239ccf5142541804c153ed4f3fc2cc2e
diff --git a/metadata/md5-cache/sys-power/acpi_call-9999 b/metadata/md5-cache/sys-power/acpi_call-9999
index c6ddf333a82d..785725db5382 100644
--- a/metadata/md5-cache/sys-power/acpi_call-9999
+++ b/metadata/md5-cache/sys-power/acpi_call-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) dev-vcs/git
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A kernel module that enables you to call ACPI methods
-EAPI=5
-HOMEPAGE=https://github.com/mkottman/acpi_call
+EAPI=6
+HOMEPAGE=https://github.com/teleshoes/acpi_call
 IUSE=kernel_linux kernel_linux kernel_linux
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-2	45ff482316b52b3f96ff6b7309b77f03	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5be6da936304131f2bba2def28007e02
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	git-r3	8f6de46b0aa318aea0e8cac62ece098b	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d2c20339df76a5da65cb363c9ec55a39
diff --git a/metadata/md5-cache/sys-power/acpilight-1.0 b/metadata/md5-cache/sys-power/acpilight-1.0
index 94e1d42db394..df69f3a14e26 100644
--- a/metadata/md5-cache/sys-power/acpilight-1.0
+++ b/metadata/md5-cache/sys-power/acpilight-1.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/wavexx/acpilight/archive/v1.0.tar.gz -> acpilight-1.0.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=9e724143a7d04189428453a48fd7896d
diff --git a/metadata/md5-cache/sys-power/acpilight-1.1 b/metadata/md5-cache/sys-power/acpilight-1.1
index 85ec38a6cd28..7a0fd69bd146 100644
--- a/metadata/md5-cache/sys-power/acpilight-1.1
+++ b/metadata/md5-cache/sys-power/acpilight-1.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev python_targets_python3_5? ( dev-lang/python:3.5 ) python_ta
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://gitlab.com/wavexx/acpilight/-/archive/v1.1/acpilight-v1.1.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13
 _md5_=b0f1ffe5d587bd2ae8c2142ad0207105
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.13 b/metadata/md5-cache/sys-power/apcupsd-3.14.13
index a0d27507d2b6..e825eeacdff3 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.13
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/util-linux-2.23[tty-helpers(-)] <=sys-apps/sysvinit-2.88-r4 sys-freebsd/freebsd-ubin ) cgi? ( >=media-libs/gd-1.8.4 ) nls? ( sys-devel/gettext ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) sys-apps/openrc virtual/mailx
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.13.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=10cc2cf3a7ce5a8cd70c8999ff76f0f7
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r1 b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r1
index 2d2405c9c494..2c50a474606b 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r1
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/util-linux-2.23[tty-helpers(-)] sys-freebsd/freebsd-ubin ) modbus? ( usb? ( virtual/libusb:0 ) ) cgi? ( >=media-libs/gd-1.8.4 ) nls? ( sys-devel/gettext ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) virtual/mailx
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.14.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b07a9c27b2b4edfcaf69ea3a31c1731a
diff --git a/metadata/md5-cache/sys-power/powerstat-0.02.18 b/metadata/md5-cache/sys-power/powerstat-0.02.18
new file mode 100644
index 000000000000..492151f540ac
--- /dev/null
+++ b/metadata/md5-cache/sys-power/powerstat-0.02.18
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile
+DESCRIPTION=Laptop power measuring tool
+EAPI=7
+HOMEPAGE=https://launchpad.net/ubuntu/+source/powerstat https://github.com/ColinIanKing/powerstat
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=https://github.com/ColinIanKing/powerstat/archive/V0.02.18.tar.gz -> powerstat-0.02.18.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=441605d45cb8dc7ac8ceec17fe59252e
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 53a47439d155..05408da25d3d 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/audit-2.6.4 b/metadata/md5-cache/sys-process/audit-2.6.4
index fee3d0d1162f..1b28d497bdd7 100644
--- a/metadata/md5-cache/sys-process/audit-2.6.4
+++ b/metadata/md5-cache/sys-process/audit-2.6.4
@@ -5,11 +5,11 @@ EAPI=6
 HOMEPAGE=https://people.redhat.com/sgrubb/audit/
 IUSE=gssapi ldap python 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 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=GPL-2
+LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap ) sys-libs/libcap-ng 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? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.6.4.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c275f88f8b9d0795463fb21c95699ec9
+_md5_=94f8b4b140bd3d9e7a581f39a1cb4f46
diff --git a/metadata/md5-cache/sys-process/audit-2.7.1 b/metadata/md5-cache/sys-process/audit-2.7.1
index f10813a7480e..514fa6962af8 100644
--- a/metadata/md5-cache/sys-process/audit-2.7.1
+++ b/metadata/md5-cache/sys-process/audit-2.7.1
@@ -5,11 +5,11 @@ EAPI=6
 HOMEPAGE=https://people.redhat.com/sgrubb/audit/
 IUSE=gssapi ldap python 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 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
-LICENSE=GPL-2
+LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap ) sys-libs/libcap-ng 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? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.7.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a6c5febf9d3277bf413267d247ba8b1c
+_md5_=ec12bfce289f6fe562768119f1daf054
diff --git a/metadata/md5-cache/sys-process/audit-2.8.2 b/metadata/md5-cache/sys-process/audit-2.8.2
index 875849cc5fe0..388c7ca34b6e 100644
--- a/metadata/md5-cache/sys-process/audit-2.8.2
+++ b/metadata/md5-cache/sys-process/audit-2.8.2
@@ -5,11 +5,11 @@ EAPI=6
 HOMEPAGE=https://people.redhat.com/sgrubb/audit/
 IUSE=gssapi ldap python 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 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap ) sys-libs/libcap-ng 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? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.8.2.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=284e8e9902e7b3b551200cb751b1170a
+_md5_=5af739a262a09713e556d75f4841d1cb
diff --git a/metadata/md5-cache/sys-process/audit-2.8.3 b/metadata/md5-cache/sys-process/audit-2.8.3
index 6965a34dc3bd..53826ab33e0b 100644
--- a/metadata/md5-cache/sys-process/audit-2.8.3
+++ b/metadata/md5-cache/sys-process/audit-2.8.3
@@ -5,11 +5,11 @@ EAPI=6
 HOMEPAGE=https://people.redhat.com/sgrubb/audit/
 IUSE=gssapi ldap python 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 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap ) sys-libs/libcap-ng 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? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.8.3.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=284e8e9902e7b3b551200cb751b1170a
+_md5_=5af739a262a09713e556d75f4841d1cb
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index f8c548bfd938..c99886cf559b 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/cargo-1.28.0 b/metadata/md5-cache/virtual/cargo-1.28.0
new file mode 100644
index 000000000000..2790ef4d0ccb
--- /dev/null
+++ b/metadata/md5-cache/virtual/cargo-1.28.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Package manager for Rust
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~x86
+RDEPEND=|| ( =dev-lang/rust-1.28.0*[cargo] =dev-lang/rust-bin-1.28.0*[cargo] =dev-util/cargo-0.29.0* )
+SLOT=0
+_md5_=b40fcb86f6d778f2a83c95bafb1cadc0
diff --git a/metadata/md5-cache/virtual/rust-1.28.0 b/metadata/md5-cache/virtual/rust-1.28.0
new file mode 100644
index 000000000000..1865aaa8e173
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.28.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Rust language compiler
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~x86
+RDEPEND=|| ( =dev-lang/rust-1.28.0* =dev-lang/rust-bin-1.28.0* )
+SLOT=0
+_md5_=972f1fbb9112b560e518e3b6a04d92d4
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 68919b3b04ef..6b80ea31e8af 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/cgit-1.2.1 b/metadata/md5-cache/www-apps/cgit-1.2.1
index 395176acf211..4249661241d5 100644
--- a/metadata/md5-cache/www-apps/cgit-1.2.1
+++ b/metadata/md5-cache/www-apps/cgit-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=a fast web-interface for git repositories
 EAPI=5
 HOMEPAGE=https://git.zx2c4.com/cgit/about
 IUSE=doc +highlight +lua +jit vhosts
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 arm x86
 LICENSE=GPL-2
 RDEPEND=dev-vcs/git sys-libs/zlib dev-libs/openssl:0 virtual/httpd-cgi highlight? ( || ( dev-python/pygments app-text/highlight ) ) lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua ) ) >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.18.0.tar.xz https://git.zx2c4.com/cgit/snapshot/cgit-1.2.1.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=16ac07f09991cf0d1d22095e3db49546
+_md5_=a0a6f8c3bdfc2e393969d5aad7a182c2
diff --git a/metadata/md5-cache/www-apps/gitea-1.4.3 b/metadata/md5-cache/www-apps/gitea-1.4.3
new file mode 100644
index 000000000000..8e535d6e7579
--- /dev/null
+++ b/metadata/md5-cache/www-apps/gitea-1.4.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=dev-go/go-bindata virtual/pkgconfig >=dev-lang/go-1.9
+DESCRIPTION=A painless self-hosted Git service, written in Go
+EAPI=6
+HOMEPAGE=https://github.com/go-gitea/gitea
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+RDEPEND=dev-vcs/git
+SLOT=0
+SRC_URI=https://github.com/go-gitea/gitea/archive/v1.4.3.tar.gz -> gitea-1.4.3.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=dd66520c215a12b8450a3939beef188f
diff --git a/metadata/md5-cache/www-apps/hugo-0.46 b/metadata/md5-cache/www-apps/hugo-0.46
new file mode 100644
index 000000000000..392159a58a0f
--- /dev/null
+++ b/metadata/md5-cache/www-apps/hugo-0.46
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=A Fast and Flexible Static Site Generator built with love in Go
+EAPI=6
+HOMEPAGE=https://gohugo.io https://github.com/gohugoio/hugo
+IUSE=+sass
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/gohugoio/hugo/archive/v0.46.tar.gz -> hugo-0.46.tar.gz https://github.com/BurntSushi/locker/archive/a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz -> github.com-BurntSushi-locker-a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/PuerkitoBio/purell/archive/0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz -> github.com-PuerkitoBio-purell-0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/de5bf2ad457846296e2031421a34e2568e304e35.tar.gz -> github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.gz https://github.com/alecthomas/assert/archive/405dbfeb8e38effee6e723317226e93fff912d06.tar.gz -> github.com-alecthomas-assert-405dbfeb8e38effee6e723317226e93fff912d06.tar.gz https://github.com/alecthomas/chroma/archive/e4dff9a08cad984e9cf8eaa39fb80f2beae10484.tar.gz -> github.com-alecthomas-chroma-e4dff9a08cad984e9cf8eaa39fb80f2beae10484.tar.gz https://github.com/alecthomas/colour/archive/60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz -> github.com-alecthomas-colour-60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz https://github.com/alecthomas/repr/archive/f49988b46e025398b9f834f7c726afe001ec481f.tar.gz -> github.com-alecthomas-repr-f49988b46e025398b9f834f7c726afe001ec481f.tar.gz https://github.com/bep/debounce/archive/844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz -> github.com-bep-debounce-844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz https://github.com/bep/gitmap/archive/012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz -> github.com-bep-gitmap-012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz https://github.com/bep/go-tocss/archive/2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz -> github.com-bep-go-tocss-2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz https://github.com/chaseadamsio/goorgeous/archive/dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz -> github.com-chaseadamsio-goorgeous-dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz https://github.com/cpuguy83/go-md2man/archive/a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz -> github.com-cpuguy83-go-md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz https://github.com/danwakefield/fnmatch/archive/cbb64ac3d964b81592e64f957ad53df015803288.tar.gz -> github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/disintegration/imaging/archive/dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz -> github.com-disintegration-imaging-dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz https://github.com/dlclark/regexp2/archive/487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz -> github.com-dlclark-regexp2-487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz https://github.com/eknkc/amber/archive/cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz -> github.com-eknkc-amber-cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz https://github.com/fortytw2/leaktest/archive/a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz -> github.com-fortytw2-leaktest-a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz https://github.com/fsnotify/fsnotify/archive/629574ca2a5df945712d3079857300b5e4da0236.tar.gz -> github.com-fsnotify-fsnotify-629574ca2a5df945712d3079857300b5e4da0236.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gorilla/websocket/archive/ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz -> github.com-gorilla-websocket-ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz -> github.com-hashicorp-go-immutable-radix-7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz https://github.com/hashicorp/golang-lru/archive/0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz -> github.com-hashicorp-golang-lru-0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz https://github.com/hashicorp/hcl/archive/ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz -> github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jdkato/prose/archive/20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz -> github.com-jdkato-prose-20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz https://github.com/kyokomi/emoji/archive/7e06b236c489543f53868841f188a294e3383eab.tar.gz -> github.com-kyokomi-emoji-7e06b236c489543f53868841f188a294e3383eab.tar.gz https://github.com/magefile/mage/archive/2f974307b636f59c13b88704cf350a4772fef271.tar.gz -> github.com-magefile-mage-2f974307b636f59c13b88704cf350a4772fef271.tar.gz https://github.com/magiconair/properties/archive/c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz -> github.com-magiconair-properties-c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz https://github.com/markbates/inflect/archive/a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz -> github.com-markbates-inflect-a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz https://github.com/mattn/go-isatty/archive/0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz -> github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/miekg/mmark/archive/fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz -> github.com-miekg-mmark-fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz https://github.com/mitchellh/hashstructure/archive/2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz -> github.com-mitchellh-hashstructure-2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz https://github.com/mitchellh/mapstructure/archive/00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz -> github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz https://github.com/muesli/smartcrop/archive/f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz -> github.com-muesli-smartcrop-f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz https://github.com/nicksnyder/go-i18n/archive/0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz -> github.com-nicksnyder-go-i18n-0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz https://github.com/olekukonko/tablewriter/archive/b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz -> github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz https://github.com/pelletier/go-toml/archive/acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz -> github.com-pelletier-go-toml-acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz https://github.com/pmezard/go-difflib/archive/792786c7400a136282c1664665ae0a8db921c6c2.tar.gz -> github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz https://github.com/russross/blackfriday/archive/11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz -> github.com-russross-blackfriday-11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz https://github.com/sanity-io/litter/archive/ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz -> github.com-sanity-io-litter-ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz https://github.com/sergi/go-diff/archive/1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz -> github.com-sergi-go-diff-1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz -> github.com-shurcooL-sanitized_anchor_name-86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz https://github.com/spf13/afero/archive/787d034dfe70e44075ccc060d346146ef53270ad.tar.gz -> github.com-spf13-afero-787d034dfe70e44075ccc060d346146ef53270ad.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/cobra/archive/a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz -> github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz https://github.com/spf13/fsync/archive/12a01e648f05a938100a26858d2d59a120307a18.tar.gz -> github.com-spf13-fsync-12a01e648f05a938100a26858d2d59a120307a18.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/spf13/nitro/archive/24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz -> github.com-spf13-nitro-24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/spf13/viper/archive/b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz -> github.com-spf13-viper-b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz https://github.com/stretchr/testify/archive/12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz -> github.com-stretchr-testify-12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz https://github.com/tdewolff/minify/archive/8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz -> github.com-tdewolff-minify-8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz https://github.com/tdewolff/parse/archive/d739d6fccb0971177e06352fea02d3552625efb1.tar.gz -> github.com-tdewolff-parse-d739d6fccb0971177e06352fea02d3552625efb1.tar.gz https://github.com/wellington/go-libsass/archive/615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz -> github.com-wellington-go-libsass-615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz https://github.com/yosssi/ace/archive/ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz -> github.com-yosssi-ace-ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz https://github.com/golang/image/archive/f315e440302883054d0c2bd85486878cb4f8572c.tar.gz -> github.com-golang-image-f315e440302883054d0c2bd85486878cb4f8572c.tar.gz https://github.com/golang/net/archive/61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz -> github.com-golang-net-61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz https://github.com/golang/sync/archive/1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz -> github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz https://github.com/golang/sys/archive/3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz -> github.com-golang-sys-3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz https://github.com/golang/text/archive/2cb43934f0eece38629746959acc633cba083fe4.tar.gz -> github.com-golang-text-2cb43934f0eece38629746959acc633cba083fe4.tar.gz https://github.com/go-yaml/yaml/archive/5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz -> github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=1ff95094a3ff481f9d4ab2d79f93955d
diff --git a/metadata/md5-cache/www-apps/kibana-bin-6.3.2 b/metadata/md5-cache/www-apps/kibana-bin-6.3.2
new file mode 100644
index 000000000000..ee60d3b83eb3
--- /dev/null
+++ b/metadata/md5-cache/www-apps/kibana-bin-6.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Analytics and search dashboard for Elasticsearch
+EAPI=6
+HOMEPAGE=https://www.elastic.co/products/kibana
+IUSE=x-pack
+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 x-pack? ( Elastic )
+RDEPEND=net-libs/nodejs
+SLOT=0
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-6.3.2-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-oss-6.3.2-linux-x86_64.tar.gz )
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=79bb37b25e8134128b202981e27ffb1f
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 769858d5fdf7..69fb252d27d4 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-68.0.3440.75 b/metadata/md5-cache/www-client/chromium-68.0.3440.75
index 4061a9f56de7..ec2af253fda7 100644
--- a/metadata/md5-cache/www-client/chromium-68.0.3440.75
+++ b/metadata/md5-cache/www-client/chromium-68.0.3440.75
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cup
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-68.0.3440.75.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5acd6c73b678b72e78272c174a442479
diff --git a/metadata/md5-cache/www-client/chromium-69.0.3493.3 b/metadata/md5-cache/www-client/chromium-69.0.3493.3
deleted file mode 100644
index b5831f9f9f26..000000000000
--- a/metadata/md5-cache/www-client/chromium-69.0.3493.3
+++ /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.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-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 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 >=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 kernel_linux 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 ~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.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-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 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-plugins/chrome-binary-plugins-57 dev-util/gn 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-69.0.3493.3.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=96494c38749312034f6a31ccb44a8ef5
diff --git a/metadata/md5-cache/www-client/chromium-69.0.3497.12 b/metadata/md5-cache/www-client/chromium-69.0.3497.12
index 2d3f3c452a29..028165a3c39f 100644
--- a/metadata/md5-cache/www-client/chromium-69.0.3497.12
+++ b/metadata/md5-cache/www-client/chromium-69.0.3497.12
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cup
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-69.0.3497.12.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=96494c38749312034f6a31ccb44a8ef5
diff --git a/metadata/md5-cache/www-client/chromium-69.0.3497.23 b/metadata/md5-cache/www-client/chromium-69.0.3497.23
new file mode 100644
index 000000000000..050dd788990c
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-69.0.3497.23
@@ -0,0 +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.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-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 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 >=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 kernel_linux 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 ~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.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-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 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-plugins/chrome-binary-plugins-57 dev-util/gn 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-69.0.3497.23.tar.xz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=96494c38749312034f6a31ccb44a8ef5
diff --git a/metadata/md5-cache/www-client/chromium-70.0.3510.0 b/metadata/md5-cache/www-client/chromium-70.0.3510.0
new file mode 100644
index 000000000000..6eb6c357462e
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-70.0.3510.0
@@ -0,0 +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.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-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 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[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/clang-5 virtual/pkgconfig dev-vcs/git >=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 kernel_linux 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 ~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.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-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 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-plugins/chrome-binary-plugins-57 dev-util/gn 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-70.0.3510.0.tar.xz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cc57b799e11db8c3bb204fa69bd40eba
diff --git a/metadata/md5-cache/www-client/epiphany-3.26.7 b/metadata/md5-cache/www-client/epiphany-3.26.7
new file mode 100644
index 000000000000..62f1d2dfaa4c
--- /dev/null
+++ b/metadata/md5-cache/www-client/epiphany-3.26.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.52.0:2 >=x11-libs/gtk+-3.22.13:3 >=dev-libs/nettle-3.2:= >=net-libs/webkit-gtk-2.17.4:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.91.2:3= dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 dev-libs/gmp:0= >=gnome-base/gsettings-desktop-schemas-0.0.1 app-text/yelp-tools dev-util/gdbus-codegen sys-apps/paxctl >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=GNOME webbrowser based on Webkit
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Web
+IUSE=test test
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.52.0:2 >=x11-libs/gtk+-3.22.13:3 >=dev-libs/nettle-3.2:= >=net-libs/webkit-gtk-2.17.4:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.91.2:3= dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 dev-libs/gmp:0= >=gnome-base/gsettings-desktop-schemas-0.0.1 x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/epiphany/3.26/epiphany-3.26.7.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bb55d4a7d0ace067ea159c822a73d30f
diff --git a/metadata/md5-cache/www-client/firefox-52.6.0 b/metadata/md5-cache/www-client/firefox-52.6.0
index 2e3168c04132..cd6fb400e0c7 100644
--- a/metadata/md5-cache/www-client/firefox-52.6.0
+++ b/metadata/md5-cache/www-client/firefox-52.6.0
@@ -10,5 +10,5 @@ RDEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 seli
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ach.xpi -> firefox-52.6.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/af.xpi -> firefox-52.6.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/an.xpi -> firefox-52.6.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ar.xpi -> firefox-52.6.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/as.xpi -> firefox-52.6.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ast.xpi -> firefox-52.6.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/az.xpi -> firefox-52.6.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/bg.xpi -> firefox-52.6.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.6.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.6.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/br.xpi -> firefox-52.6.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/bs.xpi -> firefox-52.6.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ca.xpi -> firefox-52.6.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/cak.xpi -> firefox-52.6.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/cs.xpi -> firefox-52.6.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/cy.xpi -> firefox-52.6.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/da.xpi -> firefox-52.6.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/de.xpi -> firefox-52.6.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/dsb.xpi -> firefox-52.6.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/el.xpi -> firefox-52.6.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.6.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.6.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/eo.xpi -> firefox-52.6.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.6.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.6.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.6.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.6.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/et.xpi -> firefox-52.6.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/eu.xpi -> firefox-52.6.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/fa.xpi -> firefox-52.6.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ff.xpi -> firefox-52.6.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/fi.xpi -> firefox-52.6.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/fr.xpi -> firefox-52.6.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.6.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.6.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/gd.xpi -> firefox-52.6.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/gl.xpi -> firefox-52.6.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/gn.xpi -> firefox-52.6.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.6.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/he.xpi -> firefox-52.6.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.6.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/hr.xpi -> firefox-52.6.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.6.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/hu.xpi -> firefox-52.6.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.6.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/id.xpi -> firefox-52.6.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/is.xpi -> firefox-52.6.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/it.xpi -> firefox-52.6.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ja.xpi -> firefox-52.6.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ka.xpi -> firefox-52.6.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/kab.xpi -> firefox-52.6.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/kk.xpi -> firefox-52.6.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/km.xpi -> firefox-52.6.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/kn.xpi -> firefox-52.6.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ko.xpi -> firefox-52.6.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/lij.xpi -> firefox-52.6.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/lt.xpi -> firefox-52.6.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/lv.xpi -> firefox-52.6.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/mai.xpi -> firefox-52.6.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/mk.xpi -> firefox-52.6.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ml.xpi -> firefox-52.6.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/mr.xpi -> firefox-52.6.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ms.xpi -> firefox-52.6.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.6.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/nl.xpi -> firefox-52.6.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.6.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/or.xpi -> firefox-52.6.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.6.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/pl.xpi -> firefox-52.6.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.6.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.6.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/rm.xpi -> firefox-52.6.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ro.xpi -> firefox-52.6.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ru.xpi -> firefox-52.6.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/si.xpi -> firefox-52.6.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/sk.xpi -> firefox-52.6.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/sl.xpi -> firefox-52.6.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/son.xpi -> firefox-52.6.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/sq.xpi -> firefox-52.6.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/sr.xpi -> firefox-52.6.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.6.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/ta.xpi -> firefox-52.6.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/te.xpi -> firefox-52.6.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/th.xpi -> firefox-52.6.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/tr.xpi -> firefox-52.6.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/uk.xpi -> firefox-52.6.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/uz.xpi -> firefox-52.6.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/vi.xpi -> firefox-52.6.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/xh.xpi -> firefox-52.6.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.6.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.6.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/52.6.0esr/source/firefox-52.6.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=839d893f128dbe7e15f731e2aec60e3c
diff --git a/metadata/md5-cache/www-client/firefox-52.8.0 b/metadata/md5-cache/www-client/firefox-52.8.0
index f84a4b31535f..1be761ecf9ee 100644
--- a/metadata/md5-cache/www-client/firefox-52.8.0
+++ b/metadata/md5-cache/www-client/firefox-52.8.0
@@ -10,5 +10,5 @@ RDEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 seli
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/ach.xpi -> firefox-52.8.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/af.xpi -> firefox-52.8.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/an.xpi -> firefox-52.8.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/ar.xpi -> firefox-52.8.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/as.xpi -> firefox-52.8.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/ast.xpi -> firefox-52.8.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/az.xpi -> firefox-52.8.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/bg.xpi -> firefox-52.8.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.8.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.8.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/br.xpi -> firefox-52.8.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/bs.xpi -> firefox-52.8.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/ca.xpi -> firefox-52.8.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/cak.xpi -> firefox-52.8.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/cs.xpi -> firefox-52.8.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/cy.xpi -> firefox-52.8.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/da.xpi -> firefox-52.8.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/de.xpi -> firefox-52.8.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/dsb.xpi -> firefox-52.8.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/el.xpi -> firefox-52.8.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.8.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.8.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/eo.xpi -> firefox-52.8.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.8.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.8.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.8.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.8.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/et.xpi -> firefox-52.8.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/eu.xpi -> firefox-52.8.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/fa.xpi -> firefox-52.8.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/ff.xpi -> firefox-52.8.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/fi.xpi -> firefox-52.8.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/fr.xpi -> firefox-52.8.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.8.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.8.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/gd.xpi -> firefox-52.8.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/gl.xpi -> firefox-52.8.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/gn.xpi -> firefox-52.8.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.8.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/he.xpi -> firefox-52.8.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.8.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/hr.xpi -> firefox-52.8.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.8.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/hu.xpi -> firefox-52.8.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.8.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/id.xpi -> firefox-52.8.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/is.xpi -> firefox-52.8.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/it.xpi -> firefox-52.8.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/ja.xpi -> firefox-52.8.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/ka.xpi -> firefox-52.8.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/kab.xpi -> firefox-52.8.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/kk.xpi -> firefox-52.8.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/km.xpi -> firefox-52.8.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/kn.xpi -> firefox-52.8.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/ko.xpi -> firefox-52.8.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/lij.xpi -> firefox-52.8.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/lt.xpi -> firefox-52.8.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/lv.xpi -> firefox-52.8.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/mai.xpi -> firefox-52.8.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/mk.xpi -> firefox-52.8.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/ml.xpi -> firefox-52.8.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/mr.xpi -> firefox-52.8.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/ms.xpi -> firefox-52.8.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.8.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/nl.xpi -> firefox-52.8.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.8.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/or.xpi -> firefox-52.8.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.8.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/pl.xpi -> firefox-52.8.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.8.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.8.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/rm.xpi -> firefox-52.8.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/ro.xpi -> firefox-52.8.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/ru.xpi -> firefox-52.8.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/si.xpi -> firefox-52.8.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/sk.xpi -> firefox-52.8.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/sl.xpi -> firefox-52.8.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/son.xpi -> firefox-52.8.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/sq.xpi -> firefox-52.8.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/sr.xpi -> firefox-52.8.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.8.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/ta.xpi -> firefox-52.8.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/te.xpi -> firefox-52.8.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/th.xpi -> firefox-52.8.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/tr.xpi -> firefox-52.8.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/uk.xpi -> firefox-52.8.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/uz.xpi -> firefox-52.8.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/vi.xpi -> firefox-52.8.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/xh.xpi -> firefox-52.8.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.8.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.8.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/52.8.0esr/source/firefox-52.8.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=839d893f128dbe7e15f731e2aec60e3c
diff --git a/metadata/md5-cache/www-client/firefox-52.9.0 b/metadata/md5-cache/www-client/firefox-52.9.0
index 0c98c341fbb7..34ea45c0b9d1 100644
--- a/metadata/md5-cache/www-client/firefox-52.9.0
+++ b/metadata/md5-cache/www-client/firefox-52.9.0
@@ -10,5 +10,5 @@ RDEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 seli
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ach.xpi -> firefox-52.9.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/af.xpi -> firefox-52.9.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/an.xpi -> firefox-52.9.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ar.xpi -> firefox-52.9.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/as.xpi -> firefox-52.9.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ast.xpi -> firefox-52.9.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/az.xpi -> firefox-52.9.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/bg.xpi -> firefox-52.9.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.9.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.9.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/br.xpi -> firefox-52.9.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/bs.xpi -> firefox-52.9.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ca.xpi -> firefox-52.9.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/cak.xpi -> firefox-52.9.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/cs.xpi -> firefox-52.9.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/cy.xpi -> firefox-52.9.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/da.xpi -> firefox-52.9.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/de.xpi -> firefox-52.9.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/dsb.xpi -> firefox-52.9.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/el.xpi -> firefox-52.9.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.9.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.9.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/eo.xpi -> firefox-52.9.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.9.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.9.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.9.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.9.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/et.xpi -> firefox-52.9.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/eu.xpi -> firefox-52.9.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/fa.xpi -> firefox-52.9.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ff.xpi -> firefox-52.9.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/fi.xpi -> firefox-52.9.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/fr.xpi -> firefox-52.9.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.9.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.9.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/gd.xpi -> firefox-52.9.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/gl.xpi -> firefox-52.9.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/gn.xpi -> firefox-52.9.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.9.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/he.xpi -> firefox-52.9.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.9.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/hr.xpi -> firefox-52.9.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.9.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/hu.xpi -> firefox-52.9.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.9.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/id.xpi -> firefox-52.9.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/is.xpi -> firefox-52.9.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/it.xpi -> firefox-52.9.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ja.xpi -> firefox-52.9.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ka.xpi -> firefox-52.9.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/kab.xpi -> firefox-52.9.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/kk.xpi -> firefox-52.9.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/km.xpi -> firefox-52.9.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/kn.xpi -> firefox-52.9.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ko.xpi -> firefox-52.9.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/lij.xpi -> firefox-52.9.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/lt.xpi -> firefox-52.9.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/lv.xpi -> firefox-52.9.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/mai.xpi -> firefox-52.9.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/mk.xpi -> firefox-52.9.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ml.xpi -> firefox-52.9.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/mr.xpi -> firefox-52.9.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ms.xpi -> firefox-52.9.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.9.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/nl.xpi -> firefox-52.9.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.9.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/or.xpi -> firefox-52.9.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.9.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/pl.xpi -> firefox-52.9.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.9.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.9.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/rm.xpi -> firefox-52.9.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ro.xpi -> firefox-52.9.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ru.xpi -> firefox-52.9.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/si.xpi -> firefox-52.9.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/sk.xpi -> firefox-52.9.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/sl.xpi -> firefox-52.9.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/son.xpi -> firefox-52.9.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/sq.xpi -> firefox-52.9.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/sr.xpi -> firefox-52.9.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.9.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ta.xpi -> firefox-52.9.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/te.xpi -> firefox-52.9.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/th.xpi -> firefox-52.9.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/tr.xpi -> firefox-52.9.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/uk.xpi -> firefox-52.9.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/uz.xpi -> firefox-52.9.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/vi.xpi -> firefox-52.9.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/xh.xpi -> firefox-52.9.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.9.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.9.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/source/firefox-52.9.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c51c1eb52b5a0dca625760657930cf28
diff --git a/metadata/md5-cache/www-client/firefox-60.1.0 b/metadata/md5-cache/www-client/firefox-60.1.0
index 5c2292f1d9fe..02e6fbdd0b25 100644
--- a/metadata/md5-cache/www-client/firefox-60.1.0
+++ b/metadata/md5-cache/www-client/firefox-60.1.0
@@ -10,5 +10,5 @@ RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/ns
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/ach.xpi -> firefox-60.1.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/af.xpi -> firefox-60.1.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/an.xpi -> firefox-60.1.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/ar.xpi -> firefox-60.1.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/as.xpi -> firefox-60.1.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/ast.xpi -> firefox-60.1.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/az.xpi -> firefox-60.1.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/bg.xpi -> firefox-60.1.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.1.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.1.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/br.xpi -> firefox-60.1.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/bs.xpi -> firefox-60.1.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/ca.xpi -> firefox-60.1.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/cak.xpi -> firefox-60.1.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/cs.xpi -> firefox-60.1.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/cy.xpi -> firefox-60.1.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/da.xpi -> firefox-60.1.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/de.xpi -> firefox-60.1.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/dsb.xpi -> firefox-60.1.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/el.xpi -> firefox-60.1.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/en-GB.xpi -> firefox-60.1.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.1.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/eo.xpi -> firefox-60.1.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/es-AR.xpi -> firefox-60.1.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/es-CL.xpi -> firefox-60.1.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/es-ES.xpi -> firefox-60.1.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/es-MX.xpi -> firefox-60.1.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/et.xpi -> firefox-60.1.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/eu.xpi -> firefox-60.1.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/fa.xpi -> firefox-60.1.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/ff.xpi -> firefox-60.1.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/fi.xpi -> firefox-60.1.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/fr.xpi -> firefox-60.1.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.1.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.1.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/gd.xpi -> firefox-60.1.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/gl.xpi -> firefox-60.1.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/gn.xpi -> firefox-60.1.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.1.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/he.xpi -> firefox-60.1.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.1.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/hr.xpi -> firefox-60.1.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/hsb.xpi -> firefox-60.1.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/hu.xpi -> firefox-60.1.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.1.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/id.xpi -> firefox-60.1.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/is.xpi -> firefox-60.1.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/it.xpi -> firefox-60.1.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/ja.xpi -> firefox-60.1.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/ka.xpi -> firefox-60.1.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/kab.xpi -> firefox-60.1.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/kk.xpi -> firefox-60.1.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/km.xpi -> firefox-60.1.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/kn.xpi -> firefox-60.1.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/ko.xpi -> firefox-60.1.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/lij.xpi -> firefox-60.1.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/lt.xpi -> firefox-60.1.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/lv.xpi -> firefox-60.1.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/mai.xpi -> firefox-60.1.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/mk.xpi -> firefox-60.1.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/ml.xpi -> firefox-60.1.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/mr.xpi -> firefox-60.1.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/ms.xpi -> firefox-60.1.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.1.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/nl.xpi -> firefox-60.1.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.1.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/or.xpi -> firefox-60.1.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.1.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/pl.xpi -> firefox-60.1.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.1.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.1.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/rm.xpi -> firefox-60.1.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/ro.xpi -> firefox-60.1.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/ru.xpi -> firefox-60.1.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/si.xpi -> firefox-60.1.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/sk.xpi -> firefox-60.1.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/sl.xpi -> firefox-60.1.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/son.xpi -> firefox-60.1.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/sq.xpi -> firefox-60.1.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/sr.xpi -> firefox-60.1.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.1.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/ta.xpi -> firefox-60.1.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/te.xpi -> firefox-60.1.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/th.xpi -> firefox-60.1.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/tr.xpi -> firefox-60.1.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/uk.xpi -> firefox-60.1.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/uz.xpi -> firefox-60.1.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/vi.xpi -> firefox-60.1.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/xh.xpi -> firefox-60.1.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.1.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.1.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.1.0esr/source/firefox-60.1.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.0-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.0-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.0-patches-02.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.60	6e50ef9c43ba6d6a8edb89393ad56ad0	mozcoreconf-v6	f4fae1830a38e4942d970237883259fc	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.60	6e50ef9c43ba6d6a8edb89393ad56ad0	mozcoreconf-v6	f4fae1830a38e4942d970237883259fc	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=91fc3e3a12cd4df5a17dae2a53bdb13c
diff --git a/metadata/md5-cache/www-client/firefox-61.0-r1 b/metadata/md5-cache/www-client/firefox-61.0-r1
index 055056413b14..33f7678e8e51 100644
--- a/metadata/md5-cache/www-client/firefox-61.0-r1
+++ b/metadata/md5-cache/www-client/firefox-61.0-r1
@@ -10,5 +10,5 @@ RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/ns
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ach.xpi -> firefox-61.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/af.xpi -> firefox-61.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/an.xpi -> firefox-61.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ar.xpi -> firefox-61.0-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/as.xpi -> firefox-61.0-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ast.xpi -> firefox-61.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/az.xpi -> firefox-61.0-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/bg.xpi -> firefox-61.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/bn-BD.xpi -> firefox-61.0-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/bn-IN.xpi -> firefox-61.0-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/br.xpi -> firefox-61.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/bs.xpi -> firefox-61.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ca.xpi -> firefox-61.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/cak.xpi -> firefox-61.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/cs.xpi -> firefox-61.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/cy.xpi -> firefox-61.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/da.xpi -> firefox-61.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/de.xpi -> firefox-61.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/dsb.xpi -> firefox-61.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/el.xpi -> firefox-61.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/en-GB.xpi -> firefox-61.0-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/en-ZA.xpi -> firefox-61.0-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/eo.xpi -> firefox-61.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/es-AR.xpi -> firefox-61.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/es-CL.xpi -> firefox-61.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/es-ES.xpi -> firefox-61.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/es-MX.xpi -> firefox-61.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/et.xpi -> firefox-61.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/eu.xpi -> firefox-61.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/fa.xpi -> firefox-61.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ff.xpi -> firefox-61.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/fi.xpi -> firefox-61.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/fr.xpi -> firefox-61.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/fy-NL.xpi -> firefox-61.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ga-IE.xpi -> firefox-61.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/gd.xpi -> firefox-61.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/gl.xpi -> firefox-61.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/gn.xpi -> firefox-61.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/gu-IN.xpi -> firefox-61.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/he.xpi -> firefox-61.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/hi-IN.xpi -> firefox-61.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/hr.xpi -> firefox-61.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/hsb.xpi -> firefox-61.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/hu.xpi -> firefox-61.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/hy-AM.xpi -> firefox-61.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/id.xpi -> firefox-61.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/is.xpi -> firefox-61.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/it.xpi -> firefox-61.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ja.xpi -> firefox-61.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ka.xpi -> firefox-61.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/kab.xpi -> firefox-61.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/kk.xpi -> firefox-61.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/km.xpi -> firefox-61.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/kn.xpi -> firefox-61.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ko.xpi -> firefox-61.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/lij.xpi -> firefox-61.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/lt.xpi -> firefox-61.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/lv.xpi -> firefox-61.0-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/mai.xpi -> firefox-61.0-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/mk.xpi -> firefox-61.0-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ml.xpi -> firefox-61.0-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/mr.xpi -> firefox-61.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ms.xpi -> firefox-61.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/nb-NO.xpi -> firefox-61.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/nl.xpi -> firefox-61.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/nn-NO.xpi -> firefox-61.0-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/or.xpi -> firefox-61.0-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/pa-IN.xpi -> firefox-61.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/pl.xpi -> firefox-61.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/pt-BR.xpi -> firefox-61.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/pt-PT.xpi -> firefox-61.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/rm.xpi -> firefox-61.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ro.xpi -> firefox-61.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ru.xpi -> firefox-61.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/si.xpi -> firefox-61.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/sk.xpi -> firefox-61.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/sl.xpi -> firefox-61.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/son.xpi -> firefox-61.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/sq.xpi -> firefox-61.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/sr.xpi -> firefox-61.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/sv-SE.xpi -> firefox-61.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ta.xpi -> firefox-61.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/te.xpi -> firefox-61.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/th.xpi -> firefox-61.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/tr.xpi -> firefox-61.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/uk.xpi -> firefox-61.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/uz.xpi -> firefox-61.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/vi.xpi -> firefox-61.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/xh.xpi -> firefox-61.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/zh-CN.xpi -> firefox-61.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/zh-TW.xpi -> firefox-61.0-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/61.0/source/firefox-61.0.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-61.0-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-61.0-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-61.0-patches-01.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.60	6e50ef9c43ba6d6a8edb89393ad56ad0	mozcoreconf-v6	f4fae1830a38e4942d970237883259fc	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	llvm	5c91ddccef25fc60a983057bf9507ead	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.60	6e50ef9c43ba6d6a8edb89393ad56ad0	mozcoreconf-v6	f4fae1830a38e4942d970237883259fc	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=68d60d9a1343cda24cb99c6776f45482
diff --git a/metadata/md5-cache/www-client/firefox-bin-52.9.0 b/metadata/md5-cache/www-client/firefox-bin-52.9.0
index bb36978557c6..0665dabf23dd 100644
--- a/metadata/md5-cache/www-client/firefox-bin-52.9.0
+++ b/metadata/md5-cache/www-client/firefox-bin-52.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/g
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ach.xpi -> firefox-52.9.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/af.xpi -> firefox-52.9.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/an.xpi -> firefox-52.9.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ar.xpi -> firefox-52.9.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/as.xpi -> firefox-52.9.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ast.xpi -> firefox-52.9.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/az.xpi -> firefox-52.9.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/bg.xpi -> firefox-52.9.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.9.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.9.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/br.xpi -> firefox-52.9.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/bs.xpi -> firefox-52.9.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ca.xpi -> firefox-52.9.0esr-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/cs.xpi -> firefox-52.9.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/cy.xpi -> firefox-52.9.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/da.xpi -> firefox-52.9.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/de.xpi -> firefox-52.9.0esr-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/el.xpi -> firefox-52.9.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.9.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.9.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/eo.xpi -> firefox-52.9.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.9.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.9.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.9.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.9.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/et.xpi -> firefox-52.9.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/eu.xpi -> firefox-52.9.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/fa.xpi -> firefox-52.9.0esr-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/fi.xpi -> firefox-52.9.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/fr.xpi -> firefox-52.9.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.9.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.9.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/gd.xpi -> firefox-52.9.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/gl.xpi -> firefox-52.9.0esr-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.9.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/he.xpi -> firefox-52.9.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.9.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/hr.xpi -> firefox-52.9.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.9.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/hu.xpi -> firefox-52.9.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.9.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/id.xpi -> firefox-52.9.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/is.xpi -> firefox-52.9.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/it.xpi -> firefox-52.9.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ja.xpi -> firefox-52.9.0esr-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/kk.xpi -> firefox-52.9.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/km.xpi -> firefox-52.9.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/kn.xpi -> firefox-52.9.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ko.xpi -> firefox-52.9.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/lt.xpi -> firefox-52.9.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/lv.xpi -> firefox-52.9.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/mai.xpi -> firefox-52.9.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/mk.xpi -> firefox-52.9.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ml.xpi -> firefox-52.9.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/mr.xpi -> firefox-52.9.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ms.xpi -> firefox-52.9.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.9.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/nl.xpi -> firefox-52.9.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.9.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/or.xpi -> firefox-52.9.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.9.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/pl.xpi -> firefox-52.9.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.9.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.9.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/rm.xpi -> firefox-52.9.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ro.xpi -> firefox-52.9.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ru.xpi -> firefox-52.9.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/si.xpi -> firefox-52.9.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/sk.xpi -> firefox-52.9.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/sl.xpi -> firefox-52.9.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/son.xpi -> firefox-52.9.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/sq.xpi -> firefox-52.9.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/sr.xpi -> firefox-52.9.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.9.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ta.xpi -> firefox-52.9.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/te.xpi -> firefox-52.9.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/th.xpi -> firefox-52.9.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/tr.xpi -> firefox-52.9.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/uk.xpi -> firefox-52.9.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/uz.xpi -> firefox-52.9.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/vi.xpi -> firefox-52.9.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/xh.xpi -> firefox-52.9.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.9.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.9.0esr-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/52.9.0esr/linux-x86_64/en-US/firefox-52.9.0esr.tar.bz2 -> firefox-bin_x86_64-52.9.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/52.9.0esr/linux-i686/en-US/firefox-52.9.0esr.tar.bz2 -> firefox-bin_i686-52.9.0.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0d5b5562c5b6cf22fbd4e0164b24b05e
diff --git a/metadata/md5-cache/www-client/firefox-bin-60.1.0 b/metadata/md5-cache/www-client/firefox-bin-60.1.0
index bbaaf8aae82b..55f81a02d387 100644
--- a/metadata/md5-cache/www-client/firefox-bin-60.1.0
+++ b/metadata/md5-cache/www-client/firefox-bin-60.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/g
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/ach.xpi -> firefox-60.1.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/af.xpi -> firefox-60.1.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/an.xpi -> firefox-60.1.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/ar.xpi -> firefox-60.1.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/as.xpi -> firefox-60.1.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/ast.xpi -> firefox-60.1.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/az.xpi -> firefox-60.1.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/bg.xpi -> firefox-60.1.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.1.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.1.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/br.xpi -> firefox-60.1.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/bs.xpi -> firefox-60.1.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/ca.xpi -> firefox-60.1.0esr-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/cs.xpi -> firefox-60.1.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/cy.xpi -> firefox-60.1.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/da.xpi -> firefox-60.1.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/de.xpi -> firefox-60.1.0esr-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/el.xpi -> firefox-60.1.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/en-GB.xpi -> firefox-60.1.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.1.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/eo.xpi -> firefox-60.1.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/es-AR.xpi -> firefox-60.1.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/es-CL.xpi -> firefox-60.1.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/es-ES.xpi -> firefox-60.1.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/es-MX.xpi -> firefox-60.1.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/et.xpi -> firefox-60.1.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/eu.xpi -> firefox-60.1.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/fa.xpi -> firefox-60.1.0esr-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/fi.xpi -> firefox-60.1.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/fr.xpi -> firefox-60.1.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.1.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.1.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/gd.xpi -> firefox-60.1.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/gl.xpi -> firefox-60.1.0esr-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.1.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/he.xpi -> firefox-60.1.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.1.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/hr.xpi -> firefox-60.1.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/hsb.xpi -> firefox-60.1.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/hu.xpi -> firefox-60.1.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.1.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/id.xpi -> firefox-60.1.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/is.xpi -> firefox-60.1.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/it.xpi -> firefox-60.1.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/ja.xpi -> firefox-60.1.0esr-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/kk.xpi -> firefox-60.1.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/km.xpi -> firefox-60.1.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/kn.xpi -> firefox-60.1.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/ko.xpi -> firefox-60.1.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/lt.xpi -> firefox-60.1.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/lv.xpi -> firefox-60.1.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/mai.xpi -> firefox-60.1.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/mk.xpi -> firefox-60.1.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/ml.xpi -> firefox-60.1.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/mr.xpi -> firefox-60.1.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/ms.xpi -> firefox-60.1.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.1.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/nl.xpi -> firefox-60.1.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.1.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/or.xpi -> firefox-60.1.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.1.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/pl.xpi -> firefox-60.1.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.1.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.1.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/rm.xpi -> firefox-60.1.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/ro.xpi -> firefox-60.1.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/ru.xpi -> firefox-60.1.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/si.xpi -> firefox-60.1.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/sk.xpi -> firefox-60.1.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/sl.xpi -> firefox-60.1.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/son.xpi -> firefox-60.1.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/sq.xpi -> firefox-60.1.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/sr.xpi -> firefox-60.1.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.1.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/ta.xpi -> firefox-60.1.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/te.xpi -> firefox-60.1.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/th.xpi -> firefox-60.1.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/tr.xpi -> firefox-60.1.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/uk.xpi -> firefox-60.1.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/uz.xpi -> firefox-60.1.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/vi.xpi -> firefox-60.1.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/xh.xpi -> firefox-60.1.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.1.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.1.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.1.0esr-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.1.0esr/linux-x86_64/en-US/firefox-60.1.0esr.tar.bz2 -> firefox-bin_x86_64-60.1.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.1.0esr/linux-i686/en-US/firefox-60.1.0esr.tar.bz2 -> firefox-bin_i686-60.1.0.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=38c98b4e4bb6188219e3548e34acebb9
diff --git a/metadata/md5-cache/www-client/google-chrome-68.0.3440.84 b/metadata/md5-cache/www-client/google-chrome-68.0.3440.84
index bd0e2ca2516c..fc1982389e16 100644
--- a/metadata/md5-cache/www-client/google-chrome-68.0.3440.84
+++ b/metadata/md5-cache/www-client/google-chrome-68.0.3440.84
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_68.0.3440.84-1_amd64.deb
-_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2a655510f6c9a1a87183ff004ee8a274
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-68.0.3440.75 b/metadata/md5-cache/www-client/google-chrome-beta-68.0.3440.75
deleted file mode 100644
index e674bbfd084b..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-68.0.3440.75
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+plugins kernel_linux +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
-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 gnome-base/gconf:2 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[X] >=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-beta/google-chrome-beta_68.0.3440.75-1_amd64.deb
-_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=58ad026a395c6d0b8738f78a65f39f6a
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-69.0.3497.23 b/metadata/md5-cache/www-client/google-chrome-beta-69.0.3497.23
new file mode 100644
index 000000000000..80a359f1f08a
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-69.0.3497.23
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+plugins kernel_linux +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
+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 gnome-base/gconf:2 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[X] >=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-beta/google-chrome-beta_69.0.3497.23-1_amd64.deb
+_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=58ad026a395c6d0b8738f78a65f39f6a
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-69.0.3497.23 b/metadata/md5-cache/www-client/google-chrome-unstable-69.0.3497.23
deleted file mode 100644
index 585ba17bfd4e..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-69.0.3497.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+plugins kernel_linux +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
-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[X] >=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_69.0.3497.23-1_amd64.deb
-_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c9876b3c63231eee981617a7dada453
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-70.0.3510.0 b/metadata/md5-cache/www-client/google-chrome-unstable-70.0.3510.0
new file mode 100644
index 000000000000..c9513b1b4d42
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-70.0.3510.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+plugins kernel_linux +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
+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[X] >=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_70.0.3510.0-1_amd64.deb
+_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5c9876b3c63231eee981617a7dada453
diff --git a/metadata/md5-cache/www-client/jd-2.8.5_p120826 b/metadata/md5-cache/www-client/jd-2.8.5_p120826
index 7191621847d7..96106f8cc8ea 100644
--- a/metadata/md5-cache/www-client/jd-2.8.5_p120826
+++ b/metadata/md5-cache/www-client/jd-2.8.5_p120826
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/gtkmm:2.4 dev-libs/glib:2 x11-misc/xdg-utils alsa? ( >=media-libs/alsa-lib-1 ) gnome? ( >=gnome-base/libgnomeui-2 ) !gnome? ( x11-libs/libSM x11-libs/libICE ) gnutls? ( >=net-libs/gnutls-1.2 ) !gnutls? ( >=dev-libs/openssl-0.9 ) migemo? ( app-text/cmigemo ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-cpp/gtkmm:2.4 dev-libs/glib:2 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-misc/xdg-utils alsa? ( >=media-libs/alsa-lib-1 ) gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) migemo? ( app-text/cmigemo ) oniguruma? ( dev-libs/oniguruma ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=gtk2 based 2ch browser written in C++
-EAPI=5
+EAPI=6
 HOMEPAGE=http://jd4linux.sourceforge.jp/
-IUSE=alsa gnome gnutls migemo
+IUSE=alsa gnutls migemo oniguruma
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-cpp/gtkmm:2.4 dev-libs/glib:2 x11-misc/xdg-utils alsa? ( >=media-libs/alsa-lib-1 ) gnome? ( >=gnome-base/libgnomeui-2 ) !gnome? ( x11-libs/libSM x11-libs/libICE ) gnutls? ( >=net-libs/gnutls-1.2 ) !gnutls? ( >=dev-libs/openssl-0.9 ) migemo? ( app-text/cmigemo )
+RDEPEND=dev-cpp/gtkmm:2.4 dev-libs/glib:2 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-misc/xdg-utils alsa? ( >=media-libs/alsa-lib-1 ) gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) migemo? ( app-text/cmigemo ) oniguruma? ( dev-libs/oniguruma )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/jd4linux/56721/jd-2.8.5-120826.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=560c05f8470fa548a39bbe4d6cdb0e18
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b18e72d3701daedc9f825d71889ba3ab
diff --git a/metadata/md5-cache/www-client/jd-2.8.9_p150226 b/metadata/md5-cache/www-client/jd-2.8.9_p150226
new file mode 100644
index 000000000000..486a6cdca218
--- /dev/null
+++ b/metadata/md5-cache/www-client/jd-2.8.9_p150226
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-cpp/gtkmm:2.4 dev-libs/glib:2 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-misc/xdg-utils alsa? ( >=media-libs/alsa-lib-1 ) gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) migemo? ( app-text/cmigemo ) oniguruma? ( dev-libs/oniguruma ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=gtk2 based 2ch browser written in C++
+EAPI=6
+HOMEPAGE=http://jd4linux.sourceforge.jp/
+IUSE=alsa gnutls migemo oniguruma
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-cpp/gtkmm:2.4 dev-libs/glib:2 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-misc/xdg-utils alsa? ( >=media-libs/alsa-lib-1 ) gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) migemo? ( app-text/cmigemo ) oniguruma? ( dev-libs/oniguruma )
+SLOT=0
+SRC_URI=mirror://sourceforge.jp/jd4linux/62877/jd-2.8.9-150226.tgz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9bf36964d321332711274cc39bd6b824
diff --git a/metadata/md5-cache/www-client/midori-0.5.11-r2 b/metadata/md5-cache/www-client/midori-0.5.11-r2
index aaf70280ebd0..913cc423c919 100644
--- a/metadata/md5-cache/www-client/midori-0.5.11-r2
+++ b/metadata/md5-cache/www-client/midori-0.5.11-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=app-crypt/gcr-3:=[gtk] >=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3:2 dev-libs/libxml2 >=net-libs/libsoup-2.38:2.4 >=x11-libs/libnotify-0.7 >=x11-libs/gtk+-3.10.0:3 >=net-libs/webkit-gtk-2.3.91:4[jit=] granite? ( >=dev-libs/granite-0.2 ) xscreensaver? ( x11-libs/libX11 x11-libs/libXScrnSaver )
 SLOT=0
 SRC_URI=http://www.midori-browser.org/downloads/midori_0.5.11_all_.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=43f9ec8687459909c0bce7ff00e1ee90
diff --git a/metadata/md5-cache/www-client/midori-0.5.11-r3 b/metadata/md5-cache/www-client/midori-0.5.11-r3
index e2f1edf066aa..4911246fe373 100644
--- a/metadata/md5-cache/www-client/midori-0.5.11-r3
+++ b/metadata/md5-cache/www-client/midori-0.5.11-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=app-crypt/gcr-3:=[gtk] >=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3:2 dev-libs/libxml2 >=net-libs/libsoup-2.38:2.4 >=x11-libs/libnotify-0.7 >=x11-libs/gtk+-3.10.0:3 >=net-libs/webkit-gtk-2.3.91:4[jit=] granite? ( >=dev-libs/granite-0.2 ) xscreensaver? ( x11-libs/libX11 x11-libs/libXScrnSaver )
 SLOT=0
 SRC_URI=http://www.midori-browser.org/downloads/midori_0.5.11_all_.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=583ba0ae936f2a4532f3a555d38c1f20
diff --git a/metadata/md5-cache/www-client/opera-12.16_p1860-r1 b/metadata/md5-cache/www-client/opera-12.16_p1860-r1
index 5eb39e5a4eec..9905c096d588 100644
--- a/metadata/md5-cache/www-client/opera-12.16_p1860-r1
+++ b/metadata/md5-cache/www-client/opera-12.16_p1860-r1
@@ -9,5 +9,5 @@ LICENSE=OPERA-12 LGPL-2 LGPL-3
 RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt x11-misc/xdg-utils gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) x11-libs/pango x11-libs/pixman )
 SLOT=0
 SRC_URI=amd64? ( mirror://opera/linux/1216/opera-12.16-1860.x86_64.linux.tar.xz ) amd64-fbsd? ( mirror://opera/unix/1216/opera-12.16-1860.amd64.freebsd.tar.xz ) x86? ( mirror://opera/linux/1216/opera-12.16-1860.i386.linux.tar.xz ) x86-fbsd? ( mirror://opera/unix/1216/opera-12.16-1860.i386.freebsd.tar.xz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=be0c66071fc9a6720038844178c32412
diff --git a/metadata/md5-cache/www-client/opera-54.0.2952.60 b/metadata/md5-cache/www-client/opera-54.0.2952.60
deleted file mode 100644
index 48a43349497a..000000000000
--- a/metadata/md5-cache/www-client/opera-54.0.2952.60
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +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
-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+:2 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=https://download1.operacdn.com/pub/opera/desktop/54.0.2952.60/linux/opera-stable_54.0.2952.60_amd64.deb https://download2.operacdn.com/pub/opera/desktop/54.0.2952.60/linux/opera-stable_54.0.2952.60_amd64.deb https://download3.operacdn.com/pub/opera/desktop/54.0.2952.60/linux/opera-stable_54.0.2952.60_amd64.deb https://download4.operacdn.com/pub/opera/desktop/54.0.2952.60/linux/opera-stable_54.0.2952.60_amd64.deb
-_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0c3bbdd241597e50bb558a1fdef22f30
diff --git a/metadata/md5-cache/www-client/opera-54.0.2952.71 b/metadata/md5-cache/www-client/opera-54.0.2952.71
new file mode 100644
index 000000000000..c5ef0e882470
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-54.0.2952.71
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +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
+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+:2 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=https://download1.operacdn.com/pub/opera/desktop/54.0.2952.71/linux/opera-stable_54.0.2952.71_amd64.deb https://download2.operacdn.com/pub/opera/desktop/54.0.2952.71/linux/opera-stable_54.0.2952.71_amd64.deb https://download3.operacdn.com/pub/opera/desktop/54.0.2952.71/linux/opera-stable_54.0.2952.71_amd64.deb https://download4.operacdn.com/pub/opera/desktop/54.0.2952.71/linux/opera-stable_54.0.2952.71_amd64.deb
+_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0c3bbdd241597e50bb558a1fdef22f30
diff --git a/metadata/md5-cache/www-client/opera-beta-55.0.2994.20 b/metadata/md5-cache/www-client/opera-beta-55.0.2994.20
deleted file mode 100644
index 3aea97c4df93..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-55.0.2994.20
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +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
-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+:2 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? ( https://download1.operacdn.com/pub/opera-beta/55.0.2994.20/linux/opera-beta_55.0.2994.20_amd64.deb https://download2.operacdn.com/pub/opera-beta/55.0.2994.20/linux/opera-beta_55.0.2994.20_amd64.deb https://download3.operacdn.com/pub/opera-beta/55.0.2994.20/linux/opera-beta_55.0.2994.20_amd64.deb https://download4.operacdn.com/pub/opera-beta/55.0.2994.20/linux/opera-beta_55.0.2994.20_amd64.deb )
-_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=435990115522dd9bad6752f927c2b922
diff --git a/metadata/md5-cache/www-client/opera-beta-55.0.2994.29 b/metadata/md5-cache/www-client/opera-beta-55.0.2994.29
new file mode 100644
index 000000000000..044cd5c2ab8a
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-55.0.2994.29
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +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
+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+:2 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? ( https://download1.operacdn.com/pub/opera-beta/55.0.2994.29/linux/opera-beta_55.0.2994.29_amd64.deb https://download2.operacdn.com/pub/opera-beta/55.0.2994.29/linux/opera-beta_55.0.2994.29_amd64.deb https://download3.operacdn.com/pub/opera-beta/55.0.2994.29/linux/opera-beta_55.0.2994.29_amd64.deb https://download4.operacdn.com/pub/opera-beta/55.0.2994.29/linux/opera-beta_55.0.2994.29_amd64.deb )
+_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=435990115522dd9bad6752f927c2b922
diff --git a/metadata/md5-cache/www-client/opera-developer-56.0.3023.0 b/metadata/md5-cache/www-client/opera-developer-56.0.3023.0
deleted file mode 100644
index d318b9862e4e..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-56.0.3023.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +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
-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? ( https://download1.operacdn.com/pub/opera-developer/56.0.3023.0/linux/opera-developer_56.0.3023.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/56.0.3023.0/linux/opera-developer_56.0.3023.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/56.0.3023.0/linux/opera-developer_56.0.3023.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/56.0.3023.0/linux/opera-developer_56.0.3023.0_amd64.deb )
-_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f40e36442516e27c324fff1e043d3709
diff --git a/metadata/md5-cache/www-client/opera-developer-56.0.3037.0 b/metadata/md5-cache/www-client/opera-developer-56.0.3037.0
new file mode 100644
index 000000000000..29a08084b005
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-56.0.3037.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +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
+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? ( https://download1.operacdn.com/pub/opera-developer/56.0.3037.0/linux/opera-developer_56.0.3037.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/56.0.3037.0/linux/opera-developer_56.0.3037.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/56.0.3037.0/linux/opera-developer_56.0.3037.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/56.0.3037.0/linux/opera-developer_56.0.3037.0_amd64.deb )
+_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f40e36442516e27c324fff1e043d3709
diff --git a/metadata/md5-cache/www-client/otter-0.9.99 b/metadata/md5-cache/www-client/otter-0.9.99
deleted file mode 100644
index 4630fa11c35e..000000000000
--- a/metadata/md5-cache/www-client/otter-0.9.99
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet ) webengine? ( >=dev-qt/qtwebengine-5.9:5[widgets] ) webkit? ( dev-qt/qtwebkit:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Project aiming to recreate classic Opera (12.x) UI using Qt5
-EAPI=6
-HOMEPAGE=http://otter-browser.org/
-IUSE=webengine +webkit spell
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet ) webengine? ( >=dev-qt/qtwebengine-5.9:5[widgets] ) webkit? ( dev-qt/qtwebkit:5 )
-REQUIRED_USE=|| ( webengine webkit )
-SLOT=0
-SRC_URI=https://github.com/OtterBrowser/otter-browser/archive/v0.9.99.tar.gz -> otter-0.9.99.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f5fd8d1d4ccf507346cd69f881dccb60
diff --git a/metadata/md5-cache/www-client/otter-0.9.99.2 b/metadata/md5-cache/www-client/otter-0.9.99.2
new file mode 100644
index 000000000000..23aa2594e8f9
--- /dev/null
+++ b/metadata/md5-cache/www-client/otter-0.9.99.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet ) webengine? ( >=dev-qt/qtwebengine-5.9:5[widgets] ) webkit? ( dev-qt/qtwebkit:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Project aiming to recreate classic Opera (12.x) UI using Qt5
+EAPI=6
+HOMEPAGE=http://otter-browser.org/
+IUSE=webengine +webkit spell
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet ) webengine? ( >=dev-qt/qtwebengine-5.9:5[widgets] ) webkit? ( dev-qt/qtwebkit:5 )
+REQUIRED_USE=|| ( webengine webkit )
+SLOT=0
+SRC_URI=https://github.com/OtterBrowser/otter-browser/archive/v0.9.99.2.tar.gz -> otter-0.9.99.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f5fd8d1d4ccf507346cd69f881dccb60
diff --git a/metadata/md5-cache/www-client/phantomjs-2.1.1 b/metadata/md5-cache/www-client/phantomjs-2.1.1
index 3f0f41f2bc24..5e375692112e 100644
--- a/metadata/md5-cache/www-client/phantomjs-2.1.1
+++ b/metadata/md5-cache/www-client/phantomjs-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/icu:= fontconfig? ( media-libs/fontconfig ) !libressl? ( dev-li
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/ariya/phantomjs/archive/2.1.1.tar.gz -> phantomjs-2.1.1.tar.gz https://download.qt.io/archive/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz https://download.qt.io/community_releases/5.7/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz mirror://gentoo/gentoo-phantomjs-patchset-0.01.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2e54a9da186893e1cb87c3d11cbd6774
diff --git a/metadata/md5-cache/www-client/phantomjs-2.1.1-r1 b/metadata/md5-cache/www-client/phantomjs-2.1.1-r1
index 1937b6c0db75..a8bee9b6fa85 100644
--- a/metadata/md5-cache/www-client/phantomjs-2.1.1-r1
+++ b/metadata/md5-cache/www-client/phantomjs-2.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/icu:= fontconfig? ( media-libs/fontconfig ) !libressl? ( dev-li
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/ariya/phantomjs/archive/2.1.1.tar.gz -> phantomjs-2.1.1.tar.gz https://download.qt.io/archive/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz https://download.qt.io/community_releases/5.7/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz mirror://gentoo/gentoo-phantomjs-patchset-0.02.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dc42a2ed1db9c77a1f1d7cd84d515016
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.7.0_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.7.0_p0
index e6202cc19c73..1b8f163e40f9 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.49.7.0_p0
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.7.0_p0
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/source/thunderbird-52.7.0.source.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/cs.xpi -> seamonkey-2.49.7.0-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/de.xpi -> seamonkey-2.49.7.0-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.7.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.7.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.7.0-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/fr.xpi -> seamonkey-2.49.7.0-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/hu.xpi -> seamonkey-2.49.7.0-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/it.xpi -> seamonkey-2.49.7.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ja.xpi -> seamonkey-2.49.7.0-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/lt.xpi -> seamonkey-2.49.7.0-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/nl.xpi -> seamonkey-2.49.7.0-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pl.xpi -> seamonkey-2.49.7.0-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.7.0-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ru.xpi -> seamonkey-2.49.7.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sk.xpi -> seamonkey-2.49.7.0-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.7.0-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.7.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.7.0-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=03612936bd710ab160c94e7c3d37d0d1
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.8.0_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.8.0_p0
index e820ae14e2a1..0c500bacbe02 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.49.8.0_p0
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.8.0_p0
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-2.0.5 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/source/thunderbird-52.8.0.source.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/cs.xpi -> seamonkey-2.49.8.0-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/de.xpi -> seamonkey-2.49.8.0-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.8.0-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/fr.xpi -> seamonkey-2.49.8.0-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/hu.xpi -> seamonkey-2.49.8.0-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/it.xpi -> seamonkey-2.49.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ja.xpi -> seamonkey-2.49.8.0-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/lt.xpi -> seamonkey-2.49.8.0-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/nl.xpi -> seamonkey-2.49.8.0-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pl.xpi -> seamonkey-2.49.8.0-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.8.0-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ru.xpi -> seamonkey-2.49.8.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sk.xpi -> seamonkey-2.49.8.0-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.8.0-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.8.0-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2444c30a567b0547599a17e0d1e671b8
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.9.0_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.9.0_p0
index 9e8e0ac47b61..b5f6c9c12bbb 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.49.9.0_p0
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.9.0_p0
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-2.0.5 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/source/thunderbird-52.9.0.source.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/cs.xpi -> seamonkey-2.49.9.0-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/de.xpi -> seamonkey-2.49.9.0-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.9.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.9.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.9.0-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/fr.xpi -> seamonkey-2.49.9.0-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/hu.xpi -> seamonkey-2.49.9.0-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/it.xpi -> seamonkey-2.49.9.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ja.xpi -> seamonkey-2.49.9.0-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/lt.xpi -> seamonkey-2.49.9.0-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/nl.xpi -> seamonkey-2.49.9.0-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pl.xpi -> seamonkey-2.49.9.0-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.9.0-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ru.xpi -> seamonkey-2.49.9.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sk.xpi -> seamonkey-2.49.9.0-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.9.0-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.9.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.9.0-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2444c30a567b0547599a17e0d1e671b8
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0
index 4892a9165994..60e762bf9735 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-2.0.5 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/source/thunderbird-52.9.1.source.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/cs.xpi -> seamonkey-2.49.9.1-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/de.xpi -> seamonkey-2.49.9.1-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.9.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.9.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.9.1-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/fr.xpi -> seamonkey-2.49.9.1-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/hu.xpi -> seamonkey-2.49.9.1-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/it.xpi -> seamonkey-2.49.9.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ja.xpi -> seamonkey-2.49.9.1-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/lt.xpi -> seamonkey-2.49.9.1-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/nl.xpi -> seamonkey-2.49.9.1-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pl.xpi -> seamonkey-2.49.9.1-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.9.1-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ru.xpi -> seamonkey-2.49.9.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sk.xpi -> seamonkey-2.49.9.1-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.9.1-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.9.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.9.1-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2444c30a567b0547599a17e0d1e671b8
diff --git a/metadata/md5-cache/www-client/seamonkey-bin-2.48 b/metadata/md5-cache/www-client/seamonkey-bin-2.48
index edad529f28e0..ee1ff668902e 100644
--- a/metadata/md5-cache/www-client/seamonkey-bin-2.48
+++ b/metadata/md5-cache/www-client/seamonkey-bin-2.48
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/g
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_cs? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.cs.langpack.xpi -> seamonkey-2.48-cs.xpi ) l10n_de? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.de.langpack.xpi -> seamonkey-2.48-de.xpi ) l10n_en-GB? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.en-GB.langpack.xpi -> seamonkey-2.48-en-GB.xpi ) l10n_es-AR? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.es-AR.langpack.xpi -> seamonkey-2.48-es-AR.xpi ) l10n_es-ES? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.es-ES.langpack.xpi -> seamonkey-2.48-es-ES.xpi ) l10n_fr? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.fr.langpack.xpi -> seamonkey-2.48-fr.xpi ) l10n_hu? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.hu.langpack.xpi -> seamonkey-2.48-hu.xpi ) l10n_it? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.it.langpack.xpi -> seamonkey-2.48-it.xpi ) l10n_ja? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.ja.langpack.xpi -> seamonkey-2.48-ja.xpi ) l10n_lt? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.lt.langpack.xpi -> seamonkey-2.48-lt.xpi ) l10n_nl? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.nl.langpack.xpi -> seamonkey-2.48-nl.xpi ) l10n_pl? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.pl.langpack.xpi -> seamonkey-2.48-pl.xpi ) l10n_pt-PT? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.pt-PT.langpack.xpi -> seamonkey-2.48-pt-PT.xpi ) l10n_ru? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.ru.langpack.xpi -> seamonkey-2.48-ru.xpi ) l10n_sk? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.sk.langpack.xpi -> seamonkey-2.48-sk.xpi ) l10n_sv? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.sv-SE.langpack.xpi -> seamonkey-2.48-sv-SE.xpi ) l10n_zh-CN? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.zh-CN.langpack.xpi -> seamonkey-2.48-zh-CN.xpi ) l10n_zh-TW? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.zh-TW.langpack.xpi -> seamonkey-2.48-zh-TW.xpi ) amd64? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/contrib/seamonkey-2.48.en-US.linux-x86_64.tar.bz2 -> seamonkey-bin_x86_64-2.48.tar.bz2 ) x86? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/linux-i686/en-US/seamonkey-2.48.tar.bz2 -> seamonkey-bin_i686-2.48.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fd82cd1ca3c7d2982d4c233f76d9d2f6
diff --git a/metadata/md5-cache/www-client/seamonkey-bin-2.49.1_rc2 b/metadata/md5-cache/www-client/seamonkey-bin-2.49.1_rc2
index f97857010aea..f22c5d0c3365 100644
--- a/metadata/md5-cache/www-client/seamonkey-bin-2.49.1_rc2
+++ b/metadata/md5-cache/www-client/seamonkey-bin-2.49.1_rc2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/g
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_cs? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/cs.xpi -> seamonkey-2.49.1-cs.xpi ) l10n_de? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/de.xpi -> seamonkey-2.49.1-de.xpi ) l10n_en-GB? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.1-en-GB.xpi ) l10n_es-AR? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.1-es-AR.xpi ) l10n_es-ES? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.1-es-ES.xpi ) l10n_fr? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/fr.xpi -> seamonkey-2.49.1-fr.xpi ) l10n_hu? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/hu.xpi -> seamonkey-2.49.1-hu.xpi ) l10n_it? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/it.xpi -> seamonkey-2.49.1-it.xpi ) l10n_ja? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/ja.xpi -> seamonkey-2.49.1-ja.xpi ) l10n_lt? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/lt.xpi -> seamonkey-2.49.1-lt.xpi ) l10n_nl? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/nl.xpi -> seamonkey-2.49.1-nl.xpi ) l10n_pl? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/pl.xpi -> seamonkey-2.49.1-pl.xpi ) l10n_pt-PT? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.1-pt-PT.xpi ) l10n_ru? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/ru.xpi -> seamonkey-2.49.1-ru.xpi ) l10n_sk? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/sk.xpi -> seamonkey-2.49.1-sk.xpi ) l10n_sv? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.1-sv-SE.xpi ) l10n_zh-CN? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.1-zh-CN.xpi ) l10n_zh-TW? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.1-zh-TW.xpi ) amd64? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-x86_64/en-US/seamonkey-2.49.1.tar.bz2 -> seamonkey-bin_x86_64-2.49.1_rc2.tar.bz2 ) x86? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/en-US/seamonkey-2.49.1.tar.bz2 -> seamonkey-bin_i686-2.49.1_rc2.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d822038773704800103ff107b2fc6b0b
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1226.3_p1-r1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1226.3_p1-r1
deleted file mode 100644
index 0d82b4dbd63a..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1226.3_p1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=virtual/libiconv >=sys-apps/sed-4
-DESCRIPTION=A browser for our friends
-EAPI=5
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +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 ~x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 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/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1226.3-1_amd64.deb -> vivaldi-snapshot-1.16.1226.3_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1226.3-1_armhf.deb -> vivaldi-snapshot-1.16.1226.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1226.3-1_i386.deb -> vivaldi-snapshot-1.16.1226.3_p1-i386.deb )
-_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ce4ef294feb04393514a5a7f2de6f969
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1230.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1230.3_p1
deleted file mode 100644
index c61330aca833..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1230.3_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=virtual/libiconv >=sys-apps/sed-4
-DESCRIPTION=A browser for our friends
-EAPI=5
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +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 ~x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 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/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1230.3-1_amd64.deb -> vivaldi-snapshot-1.16.1230.3_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1230.3-1_armhf.deb -> vivaldi-snapshot-1.16.1230.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1230.3-1_i386.deb -> vivaldi-snapshot-1.16.1230.3_p1-i386.deb )
-_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ce4ef294feb04393514a5a7f2de6f969
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1259.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1259.3_p1
new file mode 100644
index 000000000000..fe74de57d460
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1259.3_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv >=sys-apps/sed-4
+DESCRIPTION=A browser for our friends
+EAPI=5
+HOMEPAGE=https://vivaldi.com/
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +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 ~x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 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/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1259.3-1_amd64.deb -> vivaldi-snapshot-1.16.1259.3_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1259.3-1_armhf.deb -> vivaldi-snapshot-1.16.1259.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1259.3-1_i386.deb -> vivaldi-snapshot-1.16.1259.3_p1-i386.deb )
+_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ce4ef294feb04393514a5a7f2de6f969
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index d02c6829ecff..a4b7c8713a56 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/litmus-0.13 b/metadata/md5-cache/www-misc/litmus-0.13
index 91c2dd4c5c42..dfd75c8ec5a0 100644
--- a/metadata/md5-cache/www-misc/litmus-0.13
+++ b/metadata/md5-cache/www-misc/litmus-0.13
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure prepare
 DEPEND=net-libs/neon:0=[expat?,gnutls?,kerberos?,libproxy?,pkcs11?,ssl?,zlib] expat? ( dev-libs/expat:0 ) gnutls? ( net-libs/gnutls:0 ) kerberos? ( app-crypt/mit-krb5:0 ) libproxy? ( net-libs/libproxy:0 ) libxml2? ( dev-libs/libxml2:2 ) pkcs11? ( dev-libs/pakchois:0 ) ssl? ( dev-libs/openssl:0 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=WebDAV server protocol compliance test suite
 EAPI=5
-HOMEPAGE=http://www.webdav.org/neon/litmus
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=debug expat gnutls kerberos libproxy +libxml2 pkcs11 +ssl threads
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -10,6 +10,6 @@ RDEPEND=net-libs/neon:0=[expat?,gnutls?,kerberos?,libproxy?,pkcs11?,ssl?,zlib] e
 REQUIRED_USE=?? ( gnutls ssl ) ^^ ( expat libxml2 ) threads? ( ^^ ( gnutls ssl ) )
 RESTRICT=test
 SLOT=0
-SRC_URI=http://www.webdav.org/neon/litmus/litmus-0.13.tar.gz
+SRC_URI=mirror://gentoo/litmus-0.13.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8ed09bfe3ccc17e6e8e178df297b61a1
+_md5_=3655ab513fcd7430902ad8f9802d038f
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index da10f902945d..1dbc4cb3d9c4 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.75_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.75_beta
deleted file mode 100644
index 7c28045091dc..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.75_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_68.0.3440.75-1_amd64.deb
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44
-_md5_=af88fcb905f586fa4bf5adc077702ee1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-69.0.3497.23_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-69.0.3497.23_alpha
deleted file mode 100644
index 5cade29d20e1..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-69.0.3497.23_alpha
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<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_69.0.3497.23-1_amd64.deb
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44
-_md5_=af88fcb905f586fa4bf5adc077702ee1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-69.0.3497.23_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-69.0.3497.23_beta
new file mode 100644
index 000000000000..607fceb593a7
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-69.0.3497.23_beta
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=beta
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_69.0.3497.23-1_amd64.deb
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44
+_md5_=af88fcb905f586fa4bf5adc077702ee1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-70.0.3510.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-70.0.3510.0_alpha
new file mode 100644
index 000000000000..5a5150d5df02
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-70.0.3510.0_alpha
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<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_70.0.3510.0-1_amd64.deb
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44
+_md5_=af88fcb905f586fa4bf5adc077702ee1
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index d50f0fa243bf..40c90008210c 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/apache-2.4.34-r1 b/metadata/md5-cache/www-servers/apache-2.4.34-r1
index efd8850a6aff..8bde0f823a13 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.34-r1
+++ b/metadata/md5-cache/www-servers/apache-2.4.34-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=+suexec-caps suexec-syslog ssl debug doc gdbm ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.34
 RDEPEND=apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) >=dev-libs/apr-1.5.1:= !www-apache/mod_macro dev-lang/perl =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:0= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
@@ -12,4 +12,4 @@ REQUIRED_USE=apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.34.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.34-20180716.tar.bz2
 _eclasses_=apache-2	00139eb6ef4ef6d4c74aea146b5df588	autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0aab3777b69d4ac9edb418db75b65287
+_md5_=3b0ed896bdb925e53c0db76a9ce218bc
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.17 b/metadata/md5-cache/www-servers/uwsgi-2.0.17
index 1185f88b3653..51171752429b 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.17
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.17
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso
 REQUIRED_USE=|| ( cgi mono perl go lua php pypy python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) pypy? ( python_targets_python2_7 ) python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) python_gevent ) python_gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.17.tar.gz -> uwsgi-2.0.17.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	d0e5375d47f4c809f406eb892e531513	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	d0e5375d47f4c809f406eb892e531513	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e1a6a214d1c5647b7e46c14a5949bbaa
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.17.1 b/metadata/md5-cache/www-servers/uwsgi-2.0.17.1
index 19edcf589e03..132fa44a3cf1 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.17.1
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.17.1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso
 REQUIRED_USE=|| ( cgi mono perl go lua php pypy python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) pypy? ( python_targets_python2_7 ) python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) python_gevent ) python_gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.17.1.tar.gz -> uwsgi-2.0.17.1.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	d0e5375d47f4c809f406eb892e531513	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	d0e5375d47f4c809f406eb892e531513	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	e85f015e815dd463b0c206d781ef45a5	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=5f501b8102ab0066873f5439d5e08b60
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 4ab17d7b642b..d17216d3afa0 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.137 b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.137
index 62bd524b1d9b..54b4f92d2553 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.137
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.137
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/304
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/304.137/NVIDIA-FreeBSD-x86_64-304.137.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/304.137/NVIDIA-Linux-x86_64-304.137.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/304.137/NVIDIA-FreeBSD-x86-304.137.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/304.137/NVIDIA-Linux-x86-304.137.run ) tools? ( http://http.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.137.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=7ec94060af11f5885817d92edf73f502
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107 b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107
index a06a89464237..3315d2d4fb8d 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X )
 RESTRICT=bindist mirror
 SLOT=0/340
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/340.107/NVIDIA-FreeBSD-x86_64-340.107.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/340.107/NVIDIA-Linux-x86_64-340.107.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/340.107/NVIDIA-FreeBSD-x86-340.107.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/340.107/NVIDIA-Linux-x86-340.107.run ) tools? ( http://http.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.107.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=d88d5246888524f053fb17b81105b794
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-375.82 b/metadata/md5-cache/x11-drivers/nvidia-drivers-375.82
index d28df2b474f5..4b03eab24549 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-375.82
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-375.82
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/375
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/375.82/NVIDIA-FreeBSD-x86_64-375.82.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/375.82/NVIDIA-Linux-x86_64-375.82.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-32bit-ARM/375.82/NVIDIA-Linux-armv7l-gnueabihf-375.82.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/375.82/NVIDIA-FreeBSD-x86-375.82.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/375.82/NVIDIA-Linux-x86-375.82.run ) tools? ( https://github.com/NVIDIA/nvidia-settings/archive/375.82.tar.gz -> nvidia-settings-375.82.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=eca9bbce7a93d15b7b1fd6e608543d51
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1
index 906e59b91ac1..d469666832ac 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/378
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/378.13/NVIDIA-FreeBSD-x86_64-378.13.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/378.13/NVIDIA-Linux-x86_64-378.13.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-32bit-ARM/378.13/NVIDIA-Linux-armv7l-gnueabihf-378.13.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/378.13/NVIDIA-FreeBSD-x86-378.13.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/378.13/NVIDIA-Linux-x86-378.13.run ) tools? ( https://github.com/NVIDIA/nvidia-settings/archive/378.13.tar.gz -> nvidia-settings-378.13.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=0ff214d1d95e6defd3396a748c5db633
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1
index 487f9bfa41cb..9dd46c56c657 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/381
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/381.22/NVIDIA-FreeBSD-x86_64-381.22.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/381.22/NVIDIA-Linux-x86_64-381.22.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-32bit-ARM/381.22/NVIDIA-Linux-armv7l-gnueabihf-381.22.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/381.22/NVIDIA-FreeBSD-x86-381.22.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/381.22/NVIDIA-Linux-x86-381.22.run ) tools? ( https://github.com/NVIDIA/nvidia-settings/archive/381.22.tar.gz -> nvidia-settings-381.22.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=5ddc5b4831b973495a8b6e3df9ce03fb
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-384.130 b/metadata/md5-cache/x11-drivers/nvidia-drivers-384.130
index 19b3225a4792..19b268a33a08 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-384.130
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-384.130
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/384
 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/384.130/NVIDIA-FreeBSD-x86_64-384.130.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/384.130/NVIDIA-Linux-x86_64-384.130.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-32bit-ARM/384.130/NVIDIA-Linux-armv7l-gnueabihf-384.130.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/384.130/NVIDIA-FreeBSD-x86-384.130.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/384.130/NVIDIA-Linux-x86-384.130.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-384.130.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=086dc6aac5e3c22454f3adf0d615c20c
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-387.34 b/metadata/md5-cache/x11-drivers/nvidia-drivers-387.34
index 1da5b79fe126..9bc8c20708e0 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-387.34
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-387.34
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/387
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/387.34/NVIDIA-FreeBSD-x86_64-387.34.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/387.34/NVIDIA-Linux-x86_64-387.34.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-32bit-ARM/387.34/NVIDIA-Linux-armv7l-gnueabihf-387.34.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/387.34/NVIDIA-FreeBSD-x86-387.34.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/387.34/NVIDIA-Linux-x86-387.34.run ) tools? ( https://github.com/NVIDIA/nvidia-settings/archive/387.34.tar.gz -> nvidia-settings-387.34.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=34b517e7faa3080d75eab05d8a7d84ab
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.67 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.67
index 4c9cbc75b484..d7204efda387 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.67
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.67
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.67/NVIDIA-FreeBSD-x86_64-390.67.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/390.67/NVIDIA-Linux-x86_64-390.67.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.67/NVIDIA-Linux-armv7l-gnueabihf-390.67.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/390.67/NVIDIA-FreeBSD-x86-390.67.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/390.67/NVIDIA-Linux-x86-390.67.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.67.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=06ca1af6146a1737e1b64dacab69e691
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.77 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.77
index 77cef56186a3..b2e0ec78c639 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.77
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.77
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.77/NVIDIA-FreeBSD-x86_64-390.77.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/390.77/NVIDIA-Linux-x86_64-390.77.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.77/NVIDIA-Linux-armv7l-gnueabihf-390.77.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/390.77/NVIDIA-FreeBSD-x86-390.77.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/390.77/NVIDIA-Linux-x86-390.77.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.77.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=d903568ef42b876aae75ff33b86087ec
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-396.24-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-396.24-r1
index e4953e0f9bb2..25c51dadd537 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-396.24-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-396.24-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/396
 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/396.24/NVIDIA-FreeBSD-x86_64-396.24.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/396.24/NVIDIA-Linux-x86_64-396.24.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-396.24.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=8045231508d931175369a44dd71c4f6e
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-396.45 b/metadata/md5-cache/x11-drivers/nvidia-drivers-396.45
index fff28097f0bb..877ff16b6940 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-396.45
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-396.45
@@ -4,12 +4,12 @@ DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=6
 HOMEPAGE=http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx
 IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 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 ~amd64-fbsd
+KEYWORDS=-* amd64 ~amd64-fbsd
 LICENSE=GPL-2 NVIDIA-r2
 RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) 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-base/xorg-server-1.20.99:= >=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/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/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(-)?] ) kernel_linux? ( virtual/modutils )
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/396
 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/396.45/NVIDIA-FreeBSD-x86_64-396.45.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/396.45/NVIDIA-Linux-x86_64-396.45.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-396.45.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=497579ec17c904aedd6ad6defb28d655
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8045231508d931175369a44dd71c4f6e
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-396.51 b/metadata/md5-cache/x11-drivers/nvidia-drivers-396.51
new file mode 100644
index 000000000000..89207d661107
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-396.51
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils virtual/pkgconfig
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=6
+HOMEPAGE=http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx
+IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 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 ~amd64-fbsd
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) 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-base/xorg-server-1.20.99:= >=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/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/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(-)?] ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X ) static-libs? ( tools )
+RESTRICT=bindist mirror
+SLOT=0/396
+SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/396.51/NVIDIA-FreeBSD-x86_64-396.51.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/396.51/NVIDIA-Linux-x86_64-396.51.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-396.51.tar.bz2 )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=497579ec17c904aedd6ad6defb28d655
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
index 8243c2c15130..2c37df413d3a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
 _md5_=fc5416fc1cb117560f05ccdee97e17ca
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999
index 8407d0800f4a..f7f893f7f35a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
 _md5_=d0a967e29368ceef906ba75327b06c58
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2
index 46821beb3bee..e562ce62d856 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libwacom virtual/libudev:= >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.36.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
 _md5_=38de417953d7cc723e05ae4f97893cf2
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index dcc003023cec..b28df748c0a0 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.4 b/metadata/md5-cache/x11-libs/wxGTK-3.0.4
index 03a929b36003..ecd1ada88d55 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.4
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=6
 HOMEPAGE=https://wxwidgets.org/
 IUSE=+X aqua doc debug gstreamer libnotify opengl sdl tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
 PDEPEND=>=app-eselect/eselect-wxwidgets-20131230
 RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=dev-libs/glib-2.22: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: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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/gtk+-2.18: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/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,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/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,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/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gstreamer? ( media-libs/gstreamer: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(-)?] media-libs/gst-plugins-base: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(-)?] ) libnotify? ( x11-libs/libnotify[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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: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(-)?] ) ) aqua? ( x11-libs/gtk+:2[aqua=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,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:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=3.0
 SRC_URI=https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4.tar.bz2 https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4-docs-html.tar.bz2 )
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=87f9e007a74fb7a752fa29b43d27830c
+_md5_=6b027fdbeb5bc65312c66b05bd658c6a
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r300 b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r300
index 438ec3550f33..029a2a887740 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r300
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r300
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=6
 HOMEPAGE=https://wxwidgets.org/
 IUSE=+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
 PDEPEND=>=app-eselect/eselect-wxwidgets-20131230
 RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=dev-libs/glib-2.22: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: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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/cairo[abi_x86_32(-)?,abi_x86_64(-)?,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/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,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/libSM[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,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/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gstreamer? ( media-libs/gstreamer: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(-)?] media-libs/gst-plugins-base: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(-)?] ) libnotify? ( x11-libs/libnotify[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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: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(-)?] ) webkit? ( net-libs/webkit-gtk:4 ) ) aqua? ( x11-libs/gtk+:3[aqua=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,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:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=3.0-gtk3
 SRC_URI=https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4.tar.bz2 https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4-docs-html.tar.bz2 )
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=92999a35444ee46faa53038ab4adda2a
+_md5_=f9cafd23153052fd4630fba8942e8f6b
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 16d6339ac37d..eeff0ae8a6d7 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/colord-1.3.4 b/metadata/md5-cache/x11-misc/colord-1.3.4
index 44e6c2937509..303a7c64bcec 100644
--- a/metadata/md5-cache/x11-misc/colord-1.3.4
+++ b/metadata/md5-cache/x11-misc/colord-1.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=gusb? ( udev ) scanner? ( udev ) vala? ( introspection )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://www.freedesktop.org/software/colord/releases/colord-1.3.4.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dec181ace7a69b1b405eba6947d41e54
diff --git a/metadata/md5-cache/x11-misc/kdocker-5.2 b/metadata/md5-cache/x11-misc/kdocker-5.2
new file mode 100644
index 000000000000..ff14989ca054
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/kdocker-5.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm >=sys-apps/sed-4
+DESCRIPTION=Helper to dock any application into the system tray
+EAPI=6
+HOMEPAGE=https://github.com/user-none/KDocker
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm
+SLOT=0
+SRC_URI=https://github.com/user-none/KDocker/archive/5.2.tar.gz -> KDocker-5.2.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a632e9c1c45c12413142fb1778986db0
diff --git a/metadata/md5-cache/x11-misc/magick-rotation-1.6.2-r2 b/metadata/md5-cache/x11-misc/magick-rotation-1.6.2-r2
index 1450fff4b0e3..aca819dd54e0 100644
--- a/metadata/md5-cache/x11-misc/magick-rotation-1.6.2-r2
+++ b/metadata/md5-cache/x11-misc/magick-rotation-1.6.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/magick-rotation/trunk/1.6/+download/magick-rotation-1.6.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	ddeaa82191950841a645e0929b0a8c13	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=7ce6fe1a189440d796620b2974066830
diff --git a/metadata/md5-cache/x11-misc/nitrogen-1.6.1 b/metadata/md5-cache/x11-misc/nitrogen-1.6.1
index 732771e42771..28b7e614081c 100644
--- a/metadata/md5-cache/x11-misc/nitrogen-1.6.1
+++ b/metadata/md5-cache/x11-misc/nitrogen-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=A background browser and setter for X
 EAPI=6
 HOMEPAGE=http://projects.l3ib.org/nitrogen/
 IUSE=nls xinerama
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=http://projects.l3ib.org/nitrogen/files/nitrogen-1.6.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=21a49eb1af8b77fe543a9cf8cc17b284
+_md5_=6b8bd72e3ebf5d87006790d253e81942
diff --git a/metadata/md5-cache/x11-misc/parcellite-1.2.1 b/metadata/md5-cache/x11-misc/parcellite-1.2.1
index fb6f8424fdb1..8359ba5a32fa 100644
--- a/metadata/md5-cache/x11-misc/parcellite-1.2.1
+++ b/metadata/md5-cache/x11-misc/parcellite-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight GTK+ based clipboard manager
 EAPI=5
 HOMEPAGE=http://parcellite.sourceforge.net/
 IUSE=nls
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2 x11-misc/xdotool
 SLOT=0
 SRC_URI=mirror://sourceforge/parcellite/parcellite-1.2.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8473ab89ab2b91a51e79af7e3daf5f06
+_md5_=a52eaf1c99998e199d3cbf678c7347cd
diff --git a/metadata/md5-cache/x11-misc/polybar-3.2.1 b/metadata/md5-cache/x11-misc/polybar-3.2.1
new file mode 100644
index 000000000000..e40b07aeab61
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/polybar-3.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install 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_python3_7(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A fast and easy-to-use tool for creating status bars
+EAPI=6
+HOMEPAGE=https://github.com/jaagr/polybar
+IUSE=alsa curl i3wm ipc mpd network pulseaudio python_targets_python2_7
+KEYWORDS=amd64 x86
+LICENSE=MIT
+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_python3_7(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/jaagr/polybar/archive/3.2.1.tar.gz -> polybar-3.2.1.tar.gz https://github.com/jaagr/xpp/archive/1.4.0.tar.gz -> xpp-1.4.0.tar.gz https://github.com/jaagr/i3ipcpp/archive/v0.7.1.tar.gz -> i3ipcpp-0.7.1.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c0db069149d2b088873d675b79804a78
diff --git a/metadata/md5-cache/x11-misc/tint2-16.6 b/metadata/md5-cache/x11-misc/tint2-16.6
new file mode 100644
index 000000000000..4ecb12f61173
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/tint2-16.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-libs/glib:2 svg? ( gnome-base/librsvg:2 ) >=media-libs/imlib2-1.4.2[X,png] x11-libs/cairo[X] x11-libs/pango tint2conf? ( x11-libs/gtk+:2 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama >=x11-libs/libXrandr-1.3 x11-libs/libXrender startup-notification? ( x11-libs/startup-notification ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=tint2 is a lightweight panel/taskbar for Linux.
+EAPI=6
+HOMEPAGE=https://gitlab.com/o9000/tint2
+IUSE=battery svg startup-notification tint2conf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 svg? ( gnome-base/librsvg:2 ) >=media-libs/imlib2-1.4.2[X,png] x11-libs/cairo[X] x11-libs/pango tint2conf? ( x11-libs/gtk+:2 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama >=x11-libs/libXrandr-1.3 x11-libs/libXrender startup-notification? ( x11-libs/startup-notification )
+SLOT=0
+SRC_URI=https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v16.6 -> tint2-16.6.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7d051402203648a3e23a323bd2986384
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.54 b/metadata/md5-cache/x11-misc/xlockmore-5.54
deleted file mode 100644
index dafc81f9a348..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.54
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Just another screensaver application for X
-EAPI=6
-HOMEPAGE=http://www.sillycycle.com/xlockmore.html
-IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD GPL-2
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
-REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
-SLOT=0
-SRC_URI=http://www.sillycycle.com/xlock/xlockmore-5.54.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=35264bd8be2ae6cbef9e6a95b215de97
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.56 b/metadata/md5-cache/x11-misc/xlockmore-5.56
new file mode 100644
index 000000000000..27c83521239c
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.56
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Just another screensaver application for X
+EAPI=6
+HOMEPAGE=http://www.sillycycle.com/xlockmore.html
+IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
+REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
+SLOT=0
+SRC_URI=http://www.sillycycle.com/xlock/xlockmore-5.56.tar.xz https://dev.gentoo.org/~jer/ax_pthread.m4.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d52009b857005b552d77f41fa7c43541
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 6de0fa0e7bf2..624c5132b38d 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/enigmail-1.9.9 b/metadata/md5-cache/x11-plugins/enigmail-1.9.9
deleted file mode 100644
index d8d85d52b523..000000000000
--- a/metadata/md5-cache/x11-plugins/enigmail-1.9.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
-DESCRIPTION=Mozilla extension to provide GPG support in mail clients
-EAPI=6
-HOMEPAGE=http://www.enigmail.net/
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-3
-RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0
-SLOT=0
-SRC_URI=http://www.enigmail.net/download/source/enigmail-1.9.9.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=690fb9b73f241932b5e060a20757d24c
diff --git a/metadata/md5-cache/x11-plugins/enigmail-2.0.8 b/metadata/md5-cache/x11-plugins/enigmail-2.0.8
new file mode 100644
index 000000000000..cd98b52700e3
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/enigmail-2.0.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
+DESCRIPTION=Mozilla extension to provide GPG support in mail clients
+EAPI=7
+HOMEPAGE=http://www.enigmail.net/
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-3
+RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0
+SLOT=0
+SRC_URI=http://www.enigmail.net/download/source/enigmail-2.0.8.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=4faec33d0442f4546909aea1dec4a3a1
diff --git a/metadata/md5-cache/x11-plugins/enigmail-9999 b/metadata/md5-cache/x11-plugins/enigmail-9999
index 0cb048f3ad36..76646bcebd6e 100644
--- a/metadata/md5-cache/x11-plugins/enigmail-9999
+++ b/metadata/md5-cache/x11-plugins/enigmail-9999
@@ -1,10 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
 DESCRIPTION=Mozilla extension to provide GPG support in mail clients
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.enigmail.net/
 LICENSE=MPL-2.0 GPL-3
-RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* )
+RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0
 SLOT=0
 _eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=545208a35488c9892166ac790b9fd17f
+_md5_=4faec33d0442f4546909aea1dec4a3a1
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 1c024e99072b..8443b7331f98 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/terminator-1.91 b/metadata/md5-cache/x11-terms/terminator-1.91
index 959059134b61..c13736e8e5db 100644
--- a/metadata/md5-cache/x11-terms/terminator-1.91
+++ b/metadata/md5-cache/x11-terms/terminator-1.91
@@ -4,11 +4,11 @@ DESCRIPTION=Multiple GNOME terminals in one window
 EAPI=5
 HOMEPAGE=https://launchpad.net/terminator/
 IUSE=dbus +libnotify debug python_targets_python2_7 test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-3.16:3 >=dev-libs/glib-2.32:2 dev-libs/keybinder:3[introspection] dev-python/psutil x11-libs/vte:2.91[introspection] dbus? ( sys-apps/dbus ) dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/libnotify[introspection] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/terminator/gtk3/1.91/+download/terminator-1.91.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	886fc23057eeb13c25b3ed870e1ee23a	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	fba44f6a5c7bc8b332da3d4061896bf1	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=42455d04eab106769ae492bb69a92ffb
+_md5_=b5b1af3e13f6fa27e3251c203b6dac0b
diff --git a/metadata/md5-cache/x11-terms/terminology-1.2.1 b/metadata/md5-cache/x11-terms/terminology-1.2.1
index 22a4d2fa6a43..ce19d3a686cf 100644
--- a/metadata/md5-cache/x11-terms/terminology-1.2.1
+++ b/metadata/md5-cache/x11-terms/terminology-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Feature rich terminal emulator using the Enlightenment Foundation Li
 EAPI=6
 HOMEPAGE=https://www.enlightenment.org/about-terminology
 IUSE=nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/efl-1.20.0[eet,fontconfig,opengl,X]
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/apps/terminology/terminology-1.2.1.tar.xz
 _eclasses_=meson	219a0c7b8a0e2ea86faec46f940bca86	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f47b22f10b77b3bdcc194d16e92957c4
+_md5_=0db5808eada66531bd20c317f5dd8f39
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 473d9dcafdae..58c94de52578 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/awesome-4.2-r2 b/metadata/md5-cache/x11-wm/awesome-4.2-r2
index 839a2d10daf0..f2c0e6522eba 100644
--- a/metadata/md5-cache/x11-wm/awesome-4.2-r2
+++ b/metadata/md5-cache/x11-wm/awesome-4.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1:0 luajit? ( dev-lang/luajit:2 ) dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.8 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6[xkb] >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 SLOT=0
 SRC_URI=https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0c19c3db02b531f00075d7c4b46dc939
diff --git a/metadata/md5-cache/x11-wm/awesome-9999 b/metadata/md5-cache/x11-wm/awesome-9999
index cc83fef8ecff..a441eb74d4cf 100644
--- a/metadata/md5-cache/x11-wm/awesome-9999
+++ b/metadata/md5-cache/x11-wm/awesome-9999
@@ -7,5 +7,5 @@ IUSE=dbus doc elibc_FreeBSD gnome luajit test
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1:0 luajit? ( dev-lang/luajit:2 ) dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.8 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6[xkb] >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c2d23548dbabfcc8415646fea88a43f3
diff --git a/metadata/md5-cache/x11-wm/ctwm-4.0.1-r1 b/metadata/md5-cache/x11-wm/ctwm-4.0.1-r1
index 9a24ed044801..660504f01782 100644
--- a/metadata/md5-cache/x11-wm/ctwm-4.0.1-r1
+++ b/metadata/md5-cache/x11-wm/ctwm-4.0.1-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/
 DESCRIPTION=A clean, light window manager
 EAPI=6
 HOMEPAGE=http://ctwm.org/
-KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt
 SLOT=0
 SRC_URI=http://ctwm.org/dist/ctwm-4.0.1.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=471d9a6dad9e1758233de1186c1b71ce
+_md5_=c9a28767508c25e009dc7b6c49176b1e
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 6a19daa7085c..79bfd88e4b87 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.13.0-r1 b/metadata/md5-cache/xfce-base/xfce4-session-4.13.0-r1
index 616b1588bf5a..4650f2c18e2e 100644
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.13.0-r1
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.13.0-r1
@@ -6,9 +6,9 @@ HOMEPAGE=https://docs.xfce.org/xfce/xfce4-session/start
 IUSE=nls policykit systemd +xscreensaver
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=x11-apps/iceauth x11-libs/gtk+:3= x11-libs/libSM:= x11-libs/libwnck:3= x11-libs/libX11:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/libxfce4ui-4.12.1:=[gtk3(+)] >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102:= ) x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) xscreensaver? ( || ( >=x11-misc/xscreensaver-5.26 x11-misc/light-locker >=x11-misc/xlockmore-5.43 x11-misc/slock x11-misc/alock[pam] ) )
+RDEPEND=x11-apps/iceauth x11-libs/gtk+:3= x11-libs/libSM:= x11-libs/libwnck:3= x11-libs/libX11:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/libxfce4ui-4.12.1:=[gtk3(+)] >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102:= ) x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) xscreensaver? ( || ( >=x11-misc/xscreensaver-5.26 >=x11-misc/xlockmore-5.43 x11-misc/slock x11-misc/alock[pam] ) )
 REQUIRED_USE=systemd? ( policykit )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.13/xfce4-session-4.13.0.tar.bz2
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48670437231c87f37c77a90cf394e021
+_md5_=738d288ef875d0c89a388368477fdc52
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.13.1 b/metadata/md5-cache/xfce-base/xfce4-session-4.13.1
new file mode 100644
index 000000000000..cb29b2fee481
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.13.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=x11-apps/iceauth >=x11-libs/gtk+-3.20:3= x11-libs/libSM:= x11-libs/libwnck:3= x11-libs/libX11:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/libxfce4ui-4.12.1:=[gtk3(+)] >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A session manager for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://docs.xfce.org/xfce/xfce4-session/start
+IUSE=nls policykit systemd +xscreensaver
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=x11-apps/iceauth >=x11-libs/gtk+-3.20:3= x11-libs/libSM:= x11-libs/libwnck:3= x11-libs/libX11:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/libxfce4ui-4.12.1:=[gtk3(+)] >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102:= ) x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) xscreensaver? ( || ( >=x11-misc/xscreensaver-5.26 >=x11-misc/xlockmore-5.43 x11-misc/slock x11-misc/alock[pam] ) )
+REQUIRED_USE=systemd? ( policykit )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.13/xfce4-session-4.13.1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=77e1c285e9927270ab0d6b752b5243aa
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.12.5 b/metadata/md5-cache/xfce-base/xfwm4-4.12.5
new file mode 100644
index 000000000000..37eae369c908
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.12.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/xfconf-4.10:= startup-notification? ( x11-libs/startup-notification:= ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig dri? ( >=x11-libs/libdrm-2.4 )
+DESCRIPTION=Window manager for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=dri startup-notification +xcomposite
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/xfconf-4.10:= startup-notification? ( x11-libs/startup-notification:= ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.12/xfwm4-4.12.5.tar.bz2
+_md5_=dfd9cb2243f86fab426cb3a98b7d0138
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.13.1 b/metadata/md5-cache/xfce-base/xfwm4-4.13.1
new file mode 100644
index 000000000000..6e59b72f8c39
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.13.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-3.14:3= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Window manager for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=opengl startup-notification +xcomposite xpresent
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-3.14:3= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-4.13.1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9a71801b3b00c9b87ac5b4ff26306cc2
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 3631d6d0a111..22bcb275d19a 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.2 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.2
index 5ae1b31cb5fe..b8f6b6c1c340 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:
 DESCRIPTION=Notification daemon for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-notifyd
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-0.4.2.tar.bz2
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f37265845d43fb919ac9bd26d01b4562
+_md5_=d5c5d1d4b6850cbc58caed03d8bc0c4e
diff --git a/metadata/news/2018-08-07-openssh-ldap-migration/2018-08-07-openssh-ldap-migration.en.txt b/metadata/news/2018-08-07-openssh-ldap-migration/2018-08-07-openssh-ldap-migration.en.txt
new file mode 100644
index 000000000000..d3def75ce262
--- /dev/null
+++ b/metadata/news/2018-08-07-openssh-ldap-migration/2018-08-07-openssh-ldap-migration.en.txt
@@ -0,0 +1,17 @@
+Title: Migration required for OpenSSH with LDAP
+Author: Thomas Deutschmann <whissi@gentoo.org>
+Posted: 2018-08-07
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: net-misc/openssh
+
+If your sshd authenticates against LDAP, you have to migrate your
+current setup to a new one using sshd's "AuthorizedKeysCommand" option and
+a wrapper provided by packages like the new sys-auth/ssh-ldap-pubkey or
+sys-auth/sakcl because beginning with net-misc/openssh-7.7_p1, OpenSSH-LPK
+patch set is deprecated and no longer applies.
+
+We have created a short migration guide in the Wiki [1] for more details.
+
+
+[1] https://wiki.gentoo.org/wiki/SSH/LDAP_migration
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 5edcf743bb2a..4f9b89b690b1 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 19946 BLAKE2B 37c8e8da6d0a8ec1afb0d8130e6a0691b2337c561a7530993bc0d97dd6269ffedba2f21a2a2c3768d5c1ca61b5951708c71d2be3e169f99b0ebf7184cc931c64 SHA512 0bb16aaac12c9d78f051f6bdbcd26e1f27fbda2b373993607a770cb50b1617d861c7d394ada14a3620375b712f2fc4a8e199c1b94b59062b18e2d1cf6d090de1
-TIMESTAMP 2018-08-04T07:08:39Z
+MANIFEST Manifest.files.gz 20124 BLAKE2B 8d5e5720ecaa83951cbef7aa071491790abc0df3b048b994392dd056344cb5e02c07edf93b975d4319a6b2eadf5764387d6b3c6a28ccea046510aacb3621e58a SHA512 2c4ea463124a9543e062a5d16fa5bf03d70dbc4408019ca847ffcafac303532818032787b368951e19f00b58557407c2c9ee69bf860f501988a8f365e5a5dc99
+TIMESTAMP 2018-08-08T18:38:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltlUPdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltrOLFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBDRRAAszlyYeereCcc3AWY7wCqMwOJ5xQ0C9PUcbh0Q8amUP1IAikHzibLJ7oX
-y7T4aohSioxAXDi+OkHVsKlBhmHKEL2dG23c48q/w3XuczzOr9g0I8xtfGM4bzZ7
-QY90p6tRGnDbrTY4l+lOXku6ZyCFaBYlDSXx7Q1T5jdQl/d80l3tMmCdSs/sXSIF
-OlgVKCJC7wIKzKph6Xx//7DX8Ab3ABhvRq6MwLuZY8BEaigDLHA76tMjVEWAzn40
-Wrn/xORsXoNM1OBrIEEs5afzfiniq0lq7TWaXSOzv4mcC/Col/O0t9En7xDR0Gq4
-U5JWHi5WscJofk8C5xyLW9iX+ajOi9Zz4KD59hvNB+z8dX2eX6RIuvDs+TeA3ttX
-cCNDfHMlhmG3QwMNQ9+pvPTs3D+T2c/KckO57YxOGj39c/EzYxaqNTwLW+1n4nVc
-8fX7woPVJDgCOv4zIfIqZ1+EHhok7YmBEF10KmPOAjnqOeMKwxHgvH+osWcaK59c
-5n7IJ8TdXsJRuZ7OaMloXHc1UfXGE3k+Bs7TDr7m/rr8WTHQ/K+YUg/1L4k7/y/p
-47EUaFwajmAZtpypgJGVkko70RDWOgWdcLjZaY/+9bPSry81k8Ahg6JW4qs5AmWq
-sH82ynEFYdV1wYuUrHQdJKLNBNjQgiNCIwQmtoZ3Av3+YZhZaUo=
-=f3YX
+klCocRAAh3IFQZ3WVxU5Gz6pdtogGPdiNtlYyhHItYZ593UEQF4jU+0IebtpzFnF
+3Uwl8c0xusxEz1KXViya7v81wbZD3X3RVbZ803PatOFduiEetIhdwUoFVOFPcomE
+8xJIWgAXc+S758puv4x7m1flLhzKYkDddMnyzRuXhsKmhzAsAJNHRj3eUi13bL6I
+OSqGPUhMmdexVTN6BKafc6IPN/hui4EhMBVaYjXYN0MHztc+OWh+QvJHnxVKpJCQ
+rXGCXgGTDJ1q/Q2/ZZs6PP34dJpUtMcCgttf3yHIvY5yp3kr6IGuMrufbEJ8N+FV
+vg+IgGI09gu8tBFbJGVaRqK8QC9gq37Dow7Tpuz/oaQ4WGbuVITt6d9dpjj9jY+k
+lLXsvDrHTiBYviZg0th2/rtlDRzcpbHfHE5FTxybwQmguqDtX3T0DhWuzposKPS9
+9T9o+WY5PESvSAEFhCQFUm8xOVGOsAlLLOS6LAHxM3xiLHNebHBkEl52R7noLNN+
+1VgMT2z1fGQwzPPc3nxs63++pP1HB53q1B6D8HW4eJsFmlIJ1gc7FYKnXTl+JE8y
+QjktNWzAzcK3c0IGrFksV0k71DWhpbmLnj2wF6CAozlOebyOnDW5J9ZdCVsEEwuC
+BIESY0QJKoN2lS0ofeAiwfS4qxEGyEGcZ2+azMtAfM4hEQMU5pw=
+=6KM3
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 4a34bba484a0..b75353b7453b 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 0254be2da60c..f3153b7795dd 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 04 Aug 2018 07:08:35 +0000
+Wed, 08 Aug 2018 18:38:37 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index 2ff1f50c7927..f76f6d7fecbf 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-e398a453a62490fd3ff168887f761e0c91ab50e9 1531299245 2018-07-11T08:54:05+00:00
+2f3b1798c03729be144d39c1b8d336f077db2e51 1533676645 2018-08-07T21:17:25+00:00
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 7667737aa4a8..08beb344eb9d 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -525,27 +525,24 @@
     <member>
       <email>ago@gentoo.org</email>
       <name>Agostino Sarubbo</name>
-      <role>Member (stable amd64/x86 liaison)</role>
+      <role>stable amd64/x86 liaison</role>
     </member>
-    <member>
+    <member is-lead="1">
       <email>floppym@gentoo.org</email>
       <name>Mike Gilbert</name>
-      <role>Member</role>
     </member>
-    <member is-lead="1">
+    <member>
       <email>phajdan.jr@gentoo.org</email>
       <name>Paweł Hajdan, Jr.</name>
-      <role>Lead</role>
     </member>
     <member>
       <email>rich0@gentoo.org</email>
       <name>Richard Freeman</name>
-      <role>Member (stable amd64 liaison)</role>
+      <role>stable amd64 liaison</role>
     </member>
     <member>
       <email>voyageur@gentoo.org</email>
       <name>Bernard Cafarelli</name>
-      <role>Member</role>
     </member>
   </project>
   <project>
@@ -630,10 +627,6 @@
       <email>bircoph@gentoo.org</email>
       <name>Andrew Savchenko</name>
     </member>
-    <member is-lead="1">
-      <email>dilfridge@gentoo.org</email>
-      <name>Andreas K. Hüttel</name>
-    </member>
     <member>
       <email>jmbsvicetto@gentoo.org</email>
       <name>Jorge Manuel B. S. Vicetto</name>
@@ -858,7 +851,7 @@
     <description>The Dotnet Project handles the development using the C# language. More specifically, it is often oriented with the mono development environment.</description>
     <member is-lead="1">
       <email>cynede@gentoo.org</email>
-      <name>Cynede</name>
+      <name>Mikhail Pukhlikov</name>
     </member>
   </project>
   <project>
@@ -1432,7 +1425,7 @@
     <description>Support team for the Gentoo organization on GitHub and the related resources (mirrors, pull requests).</description>
     <member>
       <email>cynede@gentoo.org</email>
-      <name>Cynede</name>
+      <name>Mikhail Pukhlikov</name>
       <role>Member</role>
     </member>
     <member>
@@ -1613,7 +1606,7 @@
     <description>Support Haskell programming language ecosystem on Gentoo systems.</description>
     <member>
       <email>cynede@gentoo.org</email>
-      <name>Cynede</name>
+      <name>Mikhail Pukhlikov</name>
     </member>
     <member>
       <email>gienah@gentoo.org</email>
@@ -2614,11 +2607,6 @@ developers and volunteer mentors.</description>
     <subproject ref="tools-portage@gentoo.org"/>
     <subproject ref="sandbox@gentoo.org"/>
     <member>
-      <email>blueboar2@gmail.com</email>
-      <name>Vladimir Romanov</name>
-      <role>Translator (Russian)</role>
-    </member>
-    <member>
       <email>dolsen@gentoo.org</email>
       <name>Brian Dolbec</name>
       <role>Tools developer, Release coordinator</role>
@@ -3364,7 +3352,7 @@ developers and volunteer mentors.</description>
     </member>
     <member>
       <email>cynede@gentoo.org</email>
-      <name>Cynede</name>
+      <name>Mikhail Pukhlikov</name>
     </member>
     <member>
       <email>djc@gentoo.org</email>
diff --git a/metadata/timestamp b/metadata/timestamp
index a87971b24292..5b02dc8d3d74 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Aug  4 07:08:35 UTC 2018
+Wed Aug  8 18:38:37 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d96841a30173..d80d33cf0a05 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 04 Aug 2018 07:15:01 +0000
+Wed, 08 Aug 2018 18:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b25df3211892..8db000fc3ccf 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-04ebe567b790895c82828386778ebed3aa1d9762 1533365716 2018-08-04T06:55:16+00:00
+47223bae87905f8c32531bbb0918a2265a8083e3 1533751009 2018-08-08T17:56:49+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 8618b4d695c6..6f69bde5d161 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1533366301 Sat 04 Aug 2018 07:05:01 AM UTC
+1533753301 Wed 08 Aug 2018 06:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 0254be2da60c..f3153b7795dd 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 04 Aug 2018 07:08:35 +0000
+Wed, 08 Aug 2018 18:38:37 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 273c8b02b76c..e5c5d84ae14c 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 966bfad292c3..3e1129c08bec 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,10 +1,8 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-2 2682 BLAKE2B 613fdb4fdcef7c95bba710c5fcb6ee84dcb3cd739bf0caa42130e2d1a4faf7341d82447bbac6070567581b90beba261302e8d03c148876db157c68054f64e233 SHA512 1ca1001e6095b17d57cd7ff70a2cc302f6dfa466cbe0a71154dd188caabd31e4b69821a3d8383ed855dcb2d2c396b2141a70de298a6f3c40ab79993c292fa6cb
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
-DIST icinga2-2.9.0.tar.gz 2192684 BLAKE2B b27da06a8b1d70108c792ccbef67a8082b7bb1ec9326ffdcd56406e8bf00e00fa7ef7cbedae803835cc7576bfb1db07cac4e6d1c8338d67e0ff071b821a661ea SHA512 e95f29f9a7e2ba9ad2ca16972fad23a9d18ee0470fbfd70f0bbc8efba9cdcce77d7c5abd2fca98e7b30c64f0014f89f9edd494473769efa6a6e01c08ebdcc1a4
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc SHA512 1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
 EBUILD icinga2-2.8.4.ebuild 4604 BLAKE2B 074505319ffdb68d93df79dbfe6c2a88a971b1a188e28526dd97e131d7494e6076173cbe9b8ee3599c7deecb62610f23828f0c107460555d47394d29f81eedbe SHA512 be570d2178c8750227b1dfb46c682a1805696fe9b46241f6ef9f59fa1e6ac9886d7e88cc14bcd5e094cd3671f49dfa1ad91046d3e08288b8266f888fde37a2a1
-EBUILD icinga2-2.9.0-r1.ebuild 4434 BLAKE2B b8aa58e62d287d3a588214a19f3b54ba78e05f19804076cc60bfbf64b08c66aea546673c10afc4bd41cf9974c37053d5aeab2fbb9ca3a309fdcc68f6b1347da2 SHA512 5ba0a5744cd050183ce0967d4b8707db52333bc1bd0595344b27ccd1327503860114fa26fd71917d2bb501c0cd03caae8febfb3e00f6b67db637f1fe952903a7
-EBUILD icinga2-2.9.1.ebuild 4434 BLAKE2B b8aa58e62d287d3a588214a19f3b54ba78e05f19804076cc60bfbf64b08c66aea546673c10afc4bd41cf9974c37053d5aeab2fbb9ca3a309fdcc68f6b1347da2 SHA512 5ba0a5744cd050183ce0967d4b8707db52333bc1bd0595344b27ccd1327503860114fa26fd71917d2bb501c0cd03caae8febfb3e00f6b67db637f1fe952903a7
-EBUILD icinga2-9999.ebuild 4434 BLAKE2B b8aa58e62d287d3a588214a19f3b54ba78e05f19804076cc60bfbf64b08c66aea546673c10afc4bd41cf9974c37053d5aeab2fbb9ca3a309fdcc68f6b1347da2 SHA512 5ba0a5744cd050183ce0967d4b8707db52333bc1bd0595344b27ccd1327503860114fa26fd71917d2bb501c0cd03caae8febfb3e00f6b67db637f1fe952903a7
+EBUILD icinga2-2.9.1.ebuild 4418 BLAKE2B e39976a335ad196bf86ced1de4153252390945f055f8f34868480ff4a1fb62a25c8d7bfe926d3a1b0d16fb769dd7c2dc1ea68697d9e835cc0f1d84863e003a20 SHA512 ef87d37438a867f64308895fa4fa77b73555898cc3913c6e054a799e3db1f71a7f0e8f999398daacbd222b25e8053fe2413be06037c8467b0882f3e5c685cabb
+EBUILD icinga2-9999.ebuild 4418 BLAKE2B e39976a335ad196bf86ced1de4153252390945f055f8f34868480ff4a1fb62a25c8d7bfe926d3a1b0d16fb769dd7c2dc1ea68697d9e835cc0f1d84863e003a20 SHA512 ef87d37438a867f64308895fa4fa77b73555898cc3913c6e054a799e3db1f71a7f0e8f999398daacbd222b25e8053fe2413be06037c8467b0882f3e5c685cabb
 MISC metadata.xml 816 BLAKE2B 6d820358c90a580be01149ae631f40dbeb5f50ce0df937ac484269c9a58f21a450d3861dce3b34ee0882b3b61d981da8162af735c5a3de90bb7b74dae9523d08 SHA512 0d3ac2d9233f7ce53a8105caed0231cefa402861e26c760de3fb23163ea68c21b97f5ec0de65bc6953aaf2dd8fa90a9edc045a2fea8b622efdd1336959e9e60b
diff --git a/net-analyzer/icinga2/icinga2-2.9.0-r1.ebuild b/net-analyzer/icinga2/icinga2-2.9.0-r1.ebuild
deleted file mode 100644
index 5911a0414050..000000000000
--- a/net-analyzer/icinga2/icinga2-2.9.0-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} != 9999 ]]; then
-	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
-	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-else
-	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
-	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
-	EGIT_BRANCH="master"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=dev-libs/boost-1.58-r1
-	console? ( dev-libs/libedit )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-DEPEND="
-	${CDEPEND}
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35"
-
-RDEPEND="
-	${CDEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	mail? ( virtual/mailx )
-	classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup icingacmd
-	enewgroup nagios  # for plugins
-	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_configure() {
-	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-	local mycmakeargs=(
-		-DICINGA2_UNITY_BUILD=FALSE
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-		-DICINGA2_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-		-DUSE_SYSTEMD=$(usex systemd ON OFF)
-		-DLOGROTATE_HAS_SU=ON
-	)
-	# default to off if minimal, allow the flags to be set otherwise
-	if use minimal; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
-			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
-		)
-	fi
-	# LTO
-	if use lto; then
-		mycmakeargs+=(
-			-DICINGA2_LTO_BUILD=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_LTO_BUILD=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd "${BUILDDIR}" || die
-
-	emake DESTDIR="${D}" install
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/icinga2.initd-2 icinga2
-
-	if use mysql ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-	elif use postgres ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
-	fi
-
-	keepdir /etc/icinga2
-	keepdir /var/lib/icinga2/api/zones
-	keepdir /var/lib/icinga2/api/repository
-	keepdir /var/lib/icinga2/api/log
-	keepdir /var/spool/icinga2/perfdata
-
-	rm -r "${D}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners root:icinga /etc/icinga2
-	fperms 0750 /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	fowners icinga:icinga /var/spool/icinga2
-	fowners -R icinga:icingacmd /var/lib/icinga2/api
-	fowners icinga:icinga /var/spool/icinga2/perfdata
-	fowners icinga:icingacmd /var/log/icinga2
-
-	fperms ug+rwX,o-rwx /etc/icinga2
-	fperms ug+rwX,o-rwx /var/lib/icinga2
-	fperms ug+rwX,o-rwx /var/spool/icinga2
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
-	fi
-}
diff --git a/net-analyzer/icinga2/icinga2-2.9.1.ebuild b/net-analyzer/icinga2/icinga2-2.9.1.ebuild
index 5911a0414050..cedd09e7dce0 100644
--- a/net-analyzer/icinga2/icinga2-2.9.1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.9.1.ebuild
@@ -158,6 +158,6 @@ src_install() {
 pkg_postinst() {
 	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
 		elog "DB IDO schema upgrade may be required required.
-		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
 	fi
 }
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 5911a0414050..cedd09e7dce0 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -158,6 +158,6 @@ src_install() {
 pkg_postinst() {
 	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
 		elog "DB IDO schema upgrade may be required required.
-		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
 	fi
 }
diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest
index cf3455d662d2..24c31ac6d26b 100644
--- a/net-analyzer/ostinato/Manifest
+++ b/net-analyzer/ostinato/Manifest
@@ -1,11 +1,5 @@
 AUX ostinato-0.9_p20180522-buildfix.patch 542 BLAKE2B 7916e581c50b3090415cfdd2607e9614e9fffd057e2b2c8d32458fa2582e30ad37c4c334fb7a610d059e5a4951a376ebcc5795511203333333c102abfd7be1ab SHA512 b7647a4d485e5a814cc75cc86bf1552c78d1498363eb1fafcb0ec17dc9c2191d93744dd6d58c47b704ed3e8f756bab5480b31b67ce5e1ace250e64c4523130b7
 AUX ostinato-0.9_p20180522-no-modeltest.patch 243 BLAKE2B bf382374a803ac4be4e9b00e216ce61c918e3f097b3034337fdeeadeb131e7a0ed8b028b1b08f107d94438baad35be6d7606874439850ddb9f0e5176ffa28a15 SHA512 b82fed38f8b4bccca3e6de599508c1c65c8bcf83dc88ca6e4c383f04eadc6fa3c3bfd2ddf31e5eaa26b8445f674e76600712659705bd2061a1ed0646af022c6b
-DIST ostinato-0.8.tar.gz 424104 BLAKE2B 5244ac9577da3fc99b714044a349e4003f0e64034fad04e241b43288a234f86f282ba0169c7e27c358d7ee3f4dc255b2408ef23f030d25f1edfec891e8ae17f7 SHA512 ecb3581736bd8dff44fe21082c270febc2ead4530cfb57997f218bd0b61a85993208937729374dd09c67fdc24eb2b9adfe5b3750ee6daef90b1e7dac2ea0737b
-DIST ostinato-0.9.tar.gz 413756 BLAKE2B cc1cb6d4db614b1968c27d7cdbebb977f39e6be8ec1a39b08f7e34d9a1a4d6b7c0c034f245b6b562c72b5dbdba9fc04c03b1cfc0c01044c249bcc2bc67af357d SHA512 a50f6e20d8a2a4d76ca43a89feaa774778981377ce1f4c731ad8b1a97aa658013082fb85cc3f4dfdd888d708c45c8093e55facaa7f02cecbd2ce5228f57e2e14
 DIST ostinato-0.9_p20180522.tar.gz 424128 BLAKE2B 69a15e523986cd34f89669fab0ed64987f68ea7d82d481de418c2d86f3b325b5c1ff9081db8c77532b603b01f504c37c24a4f7f5b7244657cac8b2f707bc7bdf SHA512 7d8359b193c98165ea376ad0ad57e01b782e35a7b887465d74c67ae1cd434036e8beb67593c569e15a87d5d0c7f602c9f01acf068e9ffff0c0496ab4f889a83a
-DIST ostinato-src-0.5.1.tar.gz 291529 BLAKE2B 207a3b423040e82042e7e68e2c7ffaf304a0c7e7d1578a994caf090ee934e10f169b9fce96724c0527268fb9f656b25bf3baa19b5f1ab6a06ffc2b8925b1c952 SHA512 d06b59dc2129aba01e5a42a677339d6e8f353f9c7c027226e66c8a5af94ecb48e8450e7770ae5e179131fa4cfeefcc827fb9a18be4294ddfcd7a471ec26ee06a
-EBUILD ostinato-0.5.1.ebuild 508 BLAKE2B 1857e47c74bd91eea56c551e95e63b667388ecb389be9939d4e2eb37898b84416d9b151bd71952567973fdbdd22bc08f85fdfc963fc208ff716e461c45542905 SHA512 589777f1c32dbeb62411f028527259c57fd86e5e9bf27b527650d517c68e9c05a77d11ecb213d88610f468db4a756d94c817985dff618a260a7110427bbe216d
-EBUILD ostinato-0.8.ebuild 550 BLAKE2B a4e7b8e65a2278db94b3b5d284b97b8fdbeab2c70e9c81e1cba9ce90768e65f818a0a2b77ef5ceeb181fab1364682f8b45b2f5012cc3fda4aa70d4103ba97a3c SHA512 a7d654097e7fbd013e1413ebb471b6b27abfeecc0d26f98f49a424e47c58cd9ea905fe19e49b15043c5ec8c8a7166c9f56cbf5b8b6210acd5863bd18cafbb82d
-EBUILD ostinato-0.9.ebuild 654 BLAKE2B 71bac7438fc30945a49181cdf26b31a4b5f61d9a2986acd11ef5895f8c2c623d3c54a55a2c733db9b68ddfb27bb00c4a92ad0793bbdbc9a2cbf41cd5e00018f7 SHA512 cfcf4573ac143eb6f8d07ef0e49a6539fadcfa8d68214dcef455bec042f45af335e6b3bbf8eaae0fd30ae1a1d9402c7b686f45b9896da721d9227ded7c1f4023
 EBUILD ostinato-0.9_p20180522.ebuild 847 BLAKE2B 7314d2836b45cfa187f21362d4958ff095e99d5720448cf0e631e989302da4acf612778c5025686e4c4200ef1911b89c2cfae320b316312ea498add1a4d03d7a SHA512 dfe64994620dffcfb52100c6974592340d0af4318a749293c1608ad3bfec9ba6ab5088349eba41fe95e7eadd018d7304eeb0b853ce16044f52d5df92ca3bcca8
 MISC metadata.xml 325 BLAKE2B 7deccc14079e605af5cd4a154a6d7ba4f69b2c7472c0f3ebb59c968bbb3c992216b0a367973d6ed729b0b117594ff47d1e9401c1750f5a6627aefca6008aab5f SHA512 65ed2d54f5a181004ea4900cd1b26b632fe57809f4903f9e4bb79b3440e7e3d72effc62725be9e788922e37b38f34b4363c30a3adda9f9483c0a983ff2f9fe09
diff --git a/net-analyzer/ostinato/ostinato-0.5.1.ebuild b/net-analyzer/ostinato/ostinato-0.5.1.ebuild
deleted file mode 100644
index ab172d3770cc..000000000000
--- a/net-analyzer/ostinato/ostinato-0.5.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-r2
-
-DESCRIPTION="A packet generator and analyzer"
-HOMEPAGE="https://ostinato.org"
-SRC_URI="https://ostinato.googlecode.com/files/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-DEPEND="dev-libs/protobuf:=
-	net-libs/libpcap
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4"
-RDEPEND="${DEPEND}"
-
-src_configure(){
-	eqmake4 PREFIX=/usr ost.pro
-}
diff --git a/net-analyzer/ostinato/ostinato-0.8.ebuild b/net-analyzer/ostinato/ostinato-0.8.ebuild
deleted file mode 100644
index 3642909eb53e..000000000000
--- a/net-analyzer/ostinato/ostinato-0.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-r2
-
-DESCRIPTION="A packet generator and analyzer"
-HOMEPAGE="https://ostinato.org"
-SRC_URI="https://bintray.com/pstavirs/ostinato/download_file?file_path=${PN}-src-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-libs/protobuf:=
-	net-libs/libpcap
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4"
-RDEPEND="${DEPEND}"
-
-src_configure(){
-	eqmake4 PREFIX=/usr ost.pro
-}
diff --git a/net-analyzer/ostinato/ostinato-0.9.ebuild b/net-analyzer/ostinato/ostinato-0.9.ebuild
deleted file mode 100644
index 124577240763..000000000000
--- a/net-analyzer/ostinato/ostinato-0.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qmake-utils
-
-DESCRIPTION="A packet generator and analyzer"
-HOMEPAGE="https://ostinato.org"
-SRC_URI="https://github.com/pstavirs/ostinato/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-#https://github.com/pstavirs/ostinato/issues/173
-# libpcap dep is versioned to pull in the fix for #602098
-DEPEND="dev-libs/protobuf:=
-	>=net-libs/libpcap-1.8.1-r2
-	dev-qt/qtscript:4
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-src_configure(){
-	eqmake4 PREFIX="${ED}/usr" ost.pro
-}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 6472ef6167be..24994929133e 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -24,14 +24,20 @@ AUX zabbix-server.service 281 BLAKE2B ca25d550875bc16ebc2cbe3193ec46072d288fa2d8
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 DIST zabbix-2.2.16.tar.gz 15498413 BLAKE2B fc634ca5124525b3143bb736b53b5040c8f1fd45ecfcf3cc2bdf7e625d54b0fcfa3690ce5d766e987d320d9ccbf7f430957f532c31f180a0a037334d6eb5b51a SHA512 5d92c17e86608359fff220416d5eed2d4ac10edfe56f4162f4b7660c472cf6f609ba01034d76e5b7164c22d55a1fc5be753f5d0e0ce7ac71d00a6f68dca14afd
 DIST zabbix-2.2.21.tar.gz 15489747 BLAKE2B e00fe140977f0ce995497954a15ff647c813c048a706e536a12010a649d3467d6c63343c3c0d11b1900f91f8fcc5bb235f9e4a030362c93ad3c1c31e68699f54 SHA512 29e3cba0663e7160dce5141cc389959571e5e298206baed26209facab206cc4f66611d48d76306a53925a2096db6f0bed1753435ec1be20bd8db53862cb902a4
+DIST zabbix-2.2.23.tar.gz 15504361 BLAKE2B c0eec293a92564607ed56c570aca30385481cf028fdee2bb51fbb29b40d7a1908a6065a6ee21c019ed6fb9eee294bc8fb58414669ae8e16e50f614a0650e2dbd SHA512 178e193f83dbaaa8aa0a0b87dd621acf7aa24e0d84d0010532b419139ed02e3cf892e4e772362bb855efb5966a64b9da8d3512eb91e759835039dc8c3529ea56
 DIST zabbix-3.0.19.tar.gz 15642128 BLAKE2B b9b84f21371db1eb8efdfb547e2b4a9216e9fb3c76fe54420ab1c76bad5cbf4537f6f0aca720748d39fb2ebf0447c3f82bf9e0d276f9fa4c9e91bc70e8b67f22 SHA512 30239db9236f536325f0ad3a8ea08abd8c460caf60dfd80b881cc9532d2f65d6154e8911be89d141539f7eeced359809405cf1b655eafdab1b940c314c8d3132
+DIST zabbix-3.0.20.tar.gz 15653766 BLAKE2B 4c36611e6fa26f9f5a8e3201eea0f08f3c2945542284be0a823751ad39f51deffc450e1994bc685c6179d7e72bd3dd58e0071071cd02446d6d733cddf8d7f916 SHA512 06832600f31f13781b42083a56b8bca18f6a2034b6641b6809e338e374fa08dabbae6c9d54ee711b3dd2ac5017203fea3e0cbf7f70a1a1da60dda43c7e1af00c
 DIST zabbix-3.2.11.tar.gz 16099820 BLAKE2B 7038679ecc9ae1b6684d65b3dd0019865e587c82e5a3ffe55610c057f8516ebe34978101065ac31628e6fd54077877c447d64cb1d169e0ad7402e727c7e65d76 SHA512 a14e0af4b183c8deb524c8965700c2988c0c131844f7fbc748aa8d1703b9dad73c2cf6d77663799fbd455adf58fdd1ce8dc5fd6404a9269c1a42160ad0e33e6e
 DIST zabbix-3.4.10.tar.gz 17300622 BLAKE2B 1b4c275d271ae4d4607400cb6e5f955ba624bf19cd116728e7a71a1b4adc0fbbde8cf91e6b0a71c5d48bf5c38b2ebe0db79f00ba3a42cc4213a0e310d56d5e29 SHA512 25e85cbe7a93a088fa0132ed6f3f75ad1aadedb839d745be38e180f0f9b858e32045b9d057b10cab4d3a8aa770b22b631aa0894fe5f1c3ca4ca62a000934bf94
 DIST zabbix-3.4.11.tar.gz 17517171 BLAKE2B 72f7d1cad3e8cb7972cb9c3698d35f70c45de1244c14a87f403a0c2c9b1825d679fa32e54dc4b2aae80a24acb7723ce489e0d409fb027c1afc8bb4eccecf9867 SHA512 1360e1de02fbbda30539e0f1dbe9d4aee57bc693f597db011cdefe7e7c4acaa6e3452813ee29e0e614794336e7fc9210ff3458f3761fcec90db66fb4a2275373
+DIST zabbix-3.4.12.tar.gz 17509251 BLAKE2B 158c7b3061059cc54a5988296404ed6670ca872fa8fa55f8de9708871ee03f163d0365420e23ef5df89a0a85e2f23d607952cf4fc02c974037555534ca164f08 SHA512 6707ff5a15d2c139775b4b5de32ceb4982c90aa4023af310ab9cb849895387984d32f59b7dc9fbaff8f317a630238437e4651ab8272b4535fb5fc3d88750e3ef
 EBUILD zabbix-2.2.16.ebuild 9436 BLAKE2B 3d7e32e772074500827d0bd469e280f77a4f7319ada11d1556bfa3148d0a25e6b00b84d604ac0cca436d375cabfe9cb145c5e51902c8293668135396d1dfc160 SHA512 c244b2dcff1fc7a1e7dc82c254eef974a4153f3f4bdf1b202d50e3006de3e0237d4dcc587ee66ffcbc16bb39ee4ad29a4dfe283332a3593aba2585f5c970d563
 EBUILD zabbix-2.2.21.ebuild 9438 BLAKE2B 2032d57e9e5dec45250fba571414aa22b896ecd3f13d42d04b86f0392f153e2cfdc9097cac3b983a331dabd03bcde7b74685139879114bd361a15449bd850123 SHA512 dcda14cad8ea47a09853f5768fb9f538a8150a0fc1da33350ab7d77e161fa85b3719dfcac9515b461815d7c710da7b2ca5ff24db7b7a05a26edeceb00931944d
+EBUILD zabbix-2.2.23.ebuild 9438 BLAKE2B 2032d57e9e5dec45250fba571414aa22b896ecd3f13d42d04b86f0392f153e2cfdc9097cac3b983a331dabd03bcde7b74685139879114bd361a15449bd850123 SHA512 dcda14cad8ea47a09853f5768fb9f538a8150a0fc1da33350ab7d77e161fa85b3719dfcac9515b461815d7c710da7b2ca5ff24db7b7a05a26edeceb00931944d
 EBUILD zabbix-3.0.19.ebuild 9278 BLAKE2B 6e5e42556fbd612fb7060a205bd5a4e12d13db91c6ac5ac0a0724e3462dbab5657db6992f7e5b8d746a91fc2b8ee1cdb2d0c8e982b57b14a141877318dbfcc0e SHA512 7219c5535aa5d91be8132fd74bb7fc7eee2dda0fedc761c031518c0b7b86ec97dee74a03a444979ae2f556e9de252f339e88b337fbedf6efc1a5d97fcefea04c
+EBUILD zabbix-3.0.20.ebuild 9278 BLAKE2B 6e5e42556fbd612fb7060a205bd5a4e12d13db91c6ac5ac0a0724e3462dbab5657db6992f7e5b8d746a91fc2b8ee1cdb2d0c8e982b57b14a141877318dbfcc0e SHA512 7219c5535aa5d91be8132fd74bb7fc7eee2dda0fedc761c031518c0b7b86ec97dee74a03a444979ae2f556e9de252f339e88b337fbedf6efc1a5d97fcefea04c
 EBUILD zabbix-3.2.11.ebuild 9265 BLAKE2B 489884d6ce42e154f3c7c0a9b1f2e0143b9fdd38a1778b13dd8be48d0e4ba1e6645934fcb495dd08a19a22f23201270c2ef79d3d2885316b2eebae142a4bb04a SHA512 f2fd5f8759e9625a798edad0b00868c27f961cb2d3327855cde7e53e46f4950b269bdc95f280d79d89a95291cf92288a6e163fd72562a889f900ddf519a9e44e
 EBUILD zabbix-3.4.10.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
 EBUILD zabbix-3.4.11.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
+EBUILD zabbix-3.4.12.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a
diff --git a/net-analyzer/zabbix/zabbix-2.2.23.ebuild b/net-analyzer/zabbix/zabbix-2.2.23.ebuild
new file mode 100644
index 000000000000..cbd15dd4953a
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.2.23.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/2.2"/zabbix_server.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd \
+			"${FILESDIR}/2.2"/init.d/zabbix-proxy
+		dosbin \
+			src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_agent.conf \
+			"${FILESDIR}/2.2"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
+		dosbin \
+			src/zabbix_agent/zabbix_agent \
+			src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		fperms 0640 \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agent.conf \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.0.20.ebuild b/net-analyzer/zabbix/zabbix-3.0.20.ebuild
new file mode 100644
index 000000000000..c3575d4f121b
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.0.20.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.4.12.ebuild b/net-analyzer/zabbix/zabbix-3.4.12.ebuild
new file mode 100644
index 000000000000..94b8bc3cdfff
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.4.12.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config
+		dev-libs/libevent )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index dda68c7cc117..166451a7cb27 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index 5120baed6020..8b89d1e0eb71 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -1,10 +1,8 @@
 AUX psad-2.2.4-var-run.patch 589 BLAKE2B 11c7095cc2eac066c44ae03d59787c92a7db095167f1e1b30c4e5f4931cdafbab6ddf092025e6cf885ce85d11763a429d02517ef8494eb9c9231c83d261aa687 SHA512 dfd46dc06ef1f5bacb1424dc3ef9df23c5dc28abe6c6b1ffcbf7720e1d134e983e581831e7ed04074592bd1865f3628c753b313b7df1f7fdf84d438e82c25464
 DIST psad-2.2.5.tar.bz2 1243987 BLAKE2B f6b3a86a841b2685a21c4f46cab8cbb720a7955644f28cd0931f0a620aed4a743213a9f276a98b637cd5b13f93565dee22876042e43a0233cb989021fff9b813 SHA512 195a06420cf821d182a5422705ba2d407fd35f23887430e61925cad0eada7d20e2416eaf6317857a5aec2f1264a280a7e0128cc301f17dcf20cf833a9f0efb6e
-DIST psad-2.4.3.tar.bz2 1395260 BLAKE2B ec48705c90fb9acf7f6f534c103ce83fb39933f6431539be50873b26dd51bf49eee709261c0c036136bf08c6820e7344315b6162664e54b455d380b1987efebf SHA512 8a25ef377e3f4f406c2179a42217110a670f1c0eb8e7991e32a99fd695ca1866218274e9aaeb48552e1bd9bd91b5fbf34b226d767c28f1db27f15b08fba2b0e8
-DIST psad-2.4.4.tar.bz2 1429113 BLAKE2B 3eed68eb1752051f4cab8320c168b9a66e3aebdbcef41a78990202e05ff4a317714f345baf3c5998975b6c8db2ca95d2b354ce4ebaea50feb9749701ae6af046 SHA512 0437a489fcb54458dbb33e0139385e577a89db0c07bd872e4e56780feb8033080d59c99aeff419f3c94b22be8fb41995674749123d15f7d578cc8b0a77d7783f
 DIST psad-2.4.5.tar.bz2 1631602 BLAKE2B 83d5a6811743e56e86984e79f0176db7982243cefcbdef7bdc30300de6a3e2c1d5033e75ec5b7e68e89784b04c98a0ed6b9475a93f4e633ad96380facaf08c21 SHA512 6466cf3191092672557fb6c044c6126290f1d89aea37a20aad1b3eb148b5b8be5bc2cf3700938b91263d7403f776613f304bd491c24a7e16b0975b81f24481a0
+DIST psad-2.4.6.tar.bz2 2548405 BLAKE2B 7479ce4496343ca988da4dbe82190053385f1a8fa2e190002545c63f2e36283bc84293d932ebe147c9078923fa9e0527b4265fffdb8e1fd99bfc5d9955f9f3cd SHA512 a5de29b9ca0108aa8c6a325b725145f408dc517aeee4654596c7a037762f495a78827c64fc2e9c4284bc8db65caf0321982ecaf02de6d73784c2038e1078f42d
 EBUILD psad-2.2.5.ebuild 1870 BLAKE2B cd57e4844e7cdd92b25d06a2778fc8a7c6ab717657c5552df532d363d1f259e6b2a25016542e522d57ba5dd22ffaa24da234737b40a9e72726212e55e6673d6e SHA512 c613774660bf0c54a3fd696b12b8df3230c6d3631ce257e165ad573142d447ce674e47c917eb250860ed88e53fae9398749cfcc3be5b599cc81bf4fcbee2b9b7
-EBUILD psad-2.4.3.ebuild 1900 BLAKE2B 1ec3f36278d3b2469cf97841381b410ec27cae3032b1fdc34c10c10019a4cbdd07053be05c3df3a4c965626ee45ac9a62b09fe6a25a09fc3bc8e990483bef474 SHA512 7635b9a1b51c1a396deecde8793e67147652a07a71325623b18e314c27bc771e9b30965884a1cc6e1609ba2065e3eaedd702fccd02435b0d54703479bdf642f4
-EBUILD psad-2.4.4.ebuild 1907 BLAKE2B 79975e662ee59236ae3de0c2cb42aa983d15b4723b716352ee1be399c31236f7d63be8d7cd18733842ad1e8ee84c80016a8dc0dae6858bc39c2c0c6722441480 SHA512 7767cd12142192ddc5549ffc8b7785699b47eba352096d4f548d1a1cef9cefd6bff846c49f2bf6117602b735293d79b944efa435cca88a32fcf0e51d0176ddbd
 EBUILD psad-2.4.5.ebuild 1924 BLAKE2B 95af89c036864eb14580e0bd78767df519bc077817f231894625921bf69ae52cbca2d509f454b0714f2d10731fae1c45b8cb9e8ab50588a178cc96ac583497b2 SHA512 d8b0f17e7ad6d570e8a3aa54d10ae0d921eb324cc1168814c61d8c23b23c5924ae86183c0194914024b21b1db0dc34c0babf7a5ce333959422f99f59ee1c9df4
+EBUILD psad-2.4.6.ebuild 1924 BLAKE2B 95af89c036864eb14580e0bd78767df519bc077817f231894625921bf69ae52cbca2d509f454b0714f2d10731fae1c45b8cb9e8ab50588a178cc96ac583497b2 SHA512 d8b0f17e7ad6d570e8a3aa54d10ae0d921eb324cc1168814c61d8c23b23c5924ae86183c0194914024b21b1db0dc34c0babf7a5ce333959422f99f59ee1c9df4
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-firewall/psad/psad-2.4.3.ebuild b/net-firewall/psad/psad-2.4.3.ebuild
deleted file mode 100644
index 545abd2d37de..000000000000
--- a/net-firewall/psad/psad-2.4.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-#PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit eutils perl-module toolchain-funcs
-
-DESCRIPTION="Port Scanning Attack Detection daemon"
-SRC_URI="https://www.cipherdyne.org/psad/download/${P}.tar.bz2"
-HOMEPAGE="https://www.cipherdyne.org/psad/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-RDEPEND="
-	dev-perl/Bit-Vector
-	dev-perl/Date-Calc
-	dev-perl/NetAddr-IP
-	dev-perl/Unix-Syslog
-	net-firewall/iptables
-	net-misc/whois
-	virtual/logger
-	virtual/mailx
-	virtual/perl-Storable
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2.4-var-run.patch
-
-	sed -i \
-		-e 's|/usr/bin/gcc|$(CC)|g' \
-		-e 's|-O|$(CFLAGS) $(LDFLAGS)|g' \
-		Makefile || die
-	# Fix up default paths
-	sed -i \
-		-e "s:/usr/bin/whois_psad:/usr/bin/whois:g" \
-		psad.conf || die
-}
-
-src_configure() {
-	default
-
-	local deps_subdir
-	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
-		cd "${S}"/deps/${deps_subdir} || die
-		SRC_PREP="no" perl-module_src_configure
-	done
-}
-
-src_compile() {
-	tc-export CC
-	default
-
-	local deps_subdir
-	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
-		cd "${S}"/deps/${deps_subdir} || die
-		perl-module_src_compile
-	done
-}
-
-src_install() {
-	newbin pscan psad-pscan
-
-	insinto /usr
-	dosbin kmsgsd psad psadwatchd
-	newsbin fwcheck_psad.pl fwcheck_psad
-
-	insinto /etc/psad
-	doins \
-		*.conf auto_dl icmp{,6}_types ip_options psad_* pf.os posf \
-		protocols signatures
-
-	newinitd init-scripts/psad-init.gentoo psad
-
-	doman *.8
-
-	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES FW_HELP README \
-		README.SYSLOG SCAN_LOG
-
-	insinto /etc/psad/snort_rules
-	doins deps/snort_rules/*
-
-	local deps_subdir
-	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
-		cd "${S}"/deps/${deps_subdir} || die
-		perl-module_src_install
-	done
-}
diff --git a/net-firewall/psad/psad-2.4.4.ebuild b/net-firewall/psad/psad-2.4.4.ebuild
deleted file mode 100644
index 2d76d8efc463..000000000000
--- a/net-firewall/psad/psad-2.4.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-#PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit perl-module toolchain-funcs
-
-DESCRIPTION="Port Scanning Attack Detection daemon"
-SRC_URI="https://www.cipherdyne.org/psad/download/${P}.tar.bz2"
-HOMEPAGE="https://www.cipherdyne.org/psad/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-RDEPEND="
-	dev-perl/Bit-Vector
-	dev-perl/Date-Calc
-	dev-perl/NetAddr-IP
-	dev-perl/Unix-Syslog
-	net-firewall/iptables
-	net-misc/whois
-	virtual/logger
-	virtual/mailx
-	virtual/perl-Storable
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.4-var-run.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|/usr/bin/gcc|$(CC)|g' \
-		-e 's|-O|$(CFLAGS) $(LDFLAGS)|g' \
-		Makefile || die
-	# Fix up default paths
-	sed -i \
-		-e "s:/usr/bin/whois_psad:/usr/bin/whois:g" \
-		psad.conf || die
-}
-
-src_configure() {
-	default
-
-	local deps_subdir
-	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
-		cd "${S}"/deps/${deps_subdir} || die
-		SRC_PREP="no" perl-module_src_configure
-	done
-}
-
-src_compile() {
-	tc-export CC
-	default
-
-	local deps_subdir
-	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
-		cd "${S}"/deps/${deps_subdir} || die
-		perl-module_src_compile
-	done
-}
-
-src_install() {
-	newbin pscan psad-pscan
-
-	insinto /usr
-	dosbin kmsgsd psad psadwatchd
-	newsbin fwcheck_psad.pl fwcheck_psad
-
-	insinto /etc/psad
-	doins \
-		*.conf auto_dl icmp{,6}_types ip_options psad_* pf.os posf \
-		protocols signatures
-
-	newinitd init-scripts/psad-init.gentoo psad
-
-	doman *.8
-
-	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES FW_HELP README \
-		README.SYSLOG SCAN_LOG
-
-	insinto /etc/psad/snort_rules
-	doins deps/snort_rules/*
-
-	local deps_subdir
-	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
-		cd "${S}"/deps/${deps_subdir} || die
-		perl-module_src_install
-	done
-}
diff --git a/net-firewall/psad/psad-2.4.6.ebuild b/net-firewall/psad/psad-2.4.6.ebuild
new file mode 100644
index 000000000000..f4eea7be20fb
--- /dev/null
+++ b/net-firewall/psad/psad-2.4.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+#PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit perl-module toolchain-funcs
+
+DESCRIPTION="Port Scanning Attack Detection daemon"
+SRC_URI="https://www.cipherdyne.org/psad/download/${P}.tar.bz2"
+HOMEPAGE="https://www.cipherdyne.org/psad/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
+RDEPEND="
+	dev-perl/Bit-Vector
+	dev-perl/Date-Calc
+	dev-perl/NetAddr-IP
+	dev-perl/Unix-Syslog
+	net-firewall/iptables
+	net-misc/whois
+	virtual/logger
+	virtual/mailx
+	virtual/perl-Storable
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.4-var-run.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|/usr/bin/gcc|$(CC)|g' \
+		-e 's|-O|$(CFLAGS) $(LDFLAGS)|g' \
+		Makefile || die
+	# Fix up default paths
+	sed -i \
+		-e "s:/usr/bin/whois_psad:/usr/bin/whois:g" \
+		psad.conf || die
+}
+
+src_configure() {
+	default
+
+	local deps_subdir
+	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
+		cd "${S}"/deps/${deps_subdir} || die
+		SRC_PREP="no" perl-module_src_configure
+	done
+}
+
+src_compile() {
+	tc-export CC
+	default
+
+	local deps_subdir
+	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
+		cd "${S}"/deps/${deps_subdir} || die
+		perl-module_src_compile
+	done
+}
+
+src_install() {
+	newbin misc/pscan psad-pscan
+
+	insinto /usr
+	dosbin kmsgsd psad psadwatchd
+	newsbin fwcheck_psad.pl fwcheck_psad
+
+	insinto /etc/psad
+	doins \
+		*.conf auto_dl icmp{,6}_types ip_options psad_* pf.os posf \
+		protocols signatures
+
+	newinitd init-scripts/psad-init.gentoo psad
+
+	doman doc/*.8
+
+	dodoc doc/BENCHMARK CREDITS Change* doc/FW_EXAMPLE_RULES README \
+		doc/README.SYSLOG doc/SCAN_LOG
+
+	insinto /etc/psad/snort_rules
+	doins deps/snort_rules/*
+
+	local deps_subdir
+	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
+		cd "${S}"/deps/${deps_subdir} || die
+		perl-module_src_install
+	done
+}
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index e4da1124cbde..5d0fbd49039e 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -13,11 +13,19 @@ AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67
 AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b12fbae4fc47f4ae19afd6a63266b3684ddead689b2d4f7450b7a12906258fc86ef33fc36a4dac3771274 SHA512 96b69df246a18e8b7dbfdbe78959da1baa8f2a97eb290853d4040a895f2ae91b97addd2ab4e4e19345960ffe8f1b099442f40ce319b27f0d4d8d7d4780d2e78d
 AUX shorewallrc-r3 2035 BLAKE2B 6f4e4c93cee1f25405cc3ac76958064f1241a325c8b530c30f6dbd94423577d592e88613f463c4b41c1af1db22c7e53512fd8509931bb6527a8da669f2dbe773 SHA512 eaa32bf6baca0d3555db918d6221c7678f5ba67e78bf9dcdc1bf96deded8f64838d3a332226fa6605f0c1ae82e51e0f2c1540fa6188fd9bced22460a631f48a8
 DIST shorewall-5.2.0.4.tar.bz2 538938 BLAKE2B 1df68e166f5f443f120b9f45010da005b3d86a51d09c059d0886a2735c6d27c1568ae0422998f001deb48c512cb9fed23cbad423754682b06e9a4b5176b45cef SHA512 b44622972d4b4ffcde9d7da57d3994279f3962bb2d2e13892d7d77453da502527ab89cb59fb6692341b5d166cb7a3e31909df31dc21c758707eff29f3ab2c9a0
+DIST shorewall-5.2.0.5.tar.bz2 539666 BLAKE2B df4f8680ee29a773f584a1210b40a7047be1a590490a01617b26b71840e488f569ebcf268ba2f6199fb10671925356c4e187a5219ed7784672f6d14b2e90f580 SHA512 8299e0f40ad96c09eceb9460c6088e694e50b7a1b81a16395426466c666eb21dc23236c1ee6cc6047c05ad4a4ba43aac33fc7cb05f5784bf27ac81e5fa4e9059
 DIST shorewall-core-5.2.0.4.tar.bz2 76022 BLAKE2B 58602e01f7a7b6e6853c847fa38bfff2fbeb57ea68ffd124f9e556b0137bef65bfe25c8b7c70f0d6fc7b21dab7e82401985a08f0a1a8c4ca6159cbfd1862712c SHA512 bfd21f249fa3b7a952bf9aeead91eac0f7db6c2f3c386e9d2aca9645916b8a799ce58ac7b6edb93d0b934d224824f9cd94b8db63a0b35a260051209613561bf4
+DIST shorewall-core-5.2.0.5.tar.bz2 76567 BLAKE2B 078520ef3166d689d559f1c08ae417a2bf5c7fdc3618a26f72b244fa14679634752dffaeebafbd84609e33ec7f1856b701abb297077797abcb14d3264a3bfd25 SHA512 640c854a7484e886cd603742d16682456e02c0054c3d6d5f2188bf30e235ac975fc1ce50af500cf4fb99253a1d13c2408cc72aff54f14aa738e1e80b8d07066a
 DIST shorewall-docs-html-5.2.0.4.tar.bz2 4294681 BLAKE2B b6e975ddefae5dc7fd0a9be58c6fd231e828ed8e18e2405202766068b37796c075785c2cc05f25bc9decc50fbdfc01bad8d8f929b90592aa2e8cc040719e3cf1 SHA512 2685161f9d25cf745831f603129c4e9a33a264118698392f589e481a76bcb082dad14c9be6dc57c29441eb9807d842e5f08b3483e1e03099f0059f10ea907d91
+DIST shorewall-docs-html-5.2.0.5.tar.bz2 4295236 BLAKE2B 8cef99b3535551e1d4ecdf0d3d1c2b3434c0b91c793f0857bc3f22f0020d80cd49b038c7c4f5d15fe23af14869f1736a69b01978403fe94bc5dac261bd2f5e4d SHA512 5fa3ab52580e8f090ab0be9b1796bef65a41d1a9dc5c9501e3daeba22bad7b28b5306aba5b383c654eed5f7d727a7744812034eeb1ad051633a80b2892096c24
 DIST shorewall-init-5.2.0.4.tar.bz2 30526 BLAKE2B a8ac5bf7e650a58d87b608321e0ed40d8b73ed675d5b5b64ff5859149f04aca507d7a83ff6ca9c7801c84fb416d22fdc930199731a9134ef529b29cf1ec01a67 SHA512 c4e2bcf5a2f7b8fae30773a930ac7433cc8678f7bb52958ecd92a4ce5f0a78041e45578bd47e01ad72fe9fc1a3cbcda2995bd9379cc90917a31b3f676c12beb6
+DIST shorewall-init-5.2.0.5.tar.bz2 30881 BLAKE2B 92617f17553b6df514cbfc72e86597e9859baa641782848763923ff4c650915cd7fb97f0c71b41d525d6a9d5ebbf10e9918d6a8d682c9c4654de3ba40b54c0ce SHA512 0367ad7468d5a9c0c70d31fdd66c05e54cf747dd45dc1bf2e128935c65af8c2508f033ed2945185059214dd81f5a8fb3f122323fd2bb79d2d642997741167371
 DIST shorewall-lite-5.2.0.4.tar.bz2 36307 BLAKE2B ad95e4f640ae1f05936dd5dbc87e4acaf6dd576bd6704f650c8bfdc437284f0c121563427f89dbe5de4e19f543f3e182ff0d5a333da8c8416aae24994ac52ed0 SHA512 55bb514d9446c953de0453b8016105ed2471420d2ca6346cbd986f03cec5e713a1d27d5e08ddc6cf54cd6e5f936cf9a826eac622596480374929f41c062e8803
+DIST shorewall-lite-5.2.0.5.tar.bz2 36651 BLAKE2B 192ecda8b04d0330f0a7bced6136f2723d201cd7c30af80b59bfa81f49614d10c900cf5856296ad854287f3c925e5f78f144698674ec7b8d91065072db4ca53e SHA512 b95154f7614eeedde1fc087750372cadd0c0a9618986741e035a9d83c06d2534feb78edaf6a97e2a45788015e6706f8dac3714ca3b22bd068e792458a3f5af40
 DIST shorewall6-5.2.0.4.tar.bz2 186267 BLAKE2B 4076c94596e462d4f150d734700d400db90ca1d0bd788152e5421d581890cf28d7e6546d2ac0c604625cdf25771415229b2a3324153ec5439cddfcab73464ae5 SHA512 e8989b5c6fcc1162f42e884cdb0fff47baed61b69c39b8bbdaf78b246f95ee0bf6690fce3a6ae14eff2bf48d64b762b170d67462dc685f594dfd70a2e3720a01
+DIST shorewall6-5.2.0.5.tar.bz2 185740 BLAKE2B 846a3fc44a9c0a838cf75671ca34e78dd9758eeee0690d994a34615467b241f0c854e3bb9b818bcfd5e96664ab03e14a7c69affc946dffd1357ad744da41f8d5 SHA512 6875074ed8ee5bce40253a6e2633c422d7c2c1bf860a072236d6197cfe949e455b511a1792d822a8f2351254e99880236267ce70fc1150ca68e87f962b6cc265
 DIST shorewall6-lite-5.2.0.4.tar.bz2 36035 BLAKE2B edbdee2b979c0d2144e358b6e8b52808578923498c0da4f906ed6aa8460153879dd5f8b4cf98da4bcecc90a6a776d39ef17492881c093a018ccdc5b86e0c0bab SHA512 c212ba3f6bacab1b26bbc5c13a2bac2f1f796c7fa3d442f398c91ff367f242a9562ff2191b9b678e82d07a96c2dc39a0109d30417154e6cfd4f2c4c6e31b616f
+DIST shorewall6-lite-5.2.0.5.tar.bz2 36370 BLAKE2B 212cee0313c3bbf08c8d22893c5b62125d0362eb66218dc954bc05d0e082fdb4dab209a05948300394943dcd97f698c1e02310ec54cc88fb72bd24d4383776f7 SHA512 18bcbaf3bd56aaadb8d42610d4868278f42299e5a022ac5732f730b34ed7d97f7cd013f1c9374f0a6afc809250288490d94d2b4e02e4bf5edf2542bff99150e4
 EBUILD shorewall-5.2.0.4.ebuild 16269 BLAKE2B adc880388fa1d11dd869b31a7299f81081da532c610d5444f57c08446d49aa5b9381a3c623553c0a064db4885c1cdd8a816d69522bbfb1c4ebcc5582de4a35af SHA512 6c3d7998ea7f549847e52e7745355f53ed9590157fd49f1e454452215f3d0e108cd68a3980fff3aca5531ebf2e16696f50a73a26f395d4506136528e1916de66
+EBUILD shorewall-5.2.0.5.ebuild 16276 BLAKE2B 6b78da523533371e05294702605bc2cfeaaccb9b4ded2a88d4188585bc25894c55865e756108b9640f517aa69835fae55157a766ad05ab6401c4531a4f185807 SHA512 b4bf98d37de2983523d4b78a1b3de6297d38f696fb0d3125d121d8fc0fa56b53d954a4ea387ba44d96e1f7ebd432aefddbd50fb17e45c74467caa17cb9c153a4
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.2.0.5.ebuild b/net-firewall/shorewall/shorewall-5.2.0.5.ebuild
new file mode 100644
index 000000000000..a7f7766988aa
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.0.5.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
+
+# shorewall
+MY_PN_IPV4=Shorewall
+MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
+
+# shorewall6
+MY_PN_IPV6=Shorewall6
+MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
+
+# shorewall-lite
+MY_PN_LITE4=Shorewall-lite
+MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
+
+# shorewall6-lite
+MY_PN_LITE6=Shorewall6-lite
+MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
+
+# shorewall-init
+MY_PN_INIT=Shorewall-init
+MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
+
+# shorewall-core
+MY_PN_CORE=Shorewall-core
+MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
+
+# shorewall-docs-html
+MY_PN_DOCS=Shorewall-docs-html
+MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
+
+# Upstream URL schema:
+# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
+# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
+# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
+
+MY_URL_PREFIX=
+MY_URL_SUFFIX=
+if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
+	MY_URL_PREFIX='development/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
+"
+
+# - Shorewall6 requires Shorewall
+# - Installing Shorewall-init or just the documentation doesn't make any sense,
+#   that's why we force the user to select at least one "real" Shorewall product
+#
+# See http://shorewall.net/download.htm#Which
+REQUIRED_USE="
+	ipv6? ( ipv4 )
+	|| ( ipv4 lite4 lite6 )
+"
+
+# No build dependencies! Just plain shell scripts...
+DEPEND=""
+
+RDEPEND="
+	>=net-firewall/iptables-1.4.20
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=sys-devel/bc-1.06.95
+	ipv4? (
+		>=dev-lang/perl-5.16
+		virtual/perl-Digest-SHA
+	)
+	ipv6? (
+		>=dev-perl/Socket6-0.230.0
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	lite6? (
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	init? ( >=sys-apps/coreutils-8.20 )
+	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
+	!net-firewall/shorewall-core
+	!net-firewall/shorewall6
+	!net-firewall/shorewall-lite
+	!net-firewall/shorewall6-lite
+	!net-firewall/shorewall-init
+	!<sys-apps/systemd-214
+"
+
+S=${WORKDIR}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK"
+
+	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
+	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
+
+	if use ipv4 || use lite4; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
+
+		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
+		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
+	fi
+
+	if use ipv6 || use lite6; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
+
+		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
+		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
+	fi
+
+	check_extra_config
+}
+
+pkg_setup() {
+	if [[ -n "${DIGEST}" ]]; then
+		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
+		unset DIGEST
+	fi
+}
+
+src_prepare() {
+	# We are moving each unpacked source from MY_P_* to MY_PN_*.
+	# This allows us to use patches from upstream and keeps epatch_user working
+
+	einfo "Preparing shorewallrc ..."
+	cp "${FILESDIR}"/shorewallrc-r3 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+	sed -i \
+		-e "s|SERVICEDIR=tbs|SERVICEDIR=$(systemd_get_systemunitdir)|" \
+		"${S}"/shorewallrc.gentoo || die "Failed to update shorewallrc"
+
+	# shorewall-core
+	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
+	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
+	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+	eend 0
+
+	# shorewall
+	if use ipv4; then
+		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-init
+	if use init; then
+		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
+		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
+		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
+		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
+		eend 0
+
+		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || die
+	fi
+
+	# shorewall-docs-html
+	if use doc; then
+		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# shorewall-core
+	einfo "Installing ${MY_P_CORE} ..."
+	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
+	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
+
+	# shorewall
+	if use ipv4; then
+		einfo "Installing ${MY_P_IPV4} ..."
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+		keepdir /var/lib/shorewall
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+		keepdir /var/lib/shorewall6
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+		keepdir /var/lib/shorewall-lite
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+		keepdir /var/lib/shorewall6-lite
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
+		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
+
+		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
+			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
+			# so we don't need a logrotate configuration file for shorewall-init
+			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+		fi
+	fi
+
+	if use doc; then
+		einfo "Installing ${MY_P_DOCS} ..."
+		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		# Show first steps for shorewall/shorewall6
+		local _PRODUCTS=""
+		if use ipv4; then
+			_PRODUCTS="shorewall"
+
+			if use ipv6; then
+				_PRODUCTS="${_PRODUCTS}/shorewall6"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
+			elog ""
+			elog "  /etc/shorewall/shorewall.conf"
+
+			if use ipv6; then
+				elog "  /etc/shorewall6/shorewall6.conf"
+			fi
+
+			elog ""
+			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall default"
+
+			if use ipv6; then
+				elog "  # rc-update add shorewall6 default"
+			fi
+		fi
+
+		# Show first steps for shorewall-lite/shorewall6-lite
+		_PRODUCTS=""
+		if use lite4; then
+			_PRODUCTS="shorewall-lite"
+		fi
+
+		if use lite6; then
+			if [[ -z "${_PRODUCTS}" ]]; then
+				_PRODUCTS="shorewall6-lite"
+			else
+				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			if use ipv4; then
+				elog ""
+			fi
+
+			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
+			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
+			elog ""
+			elog "To read more about ${_PRODUCTS}, please visit"
+			elog "  http://shorewall.net/CompiledPrograms.html"
+			elog ""
+			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
+			elog ""
+
+			if use lite4; then
+				elog "  # rc-update add shorewall-lite default"
+			fi
+
+			if use lite6; then
+				elog "  # rc-update add shorewall6-lite default"
+			fi
+		fi
+
+		if use init; then
+			elog ""
+			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall-init boot"
+			elog ""
+			elog "and review \$PRODUCTS in"
+			elog ""
+			elog "  /etc/conf.d/shorewall-init"
+		fi
+
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
+			# This is an upgrade
+
+			elog "You are upgrading from a previous major version. It is highly recommended that you read"
+			elog ""
+			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
+			elog "  - http://shorewall.net/Shorewall-5.html#idm214"
+
+			if use ipv4; then
+				elog ""
+				elog "You can auto-migrate your configuration using"
+				elog ""
+				elog "  # shorewall update -A"
+
+				if use ipv6; then
+					elog "  # shorewall6 update -A"
+				fi
+
+				elog ""
+				elog "*after* you have merged the changed files using one of the configuration"
+				elog "files update tools of your choice (dispatch-conf, etc-update...)."
+
+				elog ""
+				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
+				elog "please read the shorewall[6] man page first."
+			fi
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if ! use init; then
+		elog ""
+		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
+		elog "before your shorewall-based firewall is ready to start."
+		elog ""
+		elog "To read more about shorewall-init, please visit"
+		elog "  http://www.shorewall.net/Shorewall-init.html"
+	fi
+
+	if ! has_version "net-firewall/conntrack-tools"; then
+		elog ""
+		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
+		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
+	fi
+
+	if ! has_version "dev-perl/Devel-NYTProf"; then
+		elog ""
+		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
+	fi
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 26681ab16ef8..0ee84d11963f 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/minio/Manifest b/net-fs/minio/Manifest
index 9f6da75f7309..470f28d80144 100644
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@@ -1,6 +1,8 @@
 AUX minio.initd 410 BLAKE2B bedce560151142afc4961569f6fb803c9d7bb4263d56061191e3dc7e867dccd62fa1a363d41c16afa931d0ad138bd8cd858d7dc636851c6a0130bb1405396e3b SHA512 01610c5dd7e5887f85b1246d475e5b5c23cf3fbaa0de21e9579bfa929f3634cccbab1b7a7b8e66fa9bec41ed3feaae033c4380cc3911a7af6f64286c4ed0cf78
 DIST minio-0_pre20180516.tar.gz 7795495 BLAKE2B d14fcbcbf4fa3b9a85bfa1f42d1069b14d4eceb4b99c2e7619d463a1fcdb941183146102da7ac38351fdf332b4bf7a141ede5469b57fc2157be19ff7ecde3e73 SHA512 6f5811500010f6e309e3918883c2127a46ba003dc43ece2c6d8a5da9e8d5aa6c2e6e4ca9dfdb4128b11327e035dcdde607b5e4ace045df1fa073d674d8b97e5a
 DIST minio-2018.07.23.18.34.49.tar.gz 8390586 BLAKE2B 57eecb767e67bdfe52259ed9ee111548c0d41313e0bd0fd60676cb910f8ec7b5f22aaf54055147b440295384df96e0a709bb4c1e7bc6d65d07f3d7e633a444b5 SHA512 7d49fb8ece251eb8672d60ac69d0ba4b1ad61901fc5707a9d3c45736c89f5cb313255d7e5c006c5682fb88fcc61c7e638350b76f8b534655bd0a8af20ec51ea8
+DIST minio-2018.08.02.23.11.36.tar.gz 8381976 BLAKE2B 4081dcb34af05e6643ac64648b2cf6dfeff7119441f79c0958b02ff7a9229ba0f46d63e3922afbb4286702a9f86dbcfb6bf1268d6a1bb4df651618ddbeb95f15 SHA512 edc1178825aa50d93dfccbeebf9370c54c61c10f0046b13ec5b25a2ae727f6520496dcfa3e42fd9b2fcaa767210db3138e0ac604ef9c87278be9e3aa4a1f78ff
 EBUILD minio-0_pre20180516.ebuild 1319 BLAKE2B 192bc1fde1b2178b9c2d345de0e3ec8972af76d1cf0ae24e40b9d45de244b4bb25c39b73b93093a5fb4008ed3f2af875137fdbbbd882b159428c8171b5383699 SHA512 b0fc2c4bcad2cddc98dd0fa5a8142ed5a256fdadc53cd79234b636d8e0225ac3d67f55a7a5c74d755b9f8236e350711b1e97a029af01ba393a0958c4f4cbc593
 EBUILD minio-2018.07.23.18.34.49.ebuild 1355 BLAKE2B 96d20da0ec42fa260e914184526c474a3fad01f8bebff80e83d67361ef43429c076b120a604ee40a5f0bb80dcd315f2cd8b2c6f12f8feadf7155fa6d953a68d9 SHA512 c76ecd7a552e916bce25cea4d3284e581f8ea02596a9c9949e4284b4638bba193d320ffc33ba529aeeba65b42bc5a6e9c8acc9a41f8777afb8422f403d4ee600
+EBUILD minio-2018.08.02.23.11.36.ebuild 1355 BLAKE2B fc3585902532d8e1486ff3fea62d48946b3db44843a947dab27a1a77fee39830bad3d49e83996d9ca0c2c1c59fdac23d4ed7a5799d11056b588bc473f6e6524a SHA512 84f8839313af5a5a26043f9cac138e94442436e5207c94622f96aa4836ba8193bc72a096b84fd1308350014f356de92d0fd5bb7d535119e842eb147545e425ce
 MISC metadata.xml 321 BLAKE2B 7e012bd9c28f71a0c8ccecc85f4ba3a18e5d4d20f7ad6d0f493d228118ecef3412886a8adbf5585aee9e22c8141a9065b06f980d40588e1db408e9d0f7ac715c SHA512 b44c2fe36086faa97355cc6d55571ceca91836e6874530529d13d909974795a553bf1701eadd85a461da1f2f53c885230cce33589d1527117d7232ff959171b0
diff --git a/net-fs/minio/minio-2018.08.02.23.11.36.ebuild b/net-fs/minio/minio-2018.08.02.23.11.36.ebuild
new file mode 100644
index 000000000000..0cc7045b5ef8
--- /dev/null
+++ b/net-fs/minio/minio-2018.08.02.23.11.36.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot eapi7-ver
+
+EGO_PN="github.com/minio/minio"
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+EGIT_COMMIT="a091b1a3eefbaea07499bef9a5462280ec9d2a7a"
+ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="An Amazon S3 compatible object storage server"
+HOMEPAGE="https://github.com/minio/minio"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	MINIO_RELEASE="${MY_PV}"
+	go run buildscripts/gen-ldflags.go
+	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
+	dobin minio
+	popd  || die
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index e2bf95b63b1d..bd50e0faf811 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 145b3a39cfe5..add3b0f86bda 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -2,9 +2,11 @@ AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a
 DIST FileZilla_3.25.2_src.tar.bz2 4712781 BLAKE2B c4e346442596eb2c1c7f5b541dc1386be5be13a3564187d5d7f275b5e1223cf1c95e11e27120c98276ea550d0b1c65122ffd62b5471a886faf1ebea0ab217522 SHA512 6c6feeec0b1bd15ff2c3fecbec22bca9c79f4263e0d1855c6d27a3df54128cfd837f0a546d1540b87b4645e620b57961b8ac0f01bd52748832f5625139c39764
 DIST FileZilla_3.34.0_src.tar.bz2 4869893 BLAKE2B 43f017a833191126526195636607b7ba4ebc73859f48745126ddd284940da90d692e0bf2373096f5262e6ebe2e6655d9cf2dbbf4b0aa6299730f47b1f04c63e8 SHA512 577118bd053c3aedbe77082b138c30abc6a759b20ea905abc4e9bef965cbca3cf73023186c389ded7d906b7cf76e4f3d4462c00fae62c7b1ae695ad171c88764
 DIST FileZilla_3.35.1_src.tar.bz2 4963273 BLAKE2B dd7a30bf6916d7b2a6db0733856c8241a5363f40e8d089975a06a683b13c32dbad6fd009a3ec526d9f0c7f4268e277576a5eac878b55f4f5ddd43ebb563d6632 SHA512 e039a00ac64b6d1b99f50a5f94268a7e11c839e75465f76ff865700071aa0ee7733c89a5f5b8e16ef5deb3cd1b30873b48c3c8a42a73ed9a6b6a05e3e35cf2a1
+DIST FileZilla_3.35.2_src.tar.bz2 4968449 BLAKE2B 1c06b0a67177fc2b91e037eef02c0835702f79d9a36f9af1eed27a4999986db2a351c073e866cb0359c6b415f737a07344619741018537c0e5a59c81c589c48c SHA512 dfd962cc1ed86b4198c339560482d722ca6fa81dfeaae47dbdb8867c7c4ce516cecff393e9bda7abf2148e32f6b423ed76296346e22570db1f292de06c5bc0b8
 EBUILD filezilla-3.25.2.ebuild 1766 BLAKE2B 7690f5ea4596731e6a5f308650049d8011cda2eb3d4e22319615719a984e7b8ac5e322990dce9faeb1b9dba3fe0c2563aa90cb4e4e12ce5e2d5f597ba848fe92 SHA512 9cdfbf62ff8e0356b91158e0b941fc8f2f72e4eb3c8a519cd3180186b6dce5c08c4204d42d6462d348de6b933161cce921a8920e3dec0b7f4e41f8036ca4f2dc
 EBUILD filezilla-3.34.0-r300.ebuild 1809 BLAKE2B bb41046d31abbaac3a395fc7724c007be8fb0c2b5e28983c54683cd55f4a83e0eae5e5bf275f371ec3bcfa4207b162c452282e73737c3da4feb9292015f10fdb SHA512 8806505fc306bf2b60bd9b48696d5848b7a6a77372a47e609a8ecaacb13b10f4287c8705b5eb7c2316c73fb7e524d42fba158aabb8aa8548bf70e6d43dc30621
-EBUILD filezilla-3.34.0.ebuild 1804 BLAKE2B 1e5b14cccc8fd2f2bd0cadad29a2c90c4513610426fdb54c2d71a2dae3d2a19d5ee69ee9aa5bd1c8edbeffd2efb202e94ed5c01683199720262cabfd09b83222 SHA512 3f65c0b456c3500aad80877d618039cc75f7e899325af4c83705e0250de0fb8e23ab593376cd8e230c416786bfa6b159bf699460ef897e2bd6c176848d83bddb
+EBUILD filezilla-3.34.0.ebuild 1802 BLAKE2B 39823cc23b1c5f87eb471a840f5b2c8aeb852df31a09a8d235289f7d09e17ed5b4d498becdb1e0a976d79bc1d3137363df9f2310b0b9bc35eb97946d62c9b74a SHA512 2d0aa62a90acc2a38372745cf37248fb35dc43417476a357a2385799afea9e5e195c24533d631fa00a6324a245b0a234343ace012607e0496353a06052d3df7a
 EBUILD filezilla-3.35.1-r300.ebuild 1809 BLAKE2B 62a9792d3b3cd66c8a923d3d7b44f4b8c99f7228cb020a1dfe3fe0eedc1428b6ae68f12eca3447451e5a2b3705070dd4f2fe3c263f4ac38256a774cecfcc10b2 SHA512 665f1417d102418e22ec46d5514bb13d1fbb75748bd04417325167618d2d9e8f99f1da848b0502d19e6a42c562aa9c44cf855658b5317b658e44a30c94cb2983
 EBUILD filezilla-3.35.1.ebuild 1804 BLAKE2B 34c7834264555386a377d4a3443ab958425bed5c2619948f74480e3cddf8d69ae1a3a0c29682bbfc2765f37dbfc971aa266b0f9bd8986ed2e2d9493a7a4cdab0 SHA512 b80c6d4cd77c7a9ac67da322f78baba6ead2cc72217b1f368d431359c5dbc48db0388cae19f09e8f5ec268861275b4d5c99d4b2b14ad964505edbc7913766adb
+EBUILD filezilla-3.35.2.ebuild 1809 BLAKE2B 62a9792d3b3cd66c8a923d3d7b44f4b8c99f7228cb020a1dfe3fe0eedc1428b6ae68f12eca3447451e5a2b3705070dd4f2fe3c263f4ac38256a774cecfcc10b2 SHA512 665f1417d102418e22ec46d5514bb13d1fbb75748bd04417325167618d2d9e8f99f1da848b0502d19e6a42c562aa9c44cf855658b5317b658e44a30c94cb2983
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.34.0.ebuild b/net-ftp/filezilla/filezilla-3.34.0.ebuild
index 944fc1ab7a7c..4d53279d037c 100644
--- a/net-ftp/filezilla/filezilla-3.34.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.34.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl2.cdn.filezilla-project.org/client/${MY_P}_src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc x86"
 IUSE="dbus nls test"
 
 # pugixml 1.7 minimal dependency is for c++11 proper configuration
diff --git a/net-ftp/filezilla/filezilla-3.35.2.ebuild b/net-ftp/filezilla/filezilla-3.35.2.ebuild
new file mode 100644
index 000000000000..46fa5c033976
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.35.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools eutils flag-o-matic gnome2-utils multilib wxwidgets
+
+MY_PV=${PV/_/-}
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="https://filezilla-project.org/"
+SRC_URI="https://dl2.cdn.filezilla-project.org/client/${MY_P}_src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="dbus nls test"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-libs/nettle-3.1:=
+	>=dev-db/sqlite-3.7
+	>=dev-libs/libfilezilla-0.13.0
+	>=dev-libs/pugixml-1.7
+	net-dns/libidn:=
+	>=net-libs/gnutls-3.4.15
+	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
+	x11-misc/xdg-utils
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )
+	test? ( >=dev-util/cppunit-1.13.0 )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DOCS=(AUTHORS ChangeLog NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_prepare() {
+	setup-wxwidgets
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-pugixml=system \
+		--disable-autoupdatecheck
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 3149943a2488..d21a64921b25 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -13,10 +13,8 @@ AUX lftp-4.8.2-libdir-libidn2.patch 315 BLAKE2B 0ebb68e3d4175b2c4900cb540049dabd
 AUX lftp-4.8.2-libdir-openssl.patch 658 BLAKE2B 430dab0713f82c3c10ac7395b8ca9ca1fc12afedf9eae52e5aaa34aad518cbee5ab225fca3a524e21efc583ab9e103bb8dafa6c9154da18962d4b03400a939d0 SHA512 a48e46873d9134693452cc55c2562d1a7d7b6bb7124dba061db029e6e1c611ed9787518c86043213629683727cf0fff07afc8ce7298a30fd237941300a1aeae0
 AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8370cdf511303df4b17346275d936ebfcb658262102c01e61e11861d69e4c54f45baeddb246c062f3c66eadf8b0bcd SHA512 4a47a2e63bfe80faa640edc92c645e89d5c0063c0adc992f0b0613e01cfa0599f61f9bd07568432673addb1a981f101c474b1a0d99fd50fced455c9700b886e6
 DIST lftp-4.7.5.tar.xz 1567232 BLAKE2B 6ff7d264102ee25e989136b67b0587c025fd29a2573b25e4b9baac63c0ff0e9e40a4444b61ad50f8b892eb2f16dd31266056840aec0fb260686eb3b1714e4326 SHA512 e7d478367a3b79f61686a538827efe8afb807a587d2967189ae351927e3acb0d5b097d8707e0cb3997aa650f8f0787aa44038bb1d081e393bc7202b348249960
-DIST lftp-4.8.2.tar.xz 1598920 BLAKE2B 2946a0ac3e915983e85f08f4c8a293cfd76b837dff007c60230522f4633dac9f9f198ee1d0e9e0d13217b83a55e46bd024d18d863e44bc17071561da6ec917a6 SHA512 582775c27f020a6864b960a06681698522842e147deee6dba18115738af56fc0094c2b21ed1eb4984626276472f707be795fcf4b23f451ba17a60e4bf8facd5e
-DIST lftp-4.8.3.tar.xz 1602324 BLAKE2B 196a9a08f97512952ea8c9e95b85c7222765a9df05d300d6c2cc3bd934b746d0c62a3d4c93a5c6eb3f1eca138495ae1c09edc31ad4f5516128c44fd3b8bbf2de SHA512 16d0ddc36ac00db009fd4e634a2eaa575bd1c690ea7e1af396317ccc677704d2a4dfa19ea0c46dab83450072714086ed2b15ac00ffe51ec5c9bb900e5e744583
+DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1
 EBUILD lftp-4.7.5.ebuild 2552 BLAKE2B 3d99cfd051ade3491264a80c2640685720425faa4d783293b23ed6baa8699e82cc12e6a8259ddcacde5d8308efecfe1bc37f267b42735589b04f8b6614fcf98d SHA512 cfcb38856ceb7c195c64467fba134b8b744c3b35a4f411e3928e99df72bec286e70e0f877948bd10075e379b9efd3dce93cd3a3f21d8e6e316d7ef75b49a11c7
-EBUILD lftp-4.8.2.ebuild 2568 BLAKE2B 9a55eaa9b585296345e3a03556add0d4fb196e76eb07e42540c9dbb3c3ec83a5595802b91f90c46f851f8e0fe01bba9eb628a5a803844a6f91aad741669fd4af SHA512 73fb5dff8969bc4059270094430f36046269082f2986ff1bd467112f6cc2c69ab6a491fd476cfe18692c9e262fabf943dd463d7ec44ce20c9e94a728c533b16f
-EBUILD lftp-4.8.3.ebuild 2568 BLAKE2B 9a55eaa9b585296345e3a03556add0d4fb196e76eb07e42540c9dbb3c3ec83a5595802b91f90c46f851f8e0fe01bba9eb628a5a803844a6f91aad741669fd4af SHA512 73fb5dff8969bc4059270094430f36046269082f2986ff1bd467112f6cc2c69ab6a491fd476cfe18692c9e262fabf943dd463d7ec44ce20c9e94a728c533b16f
+EBUILD lftp-4.8.4.ebuild 2568 BLAKE2B 9a55eaa9b585296345e3a03556add0d4fb196e76eb07e42540c9dbb3c3ec83a5595802b91f90c46f851f8e0fe01bba9eb628a5a803844a6f91aad741669fd4af SHA512 73fb5dff8969bc4059270094430f36046269082f2986ff1bd467112f6cc2c69ab6a491fd476cfe18692c9e262fabf943dd463d7ec44ce20c9e94a728c533b16f
 EBUILD lftp-9999.ebuild 2351 BLAKE2B 252c1c026a5bad4adc8b37fb16819c53090be97e18a8df4befcde504ddfc56bf7f62ca32800250729499248319799c43dc4616aa93ca7c48137a670fae9bb0b2 SHA512 714b570e69f9978fce0fb3726187110e4c1f9733a3cf6b4ed7a06d1b536a248c5c7300ad43c45558a458350bff1695ba365c6e7d7c31d6accdc7796c40a47030
 MISC metadata.xml 465 BLAKE2B b2c378d349c81c2e99b76a1a5585d58a7aa1bb866e3336e37336c838a87f78425f04a0eeca9d49ee246e085b934a9da4d5b17adf72a4b224d03b76d37bdd84db SHA512 542f366f55d7c19bb3e17a57d060824db5933f2ea3b3aaa8dd3520dc757be53e1dcf4f91fa34f15abc478e9c6b68799df3ad14836e0579f02977843e8d330bfd
diff --git a/net-ftp/lftp/lftp-4.8.3.ebuild b/net-ftp/lftp/lftp-4.8.3.ebuild
deleted file mode 100644
index 3ea35f33f1da..000000000000
--- a/net-ftp/lftp/lftp-4.8.3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils libtool
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="https://lftp.tech/"
-SRC_URI="
-	${HOMEPAGE}ftp/${P}.tar.xz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
-RESTRICT="test"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1:=
-	>=sys-libs/readline-5.1:=
-	dev-libs/expat
-	sys-libs/zlib
-	convert-mozilla-cookies? ( dev-perl/DBI )
-	idn? ( net-dns/libidn2 )
-	socks5? (
-		>=net-proxy/dante-1.1.12
-		virtual/pam
-	)
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.3:0= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	verify-file? (
-		dev-perl/String-CRC32
-		virtual/perl-Digest-MD5
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-	=sys-devel/libtool-2*
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.19 )
-	virtual/pkgconfig
-"
-
-DOCS=(
-	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
-	README.dnssec README.modules THANKS TODO
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch
-	"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
-	"${FILESDIR}"/${PN}-4.7.0-gettext.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
-	"${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
-	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	elibtoolize # for Darwin bundles
-
-	# bug #536036
-	printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with idn libidn2) \
-		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
-		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
-		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
-		--enable-packager-mode \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-modules \
-		--with-readline="${EPREFIX}"/usr \
-		--without-included-regex
-}
-
-src_install() {
-	default
-	local script
-	for script in {convert-mozilla-cookies,verify-file}; do
-		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
-	done
-}
diff --git a/net-ftp/lftp/lftp-4.8.2.ebuild b/net-ftp/lftp/lftp-4.8.4.ebuild
index 3ea35f33f1da..3ea35f33f1da 100644
--- a/net-ftp/lftp/lftp-4.8.2.ebuild
+++ b/net-ftp/lftp/lftp-4.8.4.ebuild
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index bfcd8322bf9d..e195afde8e2d 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 888c38388961..24e5e07fc8e9 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.14.4_amd64.deb 65716964 BLAKE2B 6209261ea15e14ae6b8da175afdddc4f48af55094a4dab20bdf7dcb5fe52ae79fbb7e2c235297afca2506749de387f8ca06b36a4aa89232b4cf903ded92c291e SHA512 d5e35fe04bbcb64cd2b5d12823be5400a85ca5ec8c24891f7f12aa6c38074f97a739afe7f028b4a397d1cc4d2e7193d7354829b54847dd0e95c71c7a46dae017
-EBUILD signal-desktop-bin-1.14.4.ebuild 1204 BLAKE2B 14c337f5c12ddcf3197c7bfc3a902b4e930bf87bb868f276bb2a37245ad9e23de59effbf56ac3c98631598c3ac20b7691ec48d8abcd6a2569236f7954de9572e SHA512 59455890ec3c64060964b4b430047d6e1273794083d8fce5a41c2efc1a30b47fb7d99f60935f2664a9a57c1e9adf62fae74dec52ada893bf3558bf79458db261
+DIST signal-desktop_1.15.2_amd64.deb 70027630 BLAKE2B 28feb05c3fc77cd430de99db823b5a0d8dcad88012ca27be847841a85e976e5b260f4db22b7061be991945399474397f88cd8990ac8295b0a35985777805f239 SHA512 cd0c10398e4df80849ffbf0ff4a5a7e1be832197fb19f5091798cf141cb9580fd64ba2c6353d87b26fbab6cfab53cfdcf18f7a2e4b73770506d615fac2b2a640
+EBUILD signal-desktop-bin-1.15.2.ebuild 1358 BLAKE2B d83ffa215febb3260b53ea9c8fe87f0329e7658a13d31cf99222b99edc74f330362872a07d14e851239aefadecad040f845b503094bc1130c1d1ef2eb53dfcfb SHA512 547b592cd8ace2f51e5ce09c31c84751245396a9d5fdc168a93be83e6a904e792fa60cefc3e7b0fcd85e029f18aa28a107874749a383a741fade91db6f6cffc8
 MISC metadata.xml 510 BLAKE2B 618fc8fb3b176d175bb15ceef941c60ebd89666f4b01f7b7912a4c26d8f54802982a8c089480f11573418daf88fb559dacca797c7f42493d122fd448c53eb923 SHA512 9d9ae0f5f1961fc1ad9b0e59f8d2003fc746f6f25dabb6c35b6ee8e151caf25e724b321e0c11a1b02f5431a204215caf5a4614232508b8492a0d33cd4bb46b8a
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.14.4.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.14.4.ebuild
deleted file mode 100644
index 4c7b60f0d173..000000000000
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.14.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-bin/}"
-
-inherit gnome2-utils pax-utils unpacker xdg-utils
-DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
-HOMEPAGE="https://signal.org/
-	https://github.com/WhisperSystems/Signal-Desktop"
-SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	gnome-base/gconf:2
-	dev-libs/nss
-	x11-libs/gtk+:3[X]
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	net-print/cups
-	"
-
-QA_PREBUILT="opt/Signal/signal-desktop
-	opt/Signal/libnode.so
-	opt/Signal/libffmpeg.so"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /
-	dodoc -r usr/share/doc/signal-desktop/.
-	doins -r opt
-	insinto /usr/share
-	doins -r usr/share/applications
-	doins -r usr/share/icons
-	fperms +x /opt/Signal/signal-desktop
-	pax-mark m opt/Signal/signal-desktop
-
-	dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.15.2.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.15.2.ebuild
new file mode 100644
index 000000000000..078b15d4bb38
--- /dev/null
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.15.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-bin/}"
+
+inherit gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
+HOMEPAGE="https://signal.org/
+	https://github.com/WhisperSystems/Signal-Desktop"
+SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	gnome-base/gconf:2
+	dev-libs/nss
+	x11-libs/gtk+:3[X]
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	net-print/cups
+	"
+
+QA_PREBUILT="opt/Signal/signal-desktop
+	opt/Signal/libnode.so
+	opt/Signal/libffmpeg.so"
+
+S="${WORKDIR}"
+
+src_prepare(){
+	default
+	sed -e 's|\("/opt/Signal/signal-desktop"\)|\1 --start-in-tray|g' \
+		-i usr/share/applications/signal-desktop.desktop || die
+}
+
+src_install() {
+	insinto /
+	dodoc -r usr/share/doc/signal-desktop/.
+	doins -r opt
+	insinto /usr/share
+	doins -r usr/share/applications
+	doins -r usr/share/icons
+	fperms +x /opt/Signal/signal-desktop
+	pax-mark m opt/Signal/signal-desktop
+
+	dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 3e0ffa3d80a5..5e42fcdb5ccf 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,9 +1,7 @@
-DIST skypeforlinux_8.18.0.6-1.x86_64.rpm 101968899 BLAKE2B 2aa2ed9d290f2f9307cb8db124b407b509a7b8f869805f25293df343978cc4911476a1734563325063bd1e3ef0e9044bc12d864edff838855af1f1b731dd4b39 SHA512 0917875b21b9d77f2299260ea2152b3c14c0b332343cb9832be2a613c875025b77ca782f60987f638d430d005d1bf78f1763fe82b7d91c3146c39e7fafbf1c11
-DIST skypeforlinux_8.20.0.9-1.x86_64.rpm 115781688 BLAKE2B 24f197afeb034e0de6930af40508ada51dd3dc7a24d0a20bc05e65591bbdd8630d767bafcaf739cf70da5531f60ba52f8f51d53fb6f28e6974c4ca1be304585a SHA512 c39c672f03ac340ddd31641e80a780e2e5d624ba60aab3991f96611daedc93b1893fb44155b3895a84b21c04fa9498ba6dc158a40041b17ffc14f3b272eb72e3
 DIST skypeforlinux_8.22.0.2-1.x86_64.rpm 96073264 BLAKE2B d5d85ac5ba852ef50286894a4a3ff830e3763eb962f8e40cf4d2b9a9511394113991bd0de6cfe54fb8286c5bbe25ce516a640097f9240a947c7e70c97c7bcec9 SHA512 c628bcde1a467bf69e66bd8fc134bba18a2489d857659d386addb0659492bdc7884c29087411d5728074ae7f108f98be876b6330b1178e8ffe9792662bc9105f
 DIST skypeforlinux_8.25.0.5-1.x86_64.rpm 90947986 BLAKE2B af778f6bad5440a97186d4ca6ef61c8d22099dd9958aa6176b77cd5bfd8ebced8e914df0a4c71ec5c6a7374af5650fbb2fe86592c0b0512792910f02b4ddacbe SHA512 009a6403a4a3188c9054354629a993b3eff120d45af275b19ddfe4a28c9e9b3de2058913069bf6439e92bf9f087e0b795f35bff1c4e8e313730fa951735d981e
-EBUILD skypeforlinux-8.18.0.6.ebuild 3678 BLAKE2B bf717c61439733f94edb07332df57f42eb3b399e3996e6eace9fec071a637a2fa9565a6af386d26f07ae96bb5b2e66775b6608c4f62d392426d11cbae868ab3b SHA512 68a96a0939ccb7e5e0540f2c02b426d996217aa173cee2750b4edae70b87e22ed5d3a26c1cde219be8e0dde641877a22226d4dc85b022ec2e7369068d40c5cf5
-EBUILD skypeforlinux-8.20.0.9.ebuild 3678 BLAKE2B bf717c61439733f94edb07332df57f42eb3b399e3996e6eace9fec071a637a2fa9565a6af386d26f07ae96bb5b2e66775b6608c4f62d392426d11cbae868ab3b SHA512 68a96a0939ccb7e5e0540f2c02b426d996217aa173cee2750b4edae70b87e22ed5d3a26c1cde219be8e0dde641877a22226d4dc85b022ec2e7369068d40c5cf5
-EBUILD skypeforlinux-8.22.0.2.ebuild 3679 BLAKE2B a4ff23a906830aef06275015a5ad598c143189dec6382c6ee1f5db8f3659b98bad54745f7d1fbae7df4b2cb1cf41149fafd9e46343bf23d583c6ba2d2de985ff SHA512 2c2127e18afc15dd199716c95fecbd055c557596e901fd28ecd4f831881abafb60d6146e216aeedfb95965a37af2d3a3b9c2b4a6fc01564fdf76ecdfb866a102
-EBUILD skypeforlinux-8.25.0.5.ebuild 3679 BLAKE2B a4ff23a906830aef06275015a5ad598c143189dec6382c6ee1f5db8f3659b98bad54745f7d1fbae7df4b2cb1cf41149fafd9e46343bf23d583c6ba2d2de985ff SHA512 2c2127e18afc15dd199716c95fecbd055c557596e901fd28ecd4f831881abafb60d6146e216aeedfb95965a37af2d3a3b9c2b4a6fc01564fdf76ecdfb866a102
+DIST skypeforlinux_8.27.0.85-1.x86_64.rpm 94874950 BLAKE2B b96f79e66aa6b4e85abee2cbd7a94500f344c31ad3f0863a0bb5b360646b558823b6c289394f98cbc98da66bdbc7916e27aadbae15a0cb422cef10841cbf4679 SHA512 c30fd1d41c407719b480e2d04d18d192c585f33396f8923667d255309f9dcb7e258a4bc4383808872be728bada7f06d799be8c84930e8154c01771297f5d6fc2
+EBUILD skypeforlinux-8.22.0.2.ebuild 3679 BLAKE2B 6b98754fa280237e7282a69292efb1aeccc7838847c74fb2cef6b7a0966e5b1f8cf55cf782c58bb1c421b60c85779c3c0344655f5b9ef3f62c9557e31f162ec0 SHA512 a670fd3d915bca1e9ce0e8585bf87cc9dd1c24858d2d48e979ab9f57ba1e5539bc29edf3e502b4fbd93389347f5b152909e3f9eadd438e656ac4094b94adf116
+EBUILD skypeforlinux-8.25.0.5.ebuild 3679 BLAKE2B 6b98754fa280237e7282a69292efb1aeccc7838847c74fb2cef6b7a0966e5b1f8cf55cf782c58bb1c421b60c85779c3c0344655f5b9ef3f62c9557e31f162ec0 SHA512 a670fd3d915bca1e9ce0e8585bf87cc9dd1c24858d2d48e979ab9f57ba1e5539bc29edf3e502b4fbd93389347f5b152909e3f9eadd438e656ac4094b94adf116
+EBUILD skypeforlinux-8.27.0.85.ebuild 3679 BLAKE2B 6b98754fa280237e7282a69292efb1aeccc7838847c74fb2cef6b7a0966e5b1f8cf55cf782c58bb1c421b60c85779c3c0344655f5b9ef3f62c9557e31f162ec0 SHA512 a670fd3d915bca1e9ce0e8585bf87cc9dd1c24858d2d48e979ab9f57ba1e5539bc29edf3e502b4fbd93389347f5b152909e3f9eadd438e656ac4094b94adf116
 MISC metadata.xml 684 BLAKE2B 90b427ff6ed13fb5046a188fc8476d45989bdb717c1a930e81270164d72b565942ecfd4f08821bcf265ef17fa79f515c205b314abd21b2e7335387ab10e7f93a SHA512 8a7481d0a0b8d453f7748491ebf12d34e1deeb2f0bfc618e27e15a1029bf04814afadc3ca169c12f1e7d199ec0deebcdf6369ccc6c6a41a2add78209c257f8c6
diff --git a/net-im/skypeforlinux/skypeforlinux-8.18.0.6.ebuild b/net-im/skypeforlinux/skypeforlinux-8.18.0.6.ebuild
deleted file mode 100644
index d5e5dfdff41c..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.18.0.6.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit eutils gnome2-utils pax-utils rpm multilib-build xdg-utils
-
-DESCRIPTION="Instant messaging client, with support for audio and video"
-HOMEPAGE="https://www.skype.com/"
-SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
-
-LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 -*"
-IUSE="pax_kernel"
-
-S="${WORKDIR}"
-QA_PREBUILT="*"
-RESTRICT="mirror bindist strip" #299368
-
-RDEPEND="
-	app-crypt/libsecret[${MULTILIB_USEDEP}]
-	dev-libs/atk[${MULTILIB_USEDEP}]
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr[${MULTILIB_USEDEP}]
-	dev-libs/nss[${MULTILIB_USEDEP}]
-	gnome-base/gconf:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	media-libs/libv4l[${MULTILIB_USEDEP}]
-	net-print/cups[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-devel/gcc[cxx]
-	virtual/ttf-fonts
-	x11-libs/cairo[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXi[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
-	x11-libs/pango[${MULTILIB_USEDEP}]"
-
-src_unpack() {
-	rpm_src_unpack ${A}
-}
-
-src_prepare() {
-	default
-	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
-		-i usr/bin/skypeforlinux || die
-	sed -e "s!^Exec=/usr/!Exec=${EPREFIX}/opt/!" \
-		-e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
-		-e "/^OnlyShowIn=/d" \
-		-i usr/share/applications/skypeforlinux.desktop || die
-}
-
-src_install() {
-	dodir /opt
-	cp -a usr/share/skypeforlinux "${D}"/opt || die
-
-	into /opt
-	dobin usr/bin/skypeforlinux
-
-	dodoc usr/share/skypeforlinux/*.html
-	dodoc -r usr/share/doc/skypeforlinux/.
-	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
-	dosym ${P} usr/share/doc/skypeforlinux
-
-	doicon usr/share/pixmaps/skypeforlinux.png
-
-	# compat symlink for the autostart desktop file
-	dosym ../../opt/bin/skypeforlinux usr/bin/skypeforlinux
-
-	local res
-	for res in 16 32 256 512; do
-		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
-	done
-
-	domenu usr/share/applications/skypeforlinux.desktop
-
-	if use pax_kernel; then
-		pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux
-		pax-mark -m "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-		ewarn "You have set USE=pax_kernel meaning that you intend to run"
-		ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
-		ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
-		ewarn "you suspect that ${PN} is being broken by this modification,"
-		ewarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-im/skypeforlinux/skypeforlinux-8.20.0.9.ebuild b/net-im/skypeforlinux/skypeforlinux-8.20.0.9.ebuild
deleted file mode 100644
index d5e5dfdff41c..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.20.0.9.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit eutils gnome2-utils pax-utils rpm multilib-build xdg-utils
-
-DESCRIPTION="Instant messaging client, with support for audio and video"
-HOMEPAGE="https://www.skype.com/"
-SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
-
-LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 -*"
-IUSE="pax_kernel"
-
-S="${WORKDIR}"
-QA_PREBUILT="*"
-RESTRICT="mirror bindist strip" #299368
-
-RDEPEND="
-	app-crypt/libsecret[${MULTILIB_USEDEP}]
-	dev-libs/atk[${MULTILIB_USEDEP}]
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr[${MULTILIB_USEDEP}]
-	dev-libs/nss[${MULTILIB_USEDEP}]
-	gnome-base/gconf:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	media-libs/libv4l[${MULTILIB_USEDEP}]
-	net-print/cups[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-devel/gcc[cxx]
-	virtual/ttf-fonts
-	x11-libs/cairo[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXi[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
-	x11-libs/pango[${MULTILIB_USEDEP}]"
-
-src_unpack() {
-	rpm_src_unpack ${A}
-}
-
-src_prepare() {
-	default
-	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
-		-i usr/bin/skypeforlinux || die
-	sed -e "s!^Exec=/usr/!Exec=${EPREFIX}/opt/!" \
-		-e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
-		-e "/^OnlyShowIn=/d" \
-		-i usr/share/applications/skypeforlinux.desktop || die
-}
-
-src_install() {
-	dodir /opt
-	cp -a usr/share/skypeforlinux "${D}"/opt || die
-
-	into /opt
-	dobin usr/bin/skypeforlinux
-
-	dodoc usr/share/skypeforlinux/*.html
-	dodoc -r usr/share/doc/skypeforlinux/.
-	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
-	dosym ${P} usr/share/doc/skypeforlinux
-
-	doicon usr/share/pixmaps/skypeforlinux.png
-
-	# compat symlink for the autostart desktop file
-	dosym ../../opt/bin/skypeforlinux usr/bin/skypeforlinux
-
-	local res
-	for res in 16 32 256 512; do
-		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
-	done
-
-	domenu usr/share/applications/skypeforlinux.desktop
-
-	if use pax_kernel; then
-		pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux
-		pax-mark -m "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-		ewarn "You have set USE=pax_kernel meaning that you intend to run"
-		ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
-		ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
-		ewarn "you suspect that ${PN} is being broken by this modification,"
-		ewarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-im/skypeforlinux/skypeforlinux-8.22.0.2.ebuild b/net-im/skypeforlinux/skypeforlinux-8.22.0.2.ebuild
index 134b0cc2d8af..fe787944cfb9 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.22.0.2.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.22.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
 
 LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 -*"
+KEYWORDS="-* ~amd64"
 IUSE="pax_kernel"
 
 S="${WORKDIR}"
diff --git a/net-im/skypeforlinux/skypeforlinux-8.25.0.5.ebuild b/net-im/skypeforlinux/skypeforlinux-8.25.0.5.ebuild
index 134b0cc2d8af..fe787944cfb9 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.25.0.5.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.25.0.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
 
 LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 -*"
+KEYWORDS="-* ~amd64"
 IUSE="pax_kernel"
 
 S="${WORKDIR}"
diff --git a/net-im/skypeforlinux/skypeforlinux-8.27.0.85.ebuild b/net-im/skypeforlinux/skypeforlinux-8.27.0.85.ebuild
new file mode 100644
index 000000000000..fe787944cfb9
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.27.0.85.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit desktop gnome2-utils pax-utils rpm multilib-build xdg-utils
+
+DESCRIPTION="Instant messaging client, with support for audio and video"
+HOMEPAGE="https://www.skype.com/"
+SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
+
+LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="pax_kernel"
+
+S="${WORKDIR}"
+QA_PREBUILT="*"
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="
+	app-crypt/libsecret[${MULTILIB_USEDEP}]
+	dev-libs/atk[${MULTILIB_USEDEP}]
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr[${MULTILIB_USEDEP}]
+	dev-libs/nss[${MULTILIB_USEDEP}]
+	gnome-base/gconf:2[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]
+	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	media-libs/libv4l[${MULTILIB_USEDEP}]
+	net-print/cups[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-devel/gcc[cxx]
+	virtual/ttf-fonts
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
+	x11-libs/pango[${MULTILIB_USEDEP}]"
+
+src_unpack() {
+	rpm_src_unpack ${A}
+}
+
+src_prepare() {
+	default
+	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
+		-i usr/bin/skypeforlinux || die
+	sed -e "s!^Exec=/usr/!Exec=${EPREFIX}/opt/!" \
+		-e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+		-e "/^OnlyShowIn=/d" \
+		-i usr/share/applications/skypeforlinux.desktop || die
+}
+
+src_install() {
+	dodir /opt
+	cp -a usr/share/skypeforlinux "${D}"/opt || die
+
+	into /opt
+	dobin usr/bin/skypeforlinux
+
+	dodoc usr/share/skypeforlinux/*.html
+	dodoc -r usr/share/doc/skypeforlinux/.
+	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
+	dosym ${P} usr/share/doc/skypeforlinux
+
+	doicon usr/share/pixmaps/skypeforlinux.png
+
+	# compat symlink for the autostart desktop file
+	dosym ../../opt/bin/skypeforlinux usr/bin/skypeforlinux
+
+	local res
+	for res in 16 32 256 512; do
+		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
+	done
+
+	domenu usr/share/applications/skypeforlinux.desktop
+
+	if use pax_kernel; then
+		pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux
+		pax-mark -m "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
+		ewarn "You have set USE=pax_kernel meaning that you intend to run"
+		ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
+		ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
+		ewarn "you suspect that ${PN} is being broken by this modification,"
+		ewarn "please open a bug."
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index eb319d710f24..b47432194215 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 97ec2d003cb5..7e9b5d76d250 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,4 +1,6 @@
 DIST libbtbb-2017-03-R2.tar.gz 303689 BLAKE2B d36cf5329fb31cd50f64e3a9b625ebca8bf198794073480baa4f64935f4bef183e4c11f0844cd31df943da98c778bdea807fbd91676c23a3a2f830af5e7a185f SHA512 bb7b58a33198fd64fba5f0254cfbb71120c70476d594a7aaf82c77f770d1a6e89b4571f42d3d15c1d93d5246c9145c33ba8724a5ee5ad84e96f748d9f32275b5
+DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
 EBUILD libbtbb-2017.03.2.ebuild 3653 BLAKE2B f289661bdb77b5544333de760fa1de2a93f66ccf9e9c3a1c552d9ff033cb8d2d09d55648f228a6f50d2bdf650f7a95e7357ed79a4f273534effea09b3aa163bd SHA512 ab2bce27d74c21af2bf5a1702c1d650756ed6fd1968d4ac8d575e6f9e28867f4e71fcf940154d9d35482a13d1eb4b04bcd4dea48ebe73487fbddf18b650b0e08
+EBUILD libbtbb-2018.08.1.ebuild 3653 BLAKE2B 3051f5e34d3c75805df4d8b3d3022e096e3c48b0d9a1c170fddd2776af094931c1d4f9081a8f1c14164cda9f11aca5e991fc0f80e40bc79c2e52a9734ac67d2e SHA512 be843fadcc02138fed0f8f7d6ada75a9540e1faa27a6d2eba208d87c8a7af36ac7f099f44d9410201c8ce0967c31b63311df1a938caa5ecdaed00a5e6b29f474
 EBUILD libbtbb-9999.ebuild 3653 BLAKE2B f289661bdb77b5544333de760fa1de2a93f66ccf9e9c3a1c552d9ff033cb8d2d09d55648f228a6f50d2bdf650f7a95e7357ed79a4f273534effea09b3aa163bd SHA512 ab2bce27d74c21af2bf5a1702c1d650756ed6fd1968d4ac8d575e6f9e28867f4e71fcf940154d9d35482a13d1eb4b04bcd4dea48ebe73487fbddf18b650b0e08
 MISC metadata.xml 568 BLAKE2B 508af89d4b95fa71c32b5a610e1630938dc8bf7b83a98b5af981de1a3a70ec0775d694ba5e5514f83e9abdbcb229500080fc31225de40bb65ad347cb273f44a5 SHA512 a4425e207724117d83fcd21f2ed5f9bd52a945597c19ee253c1c55b1e62f0f3d14d71c546cf2e2d6c7ad7b48b0e88ef3d46fc2a172f86cb00c710ed87946430e
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
new file mode 100644
index 000000000000..998113cc4029
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit multilib cmake-utils python-single-r1
+
+DESCRIPTION="A library to decode Bluetooth baseband packets"
+HOMEPAGE="http://libbtbb.sourceforge.net/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	MY_PV=${PV/\./-}
+	MY_PV=${MY_PV/./-R}
+	S=${WORKDIR}/${PN}-${MY_PV}
+	SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="extras static-libs wireshark-plugins"
+
+RDEPEND="extras? ( ${PYTHON_DEPS} )
+	wireshark-plugins? (
+		>=net-analyzer/wireshark-1.8.3-r1:=
+	)
+"
+DEPEND="${RDEPEND}
+	wireshark-plugins? ( dev-libs/glib
+			virtual/pkgconfig )"
+
+REQUIRED_USE="extras? ( ${PYTHON_REQUIRED_USE} )"
+
+get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
+
+which_plugins() {
+	if has_version '>=net-analyzer/wireshark-2.2.0'; then
+		plugins=""
+	elif has_version '>=net-analyzer/wireshark-1.12.0'; then
+		plugins="btbb btbredr"
+	elif has_version '<net-analyzer/wireshark-1.12.0'; then
+		plugins="btbb btle btsm"
+	fi
+}
+
+src_prepare(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_prepare
+
+	if use wireshark-plugins; then
+		which_plugins
+		for i in ${plugins}
+		do
+			sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
+			if has_version '>=net-analyzer/wireshark-2.0';  then
+				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			else
+				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+			fi
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_prepare
+		done
+	fi
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	local mycmakeargs=(
+		-DENABLE_PYTHON=$(usex extras)
+		-DBUILD_STATIC_LIB=$(usex static-libs)
+		-DBUILD_ROOT="${ED}"
+	)
+	cmake-utils_src_configure
+
+	if use wireshark-plugins; then
+		for i in ${plugins}
+		do
+			if has_version '>=net-analyzer/wireshark-2.0';  then
+				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			else
+				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+			fi
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			local mycmakeargs=(
+			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
+			)
+			cmake-utils_src_configure
+		done
+	fi
+}
+
+src_compile(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_compile
+
+	if use wireshark-plugins; then
+		for i in ${plugins}
+		do
+			if has_version '>=net-analyzer/wireshark-2.0';  then
+				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			else
+				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+			fi
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_compile
+		done
+	fi
+}
+
+src_test(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_test
+
+	if use wireshark-plugins; then
+		for i in ${plugins}
+		do
+			if has_version '>=net-analyzer/wireshark-2.0';  then
+				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			else
+				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+			fi
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_test
+		done
+	fi
+}
+
+src_install(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_install
+
+	if use wireshark-plugins; then
+		for i in ${plugins}
+		do
+			if has_version '>=net-analyzer/wireshark-2.0';  then
+				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			else
+				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+			fi
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_install
+		done
+	fi
+}
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index b27005513814..55c30b134114 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,3 +1,3 @@
 DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
-EBUILD neon-0.30.2.ebuild 3116 BLAKE2B a99ffb168c85a796c9177add65efec35626b034d1337ec208aaca0d9712ae55e25e4e7bf2db01249fe683807f1b6705386d589a9aed3909f85ffcb3e3f1f6a55 SHA512 058dea79681c3c984f4b28e4c399aea67fd8b9c031dcf90169b8a825f84be7a0cdb1a79b75c0aa31edbfd8610785d7734eb0f115dd69346dd5c755ccae9a024c
+EBUILD neon-0.30.2.ebuild 3118 BLAKE2B d967bd660eb6fc01e654b03d0d235d20e8781331f5923cd6a705edca2141b7b36d6ef767077153bb12a25c8bb62aae238ef83b6b891d30726c3afa8d5d7e9626 SHA512 e4d0f327caf610ada38693eae433f814146d4f57bdcee76c4dd01c0f5d4bd21cc927c9c341c3d3e90ef90348b199c9dd14bb1b12dda091ac92c883161d2bf015
 MISC metadata.xml 1316 BLAKE2B 8d191f415e3ec7d76acac052656386617625842ffb7ca4c0ecf6e0e5c971f142d8f644bcad394671fac98fc6f046674fe5a5f94a460a5fa4328079e1ce2515a0 SHA512 6d15131eef6b6e61c0d7289d00c8dad289c5f48ffdca65b57b1ce73afe65a705f89e710874ca9f5a199dc6b1eb818f3650b8d60a65717d3ae49f9102113ca3f4
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
index 30abcc10f8f3..895d1fbcb069 100644
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ b/net-libs/neon/neon-0.30.2.ebuild
@@ -6,8 +6,8 @@ EAPI="6"
 inherit autotools libtool multilib-minimal
 
 DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="http://www.webdav.org/neon/"
-SRC_URI="http://www.webdav.org/neon/${P}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/27"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index c6e695b036f4..7aa82510ef4a 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,8 +1,8 @@
 AUX gentoo-global-npm-config.patch 1511 BLAKE2B da2b127df9ac9babc87c1930272244e7f89ac1931543fa524e13fb3c53d2b5a9cbdf0d93dc0cae207822dee3c8f71e2a12fca3d608f6de8589ad2c0064f0855b SHA512 b6c8bf88bd44d5461cbad0354273a6f964429d1cde48ab4c8bef9f50452de22bfc5d15707c5c9adc2a0d8000a6b1be4cffdee039618b627fb0d291886309cc3f
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
-DIST node-v10.6.0.tar.xz 19741864 BLAKE2B f94ba788b4510b93e4ec556d0452da713e380621d9b3cc65a47fb0ac91766b4b25ec1f6dd06f35f621dd2d18781186a2a90aae7d728803ae221c08dd015139ba SHA512 c9434d8ea362aa8ea41053013bbd69fc5b5f4e133f9662419947919d29c246950ffad4d262cf9a252bc9f8a0cc63676947c8f0b83135a120c031d71ca37f4fd8
 DIST node-v10.7.0.tar.xz 19770604 BLAKE2B b869f11c3b14dd078f5d8b228108ff60dbafa5e3ee3948b4323bf86233ecbfe8a6e06c24d8545fa364d3880997c298fab834b33660f2cffc7bb0f7e34744e9a4 SHA512 ceb70f79a3251a6243082f17a1c96617df7c40a6e1e3a24ecdd9e4d7f1203562d586e7a85a1e8e642df1de69839a9c0ea33e4a753643c5e8a1b502fd1f2debaf
+DIST node-v10.8.0.tar.xz 19910236 BLAKE2B 0f75e1ae40db52d9fdd2643406c4d1e5378ab0e2846c08c9cc3cc3c01d989b4ee96c89b028b7bdec811aea258a32510ed81436fefbf85d7ce4923eb30e09f825 SHA512 50863e4db68de2af5448d43f5d035dcda0c982a6d9daff85a67112aa3af6c7120789e41e12b2977d679e6cc010cb0c0efa8b8e97554a7e5d7eaea838a908aa0d
 DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9
@@ -12,15 +12,15 @@ DIST node-v8.11.1.tar.xz 18279516 BLAKE2B b06f31571c93455d16899e3ba57d1e5835951b
 DIST node-v8.11.3.tar.xz 18319672 BLAKE2B a45715ffc066f378a06b84cdfc3fee96510b2fae62790965ab6f7454ccd3029b4f83cc7f8604e3bc08fb967adbbbaa419e0e2a8fda48319e7375d46a0ba469c5 SHA512 48f50f400d61c8ed35bb2b0771f31da453359f312574fdf7f2b29cba0cafa008fb0d4ad11c2cfbbcc5aa4a5c7270dc9356fe0389292136de6e2a82ed3ee4d7b4
 DIST node-v9.11.2.tar.xz 18507832 BLAKE2B f5ef210632065f2c99dbe3fd210fa832bdd09670dd8bd736dce2c7ab2fc87c3a717cda11c2a09c325b25a72d99431cbc79c0ee7c202ece5fc41786f1f0aa68e4 SHA512 ca49a1f3aaa8b25faa62c411a96551c8977bb43a22f8f171f27d3585306f379b6a12e55e60ddca04a6f2f8c62a1b3fed9e66c02898d80bf7ca59278536e04c13
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
-EBUILD nodejs-10.6.0-r1.ebuild 6339 BLAKE2B 909a1b6e0fad010c2422482d08ccb7ee170eeba8976d1c5928824bf54d61ecce2468998bbb2a8f5024ff1d2ffbb98922ee49dbac4116ab91279e3da296cbc259 SHA512 98a3c5a57a70b8089ef98f09d06f0dd6f520c11c1cf37b41202c4e64b73eff566cb09f2dd43e9d4516fc0013c3ab61c8e260d59b4180d6ba790baf2d66691286
-EBUILD nodejs-10.7.0-r1.ebuild 6339 BLAKE2B 621f278c58c4458cbe593f28e9082df4726a6864b97e81fa157db6ddf01a6cfe6bcd0b4955091253c53dac08e3c42664c13f42dacf5ee457f57610b7fc8c6332 SHA512 da4d8791c425ae98d7ae29a696b007e5d000b670f63c4c0f55739ecc41105648b62c8093fe6760b08b53d6f1edaf433e186dcf687cc0c9691d771885aaef3efc
+EBUILD nodejs-10.7.0-r1.ebuild 6353 BLAKE2B 7eb578378be767b686b216346f8f138dc26fe1e50308dc39d6a7add18fe2d8e51f7020b38b70b9aca0844d3523c08b052f513b22adb73bd0a2663893ae596380 SHA512 b09ab8e4c6248dc7512a5ad06bc53f551c71c3ba32ccd4cbca58e451aac432d6000f9686d7e45ffcb9363c5e49d16412c38b9508d12546b8cea626d39f20bc97
+EBUILD nodejs-10.8.0.ebuild 6353 BLAKE2B 7eb578378be767b686b216346f8f138dc26fe1e50308dc39d6a7add18fe2d8e51f7020b38b70b9aca0844d3523c08b052f513b22adb73bd0a2663893ae596380 SHA512 b09ab8e4c6248dc7512a5ad06bc53f551c71c3ba32ccd4cbca58e451aac432d6000f9686d7e45ffcb9363c5e49d16412c38b9508d12546b8cea626d39f20bc97
 EBUILD nodejs-4.8.7.ebuild 4431 BLAKE2B ebdf991fab56e0e40958ec1d08570a8d32732237115fa6b468e788d4d92245c553d4f0e6187a83bb5cf57ee1aee334002cbf255925cc5f3788d566d9204316a8 SHA512 dfd48068f1f246211a001fd9b180cbf5344b6948714f17eb6435be604e4138f8bcd72812b8d782c33d1569f25b907736ffd92b7852b2542f63f2dadf06ac1ca8
 EBUILD nodejs-4.9.1.ebuild 4432 BLAKE2B 3650a661997bdfeef6097b4e356a186a2b829c0f2224624b71ad832b1e957ce9e841136b83f62c53b8e524993b4eb8e203c1d10176f98f09503047e058804fbc SHA512 98b52c0ebade643785b90d8362fc047b361c4c29e5a7e81b59c581978025a24c9562171fca342d29855f4881985db4d8f017b2711c5ab4e54f0dbdf18aa69a03
 EBUILD nodejs-6.11.5.ebuild 6089 BLAKE2B d1b1c07ac7eb975d28291fca7fc10688e316e1fd62419f6cf87c9ce7952e074afb23eb89f40df0d336dd4c0f0d22ed40157035b7e6b8e2730eb2ef95a538ba60 SHA512 9a4310b2b53b0f58e855f35dd04052f4b1b8e0a8c9341486321b5e78ecd5df0078fcc614c3786d6f54799ce031c3046868d8970a041ad67fc7be0bd6e789cdb1
 EBUILD nodejs-6.14.1.ebuild 6170 BLAKE2B f8f9b6ead741f993da24c760daa48a7a5ac9415a9fec05c313257cd02c9f86ba03b4c15d7e2d0ef18dd1ad1e23b5d5152edb794756dd356368ac2fb534b68148 SHA512 c49be4f51d5fcace57544a7ab35ceac10870cee4e8341b9fb7303b2b030e21b65d3d158a854fe52b5d6813a5bf15cf5cc6c5dff254c2824c6fe8c8bc826aa634
 EBUILD nodejs-6.14.3.ebuild 6171 BLAKE2B 7946e4fcd461d071fcdb81c1642d0eb6d812e5660aa308ca3bf78501aaf9cc9430f9be3a806e371c9216774a545507759faefcb30ff4861a91fc05915b4d9601 SHA512 3e77ce77a4d9453d36eb252834ed056751c8805d4e89e47448bc1bdeeb41732a8d380eb8b4c1d13254ce14ff37bd586ecf381a5878901528b5a50de777056f6a
-EBUILD nodejs-8.11.1.ebuild 6348 BLAKE2B dd10b95ed52f83175d16c6a68c9daa39f38f8e839d2f181c8a4fb0f64715561c68cff6e704aedc186af3b657dd87b4b05f29ae7c01ef1b1a31d1799a7a66dd2d SHA512 09fc1df3c4cdeafc27dd63836f30f62c81144ec70ef09acd8ebd0e093a07c413c368c47ab6657c9fc290bf59abe72062e2f92b7f6782ffdd49e80d2036936a9f
-EBUILD nodejs-8.11.3.ebuild 6349 BLAKE2B 9d18e24ea3a71ea03e5e618728c89809045f1b7532243bbc2697cc437f298aee18888d4d6401d2ad5e0ae3072a17cb2404fd17c451531184e82427a014b0c65a SHA512 d7475987851b852eb9c6995a206bb55a89021f8f42372199ff572b5cf9e5b9b3cb187e1a6473f2fea84606d0e4e6afa1d2b8b2b3c7ba04423fa3bdb08552d709
-EBUILD nodejs-9.11.2.ebuild 6334 BLAKE2B 420c0d0352b569fce62bbb4e44ec909af6edb316178049966b77011edbc0053891c663409f5fd881ed1b509e59dacb711830236d59d4af016d2f3d45cb1b1d00 SHA512 0dfcbbf4a009bc612ddc8fdcd3728d852c33d7db0cfff83e43b9d41a6c13827714ed7d0815635cd3f6ffa95017328f2bd0bf6d9b96183d86c46c94e21cc5fa53
+EBUILD nodejs-8.11.1.ebuild 6362 BLAKE2B a1cc2e39202ee307f4792a17ffa1df456bca2c9a26427038c83080a1ecb7c4502e874a391eedb3a1b13b6e7dbd7c9b8ef715234f646b87a80eee446f15b4eca8 SHA512 07da9779295676e44c6849de2ffd8a9ac3673608c8a53ae53fd4ad04a8081887b1f66dfac8add40f57c297c212ea01d4b9f2de4add352abc98f8af73e6f24e95
+EBUILD nodejs-8.11.3.ebuild 6363 BLAKE2B 3e18355fadb75884ecd68df2b2757305919c847e27429615e1fce655c9c06c9586e0d0381b7af9ff1d1068fb979918c05a5322174b84b5b4bea009f7710a8b41 SHA512 a51d9012b4f5d6ce9c2c4f4fdbaa4c8a7418b5915c865ba6bf51bdf30f9b4a2ac1d7325cd03bcc7b05f85f617a39fffda4027976bc9b94c6588af08b918039d3
+EBUILD nodejs-9.11.2.ebuild 6348 BLAKE2B 8e74887ad5e17570c3ecdb608ff21a22813b53d3049de6a608d8a71fcd562fc8f96208601c390861a4ec0c05b4d7219131da93e35e82bb96fde7fa54921c5793 SHA512 6fdd51157c30021589e7d6c2637ce02d376f3e80da578ff1bcefdb3d2473ef689d8fca02c49e1673245a158a90d19af7cf45241d8190d0b76e563c1bedee8449
 EBUILD nodejs-99999999.ebuild 6267 BLAKE2B 2858d03713127b51e3897909454354ee34f3ba11273972cf62cad065faa3a571bb1d17c7353ecc3487e9e8809bae45caa9898a05bf7c1871b13cc6bc7d7668ac SHA512 8a8f375e96f33b6c85f7c188b488586c4193708b9d3618e4f83d3f562bfd55baf8034b61b15b8e003611c6209787339adfd07358237b70250de376b1612d0a06
 MISC metadata.xml 581 BLAKE2B cc99932eb293981a0b4e1f48a5fc2289b0b932545efaf00fdfbec10aeb52d95d7ad02268560495386992ff543e043591102415ffac04209b4d473b61a6528f3d SHA512 eb9bf78b19041213354232372bf9f31b8c73073b369abd83d1a399466ecf6f647da60ff393093dd16ade8aa6254bc782ab55cb2a655b0d685a04d84fc13d2706
diff --git a/net-libs/nodejs/nodejs-10.6.0-r1.ebuild b/net-libs/nodejs/nodejs-10.6.0-r1.ebuild
deleted file mode 100644
index b02e635479a6..000000000000
--- a/net-libs/nodejs/nodejs-10.6.0-r1.ebuild
+++ /dev/null
@@ -1,200 +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"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	inspector? ( icu ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.21.0:=
-	>=net-libs/http-parser-2.8.0:=
-	>=net-libs/nghttp2-1.29.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-61.1:= )
-	ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-S="${WORKDIR}/node-v${PV}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-10.7.0-r1.ebuild b/net-libs/nodejs/nodejs-10.7.0-r1.ebuild
index f5919ddd574e..34e08649c75d 100644
--- a/net-libs/nodejs/nodejs-10.7.0-r1.ebuild
+++ b/net-libs/nodejs/nodejs-10.7.0-r1.ebuild
@@ -19,6 +19,7 @@ IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap t
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	inspector? ( icu ssl )
+	npm? ( ssl )
 "
 
 RDEPEND="
diff --git a/net-libs/nodejs/nodejs-10.8.0.ebuild b/net-libs/nodejs/nodejs-10.8.0.ebuild
new file mode 100644
index 000000000000..34e08649c75d
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.8.0.ebuild
@@ -0,0 +1,201 @@
+# 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"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.22.0:=
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.29.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-62.1:= )
+	ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+S="${WORKDIR}/node-v${PV}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs!
+		dohtml -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-8.11.1.ebuild b/net-libs/nodejs/nodejs-8.11.1.ebuild
index 9ffc5ede447a..54203e6ccf9e 100644
--- a/net-libs/nodejs/nodejs-8.11.1.ebuild
+++ b/net-libs/nodejs/nodejs-8.11.1.ebuild
@@ -20,6 +20,7 @@ IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap t
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	inspector? ( icu ssl )
+	npm? ( ssl )
 "
 
 RDEPEND="
diff --git a/net-libs/nodejs/nodejs-8.11.3.ebuild b/net-libs/nodejs/nodejs-8.11.3.ebuild
index 2c5331823d68..8f2f243c0b08 100644
--- a/net-libs/nodejs/nodejs-8.11.3.ebuild
+++ b/net-libs/nodejs/nodejs-8.11.3.ebuild
@@ -20,6 +20,7 @@ IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap t
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	inspector? ( icu ssl )
+	npm? ( ssl )
 "
 
 RDEPEND="
diff --git a/net-libs/nodejs/nodejs-9.11.2.ebuild b/net-libs/nodejs/nodejs-9.11.2.ebuild
index ea25cfd9cddb..449755ba98b5 100644
--- a/net-libs/nodejs/nodejs-9.11.2.ebuild
+++ b/net-libs/nodejs/nodejs-9.11.2.ebuild
@@ -19,6 +19,7 @@ IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap t
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	inspector? ( icu ssl )
+	npm? ( ssl )
 "
 
 RDEPEND="
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index bd16c1d5dff8..77a3f6bb91bc 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,7 +1,7 @@
 AUX 2.20.3-jsc-build-fixes.patch 611 BLAKE2B 63491442c9836873401fc58a2a2ed44d4f24fe52d67f21f98cc11a21e19572763cc6e0d656806cf60e4b2cdb11234ece232baa9619c54d33b69323984c573cb2 SHA512 90361785e3f562f55e37315600ab9f096804e755d0dbfa56eafd2fcb9448639467c6a707c8bf641cfa714489a8819bde706b9fffeb0229aca82c3f135e886725
 AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 BLAKE2B 4eb51aefe08ba9c2bef60a9b5f5f68dad98dac259fc2c014b0fd567a45424a30aee9412cd914b0a05745c16df0dd81e553fdf80e15beef5f006408ce78825321 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc
 DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029
-DIST webkitgtk-2.20.3.tar.xz 16623456 BLAKE2B 3ae9441287f4af04d2d7e2c490b262b5619f1b47962f16e34589f81f24dfd6b2e4dd3b6c98ce8fc2582c288a5afa492613a36273853cee5bf58946355febb07e SHA512 69a7b27e294de6fd43240ce1d314cd1ccdbf29674c97967674459fd02720b31fa53e5412efbd93dc1e805d38e38feb7fe9a12cdd9c472471676b8db3c11734de
+DIST webkitgtk-2.20.4.tar.xz 16625400 BLAKE2B e2a07bbf38f059424738c69ecab7a1eee205cede2bbed4dedd0899e3d38c4b0b6b8f4fc52f5af6d65c0a0c8111c6c73d8765e55452a89022c476e90fb2ff8275 SHA512 3e6a370823d9a3521862fea0e7ae9f2455101afee247fda7b6d23ea609a0d1db3aeb86c41f903a89776550c190a2cf0baa903883671eca7222249849adc49090
 EBUILD webkit-gtk-2.18.6.ebuild 8242 BLAKE2B 1e8058fdf46994b372aabdb0e03bcd19ee95b042cfd6f12b12396273b6f887e2f802a40445426cabe724e5044bbf138209a3cf5dc13027dc21807491b45970ae SHA512 ac334598eae40b438c8504e9d5ba93dd7902b1ee55d79f07a171b7aa78088e2bd2d54cbed7e528e32cc03835e0a027f13244a14a806d350e1861a222457c4ec1
-EBUILD webkit-gtk-2.20.3.ebuild 7905 BLAKE2B 06a2b08d6cee0f259f0fcc2ea959a7e18b99c5332ef8ea9c60e271b57c91ff2bea8d4d0d63cf64345009156adb2e6e8fed57377f2b547b93bf544a80e44fc09e SHA512 e3758a9221d9f081c9946bcceca2da2720c895d151d33a5292a5c9615a4c75130b22a6a38398cf8e6c2cfe5f65583023a4b90dfa586c323dbdf8ffabddbfe7bc
+EBUILD webkit-gtk-2.20.4.ebuild 7855 BLAKE2B a0d932575d5f7ba224db1579469877ec9520d9c0c8d97e0f7f08b162d50ece4e85979ee839845eb7c07b391736e73236844c74ceca33d35e0d3444150575a0eb SHA512 0358d76289f7178aaa8da7684f2715f859390bea803305bff6d966aef86e633ce6e88380faf2054d2c027107f3d9cb35ab31deba8849442663c92671ce79af3c
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
deleted file mode 100644
index 264307b6bd2f..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=[X?]
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PV}-jsc-build-fixes.patch
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
new file mode 100644
index 000000000000..6a241552a2b4
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=[X?]
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 4005998389dc..7fd88c87b0dc 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index fe9378ff7a9b..5dcca8c4fcf7 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,31 +1,16 @@
 AUX dovecot-10-ssl.patch 550 BLAKE2B 5317b802113e6dd711056684bb2de8167113c95ea28ea805fd3a1f688878505d02d85bd9ab69fc222cb2debdc1b5186f48f3c2cbea2f1df24714482939284f46 SHA512 7acc31dd4a3f51a9c13d590fd2803c2cb98c281e0595ca2a800539a143f89b95f923a3678beb0aa2b254a54385522329e0f3e1e8ba4c5852e7b51f8f111122a9
 AUX dovecot-glibc226.patch 2838 BLAKE2B 522fd7552faf88cba7c48f5074d264ca4450d1f72113eba9a7cf23317402b76a53874998bc0eb6cadb4580935dca061314b7c6bd355a6ce618c43465a7c8c5d2 SHA512 5ed7a19941cec35a8edace588bedac7d6d12903bf5ece2a224a61f021ae663352dd668c81cebe2c9b132fd0614998c77f1d19de2f48b2d3794c453b9ae333693
 AUX dovecot.init-r4 1499 BLAKE2B 9c05fd7da0409b0944b0204bdcd683ab889190effc8cb7b072dcab140f52e2f39336a344deb74b63ef184152604412ca4c2b3d79c3d63341386e7952c54b0a26 SHA512 8fbc80bc0efa6b83685da19b6a5c2a2d2ca7e59be7f1f7352984fe30004175330e53f3db1c4c2471f1d7d5e088bef0b4dced97d29d32be8b50d000987b6eeb09
-DIST dovecot-2.2-pigeonhole-0.4.18.tar.gz 1742357 BLAKE2B 8f9fc54e6effb233f7e8543a560b474dd4cd028d0a7bd1cc02e45c879bc2e7d636c2543e8aed3bd8e0b49b260703590be44fd1032ba3e1f4eb87a8e6f8ecf396 SHA512 6f49a6a6435b0e4dcbe29f852ce17c016df2f367f5460301a2a2c6bd5f5ba6260b23bfe1c5e78b91c6041554ee67d1ce14ad3adf219505f692c61681d9e70cc4
-DIST dovecot-2.2-pigeonhole-0.4.20.tar.gz 1745121 BLAKE2B 4a320d7340f3a7fbb92f911c16abb49561692310c7c9224842065b9830f057e442e6ae27010232d615a06f6fdd889ef8619c555516e2d843802297644b935a27 SHA512 84a28842be206e05cb96c07cf1c1b62c9c378ba4c952caa47cf79a44b9428e076f4182eadd9c4fb8f45d3605b881f91e8e520c41705017ac4039240d4bcace39
 DIST dovecot-2.2-pigeonhole-0.4.21.tar.gz 1774887 BLAKE2B ebf2601e7b087d655713f985b72442496e36543ec32881d3bc84d2c6b132f58082aee6c5fae3747f756b72a3c9a2e11f78350bc34c398214de13dfc83cffdef1 SHA512 4751f449ede1b05173c706b414ebf9f7f670ff78589ce6f0b687c32c9abe6dae8b3064ed1b20e893d9ec0147b0139ce479e1d74ebe94747c33f2d8ca177912de
-DIST dovecot-2.2-pigeonhole-0.4.23.tar.gz 1787189 BLAKE2B 5ba20f6943dad508a655a5ba48c8d9a61d1bd40ddcbc8c037a4cda629fc7f87abe0abd8858d1d50324d7003f3997df27e9fc81ca83c76f465bc3bcbb3e023fae SHA512 24dae1f7a52fdb37f644e9c0a5c30dcbb95018e8dd43f18af56e7ee813723cad36b74d6c22ddff281e140e4c0bbb61900baf23116a980dcda5244ae8a5b544f8
 DIST dovecot-2.2-pigeonhole-0.4.24.tar.gz 1808131 BLAKE2B e8a19b5c3b4876e71556e52ba6a984f6ed0abe93a222f692303fd41cd7a1e6e4e8fd0e5ab0821e9e179b595694752813689a07b428b2590582c3ca7dbb99a08f SHA512 2e21c95ece475ffcb78e5b5d4efa29e61471faf90b80b44a49963fb287de2784ebfb4c2b7ddfc66732fd073e9f02995d5950840336f6babe618b3d7d5166059f
 DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 BLAKE2B 7e6f11bf74d56887b640ab5ebffd6e2ad7878d47da808f81b2f21ab4de02495f6ca79453ab5867568afee7f2d9a0915601ceccf5c6a9581d38994c4d35f692e7 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2
 DIST dovecot-2.2.19.tar.gz 5256627 BLAKE2B 0b7fe57ced1b1f7eb5e29e8d6723d237cc107752286995d8e5f6857f24b45ab40c4a38b03935b228e8530c3b254509124a7b6ce4e0a8a9be0ea87f0c529db935 SHA512 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9
-DIST dovecot-2.2.29.1.tar.gz 5972119 BLAKE2B 9b05e9976369757de07471c2e499a863efbd94b51d8aefdeb2144c01596f03f9ea02670ee9cac9590615e4139dc754c11eb4777d791f87a2e6031302155d9f05 SHA512 1e5ea6080ebe7dd4afe6fcfe8e98ed6d2ad2735655a18cc96e439dd044ccc3a1a6a80428bc746b4d6250820895d6a62121562e97e4b46c8b1cf88a19443bc111
-DIST dovecot-2.2.32.tar.gz 6100268 BLAKE2B e7d79f81fe06565d254c46de5cd7f4565883a029f4fa409d9f3c6ff75d599fb3f1ce5f8a32b96b9bebe4654de2be4998d0e178f1784e00d246186727324c6e80 SHA512 a26ce763fdea7d72ff9801d3b7d57a1f0d00278e4a1aa60d1be070fe5a6d2c6a15f266a519119492bee7a3e7a6b7d0732e9879e5c5841adbab8c0952cd1b7c7c
 DIST dovecot-2.2.34.tar.gz 6181270 BLAKE2B dfdb1e6812574e79595202e830167400569adf61155aa5ddaae443e798c4a05ccec2acd2975e00e9e7ffc63ee1dcf7e4e2a9288b1e6e1e1427d1e89790a8fa13 SHA512 9f08a7116a08a08495aa0e7b4cb6b11a924ea61006970487946e338bc79bba7fd7619c345cbf278a74de285d548af04fc66eaaee508185b8b9d7335cf5612055
-DIST dovecot-2.2.35.tar.gz 6185237 BLAKE2B 7ad08816553683126c4c8d494770730c49c2912a5437ba6dcb21e418d636c0d03280425e8a55b420a4500ebcf459da8be11deffccefdbc60811393e2044a4e4d SHA512 002ceea7f17018bcd438edda5a36a782606f291264ef63cebb8b4f72b094e812bf5553686c9e1e0d8c1354af54c1174f3670d1b1fc498ec4cddb3f731bf00c56
 DIST dovecot-2.2.36.tar.gz 6239707 BLAKE2B 702bb24265b5fefec9c484b3cca890fb1536ff94d1f2d6c99ee8c294ee4e38091eef5a727f0d4bd03700263286361f55747a22fa74def350710f9e49a4b10580 SHA512 327c50971e276f6013ca7f7bb59498ee88d76c9f8419bd18ee531cf10142214350fb81c6d64eaef73ee01765dd0fcf4142ab146ed67d9d7d86d5a58d41cf8db5
-DIST dovecot-2.3-pigeonhole-0.5.0.1.tar.gz 1783039 BLAKE2B 8452c11d1c5f26d2ee9a0c54a2c30642bce5117f1ad140db8a8509a2bcc03236361a99c6f622267279eb75c19c68de7d96947557b595c345db34e34a135b492c SHA512 60016145caa444eeba13b49735f87ab2ebe7f178f104ad57283b5aa7e5119920d9f579032b775547e0866e86045a4ab653fd084068187d0cbe2e088cc15fc288
-DIST dovecot-2.3-pigeonhole-0.5.1.tar.gz 1792702 BLAKE2B 219bc6b3182e303b7f3784cca0fb7fcc9d9aae62e60cc490d7f0a94fa4f9b805933d9fd67c4927cd8f9c864c3b73e28bfde1866848960c71dc47d5e36196b748 SHA512 5d65c3c9f3131c4e82287d054bd8b963d7c56c3e0677d7384881cf109ca82080d6222f672d8f973447d98be823a4df5bf43760d4ba87b76447d13abab30130c4
 DIST dovecot-2.3-pigeonhole-0.5.2.tar.gz 1814618 BLAKE2B b1187021673429bee1b45a1f657bea995e9881257919ff55bac63106d65963294ee2b3829167c6d50e351c4bc3c7e88a5ccfb757308d2500c5d4146246145074 SHA512 6bc24d9241f94db795a012346d9bc94b5cc7d7ce0175c03213c2b5d179d80dec95e9bdbd50bed628c8f9f7c51639e692ba5e429212a3b4a654c1e4764ac4f11c
-DIST dovecot-2.3.0.1.tar.gz 6499984 BLAKE2B 4bfb38ba8bed154e58db03c53c0a6958632841fd66a118571c341be90f9d20a570a22699d4b8d117b72d4599fe074248c96cf4e7fc78ddd65c69662b4275cf97 SHA512 2b30c46c1660f425f6303a15cf638388439fd7a8065c91d28caf41d9a6403a4fccb530df3f69037a634bc3b0b9e498037da6b0b93c176f5e3b5808907d3f759d
-DIST dovecot-2.3.1.tar.gz 6703089 BLAKE2B a9a021531241f86083cd5bf31f7b9211df77b2423ad213ca35904e23002121631e81a6419e3b07a838eb699faff615dcb35f3b95a1da537f74068b3c15795b35 SHA512 fe664ab771145f2390fef45839ff2756e36731c61e571dfa6975014f9cea43144e2aca0acf1a83b1dac55ad50042d0fa170b83570aa411228557861ada410b79
 DIST dovecot-2.3.2.1.tar.gz 6797491 BLAKE2B 92b88fd0f0cb8ed6c418bf27c2e1fc4efe13f1ccfb4948ce5eed1a4e76a4e96f0d6770d9841026ec5a515310ebaa4b335063e3516de454db8ba06cc4ee5a00ec SHA512 c085a0d04925485423086736a3c7d919ad0ca9efeff005890382da5333edb68c7d23ccb89fbe2ac44f8f016fc993bf2c669e450794c3ab13463676cbb47c7bf7
 EBUILD dovecot-2.2.19.ebuild 9072 BLAKE2B 27ccb93298e73d91e8402b6fa0666a35d0cc4c59ff5ea5a5b5a8c1e421b75bb29d6ded7d0a8ae3128a59ab39c88ca89dffc383bb85353e4236174397e119a8a5 SHA512 46683dd02f04b8c03a6261983e89ac0b3bf1b80ba05e7a574c0275f0699ab6c85a0f44cb4106b1d967a83f8f92aa4b8a74eced4054e7e14ee128a08ee118c3d4
-EBUILD dovecot-2.2.29.1.ebuild 9215 BLAKE2B 4797bfb9f28d498d156d75e5837211ffba13f60da38990b55ef62960479af213a8a4eadb4de3b95a2d600089edccd3ec406cf97744d13918598020f18e756458 SHA512 e83a87950486c3f0b07b856b98430d99c42b42fb32fd796c1ef4ed192e05dc3d774429281e73a806855e809cec0e3ff1a7c6209de5d7608e01d17a29a3653bae
-EBUILD dovecot-2.2.32.ebuild 8655 BLAKE2B 9f500ad24385b63fe899c6c66e546d6e3f68f9059af9d7c10d406e3df75a4085a38ce19dfaaab7a7b1d022d07fef4bdcb033d1d20fed5752a5f864f0a0ff8a0e SHA512 f4ca664c39c32400528b5e01a8c0e58ef71d51f4ef52c827ec58b66bffd96281ddd91dad388be496ab78f887746f4c1ac9deb272ed108854e542ce5d4ae2348d
 EBUILD dovecot-2.2.34.ebuild 8652 BLAKE2B 473b843fa61c17b3ce4474175aca83e9b5c76641853475de27a87b4a84f8101a5dea4c22a6aac0eb21b253ba9dcc8e139eec3283629f2f672d350144f71d3fdd SHA512 0eed64f5d2841aa46c727ed75ba5ff7ac4da8b3bee056990d327e36a8e951e85b70822271dc30dbb3ba80b599dd5442c4ad5efe7cd00440795437ba7218b47dc
-EBUILD dovecot-2.2.35.ebuild 8680 BLAKE2B ee3b5978fcda5ffe294bfa7dde81c6018a4023edaeb3d8fc74ce14edcc414ffeb41f87807cf1a25f4e07b2d563ca32e0a5fe57f565c3268455fcdee69205b74f SHA512 d65e27a65e31e9d1cbd4745c5bf46c73d0d4bd7e1d073f26490b4473ed9b4ea5b0cfaeefcf271cefe909b9a4d932d52f85b937e9a6de3430e9b20ed70c604933
 EBUILD dovecot-2.2.36.ebuild 8680 BLAKE2B 72a70c2452e8bfd0364abafe74c6adaf466ef8ff1b73fee0738e75584515ec934ea13b00db597fc69aa9a42f3b0857321efc426f02a828adad8a31165eabbd1e SHA512 186ff159dbee204d75df7acf04001aa7c10c11ce87a05e89aff4d010233b9da27b51f59b0eec4a0535d3f404fcf330c391eb0e843d1d6de4d1bb73a9ce7f8740
-EBUILD dovecot-2.3.0.1.ebuild 8678 BLAKE2B 6ba17ac442f7d88698444bae891690e4fe840d0b3fb0ab17033639f3c38b9a7da3041fe8dfaf42dab6269519a23b0300773b89a9b5dd9129a89e02a25b9e3e6f SHA512 6f058b5793c9c1ffe2cd1894fb4f40508befd87a36a66c00d6f5d202e99b014a638ff873eb68ffd7ccf59ff3941cb27f2981a4658ce7b8402d3c24449ff1fcf5
-EBUILD dovecot-2.3.1.ebuild 8676 BLAKE2B ea98fd811bdfec3f54d867a82598c46b0853c370ee06df43aa033eb4ea272385b2783ae91a577856e3a975ffabb251ca2073789612b66259b1f0216a51297219 SHA512 aa2b5e14e32fa6392a193b987eef13dbdddd725b61aba22e45b4bc3e466086d55ebfda58bd2d8ed93dc55ec7823eccfd5de311955693e9a0c362a8723aac4a48
 EBUILD dovecot-2.3.2.1.ebuild 8792 BLAKE2B 34856e60e8aae3d17df882a5196743b4ee2a03a05bde6dc9e15ebaec7cac22111da43213b0953b54b3cb7db42f288aaf58114c12c4330dd5161bbfd7ce8ce180 SHA512 bb1ec91d9575dd4c3abc14d38372fae1581d47f2a95fe820656d7ac38410bdad8496f3809ca6fca32d97e6d8e7b29bd0d934138e7e2c958e9594ac1439b51fb0
 MISC metadata.xml 1374 BLAKE2B 629969318c5bcbdf0521d2293c6ead5e735ba5a113db3166e4df82103a3a84cbc62f3a2843082c9d5bdb635f25353ac7d3a4fcdf80d45e07b11b98754e744506 SHA512 16bdf15120dd8c957cd6e4957910acf21440dd0b8774cac9d9c5a48635cd46c7093850974b592ebbcd49085607fff2051691a42112f4ab9df44c51b9fea6d180
diff --git a/net-mail/dovecot/dovecot-2.2.29.1.ebuild b/net-mail/dovecot/dovecot-2.2.29.1.ebuild
deleted file mode 100644
index 484d17c54bd7..000000000000
--- a/net-mail/dovecot/dovecot-2.2.29.1.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.18"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="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:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
-	eapply_user
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--runstatedir="${EPREFIX}/run" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		--with-icu \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.2.32.ebuild b/net-mail/dovecot/dovecot-2.2.32.ebuild
deleted file mode 100644
index fd713a3164fd..000000000000
--- a/net-mail/dovecot/dovecot-2.2.32.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.20"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-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"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="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:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-# Dovecot does not support building without ssl.  Force it for now
-REQUIRED_USE="ssl"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
-	eapply_user
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--runstatedir="${EPREFIX}/run" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--with-icu \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.2.35.ebuild b/net-mail/dovecot/dovecot-2.2.35.ebuild
deleted file mode 100644
index 6c3d022d8fb4..000000000000
--- a/net-mail/dovecot/dovecot-2.2.35.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.23"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-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"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="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:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-# Dovecot does not support building without ssl.  Force it for now
-REQUIRED_USE="ssl"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
-	eapply_user
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--with-icu \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.0.1.ebuild b/net-mail/dovecot/dovecot-2.3.0.1.ebuild
deleted file mode 100644
index 32f71b878558..000000000000
--- a/net-mail/dovecot/dovecot-2.3.0.1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.5.0.1"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="argon2? ( dev-libs/libsodium )
-	bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
-	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:* )
-	!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:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-PATCHES=()
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--without-libbsd \
-		--with-icu \
-		--with-ssl \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with argon2 sodium ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX%/}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.1.ebuild b/net-mail/dovecot/dovecot-2.3.1.ebuild
deleted file mode 100644
index 68fb5d8ba4fe..000000000000
--- a/net-mail/dovecot/dovecot-2.3.1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.5.1"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="argon2? ( dev-libs/libsodium )
-	bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
-	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:* )
-	!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:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-PATCHES=()
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--without-libbsd \
-		--with-icu \
-		--with-ssl \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with argon2 sodium ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX%/}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a43c4f236ced..c851b3d6ff0e 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
index 69f81c160178..a3505dfb8b78 100644
--- a/net-misc/cadaver/Manifest
+++ b/net-misc/cadaver/Manifest
@@ -1,4 +1,4 @@
 AUX cadaver-0.23.2-disable-nls.patch 324 BLAKE2B 5ae07a17eb6079f9801ece8b8a3b893c1d52e13d2cd3693a1e412a873329709b86b2eda9c2bb68d07f850708a49185e6c63602148f9530ab729a2b178fb52b31 SHA512 4c9d7d93af1d747432bfb393b33d5f575f7ad1c2dda1c88238cb40a274f979aee91b75c1cd5c2f91787156e3085df0864204989944be6cfe1b7013c61db25f4f
 DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41
-EBUILD cadaver-0.23.3.ebuild 1006 BLAKE2B 9196f01e1d76ea65b3fc534f9631b38e48f4ca5b6a8a4f9d9ee77e6093405a96d4ac1d002e06ba501eff3b414002a4da713475c3534c69ef938d09095e377418 SHA512 ffd08740adec1d75862d2c0cf1e51f8ac55ec890870b4749b468632cc04a9a801cba8eacb596b942767d4cffeb45ce16b924c8d53c1cc1faf3be6661195e7da2
+EBUILD cadaver-0.23.3.ebuild 1003 BLAKE2B 464382d408790dbd469baa1fddfbbb8332ce615c311766cdffb6b7a3883d37e46594adcc0d6c50bb654f45e25b1fe388cc3bf1aa649810846e462eacd6341bb3 SHA512 30476ce64954a4afb8142a3dc1e7103d8b51834ad89b965d938fa65640ce585d21a9532b76b9ad9c447ae721def2f73db380ac4c3863cd09d0323521cca96b4a
 MISC metadata.xml 338 BLAKE2B b00867702effd06d43020a0a3f5962d8aa1ae94197580af3d08c43458e0094f9967abdaa8f3cbf204d14c31c9ee37b31151cd05926978f18dc3344b52c2ca397 SHA512 7d37b09863b6d2a4a6c00930f8f4b9d2237cd216e52af58ea002875d0f65325b7c1a112a9832046db347d7b4bd5881e01cd06257be61516f9e1f975939989749
diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild b/net-misc/cadaver/cadaver-0.23.3.ebuild
index 0401ea0f0cac..7b62221093c6 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -6,8 +6,8 @@ EAPI="6"
 inherit autotools
 
 DESCRIPTION="Command-line WebDAV client"
-HOMEPAGE="http://www.webdav.org/cadaver"
-SRC_URI="http://www.webdav.org/cadaver/${P}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/calicoctl/Manifest b/net-misc/calicoctl/Manifest
index b8453a876df2..941c4cba237e 100644
--- a/net-misc/calicoctl/Manifest
+++ b/net-misc/calicoctl/Manifest
@@ -1,6 +1,7 @@
 DIST calicoctl-1.5.0.tar.gz 63645 BLAKE2B 583159a60d7b8ac02bd36d63579e216cb2a60cfad4305ba89997bb9e55568dfcb349edd9d2ef94525b2b71044a96fa5baa79c3f70a9eaf9b93f58ed949e967d6 SHA512 57bf1b9e008df0c652881f84e59cbfdb3bf6192ff0810ef068c16e7601a6da78e7d0c4bdd912606c2095059ced8e7fe820bbb42f328bf9e7a5404f773f4c883f
 DIST calicoctl-2.0.0.tar.gz 86002 BLAKE2B ec096880b6c6463364eca721693722d3dcd747a9f3f45af6188ad0d89d4ca2420cd9e5c9f6ed59d64842500887bf8849a7636846cf7ea84223503e333e20ab95 SHA512 d8c4f71c310ef8e2e41d51cc1ff02559cb85b1450e139dcf70aa4eee7989d2d4dfb6cf9c9dca88a6589e28f963e319835ba3542352670b14709812077473b133
 DIST calicoctl-3.1.0.tar.gz 87560 BLAKE2B ec9ccfc1b2fe03edb64372afd7caef7c96301a4a25909eac2bd2386112170262db4ddd017587c731a62fb0fdda18183a808634579a1e407bbe5e6f2b61edc00d SHA512 0cc60dfb635c3092ec998917ad564c7d7bba427fe2355d57fa53d6b050bbe54208b30412f6a5da5cd9c8e943abdf3e5ef264213643107919af70d0a2f142dc17
+DIST calicoctl-3.1.3.tar.gz 87574 BLAKE2B bd1c00f5ba084bb7bb49af64fed0dfd3cac8da921f8e33ecafea1329d7d09de3d2051680f8f0a3638d1cb98b90a9cddf0a88438844f365ffcc1fc6a9d50d656c SHA512 7369ecbdb4c7afb383e0e47ab088022b020665854a66400ee415dbc64a9ce7fba32ace67e202d13e8feaf2bde7c7e3544ea46e98ea0e2f9fc59c7def4a851479
 DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536
 DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
 DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
@@ -33,6 +34,7 @@ DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 629
 DIST github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz 2444654 BLAKE2B 592a01beb3b9ab843786768f97c6e416ec1d167f1afc27ec1a60921b6ed038052190adedd97b635390a2386488c5a080b01d438dfa5a3fb87966b238e091b978 SHA512 97957c4162e542f0cbada090a38220e33e107259a68ad6b4453a593e7add4d725ecbd18a61506062d27d61a697654a2ef1a0b7410789275b20f20d42a704c459
 DIST github.com-golang-appengine-5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz 248545 BLAKE2B f30fbefd0442e492a1435a415b8b70f19afbe13752779e80ce393ad3c01c478c0c975833c96291ddbcd3ce7086b0be8adb64dd96f16afdac2e5b784fa36eccfe SHA512 fb8a4e6b1689e8e6bec7fb9b4a4580892331322f144819fad96b7b5dd09fa89cfda45a8b4e1dfa25ee9f3bdb8a064705b05180efd1825fa8a3ea4f4cb93130e3
 DIST github.com-golang-appengine-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz 300759 BLAKE2B dfa857e9da660106f75869c3515305b6842e3d3ce60f92175ec2de3e9f08378c9340b25a656f71c2c9a1c4ad4ead41e3b2eadab9a47e7e5eb62d682ec648f320 SHA512 c874c819b5ad176574f9bf0459eb3797facd7a2b477d4db83353c690a279547bb9c0ea11fbc4bc74e010b20388b13e715be8f5053609efa98667b7ce29ccaffc
+DIST github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455
 DIST github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz 1435086 BLAKE2B 5c9cc162a9a3a17c4423a74717244fb2254db0e83408907a843b3cf684653d71ce4c33fcaca5dc8ca86f99a9b36a7147fced051778e9655f7e6acd01b09df603 SHA512 7335eca4fafdede3f5737900c46ba92ba598ec2e36534b5f507dc7684e5a68a1dc3dde6137172c6fab7445ee811612a5c1da3f8db180188fa4bc91935c9a489e
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
 DIST github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz 916090 BLAKE2B d6e9cd2d0a0cdb59fc38f3ecbefddd289b3d78cc88c4b558c90ac27f75db7e59004d277e4194e5c9a0d56b5daa98e6e85d291f59ac79df314a53d803aa5a296b SHA512 40c070ab27ba31bbf0f0555e2b90b12100246caef36d7bf48d543e432272b0eca6e0deaf49e1e31ff6974b06d6476924818862a9243a8646d0f38b344a09633c
@@ -60,6 +62,7 @@ DIST github.com-hashicorp-hcl-392dba7d905ed5d04a5794ba89f558b27e2ba1ca.tar.gz 69
 DIST github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz 70427 BLAKE2B 3b699fd5923ce6c823bed429fdbaecd0ea3f1a7518e37d7b4698b2b112e24c049a90994c1651fc66f0def3958865b88374ebb39e03618c09a49a5795661d3498 SHA512 d56f15b28e89c638d2d5c4f7859d3612ae7c7f981a6950ea59bb87987ac4db6a3582b00680ccd4f9e579b3d2c5e53958d89941270366e159772959a4c5b1e96f
 DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
 DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
+DIST github.com-influxdata-influxdb-0253f6fe05e8aa5d5382ef7a05d5c956a11fac94.tar.gz 1290543 BLAKE2B 6517450c7d4cdac1908ed0a498c4cf6c66ec5f64631edabd5293c3eacae02a4650affc4af80beecc024d34aaa629827b9d116974f2b2bbb978fa57c119b143f7 SHA512 ca66e7fb49c3525222a3dd90bc62cf835218d95018ce093a2464b42b70293c3a7203c9a930e92d788be6f67a90558def5d6c62802280fdf382874acf372ee8ac
 DIST github.com-influxdata-influxdb-38d2d29f79f249b4f7647b441355cbc03e9fec1a.tar.gz 1227453 BLAKE2B 6319911183f16e0a38afc5a5e88f122b17028e49dfd1c7a9457b4f4d821a6fc230ff901143aebf255cfe8b575708bbd9833ac895c7a9d3c09859fd6b5d4bc37d SHA512 a8583db6224bb4c821fdf807f1d9fe151ead3799bb1d69cc5449dc0f958e04ea41ed0d77e425314736cc34856b56a699bb37ea220969dc823eeea911f037d940
 DIST github.com-influxdata-influxdb-392fa03cf3cc98b78e606c34996976cea65b6814.tar.gz 1071651 BLAKE2B 036d9aec6ec0acf694e350fbf02ad3fa9c0f7cd030a3e6fe36e19d1acac643b34c2f2c2aba45526d606d26009a3e97fb3f2ac33194722864063222e3ea95b087 SHA512 615fac477fd2dbd7afecef1be0cdd222997ef977cf388d3c6ce856cafd5ccf62e35cd76c5a9bcc04d93370bd45035e0fb346d1099950768ea60eafb36c5e19b4
 DIST github.com-influxdata-influxdb-b287c191f362e7313aae0fa08c19b787076ad530.tar.gz 1165644 BLAKE2B 657eeb6a1dce77f712deff0294017f57952e3455e5c3dea7279358c170dce08708c51278517b11f2fd504572f526683108c72e7a7bae42528786120d4102c510 SHA512 268e4f119429d209942d054dd9457f88d0bb97ef7cbaf9e7550c9887c78c4bb9197b260bf763ece33e3ffa0e0cf33d41a5049a454118b2eefeb8062ef096c16e
@@ -68,30 +71,39 @@ DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8
 DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf
 DIST github.com-kubernetes-api-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz 591475 BLAKE2B 7c66c79cbcbeaac326bc25110979279472749b59e4924714f65c42b5f55aa09700581a91bd77a21741be0238ae03f0f6b59d4cc39d2f0ea377ebbe31bc2974b3 SHA512 801ce8b413fabc176c61605fadf964bffb165f4ad66d3902c91930d2c5c09e711e14700fb9437722df509a26c93509de6c0bbf79918c35c37a6102135fe470b4
 DIST github.com-kubernetes-api-9b9dca205a15b6ce9ef10091f05d60a13fdcf418.tar.gz 599747 BLAKE2B a9d36fcc97232af6cae2558ef77caec625f790f75065ebbba3a94d61b9f06b68c3f5b7ed58f8fbf79b158905e849ce958b3b071a09e92a9d8bd46554fdf019d7 SHA512 99a1c84bad03df827288cd94665ccfd1c290945ec63787cd56f49ee27ecea8174fe5597d4c48367aec11f3ac18d1087a2cbfb7ed9a76906aabb31bd0199f5ddf
+DIST github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz 591490 BLAKE2B f4eccb5a531799c958b9d812403b89e5d106b6aeccf6060b3e206928bc663d84e5c496e4290a3f11602c3c6582ebac94647c75ed3682c552e9405163dc04dc71 SHA512 2a76c7c6ed44ed037d4d369fc32ef4e31ebf768f415fe7591484533263ac3f5405bd0699e8c8f373c2195e699f682f2ad24bd8ecd21fdf3b26416116fdbbe92b
+DIST github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz 436650 BLAKE2B 85d7709ccd606e3fe762132ef88b7cba60617cdb36cf60e1c41a64b0320cca9b050bbebe357a693af349d1acfd2e861da9aaad0e32a16a9d6864fdc10c07fb20 SHA512 d7130b3326a8025547e16e42a93baeaab9379bca835ee19283b6adf83eb8259cc993aa25edb8dd0fab7dd30800cfb12c5a4927f295fbbd8edd7852acd8b23b8d
 DIST github.com-kubernetes-apimachinery-5134afd2c0c91158afac0d8a28bd2177185a3bcc.tar.gz 450287 BLAKE2B d311171547b907179e9edb85f1e688752d628fb00001abdb0106bec0ae9f66bbb569c627fcce656dc57538435a6cf18f0d2f426c4e98d12296240f4dfe96352b SHA512 a9559fe0b585499a3f142cc24fc850ae2bc05c3232861f7749dc7b01a82903d17cb8ca889d58e0a76e245d8e8809c3a45160c1f79101b407c9141d8a893574eb
 DIST github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz 436659 BLAKE2B 5985daae9aa7e1646753c90004dfda92b444d5ef4b93fa32815c3af010cf038601ab343278bbd53ab5cf0674d06f5b9c99b4eeb4167d30fa6396d0da7a1831e0 SHA512 be41916d67622289b23895b1bf12a7dc5c24503ecaaef9c5addaf400d561da9a6ba599703b81ba473cf4c189fac9062fed5e3c9838b4a0fb42edd9257ad41a03
 DIST github.com-kubernetes-apimachinery-b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz 1317793 BLAKE2B c495730d6f4a4f477513e06c242f4cf9b234f4300a6ea0407a9fd36e6307445794512d7f6002dbe0153113b69af18ea7e316232d0054b714c2552c31b9ce08b8 SHA512 f44fd60453259a050b591d198a6e64c0e8729065b3b3ba73bb36b22211428e2d9bbadc7a8286a31084f5253f9f8cf95aeb7d1ee4ad5eba870887a5f7787a81c1
 DIST github.com-kubernetes-client-go-4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz 2764746 BLAKE2B 6229eb3d5a0b66221189588f13be52b6ed2f1a76a065b6c003b4968ff684736138af88ce3bb8b958fcb9ee0272e5c02be939fddff21ca32876880e31cd8b78b4 SHA512 63e57485cf08a438d913ee221d95fe61eab33c66548a24cc3dda0d833cc49cd1a30ea75c1678c407384e7e7d6f23d8e4ef22c944f208676a9693affad57a5cfe
 DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
+DIST github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz 27347 BLAKE2B 15d6a8e072d90a35780be09bd12dc2074795442972d674a16bc536dbee15dee05af71dc1e5b0b9e8a8c688580c31549e651f4972dc514ee7bbaee57a26234219 SHA512 1afda82fd79bf2e4f3a72a273a1240bef8be972a20a469a9304a1e1120a4b47a0c57d07a37800ca46f3bb55966173b73d936b3249be61d0a9c1aebe30a675bb0
 DIST github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz 27068 BLAKE2B c2b433238a708feb8b087438de90a6aa435ba88dc88f63455604ed7b02a9b7cb6e84fdcecf9054d20fb8e6244e8b3c5c6d26108bee04a1faa7bf1e08c9554b09 SHA512 ad865c986a7eb0fff44deec908a5217a935b283fa170912b0cfdc5f3b96a95ed60b49f991480a4e37699d4cde259cba9f85d4fc0e8757e9581048122c89f6569
 DIST github.com-magiconair-properties-2c9e9502788518c97fe44e8955cd069417ee89df.tar.gz 28780 BLAKE2B 70b3a20cb202e40873a3d68753c36765d09ec47da285bad924b68efe0eb1dcddd50bef0bcf20d3363d3a2912edc22fc528270868bcce8d83642efd1de71b7161 SHA512 492a1534467349e2aae5e49e286639ce711d3c6b94f97924ee4dc59cbcdca19fc519089a9226c142c69aedb0beb6dc2bbd570f0941998a1d94c57b074129949f
 DIST github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz 27761 BLAKE2B 0f39a63d3d19ad5d3ac367739d568dd3abe74a8a6aa0e60cf19ca8203412270fc45dd1fea07627290a85c42db6ead0229f72bfd845b9e4f645976db1585838e7 SHA512 493a7493e415b45abe2109c79e02ed7903de6a559911cff0323f9577fcf41134ab8f4ac26d776fdf9a891654f063bd2452c7e557c643d73de5f558b13533f62c
 DIST github.com-magiconair-properties-be5ece7dd465ab0765a9682137865547526d1dfb.tar.gz 27514 BLAKE2B 82a650e1641bfc98776fdbe39cd8a8afe777cf6d8af5c43bd52d0b26f089d59245d30bbb4da64caffdfd68921792d328f32cbd698068febf5a6acea3a02bc8a0 SHA512 63731f3772ec2f8b503824d9d7805d8f087c96f95c37ce15500fb6a528a1d3c09ab95f0d5fb86a6cccbca185a9c666c87a8130676a01e0c887b1ba57216c4b12
+DIST github.com-magiconair-properties-c2353362d570a7bfa228149c62842019201cfb71.tar.gz 29495 BLAKE2B f394e50ce58dfb59db8e8ef6364cdf494604cec2e042009a8a72250908102ce31bac173291f9c75ad585cc570fb7635b7146b1ec85daf01899945b5bbe1be621 SHA512 fe3e521365758b42df60acd8d582a080eb4828ef56cd20da57b6041074bc4b7673f01a6ee83d8271abf60609efd0c200149ccd7564da1b3a40bbf3e2c9967e66
 DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
 DIST github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz 22406 BLAKE2B e9f1d0da4d69c110a9b9ef0ec640dcb53bcc101288b15411367760b5710808f64eb8fe6f0d61f77ba89cad2f965da2d4f72d92e42a07986e1cc39777a050a8f8 SHA512 0452fbc64250169ea99fe4eb4e2ef4f81c7bce5b77572789186f749c9c502c29c7146f7ef57971b6b78db0abe33e9926931719dd610f59925e31e6dd6c0b8d70
 DIST github.com-mattn-go-runewidth-a9d6d1e4dc51df2130326793d49971f238839169.tar.gz 22882 BLAKE2B 4a9fb7eceb3bc3f32fac8bba304a971ba4387d3bb65799105682236b86a155c6921afb82f542bff4b90378bf6d47823f81a09999642d88b4f5e80521a1329674 SHA512 465b03ab84b9949d392ed8573dabb0b588fb92d410e027f45f4a58d9f9fbb8f9b03e33e5f9ed27f8d34146e9e26cbd8f229caa134278af203daef40859524202
+DIST github.com-mattn-go-runewidth-ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb.tar.gz 22988 BLAKE2B 3fb35426ba8d909d20a1fd939998685efc4b8ae684defe13b27d344350b7de366b05953eecf93ed192263e8d72380c7f4c644334f1192f1482393d8c7390b511 SHA512 1379124ce0f1c83d6677b110ff43ee6b8b003d125b311666de2fc029d25b59ea895dac1bfd812ceb360457379276650f62b8747d9fba15de78f3b57cf7d72af9
 DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
 DIST github.com-mcuadros-go-version-257f7b9a7d87427c8d7f89469a5958d57f8abd7c.tar.gz 12273 BLAKE2B e02e33c32147dcd94129b98b1e4f0e7e2864999844ce1c815e3acf448fb853f1094cc46b81310e2bf54ad2000006884412a72226322fbfa6eb32f1c21592d7e9 SHA512 68c62bd29ae3d1e67b626be39b4af69134ac973d75b880ba935315d4ea1b47769683ba50739b5d65e9a01022e2f9ed0f73a483a6023113eb762667636fe9a190
 DIST github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz 12403 BLAKE2B 2c800f93b933a49b292240eef973a01e54fc7e0a3d613629e6e2d506ffdf98c2430de7498adb4ea19b4faf433aff146f70b98e88bd7ce9404cf25c68246b3449 SHA512 ef192dd1239db964e3969fa45bd7f0032cd0d0141cf3af560f40c0a44ce5651101f518363cb7a4fe017375d7cd1ffb23da27b02e3f5805742bb3772bec19bf5d
 DIST github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz 7591 BLAKE2B a5f8b5f65740ea93f2dcd753567885530c4ec9cde743780e74fe0fe08056f87464f398ee6fba37b26a2d74342d839df45c7fe649f3857018649c86d96c87ec67 SHA512 143b517ef8b5a8bda86dee77b573b12e051816bb6cd0ba962befa3fde4d849a4b95c02c76d36a08209fa29681bbb39fe28a69ba9fb326f218bb4f3ca70350496
 DIST github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz 18394 BLAKE2B 928baf92d3af36498a4fd74f23086dd4d759f72ebcfa18b49cda23e7fff719ae9fdba9576869ddf5e220f8f6cce61a9c5c772d34a0fba1cb96eb6e05dd9b916a SHA512 2b74b167940018f95f1e4767d44ff66d94b4bc8ccd97f98364e06bd1f6bc46006c0acfcd470567b6de8e357009f42e96b9058315cdbaa3254743480d2cbfd35b
 DIST github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz 15601 BLAKE2B c2212f4c34ae15eefa1a681b2beaa8cbf3f63fb2317a8fd95f21df54eb6a05b2d312d96848deb1afdd47aefdeecadd20920ae25a0d865f31c16b6a5da4ac6dbd SHA512 30b6f8f902ab7d4dad899c19687b6ec0e8c51655a04163c37ed1fa36cb420695631534097d4de0f342dbe649b412d38d0254b40bbb2970c3a70adc0244a6e800
+DIST github.com-mitchellh-mapstructure-bb74f1db0675b241733089d5a1faa5dd8b0ef57b.tar.gz 18671 BLAKE2B a06836438c27cd4386fe3d2fb234a4ecccbc011fefffb52f9cb71f55443360c186c48e603ae745a6266b7356fbfddd92465f246b73b2bd5b9fe233af979bb552 SHA512 b5740447fa3b81ff8b713f328dbbf866f01527ee71f23141595d0c0f39d865f9ea95a04bac118dc223a3ebfc3ebeb5b8f857fec66f4232ef7da8f292ac8cab59
 DIST github.com-mitchellh-mapstructure-d0303fe809921458f417bcf828397a65db30a7e4.tar.gz 15563 BLAKE2B 18413ac854e81ae19576dd7be5d6e2c09bdb6ec8c2c72770ccf1c3a4bca1d7c4f03065a94fc966a22800102c6aeafc43438c50aa8bd88785849316f2d8a5226b SHA512 f4a77684d2919f48c274df444525772e0714d600fa64523cbe0598ff6294e0806d7ce7cddd34b87b852526c0d7ddf9ac2b65e38ade9de8b86d7cf04165886287
 DIST github.com-olekukonko-tablewriter-65fec0d89a572b4367094e2058d3ebe667de3b60.tar.gz 15185 BLAKE2B ba0e6cb42e67fddde9d4454c5757128842290daf6356bf44e05112d3759ef9373ae6ac7b82909f3cef7a31ac2b2612fc222861ca3f65190b24f80da9e2e0fa8e SHA512 48aa8d3e5795dc1d16486a1c418b60e51da254091081bc82116a66a7eac277c34814e0d8e598a7946dfbbc851b94a31d6d7e8032eb427bd858a5c3f56d3edbfd
 DIST github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz 16790 BLAKE2B f69ec79cf7e3bfb6d7ee32139db6970b1f45edeb701bdb1b15de48f2a9b33a3eeab003e67e82de2c4b6597af4fd1d94064b7fd7d31b115491216d2e868ba6744 SHA512 697296bda248977a19c573ffe5ab8b2535becaf2d775229bab744b20f931e49ba83743b99201f2ac154ff2f8aab7ff1dae792d09e7be3b1d7e4963b5efffc53c
 DIST github.com-olekukonko-tablewriter-be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz 12269 BLAKE2B a67162f71bb88ce1100966805ed1ce71a500d3299fef06bce25590b1273b0e47139d952b499535fa3c1627bc5693f3d063f281818096d1520040d44f850ba1cb SHA512 444bf361e0b602fba43a4b0d991614f10ed79a105bbba30bf3054d0dec687de6e9f4583793d52d5e25c99d55f3d39c5121f60110f3a879cf0bbd37594834a929
+DIST github.com-olekukonko-tablewriter-d4647c9c7a84d847478d890b816b7d8b62b0b279.tar.gz 17378 BLAKE2B 23cf5e288d72278f082e1b533ef8324abc268a317b7c11772af89f964e646b22fa246833eff4d0307a89dc89c0c304e3dcb3e37ac1f3252f7213655acdf887b6 SHA512 9418d06e67a72089f0b35f9f7eb1d0da68ee8c433e4577b798a6ba428233b2f9c3bec5723ed6620c5ed257ccb1a1f32262394f21d4d781c3d56e8b2034ac7111
 DIST github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz 125539 BLAKE2B 7f6c6218fe07985014f113ebfc53a3cf6f970950e8ba4ed56dc59da58dbe208b5cc3639bd17f7af3d99150d792988f63499c5cf7048b6888a8b5266f6754ae3c SHA512 a0656bd310cfe3fb734c39796a364de2766cf0accdaedb7c55eebba3d1713997ac288ffe52e0b1c9625e448e40c44e7583d29a6a2b9277246b809aabac138274
+DIST github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz 131061 BLAKE2B 125023ad75acf77a29b13442693f98f8561416148d11860e6b90756daa5d7d6751a80c31d5657b5c315d1e22b353dd02d707dbf462deed9c31fceab9f266c30b SHA512 31d85ead950c0379353b098a0c5dd47aee818dd1a1ebb3eb28a5aad16752e7061b19559baf44ce293f944bf8e8bc6828971c73295cd9e38322521131b27e0010
 DIST github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz 81972 BLAKE2B 3850ad70883ccfd0644865951f5ec8844cfbe4951caaa48f4db1c141056d9eeceed284ae614e0c58bee684cb863f53e0ea0ab98bb3773870965f32f255c89ba0 SHA512 10d5cce762d2f75b352ae41c588203e6d7114baf32c5bf67321807073570b66357efad1117fc982b64e29a3ca233767a25d1737522646b6bbd61c3c5ce881541
+DIST github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz 83070 BLAKE2B c1ab5620aab30e5f518547c286db937b63755737ad6c23b5cddf64098e87de21eb777fddf1739ccea03900f171137aa4cdafa131a932b7c66f9b77aaf339d215 SHA512 7a089d1f2c4179b8ee77e0106794f228cb9f269a83150c39c9518a8e7d2afd83bb0e54beec828431ab6c1e30f6b366a7185a7fff9ca88b312f3354ba36deaef4
 DIST github.com-onsi-gomega-c893efa28eb45626cdaa76c9f653b62488858837.tar.gz 79917 BLAKE2B 4198339ce13c20b18749078bc24e455cca89c088b205b51c028c58bc0aab04854de41f28dd9b6132dcafd175b1eebafc670d4479b704778013cbcf3d751bc9cd SHA512 a26e64dd11ef98b02d5f85cdbcc6e0ebdd54ada1a689fa37a023122fc3bff0486bea060194c4725b5ab445e4533330f625655dc892d015a6b9399def3f402ba8
 DIST github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz 669740 BLAKE2B afecd69c02b30555625e96ae9fde583336620e2ba8129817bf4af60a1db4ce33c630e0d7de47d42996970ec94a781a895ba8a938a3132dca560e8d2c1a0529bd SHA512 5d9da0f1ccb9443e834d32662906c8cda0c4b0a780d61283a433e0a86af97579938ab5814e5c337c3febe57963256db0107564e73884eaf78edb2357fc4eb7b1
 DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
@@ -102,6 +114,7 @@ DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.
 DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 BLAKE2B 17cec7cd807556c3524f8b54f8a6d70f969002b23ebbe588b86fc6a84d831f576b80bf36e9bb2827440890c9a9049759f812ed2e43609943411ccbd9d7013c8f SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593
 DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755
 DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e
+DIST github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz 406325 BLAKE2B 1d5313d69ba68efb76ae5227a64fb7b10d74e0741f8fcc218c0fd286cd5251a073cc5bf34518d030eb19d2a3c69ab7d4b3d59e8ed8f97580a96787e1171f9ac8 SHA512 f13616bc8873e47ebb9c5ba1a08ccec5545daf4f821859218cf53cebc089c806d4064456755acc966d0c0b310228da927e0041039c2ef3c7c7478f8e79cbfae9
 DIST github.com-projectcalico-libcalico-go-25a8c377d7b3299a50197a92704d606f5f5ca691.tar.gz 196217 BLAKE2B 93c66ef3e4e4c13b7063a369dfa3a48fd94c62f04888238ad0980109f5894f1fd903a34ed959b286d7df81998e23db4a39b2f56ab6e21e4a84f9768b4b20b247 SHA512 15ad47cd54f4424eaf5300094d4b85760d344bf6f10bd01c6a165bc63dacbe09e08bccd727e03dbda9d0fbd00663f51a257a0e49b7fa94ba549d131f5e56c5ca
 DIST github.com-projectcalico-libcalico-go-7c2de5ed8c029f222d87fc849b54c4075ef3173f.tar.gz 382793 BLAKE2B 39b8355eb1b887328021c6b15c85e3a304e341b52f732b429562a7f0102eff00651091f1978efea0017512538669209e037694093e7482c3d2b2a6a4fbf59b89 SHA512 c411ebaf3c5e6e072b4c3fefac623e5cb7913ee8a58813827c090d1ea388a7b2023d98c56267e8755b2f97359a3c67d241b2e04630d3846cd514162fbcf351bc
 DIST github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz 405046 BLAKE2B 3e29de42c9f3d66dbbceb2f98557329ff3ae019b3a1d59ad8d693183cb5faec584ff2551c5ca2c946897b5f86d24c23dc837166ef2a7456a63c66dfd4d44c213 SHA512 9ff540f1d4db060eeaaa0e97999b33e031413a629a685fcc67ae1664c3e427c24ee7d572eefea5bec0e4561fc52da43a55f74dee76cb6a86080fe89ddf42ad77
@@ -126,6 +139,7 @@ DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b
 DIST github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz 6345 BLAKE2B dad5459a45bc35e28f9ed7473a02bbfdfcc8da06e17cee15a1876125829065fd4bcaad35b8ec489f3b308637a3fa9cd829c04836207620e61db1a7f706660c6c SHA512 f98c62d7e74ce3e35c29862244d46fb19fcd615e500713dd7c26b30ebedd7a846e419af6586031b748029b8b4d5e32baff6d36bb1ec35856bb6ad5625a407f14
 DIST github.com-spf13-pflag-08b1a584251b5b62f458943640fc8ebd4d50aaa5.tar.gz 28833 BLAKE2B 882202f5b6d96a2bfdeaf0723d782d08b96fb4afdf41786217a085e8941b0a1326ef8fa643c72e61346b335985c0bc6cfb88eceef284b43c96532f6ccbc677e2 SHA512 5bd4af9e36625b508b106ddc288c09d65735875fcb6a0235ab9eef99958fe4b4666037b63faab74c63a76bb7f4eb2ca2f60d53ece71e695bf6d73ce818c2bed3
 DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
+DIST github.com-spf13-viper-15738813a09db5c8e5b60a19d67d3f9bd38da3a4.tar.gz 32109 BLAKE2B 3d1f8c8d943766a7b7402f30ce80fe78a96b8455f901b6c3dab786682c84ba3a7515e62b1f62f5124564f6ea664abea1e2f77685e259f5e31db3241aeb89c826 SHA512 18fd5063350bec742ec85d7299c678d825be9f6745990264fe98c6b874ab3abe9bc478fb97059b2e675b78dc5bc3f12fc9ae65ce9e7c170f8abf9498b6e78071
 DIST github.com-spf13-viper-1a0c4a370c3e8286b835467d2dfcdaf636c3538b.tar.gz 32229 BLAKE2B 95b1ed58026f177674a452e531ad445582a8cdafc1e86293918e3b8a8e81f71644b66873c621621655eb87c0cfb67f8e2b089b02bb74bdb30a714b92fdae0cc3 SHA512 004f7cb37ce692cb86b3f793afe5ade9dd478ffdceb23ac8da667c626539503e199f424d6b3183c8907257186eb1a16552ba36979bcdaf363482a6f19cc98d89
 DIST github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz 30849 BLAKE2B 8e66dbb5c90c47e66ea72848d86602861791fe3198ce6cde5ea87330f15dd19cdd249788bebc31b2a66577c20edeef01c8beb59a4140d57167c4b13d33118a04 SHA512 4acd37411683d753d81d839e83c2257bc424c42b8e295868da84cb045db131be063b0e5a0fb88c587332582f356186659d5a181e65ae1838e868576543c1fecd
 DIST github.com-spf13-viper-8dc2790b029dc41e2b8ff772c63c26adbb1db70d.tar.gz 32064 BLAKE2B d80eae5064164c160d75a8c1fadbffb0a90e30446ff887c422685a5ca179ff7d14e4c3630c1cac0a93e71749180e3257e7b5079a40f71391500198a483bf261e SHA512 457a307ad389f7deaee7fc547376fdf618509460f57aa304fd144181c8138207703864e036615426e64cbe3d39735a38053c9e2401f026e081ac669edf00f4a8
@@ -138,4 +152,5 @@ DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.g
 EBUILD calicoctl-1.5.0.ebuild 4548 BLAKE2B 552ba00a20c61cf2ceab79df6659e401da2d6d6028e41b9e079ed77c4ab3cc8148327879071b80462ccedf35ef6056ccc3f9462566c2a8e7e23b35ca753962d5 SHA512 d4f7b1c9440797478d7253f1e73d52c0e7b93520b11cac134c4840b73912ab4945aa48643c278a970bce924354d31df0c768c6fffd725cafa669d1bb5391a53c
 EBUILD calicoctl-2.0.0.ebuild 7370 BLAKE2B 521081083aacd60a72b6c1a18b1d37d9de8a7447f38ca6b12417a884df9a64cbfde747a3461eea18cd8fa88fcd8750dabeec7bc636f3bc3a21f1a443415aa476 SHA512 24f4c1c654d3d6416b730e6bfba3dbceb55733c2795afb22ec0c151f862d9f5f9f496915f64531851b3683a4cc502a158bb62823189bfe9349750fc47dc20961
 EBUILD calicoctl-3.1.0.ebuild 7470 BLAKE2B f94887743cecbd2314584f534514f0520fa13c88aab9314c4e061465a976b4f3564e3e0e7d66aba8642d9f4402dd01a8e52d2037da99d87d1d8988e11dddb6e5 SHA512 01746b4b4226c4ffff1571e110340ed807af89e2b2c7e8cfc2fbe6f4229258c1884ae1f9c2a6e3ca13cd0944c78e1dd893d90c2813e91d2b3114505b6ae257fa
+EBUILD calicoctl-3.1.3.ebuild 7470 BLAKE2B 4275c796f7818af1b086d771a46b60f8bbc95de348665ea705bca8ad9bb5decb12ee7a33c02097977f2fa4304be15bb827924c09e966c0362c8f4e99206837ce SHA512 c34b13ea76ef55bc0983fb61f4e938fd9aa33a6ff633f742e9c480ae5be2a41086b637f4cb19ab38336227cbda1c0d8290d8d036190b72a008644b95106549e0
 MISC metadata.xml 333 BLAKE2B 3dd1d3ce43f7078154602241871e2b6771c001e8f5c60f0582f2ff97033b226a6c7e0d1ce88ba5dcdd72ecab65b6973afc35c893c2a74eaa2fb093543999b5c8 SHA512 3e2d87ccb2206d26aa0000ff9fc684bbd42c6d84b7b19572d1a8e49bfd96ee103a498372ff54acb29169c3b053dae55a9aa7635027d1175b649c15a49106b61e
diff --git a/net-misc/calicoctl/calicoctl-3.1.3.ebuild b/net-misc/calicoctl/calicoctl-3.1.3.ebuild
new file mode 100644
index 000000000000..8c4041dc0315
--- /dev/null
+++ b/net-misc/calicoctl/calicoctl-3.1.3.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/armon/go-radix 1fca145dffbcaa8fe914309b1ec0cfc67500fe61"
+"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go d2709f9f1f31ebcda9651b03077758c1f3a0018c"
+"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
+"github.com/eapache/channels 47238d5aae8c0fefd518ef2bee46290909cf8263"
+"github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d"
+"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
+"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
+"github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
+"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
+"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
+"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
+"github.com/google/btree 925471ac9e2131377a91e1595defec898166fe49"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/googleapis/gnostic 68f4ded48ba9414dab2ae69b3f0d69971da73aa5"
+"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"github.com/hashicorp/hcl ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
+"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
+"github.com/influxdata/influxdb 0253f6fe05e8aa5d5382ef7a05d5c956a11fac94"
+"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
+"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
+"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
+"github.com/magiconair/properties c2353362d570a7bfa228149c62842019201cfb71"
+"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
+"github.com/mattn/go-runewidth ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"
+"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
+"github.com/mcuadros/go-version 88e56e02bea1c203c99222c365fa52a69996ccac"
+"github.com/mitchellh/go-ps 4fdf99ab29366514c69ccccddab5dc58b8d84062"
+"github.com/mitchellh/mapstructure bb74f1db0675b241733089d5a1faa5dd8b0ef57b"
+"github.com/olekukonko/tablewriter d4647c9c7a84d847478d890b816b7d8b62b0b279"
+"github.com/onsi/ginkgo fa5fabab2a1bfbd924faf4c067d07ae414e2aedf"
+"github.com/onsi/gomega 62bff4df71bdbc266561a0caee19f0594b17c240"
+"github.com/osrg/gobgp bbd1d99396fef6503e308d1851ecf91c31006635"
+"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
+"github.com/pelletier/go-toml 66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
+"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
+"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
+"github.com/projectcalico/libcalico-go 0417ab6e1ea49be2abb978df365b25f20fdb3c6f"
+"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
+"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
+"github.com/prometheus/common e3fb1a1acd7605367a2b378bc2e2f893c05174b7"
+"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
+"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
+"github.com/spf13/afero 63644898a8da0bc22138abf860edaf5277b6102e"
+"github.com/spf13/cast 8965335b8c7107321228e3e3702cab9832751bac"
+"github.com/spf13/jwalterweatherman 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
+"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
+"github.com/spf13/viper 15738813a09db5c8e5b60a19d67d3f9bd38da3a4"
+"github.com/termie/go-shutil bcacb06fecaeec8dc42af03c87c6949f4a05c74c"
+"github.com/vishvananda/netlink fe3b5664d23a11b52ba59bece4ff29c52772a56b"
+"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
+"golang.org/x/crypto 9419663f5a44be8b34ca85f08abc5fe1be11f8a3 github.com/golang/crypto"
+"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sys 88d2dcc510266da9f7f8c7f34e1940716cab5f5c github.com/golang/sys"
+"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
+"google.golang.org/appengine b1f26356af11148e710935ed1ac8a7f5702c7612 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go"
+"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
+"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
+"k8s.io/api a315a049e7a93e5455f7fefce1ba136d85054687 github.com/kubernetes/api"
+"k8s.io/apimachinery 40eaf68ee1889b1da1c528b1a075ecfe94e66837 github.com/kubernetes/apimachinery"
+"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
+"k8s.io/kube-openapi 0c329704159e3b051aafac400b15baacf2a94a04 github.com/kubernetes/kube-openapi"
+)
+
+inherit golang-vcs-snapshot
+
+CALICOCTL_COMMIT="231083c2ce934b7946ebed3ed96f4fc1a3ba4f69"
+
+KEYWORDS="~amd64"
+DESCRIPTION="CLI to manage Calico network and security policy"
+EGO_PN="github.com/projectcalico/calicoctl"
+HOMEPAGE="https://github.com/projectcalico/calicoctl"
+MY_PV=${PV/_/-}
+SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o dist/calicoctl -ldflags \
+		"-X github.com/projectcalico/calicoctl/calicoctl/commands.VERSION=${PV} \
+		-X github.com/projectcalico/calicoctl/calicoctl/commands.BUILD_DATE=$(date -u +'%FT%T%z') \
+		-X github.com/projectcalico/calicoctl/calicoctl/commands.GIT_REVISION=${CALICOCTL_COMMIT}" "./calicoctl/calicoctl.go" || die
+	popd || die
+}
+
+src_install() {
+	pushd "src/${EGO_PN}" || die
+	dobin "dist/${PN}"
+	dodoc README.md
+}
diff --git a/net-misc/felix/Manifest b/net-misc/felix/Manifest
index 72c37cccb19d..ee80d99cf1d4 100644
--- a/net-misc/felix/Manifest
+++ b/net-misc/felix/Manifest
@@ -2,6 +2,7 @@ AUX felix.confd 111 BLAKE2B ea790c8b649f58bc8b4cbef2c91dccdbd7ba2bff9db80d45b677
 AUX felix.initd 522 BLAKE2B 1250ebaa33bec5c85ae6489bdeabef8e36bec949c18072235cebb0b5811a89ae061659dc868e804a5f9f069b2829eadd2921313aaad95cb6f7b86cee34d4defe SHA512 c5393cfcf94303fb02e7c2aea7992cc3969437d5f39674f243a800ad2d0659fbc6e42a411aec20d6477774353b125c7a8ffacc510dffb20442eba81e88582ee9
 DIST felix-2.5.1.tar.gz 331705 BLAKE2B b8ed9b2355fd7ed6af95421d863f52f0553db5b2b7043095075231fe79d7500ce94c1ceb33614cdcdf715ba275ec254c605622eeae83486d8861a6449ba0c2bd SHA512 60bea2115164b0c75b08ee5011e6754a5173c5e360215b71483fac2f26f1a57223df6ccfcd226e542335be5aec886d9e4f379353f3d57f11f9ec0098b98b393c
 DIST felix-3.1.0.tar.gz 465717 BLAKE2B 07df31c230a377cc8f9f46a5c6d49ff98fb4292bada3713aaa71a73b309d2a661c9a0904cb67897ceafa767fc38ad8fc53cfdb6048e4d92a02ea08c005e8f88a SHA512 1633b9748334bb7e9044554c258130037bbffea5ca132235cb63cb061c3fd5b17f143cb85b815e321c936f31e501e2b4e089c896b1a9a5b5765e3cf354041170
+DIST felix-3.1.3.tar.gz 467553 BLAKE2B 80fc599d5b2d6f57a251b6d679cd7b3ea461827e8f37fd3c798f1b8bbfd319449d037c0a5a6b7dcc77594a8f557897f7a228567fca8f95c00c028a8c4433e425 SHA512 2ba79babd27016a83ad525611917f1ed43707ccbdfda80bf40973698ac343255896aa978a38be58b58e13ecf6956a028caa5c2d0f1cbbef8a088961f449646ff
 DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536
 DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
 DIST github.com-Microsoft-go-winio-78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz 78903 BLAKE2B b2480753213e2c387d969c8dc68994cb6d107ebc970ecb986d4bf22b542d460814d0ba0e40b82e9022072142b201cd794fc8dc7bcfcb1531c9613f2c3408b7a3 SHA512 192b544268bd10048ca877d70b35faceb9c648e7298124678b21d727a27d569e61536f42a7030b7e40610ea5822c0bc2264cac03c340ecc90e43f9120b6734d9
@@ -23,6 +24,7 @@ DIST github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d698182
 DIST github.com-gavv-monotime-47d58efa69556a936a3c15eb2ed42706d968ab01.tar.gz 5945 BLAKE2B c57ad94b089601faeaab532e503a73fe1868cc5d165c7594e96bad34b5e2ee474ba9ff59418ab8b4c7e877cb3ec59d54114711304a797c712468a20f14aa8e4d SHA512 b736e2f99b44ecf3876faf1243374885048084ea61786e77bc17a866f2f27ac14dc3b4d032e5968489a08044321ef32b0bca020db453a6315e3696e063b6bf11
 DIST github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz 11776 BLAKE2B bef19eeb755e2711ca293fa759ff98e39e17ef5679bef7b73592da7d44f1212dbe4812aafdfd63e585337623161074464a42f255873901e26091fd56f100b454 SHA512 a6848eeda7a6066b3df7582f681aa3382dc4e6d3c4579b4a13d8b31af317be56529a8ebf5c396b85490c0cddcfbe08872db8d747fedd212ff035678b9dfa9e0e
 DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb
+DIST github.com-go-ini-ini-06f5f3d67269ccec1fe5fe4134ba6e982984f7f5.tar.gz 34203 BLAKE2B 8eda5e022be1507d92f17ef3d2ca9f02df7a63d4bdae14d3486af05981d4007be0f32d1930341d5a724d20fd6f37d19dbfa9f1a703c14a86923f2940a5b3e2a6 SHA512 fdeb9b80afb13697b9b3084ea17e92fe2c528fec57bc4a18beafa18160201c94a9e31f85751d8eac836f2e41f818e547f5f2038c3a001c3f91a1187e1ba7846f
 DIST github.com-go-ini-ini-20b96f641a5ea98f2f8619ff4f3e061cff4833bd.tar.gz 38030 BLAKE2B b7fd1f9a6f028a68b07ad71c2edaae3050dda90585053273ac8112e9fbcbc66af7cfe675687ff52dc5dbe16c3567b4cbae8ea902066ad4122b9f7e4e36a17a78 SHA512 9de56f22a8b4ffcc8d64ebba79e2a4aac796f4d2edf475dc506a45e155a3a5bd27bf4dc7c7b5745be585ae69f3ba1394d1f6f14812b7c3a338125a5b0c315b40
 DIST github.com-go-ini-ini-5e9692864e22d02ac79e2fa499cffb00520b4fea.tar.gz 31516 BLAKE2B 25846eeaaac2c159820aec06fb0a270d5099b7f0950cd6cfa8611e449fd5a961b3a72d6ee4ae5a03a86a7638c41dc61c287fa15abe87a24f72323a4880f7f546 SHA512 3237eb68ef882515e9de916b0d959920021f8a1b5eb156847441a36f43efabcddf929dd17ca608f66ea405c923e5561f8220fbbc7a7a55b80775b5502cecafaf
 DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac
@@ -35,6 +37,8 @@ DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 629
 DIST github.com-gogo-protobuf-100ba4e885062801d56799d78530b73b178a78f3.tar.gz 2432841 BLAKE2B 744f754476b0ae957d9874c4d06956057006ffcfd2d75ca50dc22b94eee967010b941f205b816216af58a19e8d3405d499d43a4199b5be172ccec6d4f2ece443 SHA512 6047875c5488d943a9f63776a4b55f71ab335344f6e99e76861240ad152db018b13ea52c18ff4db21c932090a50d32659643e0737c3290f18e945a352e450f3f
 DIST github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz 1732674 BLAKE2B 2dfc3538a0f7e4b77f90795a6e76a0c962bcfdb7fe557e64484481cb6ad053ddd738abd1415cea69fc1305dd2d4e2301510c6715243c76e2251304b6f74d6649 SHA512 2b40b3eed0fe85fb111d49b0eaea33be382539c1829ab43da6da0cbe3f5f7db44422ee38e425d660e85d0541031364a8def3b2e4589cad326c29a1bc4ed8a6a6
 DIST github.com-golang-appengine-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz 300759 BLAKE2B dfa857e9da660106f75869c3515305b6842e3d3ce60f92175ec2de3e9f08378c9340b25a656f71c2c9a1c4ad4ead41e3b2eadab9a47e7e5eb62d682ec648f320 SHA512 c874c819b5ad176574f9bf0459eb3797facd7a2b477d4db83353c690a279547bb9c0ea11fbc4bc74e010b20388b13e715be8f5053609efa98667b7ce29ccaffc
+DIST github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455
+DIST github.com-golang-crypto-ab813273cd59e1333f7ae7bff5d027d4aadf528c.tar.gz 1611750 BLAKE2B 510395566152cfb558ad71d8c5e9ad5821948265d58bf6e7943fc4889e92b6a6c95f627feab2750c119d5b303588152772cc5005e0d83fdfdba96256f7c513c5 SHA512 21ef1940bc1f1f854fa9497eb27a87b554e38d608e1ce5e0884fbf7203591f2fd52127062e85c50cbd366edceecbd226d4f75e96bb0014603200ada7d268abd5
 DIST github.com-golang-crypto-b2aa35443fbc700ab74c586ae79b81c171851023.tar.gz 1456586 BLAKE2B bdcbb114281611c90e441ab14786336f6352818fa766b6f3f8c62a6988fed3923dee618005cde1e17799272192cb06d1a8a176abfd3504bd7616e3596dd3345b SHA512 30a455f428011f4ab6b6528c8b3d882ed988d43f9e08cda3730b56b3174e674330df9610c48d839f81ec564a03cce5ffad60aed652cd04159a24b999750d81c1
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
 DIST github.com-golang-net-3da985ce5951d99de868be4385f21ea6c2b22f24.tar.gz 899847 BLAKE2B 0ac617849aaf70cc78ebeb0b68cd8ed9b866ea15381eb31f233c2afb351c3ed90169311cf5105a961fc6a844434b55aecfc00e26e136a430481f86f3eaa394fb SHA512 9b98953b1cd4a0382175b4299cf605b3a41f758054a167bc764c324c4c5c8ba7205760113c44666f77d447804f7f1a6d3b34a334859cf9528b19161f77baf075
@@ -58,6 +62,7 @@ DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.ta
 DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
 DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
 DIST github.com-ipfs-go-log-4b54e7d2460df21c1c2d345af2337f91bfc938ca.tar.gz 11316 BLAKE2B e8aca3cbfc22c76e16c87c3ba3efa8903a7a378b485845831b9d3eb2deff4e637ffa67a490f144966987c9ac133903466a6ae17b5f9ab7ec87bff9ec73d55244 SHA512 5eca2b00b16ff94327b47505426f62c913ab3e0485f18a1d2a30e0a15afbccede8914a7ad10cddc8b0745deab70be4abb650a71c05659874c3900b3b9da26580
+DIST github.com-ipfs-go-log-b9df188d0fae32d69c1a519fa81741668a12f55a.tar.gz 28143 BLAKE2B a2ef3db0067c5cf86ad17376c08f28efdc2d735a62dd10aec5b55ef5e4b711f0f6b281fbd6916a0f91fc9ef1e26415bac3d1184f6281c478506a17b4e6f31ba4 SHA512 e01209547e95f45d51d3794e912fe0a4343c61d54c3fca5f7ec6c13d859aeb7a2eab61b14ddeaa451acd8c7aa6f57bb000cf9b9c77c53a8fd0212be5e5df4687
 DIST github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz 12680 BLAKE2B 852a4445fa50334de624395ea375945e273b7bfdc2a2dccf677e75a18bde34408ddfc9c0f4329edadec31cbe148cb139cd8659b4e7ba5dde829c58e39228de9f SHA512 729b41f0302aeb23b077a7ad913cb70f06982c243a37ccc264d5475d3db693c6e019c5cf9eb6307d809c2c99a4d68d711d4e11fe062e907750247d3f3e1d519d
 DIST github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz 5584 BLAKE2B 60e968bab9171dc1f09dfa3bfbe98324b4a536fc7664465154173a97f3a4a28a1adb1b8f659c5494b15c03ab8c788e8f9459fca2d6f0b37b7815da20d74e2072 SHA512 055351c704c9227b8d6cbb95177c2dbd554d582cc0ba4dfb5f8f0f550f80cfbd264c82b2a84010b8b1e9f02d9c759b4317f277f0f1b873a5eeb181cd0b672284
 DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958
@@ -65,10 +70,13 @@ DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8
 DIST github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz 4860 BLAKE2B 8f5958f711e86899267876fa27d534a34e8d48d07eddb14a82cdad1bd4056e525e74e41161be398e7da9c8c4bf7e03a1dd90e897bda7463dd7c425a20b94c8f3 SHA512 924fb47d68a300e7a17e67259c1ca6f395c23a2d630cabccdcea7ff76a9087597b317c2cdc9cecc42d885ce1e8faab338539f210681f02c695657d7b17039bc7
 DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf
 DIST github.com-kubernetes-api-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz 591475 BLAKE2B 7c66c79cbcbeaac326bc25110979279472749b59e4924714f65c42b5f55aa09700581a91bd77a21741be0238ae03f0f6b59d4cc39d2f0ea377ebbe31bc2974b3 SHA512 801ce8b413fabc176c61605fadf964bffb165f4ad66d3902c91930d2c5c09e711e14700fb9437722df509a26c93509de6c0bbf79918c35c37a6102135fe470b4
+DIST github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz 591490 BLAKE2B f4eccb5a531799c958b9d812403b89e5d106b6aeccf6060b3e206928bc663d84e5c496e4290a3f11602c3c6582ebac94647c75ed3682c552e9405163dc04dc71 SHA512 2a76c7c6ed44ed037d4d369fc32ef4e31ebf768f415fe7591484533263ac3f5405bd0699e8c8f373c2195e699f682f2ad24bd8ecd21fdf3b26416116fdbbe92b
+DIST github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz 436650 BLAKE2B 85d7709ccd606e3fe762132ef88b7cba60617cdb36cf60e1c41a64b0320cca9b050bbebe357a693af349d1acfd2e861da9aaad0e32a16a9d6864fdc10c07fb20 SHA512 d7130b3326a8025547e16e42a93baeaab9379bca835ee19283b6adf83eb8259cc993aa25edb8dd0fab7dd30800cfb12c5a4927f295fbbd8edd7852acd8b23b8d
 DIST github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz 436659 BLAKE2B 5985daae9aa7e1646753c90004dfda92b444d5ef4b93fa32815c3af010cf038601ab343278bbd53ab5cf0674d06f5b9c99b4eeb4167d30fa6396d0da7a1831e0 SHA512 be41916d67622289b23895b1bf12a7dc5c24503ecaaef9c5addaf400d561da9a6ba599703b81ba473cf4c189fac9062fed5e3c9838b4a0fb42edd9257ad41a03
 DIST github.com-kubernetes-apimachinery-b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz 1317793 BLAKE2B c495730d6f4a4f477513e06c242f4cf9b234f4300a6ea0407a9fd36e6307445794512d7f6002dbe0153113b69af18ea7e316232d0054b714c2552c31b9ce08b8 SHA512 f44fd60453259a050b591d198a6e64c0e8729065b3b3ba73bb36b22211428e2d9bbadc7a8286a31084f5253f9f8cf95aeb7d1ee4ad5eba870887a5f7787a81c1
 DIST github.com-kubernetes-client-go-4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz 2764746 BLAKE2B 6229eb3d5a0b66221189588f13be52b6ed2f1a76a065b6c003b4968ff684736138af88ce3bb8b958fcb9ee0272e5c02be939fddff21ca32876880e31cd8b78b4 SHA512 63e57485cf08a438d913ee221d95fe61eab33c66548a24cc3dda0d833cc49cd1a30ea75c1678c407384e7e7d6f23d8e4ef22c944f208676a9693affad57a5cfe
 DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
+DIST github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz 27347 BLAKE2B 15d6a8e072d90a35780be09bd12dc2074795442972d674a16bc536dbee15dee05af71dc1e5b0b9e8a8c688580c31549e651f4972dc514ee7bbaee57a26234219 SHA512 1afda82fd79bf2e4f3a72a273a1240bef8be972a20a469a9304a1e1120a4b47a0c57d07a37800ca46f3bb55966173b73d936b3249be61d0a9c1aebe30a675bb0
 DIST github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz 27068 BLAKE2B c2b433238a708feb8b087438de90a6aa435ba88dc88f63455604ed7b02a9b7cb6e84fdcecf9054d20fb8e6244e8b3c5c6d26108bee04a1faa7bf1e08c9554b09 SHA512 ad865c986a7eb0fff44deec908a5217a935b283fa170912b0cfdc5f3b96a95ed60b49f991480a4e37699d4cde259cba9f85d4fc0e8757e9581048122c89f6569
 DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
 DIST github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz 8208 BLAKE2B 4cd558c21bd893f17280c05550015f2f8148344d50dbd958f7cc7fa68d06223d0e732ace81c445f0091357d6d0a1564efd7d246af5cf432de0d8728f5cb1d250 SHA512 fc274e5699b637e953b31e5014b759f0367d925c289f9eabd7538eaf916ec8a7613e3eaf6d8f9294869f54e943448cca21130daccf1717525aa123761026902e
@@ -77,15 +85,20 @@ DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b6
 DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
 DIST github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz 3009 BLAKE2B b68ad69058837306d4988760ab7a052d988a9ea8c297001698aadff3eb0c404b3f0953faca4b2f12a174aae9e5b6f77dbb793b44b356cb9a420bfdabd72d76b0 SHA512 21392e0a444215f0345548e38e5bd439c1d97742fe705060c9e6dd41c0646d4cffb2932b886f7080c4b849fa4f075a8496328f37112dbf87a81967b229f255c9
 DIST github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz 125539 BLAKE2B 7f6c6218fe07985014f113ebfc53a3cf6f970950e8ba4ed56dc59da58dbe208b5cc3639bd17f7af3d99150d792988f63499c5cf7048b6888a8b5266f6754ae3c SHA512 a0656bd310cfe3fb734c39796a364de2766cf0accdaedb7c55eebba3d1713997ac288ffe52e0b1c9625e448e40c44e7583d29a6a2b9277246b809aabac138274
+DIST github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz 131061 BLAKE2B 125023ad75acf77a29b13442693f98f8561416148d11860e6b90756daa5d7d6751a80c31d5657b5c315d1e22b353dd02d707dbf462deed9c31fceab9f266c30b SHA512 31d85ead950c0379353b098a0c5dd47aee818dd1a1ebb3eb28a5aad16752e7061b19559baf44ce293f944bf8e8bc6828971c73295cd9e38322521131b27e0010
 DIST github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz 81972 BLAKE2B 3850ad70883ccfd0644865951f5ec8844cfbe4951caaa48f4db1c141056d9eeceed284ae614e0c58bee684cb863f53e0ea0ab98bb3773870965f32f255c89ba0 SHA512 10d5cce762d2f75b352ae41c588203e6d7114baf32c5bf67321807073570b66357efad1117fc982b64e29a3ca233767a25d1737522646b6bbd61c3c5ce881541
+DIST github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz 83070 BLAKE2B c1ab5620aab30e5f518547c286db937b63755737ad6c23b5cddf64098e87de21eb777fddf1739ccea03900f171137aa4cdafa131a932b7c66f9b77aaf339d215 SHA512 7a089d1f2c4179b8ee77e0106794f228cb9f269a83150c39c9518a8e7d2afd83bb0e54beec828431ab6c1e30f6b366a7185a7fff9ca88b312f3354ba36deaef4
 DIST github.com-opentracing-opentracing-go-328fceb7548c744337cd010914152b74eaf4c4ab.tar.gz 28604 BLAKE2B 9507aaac97438b1331fd190a1ef2a260b9125ae25e5fba57898ec421bfd97c592f0f8c92b12759d57969365273383d8d92a0a153ecdbf758ece6b7559e8b931d SHA512 01fa40a812f568208aa4cc603fb61444b1699bf8f7f7caed538c36051d12aa2f863c6815044760109ab4e4d14e9c777695e5c66ea76d9473c928fb321d87c1bd
+DIST github.com-opentracing-opentracing-go-6c572c00d1830223701e155de97408483dfcd14a.tar.gz 32162 BLAKE2B 4e7a0c8e4f84c6495f866f12f1da176c99d5ed7bed65238585b177a8edaaadc5981748b2d1c16fe9c8d9b4ec3d065212584462635ef3b25574c859834769adb8 SHA512 1e90f596f2888de1f61247d3f8ea084dd1248f17552408f14fc1dc7b794ddf547c288858d920b43fa5b340703a5385489ecde7b9065392324d457499560f07a7
 DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
 DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
 DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 BLAKE2B 17cec7cd807556c3524f8b54f8a6d70f969002b23ebbe588b86fc6a84d831f576b80bf36e9bb2827440890c9a9049759f812ed2e43609943411ccbd9d7013c8f SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593
 DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755
 DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e
+DIST github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz 406325 BLAKE2B 1d5313d69ba68efb76ae5227a64fb7b10d74e0741f8fcc218c0fd286cd5251a073cc5bf34518d030eb19d2a3c69ab7d4b3d59e8ed8f97580a96787e1171f9ac8 SHA512 f13616bc8873e47ebb9c5ba1a08ccec5545daf4f821859218cf53cebc089c806d4064456755acc966d0c0b310228da927e0041039c2ef3c7c7478f8e79cbfae9
 DIST github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz 405046 BLAKE2B 3e29de42c9f3d66dbbceb2f98557329ff3ae019b3a1d59ad8d693183cb5faec584ff2551c5ca2c946897b5f86d24c23dc837166ef2a7456a63c66dfd4d44c213 SHA512 9ff540f1d4db060eeaaa0e97999b33e031413a629a685fcc67ae1664c3e427c24ee7d572eefea5bec0e4561fc52da43a55f74dee76cb6a86080fe89ddf42ad77
 DIST github.com-projectcalico-libcalico-go-fc4a3648215b9beda5d08e26d76e91f12fb45079.tar.gz 198156 BLAKE2B 58eb1a2e617260d1b61582a12d6ae01f7eeb9caefe4c8d6c4276a95d277e1d25242fe6975394c83d1e6bf39375f77dcccf37a77262f56dfc344d15f29cfe4b7d SHA512 0cab2d2d14205b184dba501fd171897117f0dbc2cb42ab121e789c20d46c3e2e6c71fcea4162646432726379322d332a841866101cf32ae51e698fdd92b54c1f
+DIST github.com-projectcalico-typha-5374e9f32bde159a4aa19c821618920f491004be.tar.gz 231051 BLAKE2B 0d799bcfa6396dc264bcfe1d90343f35444c6f21a5efad57e3358815c939fff4a6af587e75250f259ea243337fa27f2d0405163b002b2a05708016b663c17767 SHA512 c89213b92b36d509714be314bbe4db171e5682afb3ca69d771b4b53ead24e7105b03420040b6d57a7a5836a22f9dd1ef87da28b08e4726eef65ee5987385c4ec
 DIST github.com-projectcalico-typha-6913426bf2b4ce2a6d24c9fed5e97539b9f7dacf.tar.gz 230984 BLAKE2B aa385de599b109ac0fdd2cd8f87e8a9c753bbc60474c8b85d2f4b6a286bd375f0b0ad0c1399292abd4417e2db6cfefad5b11cb3e49c484f13f13b001ed6fa2c6 SHA512 cb857385d2e3ce262615d24149b635d2d84430eb0a5201f7dd7c746b1c2a335a19bd94c2050d1f4f74746eda4f3e9521e4025fe2469aa3fefc0ce148fdfde76f
 DIST github.com-projectcalico-typha-71413e6c4e8f903f899429329cf3e38e17633ba5.tar.gz 227211 BLAKE2B 41857009f54f2f1dd4b2532cb06e14356990caffca4995020cf311278ad3990719b34add9024a39be513cc1f6491d3a57c2850f5d8990698e7b66eaac5c228d3 SHA512 100d53dc3164008d6f5e701193ea1860a266e2321da585bff2a083a7853224ce866ff5cd1a64be0fd6530101bf0cc6c98fa366df331336023c4fc6f140649e6f
 DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a
@@ -93,6 +106,7 @@ DIST github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a4931
 DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf
 DIST github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz 63007 BLAKE2B a62f727ef9dd42d52f495ab7449cbafbe7c7fcdb1bc171df97c40348dcb7fe12788223d7a2aea3398cae7dd17ec73ae6349b5e5f35f4785f2796cc9a16c2d420 SHA512 4f1ab6cffc309a00ed68959b9372e1d3ea4f8d597b8c462a4e365cf22737245e601b8bda0764bbd1f0172d773805d16e90a8aa90cb95e9462e35320043e04060
 DIST github.com-prometheus-common-61f87aac8082fa8c3c5655c7608d7478d46ac2ad.tar.gz 61732 BLAKE2B e0e16b1f12d62cb2c4618e37022aff054215b5910389505788bd671d6f29e2e8dac39ead98d590a75b4b07840d7667b293ad43096bc1e285e2b55137d3bcc796 SHA512 8dd198db3ee1f9708684ce25b3afa6e3202c9144537302d21dd34474d56163ceb429bd9372619d025d06a31f712feb2374b14d4053ba83355ff3b193e232c9b1
+DIST github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz 77798 BLAKE2B 3e8daf72d7ca8d702898349617c48a62d4dd7cc5ebeb65bd63d38978f5d8f05e6d0f02237e1fe285630da198aba90783e27eee69ac6a06f90e1a7be3fad50b4c SHA512 bdf0b2f818f9df4685ec7536a7478cb86ab8a8297081c618d92b14bc0296c2c66c9ccb403b2f4af42a7fed769f3ce2020082e2e983e3f2668e14776a6d26828b
 DIST github.com-prometheus-procfs-e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2.tar.gz 43889 BLAKE2B 046b59464a287395f73c756a3addcf319a437f4d5594e56d91ebe4fbc86ff5e6db92c87d7bfcd49b87606d1b2a4b3378a49f39a4989be55021da1e4e1834c7bd SHA512 c31a595327ee82e4f5fdd9f58f395261cd9a290e2bfd9115593b20508966ad529a31322b228736c7fa6eb0cc74d81c6f298bfd17450e534ffe1a8bd74633b325
 DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507
 DIST github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz 7607 BLAKE2B d0f59a0862b44a5c84b9f4dd65eda26facbab84f57508a346c060d6468fd6ce8cf5014d715a43ecd56135f101d9e7aa33714431cc4ce6fd809fa2a1cf865ea75 SHA512 2bbff9fa393814c4c31ce033d604d29b908b2b110b154a693968bc1f8859f8417c402a183fcfdf07c4732576f285df92b57b9ea954974ff8e6a753ab3d82fc39
@@ -103,10 +117,12 @@ DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 3892
 DIST github.com-tchap-go-patricia-666120de432aea38ab06bd5c818f04f4129882c9.tar.gz 11995 BLAKE2B cb880cb4ffd844c5dc86cfa2b1aee79b6ca7c7f527d3331b1bd8a85860cef203c6f4d4a85cbd6c55b3c160e2e121cf69c84de97fb77e3db0028662c15b7cc335 SHA512 e8aade384d3505c3bc9389c7215b789e013bc4088c1662e23170503876f2ad2ef97df63cfc6ed9b30c58b6287793e003d4c3a2e6250c0ea76aab807b2eb08ab2
 DIST github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz 169394 BLAKE2B fe292aaad3f31173e1ed0e0d9dff74b9f5c46803acee9476f86a4822327296bfe52009d68c1b7bc2ed246596032e74a597eb951795a37eea9518a01ab4b3ad9e SHA512 adbe58e9286863ef674b6204d3b56276ff4e3bb1743af53e369fd2be97ee28dc26bb89f509f9b01641731b058db464af839adbad0e31149503b57796b22b2be8
 DIST github.com-vishvananda-netlink-85aa3b74a43a9fa174a588ce9a042c9b71b0842c.tar.gz 121969 BLAKE2B fe1d28a8249065955a1812e59279d823418af7c437683ba8a65d69339d6acb37ac9c5fb95d927314e0e461512958a2302cd8bde4b643d3ff95894aff374dfc1a SHA512 c5b7586e23a93022e52da1b570747ba2b24c43554ebe3836f93b3cb63e52f059bc300152015ba11d25a0573f03453da30e148933aa5a7db15cd26eecfd9456d9
+DIST github.com-vishvananda-netlink-dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz 122308 BLAKE2B 3b7e1486b64c0dfd9658b7e7e631b1fc4ae19155dee5392ab57929a51e0734b744399c7902ff558091046ea64f5f1ecacfb2594011d3077880356d659a42c9c7 SHA512 65251591bec228edadf1b0193d4b47f97cefd8eac1a54edd623d20186c70dbf49631562826bc193e81f3af3262a0211dde9b9638ee5a9ca7ded6841a2ebe65ec
 DIST github.com-vishvananda-netlink-f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz 103396 BLAKE2B e0016e5a663157383ca37a99c32a1da395a9e6e53536acc6f03f25d9d347f1c4d8d1d00c8cfb02ba4f8ce69a5f7c06d9440fc177bd88e599678d67c18415cb82 SHA512 4e9f7d7017486160599aa6b98d32c41b135b74fdcc08f642dbb3ec9db83c21a94a2b4c9ff52ee78d0762468710c566c052e5b4fe7287e5ef99263136ae595184
 DIST github.com-vishvananda-netns-86bef332bfc3b59b7624a600bd53009ce91a9829.tar.gz 7753 BLAKE2B c251f716c79fd6c94204c1d0a7e99d58b964fa9e9664a80ce4d8045a433e8d7af91fc99ceb0d7d00bed26bb65ff22dc9f0527f4001d9bf71ed8996d5caf2ad4f SHA512 7298f8ff33c14faca3cd57f68de676049eee8aad6891f5ac03427b63f3554c666bf27896801a8528d9483b469df14040116fa52d263d851c7a9766577728b0fe
 DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86
 DIST github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz 34843 BLAKE2B ec139b3eb8f034ca9243c99497380097056a19e3fa8541e2075c1c7e108c96b4e97004fd47f1590dad0ad155db6c33ecdb5ea1162498f343c9c07c2f73d3476b SHA512 29ac7f9ebc485fd09d1c65c71457add052c7faa975591a0be1ffb20608cdcad61ed427b284d99340d1ac647d0a3bf99938522d90299a26172e74bac2d7f3e498
 EBUILD felix-2.5.1.ebuild 3998 BLAKE2B 13f283532d310dc707daaea73c428a66232c2450a4374d9740fcb8161a310333e6eaa823c5cde65477516725ee357b46d96f2b3fa055b442e74414f175ee70d7 SHA512 3d8f122b1c6214dc60cc47659d44d17aae7da4d14db083eba8d57a08c8c506a8f7086e4a350de2e518df91a96c4f42b8ff75cfb5339c755a950d93c63b4b4cb3
 EBUILD felix-3.1.0.ebuild 7540 BLAKE2B 8b10b3463d5bcebe8810044c302f2aa75169345d42ce3c03c2fab20c17539854622ace8d0e156ca356bfae56a4539b885bd8ba5afa48dc3b3ed92a6a9cb7a212 SHA512 e77f909b0902c10d3f8bf193dcd9e6c82697e400327236489b601afa489bfe953332a5e7c73534f2e1158067a62eaa010c6b53f533ace23265a215d6be689369
+EBUILD felix-3.1.3.ebuild 7540 BLAKE2B 1cd40ccecd40be6f6bc9aff34776571b99c229b8ea44b803f820ad6f60b86c5828e41e7535357079bb95b281ddfd2d74a2153c36be1519044474031255e46e45 SHA512 4a5c4b808b405c34dacf87a629b6ae58d610a8c172dd91621c1f8979967a7100998a84b926bea3f32c5d2adc6a160df481dc08259dcd7835eaf22d2fa60d89eb
 MISC metadata.xml 406 BLAKE2B d2f0449cbf46550d7f8794221b6c6f9ed445ebf8b166bdc8976bf605ef61d12f8862b7597f63c6ec171af9d98c3a14bccea7d96fd24cedf58d895b8aed8b1fef SHA512 5aef67b8438efa537ac2a74f6ca701c8211f474ba2aa7a7ec8d26b523f93b18b3e31414143aa488c4480295ef51dac65988b2c923f3593f2028eb69ac93db8cd
diff --git a/net-misc/felix/felix-3.1.3.ebuild b/net-misc/felix/felix-3.1.3.ebuild
new file mode 100644
index 000000000000..97d86ba45d4a
--- /dev/null
+++ b/net-misc/felix/felix-3.1.3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
+"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+"github.com/containernetworking/cni 137b4975ecab6e1f0c24c1e3c228a50a3cfba75e"
+"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
+"github.com/emicklei/go-restful 777bb3f19bcafe2575ffb2a3e46af92509ae9594"
+"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
+"github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
+"github.com/go-ini/ini 06f5f3d67269ccec1fe5fe4134ba6e982984f7f5"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
+"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
+"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/gxed/eventfd 80a92cca79a8041496ccc9dd773fcb52a57ec6f9"
+"github.com/gxed/GoEndian 0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7"
+"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
+"github.com/ipfs/go-log b9df188d0fae32d69c1a519fa81741668a12f55a"
+"github.com/jbenet/go-reuseport 7eed93a5b50b20c209baefe9fafa53c3d965a33c"
+"github.com/jbenet/go-sockaddr 2e7ea655c10e4d4d73365f0f073b81b39cb08ee1"
+"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
+"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
+"github.com/kardianos/osext ae77be60afb1dcacde03767a8c37337fad28ac14"
+"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
+"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
+"github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade"
+"github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"
+"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
+"github.com/Microsoft/go-winio 78439966b38d69bf38227fbf57ac8a6fee70f69a"
+"github.com/Microsoft/hcsshim 34a629f78a5d50f7de07727e41a948685c45e026"
+"github.com/mipearson/rfw 6f0a6f3266ba1058df9ef0c94cda1cecd2e62852"
+"github.com/onsi/ginkgo fa5fabab2a1bfbd924faf4c067d07ae414e2aedf"
+"github.com/onsi/gomega 62bff4df71bdbc266561a0caee19f0594b17c240"
+"github.com/opentracing/opentracing-go 6c572c00d1830223701e155de97408483dfcd14a"
+"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
+"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
+"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
+"github.com/projectcalico/libcalico-go 0417ab6e1ea49be2abb978df365b25f20fdb3c6f"
+"github.com/projectcalico/typha 5374e9f32bde159a4aa19c821618920f491004be"
+"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
+"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
+"github.com/prometheus/common 7600349dcfe1abd18d72d3a1770870d9800a7801"
+"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
+"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
+"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
+"github.com/vishvananda/netlink dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb"
+"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
+"github.com/whyrusleeping/go-logging 0457bb6b88fc1973573aaf6b5145d8d3ae972390"
+"golang.org/x/crypto ab813273cd59e1333f7ae7bff5d027d4aadf528c github.com/golang/crypto"
+"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sys 88d2dcc510266da9f7f8c7f34e1940716cab5f5c github.com/golang/sys"
+"golang.org/x/text 4ee4af566555f5fbe026368b75596286a312663a github.com/golang/text"
+"google.golang.org/appengine b1f26356af11148e710935ed1ac8a7f5702c7612 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go"
+"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
+"k8s.io/api a315a049e7a93e5455f7fefce1ba136d85054687 github.com/kubernetes/api"
+"k8s.io/apimachinery 40eaf68ee1889b1da1c528b1a075ecfe94e66837 github.com/kubernetes/apimachinery"
+"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
+"k8s.io/kube-openapi 0c329704159e3b051aafac400b15baacf2a94a04 github.com/kubernetes/kube-openapi"
+)
+
+inherit golang-vcs-snapshot systemd user
+
+FELIX_COMMIT="dba3279377fd6ec7baf0ee560bcaec685f25fa86"
+
+KEYWORDS="~amd64"
+DESCRIPTION="Calico's per-host agent, responsible for programming routes and security policy"
+EGO_PN="github.com/projectcalico/felix"
+HOMEPAGE="https://github.com/projectcalico/felix"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+bird"
+
+RESTRICT="test"
+
+DEPEND=">=dev-libs/protobuf-3
+	dev-go/gogo-protobuf"
+
+RDEPEND="net-firewall/ipset
+	bird? ( net-misc/bird )"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	protoc --gogofaster_out=plugins=grpc:. proto/*.proto || die
+	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o bin/calico-felix -ldflags \
+		"-X github.com/projectcalico/felix/buildinfo.GitVersion=${PV} \
+		-X github.com/projectcalico/felix/buildinfo.BuildDate=$(date -u +'%FT%T%z') \
+		-X github.com/projectcalico/felix/buildinfo.GitRevision=${FELIX_COMMIT}" "github.com/projectcalico/felix" || die
+	popd || die
+}
+
+src_install() {
+	pushd "src/${EGO_PN}" || die
+	dobin "bin/calico-${PN}"
+	dodoc README.md
+	insinto /etc/logrotate.d
+	doins debian/calico-felix.logrotate
+	insinto /etc/felix
+	doins etc/felix.cfg.example
+	newinitd "${FILESDIR}"/felix.initd felix
+	newconfd "${FILESDIR}"/felix.confd felix
+}
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index e87396e2e511..b5ec9d9b7f2a 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -10,9 +10,11 @@ DIST FreeRDP-2.0.0-rc0.tar.gz 6486529 BLAKE2B 6d9bf0e88c925f2184f87696b78a374c5f
 DIST FreeRDP-2.0.0-rc1.tar.gz 6530403 BLAKE2B 5e276c3d1153f04512dba4bf09807751ca70ece3496c1ba00766b04369fffde8d86ad446345f0eab0fea4641708b7f985f95ea4a6001107163ee60e35822a955 SHA512 5d8fd7d6900feac1e42bfc0ebc111524205c3baa093958ced42d03635076ae7d88cd86439a22ff0656bc53f0302daee5a114a4ac26328ae598ee086490926182
 DIST freerdp-1.2.1_pre20150326.tar.gz 6146857 BLAKE2B 8ead05b89e129ba09b046f545073d128ca1d44dac7248c23bc543094f0fd23f336c890367945e7fce4def98c4ce1e01c4e5a970e92f3d4f74d08daf3cf0a8c6a SHA512 ca1499d56ecb9c9bc624de2ecc976eb9633b795050ac01e16fcc9e0a8951d274cc63644a0e2b830e75f66de894f6a22274864fd20a9351834f6d664874e65ec8
 DIST freerdp-2.0.0-rc2.tar.gz 6611081 BLAKE2B 564abd6289f0c9d3947b9074111ade8c2e7b6e6dce9af8a06ef1772d0e76822c5df80932a5cbac2f23c4d2a76d4796c12bd4fa067c6ef21ea84a1b8423be1ce3 SHA512 cb765b3b9559c4877be4c10e5df9e95d11a0184ce34e89564097c3234f859de8e82b6de6217396628e5f70c85c40c65ccd75f9b0f7f89daaed7e0e971a833589
+DIST freerdp-2.0.0-rc3.tar.gz 6575186 BLAKE2B a99b54ca284d1c5c61104e22edd6bb4bc435ed1d5b95a84f089c06e6d49c14987be24c5e6b08e02f7df4a56230159c827b8ada24f68ff0188e74c0386507d691 SHA512 0019daadd5f0071d983053c554834392a751ec3bcde2ed96d4c0fceb7c32a319b9bbfeb68ff9b15216f7db479c883b461e7c51e612c99626dd09af5a68ff96f5
 EBUILD freerdp-1.2.1_pre20150326-r1.ebuild 2786 BLAKE2B fe5e87301c14a9f29b33ca4994abd5deeded6938631ed184139d452b49b98b957f03c57e709a4df6cda2627a773e6cc0bb7699bcba522aba7aa8548b4cafade9 SHA512 57788c008c8d32a69ae90ce741cca7b12d7b8d0808fd4e151bd99febb70b7d7d016dc6d586eaf9dfc3ef888cec0b752c0eb9805610ac6910dbd0808914bb5900
 EBUILD freerdp-2.0.0_rc0.ebuild 2907 BLAKE2B 1c4ff670b1e7db50ca56af231ce54a080095f8fce142bcb96cabf2908ff71ff11159e691a7e21fab5fd7e436f28ad644af6f710958c92a1908b77dfc7deb9407 SHA512 dc9b9e146822c84ed51e2221f10ba500ec51392f21f9d75fa3c10f1408c6f3fc266fdbc5f11bbf5dde566699e0e01ffd7bb0e85c072baa774e2933338fd2e9f2
 EBUILD freerdp-2.0.0_rc1-r1.ebuild 2892 BLAKE2B db7a01064767e64c2a7a70da24f61c41a02f0eb471f0f54092401a8b15865fcea61e9cde7e92e811a38e91ac90442523fc507ebb12a5df49c3fc82d94442fde1 SHA512 20910eaf36b9a4eb38231f96dc30443e760eae0f794d28a98f3187e424500e651f715ff79edb05400fea962a9d99cbc4c2ac32955391ac762e822eec666452fa
 EBUILD freerdp-2.0.0_rc2-r1.ebuild 2664 BLAKE2B 8612caa8fd82f99e1e6369ea991dd25270b9d7d104825038d6f0bc11983d43b84ac0ca15b02ad112072ab654b10f68372bd949b171ca0f9282dd0971be6b6389 SHA512 0c17d9a07ef8a13bfa8462eac1b3f19c3741e156e1dfd4e5fad41158cbd65bd18403b55cef9a04d0f3f5fb4c53a75c1f34b3405e86210823916eb2a10d6510be
+EBUILD freerdp-2.0.0_rc3.ebuild 2615 BLAKE2B 6987e6d5cb42d17359e6403b61bd44417da1e61be7fe4495e6aec26306a75f1d53faad0f89a2ffe632a63c486988c4e8991196dc7ddb28dcf936870e6b289259 SHA512 e5215b3905e2cfc280d9b6f44a026b65df7cafdb9d50611dd857e09c796556eafeebeb1f38c582c6afa9083508ef571887dc8c9668b9d69ceb59cda86169518f
 EBUILD freerdp-9999.ebuild 2615 BLAKE2B 6987e6d5cb42d17359e6403b61bd44417da1e61be7fe4495e6aec26306a75f1d53faad0f89a2ffe632a63c486988c4e8991196dc7ddb28dcf936870e6b289259 SHA512 e5215b3905e2cfc280d9b6f44a026b65df7cafdb9d50611dd857e09c796556eafeebeb1f38c582c6afa9083508ef571887dc8c9668b9d69ceb59cda86169518f
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc3.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc3.ebuild
new file mode 100644
index 000000000000..48abe1a3fc71
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.0.0_rc3.ebuild
@@ -0,0 +1,115 @@
+# 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
+	MY_P=${P/_/-}
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+else
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+IUSE="alsa +client cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib:0
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	client? (
+		usb? (
+			virtual/libudev:0=
+			sys-apps/util-linux:0=
+			dev-libs/dbus-glib:0=
+			virtual/libusb:1=
+		)
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			xinerama? ( x11-libs/libXinerama )
+			xv? ( x11-libs/libXv )
+		)
+	)
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg:0 )
+	openh264? ( media-libs/openh264 )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXrandr
+			x11-libs/libXtst
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	client? ( X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) ) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DCHANNEL_URBDRC=$(usex usb)
+		-DWITH_ALSA=$(usex alsa)
+		-DWITH_CCACHE=OFF
+		-DWITH_CLIENT=$(usex client)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_DEBUG_ALL=$(usex debug)
+		-DWITH_MANPAGES=$(usex doc)
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_NEON=$(usex neon)
+		-DWITH_OPENH264=$(usex openh264)
+		-DWITH_PULSE=$(usex pulseaudio)
+		-DWITH_SERVER=$(usex server)
+		-DWITH_PCSC=$(usex smartcard)
+		-DWITH_LIBSYSTEMD=$(usex systemd)
+		-DWITH_X11=$(usex X)
+		-DWITH_XINERAMA=$(usex xinerama)
+		-DWITH_XV=$(usex xv)
+		-DWITH_WAYLAND=$(usex wayland)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest
index 89dfe507ae81..7c23319385ad 100644
--- a/net-misc/ipmiview/Manifest
+++ b/net-misc/ipmiview/Manifest
@@ -1,6 +1,6 @@
-AUX fake-java.bash 289 BLAKE2B 1bd0c9477af5d064f4479fadd040338d972195ad99f87e7244b4953764da3f4a2bc4ffb7118bbe8bcc9c6d8cf9c5e42a1990219ca7e8d89cb931f5ee6265d214 SHA512 9de74481bcff69098484b328157ad2208255e791dd4595e1ba926a2754c7bbae04b94ec4d717e7b9556b64bf4fdc749e012c99fdc771844fbf003021d9cda65a
+AUX fake-java-r1.bash 289 BLAKE2B 1bd0c9477af5d064f4479fadd040338d972195ad99f87e7244b4953764da3f4a2bc4ffb7118bbe8bcc9c6d8cf9c5e42a1990219ca7e8d89cb931f5ee6265d214 SHA512 9de74481bcff69098484b328157ad2208255e791dd4595e1ba926a2754c7bbae04b94ec4d717e7b9556b64bf4fdc749e012c99fdc771844fbf003021d9cda65a
 AUX launcher-pre.bash 143 BLAKE2B b33051ba8052380465c59b68733416298166949bcc794047a097816dac68fed0bc7ad39dc056e57e5114f622faf64b67598028b35b83d6ded95034d2a71126d0 SHA512 2a1b35175fe6364eb7790de93878d4834ca69f1dde438fdcf0cebd7c7bf16600f2eaacf334f91c740512ad068914c1adb7a09017a23694bcceb837be20989161
 DIST IPMIView_2.14.0_build.180213_bundleJRE_Linux.tar.gz 95430772 BLAKE2B 467f1b8b99df6e0b48bab0d652411ce097826eb532e92ac7889ea9c93ad53ff78a291508498d9ffa1463342951cc640fb46bfddd887669b4ebad9f1a9dd09941 SHA512 59fd4ad70f7f6da98a8ca1a95678e368cf963caa3c454e1e1c60006966aa5faeb964c7c68d4fc7f0f5804ffbb49c06d44ab56974bb47bcb77490ad737c707e92
 DIST IPMIView_2.14.0_build.180213_bundleJRE_Linux_x64.tar.gz 94006067 BLAKE2B 38e597401f3bfb27acb2b6c824ac1dcae17b7ca46fcba1ba64d3533142913915a836bbee6ccfbdb9d21f9a9976629b3412e5f6f40850c3ce139a97428bb25be1 SHA512 7b4f0e3438281da33cb85195048f21fe1101a44ec18a67f83f88665c875d01706664df44ea8eb7403b98685c09764094eaf553f985cebadce66c3dcf635151e1
-EBUILD ipmiview-2.14.0.180213.ebuild 2356 BLAKE2B c46d679078733f0400479296c6f4cba35ac970cd342c3dcd79c3712f8e30f4cb2127970853d41fe10a68907e1edefc894cc73c411ab81c07abf130d050e5acb4 SHA512 fadd6e19903ebf497f1bc136266267743c88ca78d51c73533bd8ae4602c0423d6b39f4992d711ea5b864e482ca7c3f8457b7148392bad0c1740513b57393ae83
+EBUILD ipmiview-2.14.0.180213-r1.ebuild 2386 BLAKE2B 4a7a02c7d76935e1d9a2fb4a4007e22780ea693a83fde1c1cc53d7b3fd56e07f10ba4768031899f1ecfa15555a94024acfcc21fd11b33d228ee7f741087ad6ae SHA512 8c6deaa07d3796366f18b0823b2e9cc8c30423b8c166e4e349b661f94c1df29e0a6afc31d40fe0b507519dc5875f3659888ef16b84c86fc7bdaf015b4b5703cc
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/net-misc/ipmiview/files/fake-java.bash b/net-misc/ipmiview/files/fake-java-r1.bash
index 7d4fbfe32a0b..7d4fbfe32a0b 100644
--- a/net-misc/ipmiview/files/fake-java.bash
+++ b/net-misc/ipmiview/files/fake-java-r1.bash
diff --git a/net-misc/ipmiview/ipmiview-2.14.0.180213-r1.ebuild b/net-misc/ipmiview/ipmiview-2.14.0.180213-r1.ebuild
new file mode 100644
index 000000000000..9c6362bda4b1
--- /dev/null
+++ b/net-misc/ipmiview/ipmiview-2.14.0.180213-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 desktop eapi7-ver java-pkg-2 prefix
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="IPMIView"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="A GUI application that allows to manage multiple target systems through BMC"
+HOMEPAGE="https://www.supermicro.com/"
+SRC_URI="amd64? ( ftp://ftp.supermicro.com/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz )
+	x86? ( ftp://ftp.supermicro.com/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux.tar.gz )"
+
+LICENSE="supermicro"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="net-misc/stunnel
+	virtual/jre:1.8"
+
+RESTRICT="bindist fetch mirror strip"
+
+DIR="/usr/share/${PN}"
+QA_PREBUILT="usr/lib*"
+
+pkg_nofetch() {
+	elog "Please download ${A} from"
+	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_unpack() {
+	unpack ${A}
+	mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux$(usex amd64 _x64 "") ${P} || die
+}
+
+src_prepare() {
+	default
+
+	# Extract icons for menu entries
+	unzip -j -LL IPMIView20.jar images/ipmi{view,trap}.ico || die
+
+	# Don't use their scary launchers
+	rm -v lax.jar || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+	java-pkg_doso $(usex amd64 '*64.so' '*32.so')
+
+	local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash)
+	java-pkg_dolauncher ipmiview --jar IPMIView20.jar -pre "${pre}"
+	java-pkg_dolauncher ipmiview-ikvm --jar iKVM.jar -pre "${pre}"
+	java-pkg_dolauncher ipmiview-ikvmmicroblade --jar iKVMMicroBlade.jar -pre "${pre}"
+	java-pkg_dolauncher ipmiview-jviewerx9 --jar JViewerX9.jar -pre "${pre}"
+	java-pkg_dolauncher trapreceiver --jar TrapView.jar -pre "${pre}"
+
+	exeinto ${DIR}/jre/bin
+	newexe $(prefixify_ro "${FILESDIR}"/fake-java-r1.bash) java
+
+	insinto ${DIR}/lib/BMCSecurity
+	doins BMCSecurity/*.{crt,key,pem,txt}
+
+	insinto ${DIR}/lib/BMCSecurity/linux
+	doins BMCSecurity/linux/stunnel.conf
+
+	dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel32
+	dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel64
+
+	doicon ipmi{view,trap}.ico
+	make_desktop_entry ipmiview IPMIView ipmiview.ico
+	make_desktop_entry trapreceiver "Trap Receiver" ipmitrap.ico
+
+	local DOCS=( *.pdf *.txt )
+	einstalldocs
+}
diff --git a/net-misc/ipmiview/ipmiview-2.14.0.180213.ebuild b/net-misc/ipmiview/ipmiview-2.14.0.180213.ebuild
deleted file mode 100644
index 8b3eaa7b7209..000000000000
--- a/net-misc/ipmiview/ipmiview-2.14.0.180213.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eapi7-ver java-pkg-2 prefix
-
-MY_DATE="$(ver_cut 4)"
-MY_PN="IPMIView"
-MY_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="A GUI application that allows to manage multiple target systems through BMC"
-HOMEPAGE="https://www.supermicro.com/"
-SRC_URI="amd64? ( ftp://ftp.supermicro.com/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz )
-	x86? ( ftp://ftp.supermicro.com/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux.tar.gz )"
-
-LICENSE="supermicro"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="net-misc/stunnel
-	virtual/jre:1.8"
-
-RESTRICT="bindist fetch mirror strip"
-
-DIR="/usr/share/${PN}"
-QA_PREBUILT="usr/lib*"
-
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_unpack() {
-	unpack ${A}
-	mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux$(usex amd64 _x64 "") ${P} || die
-}
-
-src_prepare() {
-	default
-
-	# Extract icons for menu entries
-	unzip -j -LL IPMIView20.jar images/ipmi{view,trap}.ico || die
-
-	# Don't use their scary launchers
-	rm -v lax.jar || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_dojar *.jar
-	java-pkg_doso $(usex amd64 '*64.so' '*32.so')
-
-	local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash)
-	java-pkg_dolauncher ikvm --jar iKVM.jar -pre "${pre}"
-	java-pkg_dolauncher ikvmmicroblade --jar iKVMMicroBlade.jar -pre "${pre}"
-	java-pkg_dolauncher ipmiview --jar IPMIView20.jar -pre "${pre}"
-	java-pkg_dolauncher jviewerx9 --jar JViewerX9.jar -pre "${pre}"
-	java-pkg_dolauncher trapreceiver --jar TrapView.jar -pre "${pre}"
-
-	exeinto ${DIR}/jre/bin
-	newexe $(prefixify_ro "${FILESDIR}"/fake-java.bash) java
-
-	insinto ${DIR}/lib/BMCSecurity
-	doins BMCSecurity/*.{crt,key,pem,txt}
-
-	insinto ${DIR}/lib/BMCSecurity/linux
-	doins BMCSecurity/linux/stunnel.conf
-
-	dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel32
-	dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel64
-
-	doicon ipmi{view,trap}.ico
-	make_desktop_entry ipmiview IPMIView ipmiview.ico
-	make_desktop_entry trapreceiver "Trap Receiver" ipmitrap.ico
-
-	local DOCS=( *.pdf *.txt )
-	einstalldocs
-}
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index bcf334fee109..50cf828343d0 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -6,10 +6,12 @@ DIST kafka_2.12-1.0.0.tgz 44352403 BLAKE2B 14c536224c2d75ccaa471dfa7dc806f99e17e
 DIST kafka_2.12-1.0.1.tgz 44474706 BLAKE2B 59aaa2bb2f1940b4d581882eaedbba091149cecadca970762b7ba83aff41da165526e5d69a65212de2f25c28ad5c2327befa4d9d01bd04e7fa8b9d882e832dd8 SHA512 935c0df1cf742405c40d9248cfdd1578038b595b59ec5a350543a7fe67b6be26ff6c4426f7c0c072ff4aa006b701502a55fcf7e2ced1fdc64330e3383035078c
 DIST kafka_2.12-1.1.0.tgz 50326212 BLAKE2B 079118f6e269c028a78700a6d11f70c36b8856a5f4180050c5d4b667f6f719fcffcc50433a687e6b181dd15423dbe28dfdfacd82f6d6046e8839a21d56c6377f SHA512 48d1ddc71f5a5b1b25d111f792553be69be62293640a3c6af985203c6ee88c6aa78e01327066bfad3feae6b0b45d71c0cac6ebd2d08843d92269132741a3791b
 DIST kafka_2.12-1.1.1.tgz 50602117 BLAKE2B acef2456e70278e09fe2a686205829d0c699aab6057ca0ba458bc1ee141e6d9336013e664b02242ad83401f4f71a8ab4b42574ffcaa99b05f55ef68a4b87d72d SHA512 2a1eb9a7c8c8337c424eefed7baae26b3dacba6a4ab8b64d9a7d5c6ee2cdb66cfa76c5b366f23435941569b89bf02482625189016296b2ea2a05fd0f38f6b709
+DIST kafka_2.12-2.0.0.tgz 49405896 BLAKE2B 601ea97c3007e2d09b1520baa86bf9ed7e740ba6e1aaac675cb158dad3e079a253e032ba7e1034526fa04d7f8088043747800b37db59232b45e729b944029f6c SHA512 b28e81705e30528f1abb6766e22dfe9dae50b1e1e93330c880928ff7a08e6b38ee71cbfc96ec14369b2dfd24293938702cab422173c8e01955a9d1746ae43f98
 EBUILD kafka-bin-0.10.2.1-r2.ebuild 1473 BLAKE2B a81a81398ba9740a7a63d371ee95e49d85b955da7213ce76e6f79af1dfdd5cb82f435d84e485f175daab0f3bd42a65b0723d26b53f0b96524eb2d61857c5a5c0 SHA512 09183d60d03861587177d48157da6d368a9d6b2e37140021380697decdb5504db39efe9b1b42fe6c372e2f6640fe2d70ba516bb3145db11949e4b6b5c66f753e
 EBUILD kafka-bin-0.11.0.2-r1.ebuild 1492 BLAKE2B bf1ef604907033196656a8b3892fa1c267bfbbbe5faab963b20c1ddbb832c48bc9cb9f254d7a03417635ac9ba82e7be37a33fd005499b7b3137a5dbea299770c SHA512 ba1374b720a1fa8178ba2557d98a4bfe8b9bee0c6ecc598a4ad90d02d5fe16d8b77c24ad3f76382e3bce30a9da979a5d1090667b5889aa2d4dd36873b3f13b88
 EBUILD kafka-bin-1.0.0-r1.ebuild 1473 BLAKE2B a81a81398ba9740a7a63d371ee95e49d85b955da7213ce76e6f79af1dfdd5cb82f435d84e485f175daab0f3bd42a65b0723d26b53f0b96524eb2d61857c5a5c0 SHA512 09183d60d03861587177d48157da6d368a9d6b2e37140021380697decdb5504db39efe9b1b42fe6c372e2f6640fe2d70ba516bb3145db11949e4b6b5c66f753e
 EBUILD kafka-bin-1.0.1.ebuild 1473 BLAKE2B a81a81398ba9740a7a63d371ee95e49d85b955da7213ce76e6f79af1dfdd5cb82f435d84e485f175daab0f3bd42a65b0723d26b53f0b96524eb2d61857c5a5c0 SHA512 09183d60d03861587177d48157da6d368a9d6b2e37140021380697decdb5504db39efe9b1b42fe6c372e2f6640fe2d70ba516bb3145db11949e4b6b5c66f753e
 EBUILD kafka-bin-1.1.0.ebuild 1473 BLAKE2B a81a81398ba9740a7a63d371ee95e49d85b955da7213ce76e6f79af1dfdd5cb82f435d84e485f175daab0f3bd42a65b0723d26b53f0b96524eb2d61857c5a5c0 SHA512 09183d60d03861587177d48157da6d368a9d6b2e37140021380697decdb5504db39efe9b1b42fe6c372e2f6640fe2d70ba516bb3145db11949e4b6b5c66f753e
 EBUILD kafka-bin-1.1.1.ebuild 1473 BLAKE2B a81a81398ba9740a7a63d371ee95e49d85b955da7213ce76e6f79af1dfdd5cb82f435d84e485f175daab0f3bd42a65b0723d26b53f0b96524eb2d61857c5a5c0 SHA512 09183d60d03861587177d48157da6d368a9d6b2e37140021380697decdb5504db39efe9b1b42fe6c372e2f6640fe2d70ba516bb3145db11949e4b6b5c66f753e
+EBUILD kafka-bin-2.0.0.ebuild 1470 BLAKE2B 4aaa459feef046beaa51a9aead391ba79c03f2dd3f2f17bcf19470cb48f387e861d843fefe376afe4cbf4150c2c5c879d30b9f0f7da215403723c4f935ac89a0 SHA512 ffe99368c9a836d63441f34aea7d130de197f5d63de0a92af6c928b3d47dbafdde467bf304f6ab32006ef0eba3bc1c3efcacf5e6d81d064e1997878037204a32
 MISC metadata.xml 311 BLAKE2B 9fa7db32894e010ccdfb89bae2807b359d0e82ee6937427b6bdbce2554a02367b6e66b689fd7f74ba05e3a701bf4cfd7bdc20b15a96b645b03d6ecc34826fbd0 SHA512 9221b0e14820c3217378e26fe5bb82d03fca4ff3c98cb3fe5a95d688df8b7c792f8a97bfdb0f47874dc36b13dce3bae1a14db073586bde3a46e2fda434859af6
diff --git a/net-misc/kafka-bin/kafka-bin-2.0.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.0.0.ebuild
new file mode 100644
index 000000000000..3abcc1ad7e01
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-2.0.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="http://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.12
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+RDEPEND="
+	|| ( virtual/jre:1.8 )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+pkg_setup() {
+	enewgroup kafka
+	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
+}
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+	eapply_user
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index a75aacd5e282..1a2e665e5da8 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -5,20 +5,10 @@ AUX memcached-1.4.4-as-needed.patch 1135 BLAKE2B b290f928cb0c280742eb95b69e1fdec
 AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034ca92b0e26280cbd99db3c487f57ef8f1d6ebfae49db44852b88018a95f8d2b0e0a1c6ce16bbaa5c0 SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63
 AUX memcached.init2 2205 BLAKE2B d27dbf6fb4d72ec49ff89cb3957770a25afe467c96c05648e75dddea47cdacee09d073e138e72d3b8671c3538e2005049dcd05440083b03e25136b3fd206c4d9 SHA512 b7b68362a4e4b24e9db893b85c3959184d17ea0bf8346a38561235461cfc8c94cf6d546f1c31bbe34bb7ca3409db2209171dd08214d5f057d00c65885663992a
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
-DIST memcached-1.4.33.tar.gz 389813 BLAKE2B 1dbee338c0cb3c9006c71e60353328dbabb8e7b576760ca3be617d94dd1b1b31ed027618008ee7e0e86716bb146c63bc89ef793f8299d6bcffa313e6c2af4b22 SHA512 00af5a2f46702fb8e606b1035cdaad125445d8eb701927a3ccccd7cd6c12e0811efb3ad917e3118043fd993b5c313f1aa0c4b2a471218e971a21fed7c896e136
 DIST memcached-1.4.39.tar.gz 403751 BLAKE2B fc6082eb9b6dc5ee41c42ded9bcde03ebfe87d1c8ed9acbc6e61cb8889604c6c2715e49556473a1b9215974150b0ccb03d5dbb7210108c87d8e67f19eaccbd87 SHA512 055d39d9d681adebb9a6a255bce5d550b61df0a1981f0105f8ffcc936e2053bca60360d755b65d79af836ba1ca71d4c739c67e20a2e0e7110ada183a7b0b63d6
 DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff33cd21149cf4a8fd234c383382b83a089196fd168f178aaaa7f764ac4b0b72a4bf8f50867bdc377e95a622f399a1 SHA512 439e1dbf3b15fd014446abb5fd130eb914a72b7372f65a00388da83f30486e8658de75b87626b0c512397457aca9b60057fcedb83d84c628b53137d2a2167c0d
-DIST memcached-1.5.5.tar.gz 449297 BLAKE2B c4c5f35a83b858942292ee7dcf613ad954214e68ddfbd79afc9b71543227ee08279b5a7d1beb5da5f9b4f5ae6c9670979eba6259eb299510b80abcbfa29e362f SHA512 38883600398b5d9378bb57508ed94b80ed2c4ef0e2610e328a60bcb79268f85c67c99159993040b36eac964138822862fa78f62c649560abc4818233b1b2f3d0
-DIST memcached-1.5.6.tar.gz 452038 BLAKE2B 357197c06a3211a7f2fcd90a3895f0ed3a56bc4e5b685e2dbe605cd9bbab676759b9707c9cedaeec9dbc59dddca92a7e6152cf5f4324ec66edbf7425bd7a7209 SHA512 b8bb3b69358a476c6f11f42e89565dd0261cba3f1eaa6b0999dba7c2cb2d7c5e9ca24dedc6b7fd46ec78e40e52d66fe4694ebafd6bbd4557d25d66757d9024a4
-DIST memcached-1.5.7.tar.gz 458062 BLAKE2B 5ff0b2a0f46472dde5037268ff97e88afa15f9f9406e93a8cb43827e2bf918a935e1a29456e756cca1e5adcbf6634b6f1e9a7b007e9f446c1400ff64c1480a1d SHA512 b20a6b0c79007904146c83c119c17e6af47b8c4d9993c316fe2557fade66a1bf14839fe8fdc371a52a7ab558433048a6d9386962647221743ed0908b277003fc
-DIST memcached-1.5.8.tar.gz 459715 BLAKE2B b151a0c204c392f54551361ac6d12f61b511eaac3837406fc29a6dd64fd7522efb04f33a06f9f316d5e64ef33cf1940d4a90818bbe7401ac27a636cacaeff34b SHA512 6f0e3ce9cae3e424c41223597353b9520e7e7f97fb4719a5d520dfd34e1d917d4ee0e42bced0a5799042227b80bc4ed2778715a71b9941239db13cb367bdb088
 DIST memcached-1.5.9.tar.gz 462605 BLAKE2B e648cd968f64107be11ebb101efd1d61bfb7db677b3cb7ed1325ca1fd810949cb3067ebee07df974f89beff48a38133f4409fcb8cd176b195a5287ea91be3d53 SHA512 06f7f09a0ec1ec02353296f79776ce9229c648f4ca7c6914f82b3e50455c3b5c8d535c62d8a823f5a50375acddb9cb77470bec430c2acb37f107fb660fe29e54
-EBUILD memcached-1.4.33.ebuild 2612 BLAKE2B 8e651b8e98e4afb33ec2c6000b644be2b1394790c8b417ffea52d5c470ab36c6ab71f393800a0d743b9ad6dfe60af124707eba05b30d045fa1899465387193f2 SHA512 f7adb04376c90de335cd8faaf8e98a6fd3169ed8d039781080e11676a3b07ed945ff01cc8f85405efb51813391025f75378da2313aaef9f58c3105a509e93568
 EBUILD memcached-1.4.39.ebuild 2873 BLAKE2B 1862c2434c8b711d22d97d827a79a484c1e0f682e92f282d61c10d78d6c6bb62af86519a59d3e3f715f9eae6fb8af2ee92b7705f9c987ca01f35f64ec87c08bd SHA512 2980ce757bbeb1cc401cd91473dbb4a76bce44407f0253aba2f05353426e87022cf40fcb2d584eae9d8bbd930f901e65030b86842936cd48b7425ce7163d78d9
 EBUILD memcached-1.5.2.ebuild 2882 BLAKE2B e92dbd6cde47898797b2225a09a560651dbb3a9fb9cf603d2b5aadecf25472a02ac33771369855deca687e80fd38c53a263f4affeb92ffb60719d5a64f381deb SHA512 187509aef05b0c47ca2f8ef26bcf9ec813d5fd2a859482a2ce95907b1dba05d4c7d0091542c9e85cc4605e679600bfe7a2260cc3a3b150d3a5a608729d75251d
-EBUILD memcached-1.5.5.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
-EBUILD memcached-1.5.6.ebuild 2934 BLAKE2B b299969c7503c6d6ffddfb0ff194e746b5da395531aa3f81eb075a80fddce43a1bc4863ac66eea4e5b767500c41b671025cdcd0cc8b28c1c53f8c42f474a9924 SHA512 d81a2ce839cca833369715dca2a0eb92693cfa6be4338052abdfaafa5e814970e7db7f86da7063a390209b651fcd244b0a00df725b35d203a44f16474ee30e67
-EBUILD memcached-1.5.7.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
-EBUILD memcached-1.5.8.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
 EBUILD memcached-1.5.9.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.4.33.ebuild b/net-misc/memcached/memcached-1.4.33.ebuild
deleted file mode 100644
index e800726349c4..000000000000
--- a/net-misc/memcached/memcached-1.4.33.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic systemd user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-		 https://www.memcached.org/files/old/${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"
-IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4
-		 dev-lang/perl
-		 sasl? ( dev-libs/cyrus-sasl )
-		 selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	# Handled different upstream
-	#epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
-	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${FILESDIR}/memcached.service"
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/memcached/memcached-1.5.5.ebuild b/net-misc/memcached/memcached-1.5.5.ebuild
deleted file mode 100644
index 7b92758285f1..000000000000
--- a/net-misc/memcached/memcached-1.5.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic systemd user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-		 https://www.memcached.org/files/old/${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"
-IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-		 dev-lang/perl
-		 sasl? ( dev-libs/cyrus-sasl )
-		 seccomp? ( sys-libs/libseccomp )
-		 selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/memcached/memcached-1.5.6.ebuild b/net-misc/memcached/memcached-1.5.6.ebuild
deleted file mode 100644
index 08c1e0d3499a..000000000000
--- a/net-misc/memcached/memcached-1.5.6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic systemd user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-		 https://www.memcached.org/files/old/${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"
-IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-		 dev-lang/perl
-		 sasl? ( dev-libs/cyrus-sasl )
-		 seccomp? ( sys-libs/libseccomp )
-		 selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/memcached/memcached-1.5.7.ebuild b/net-misc/memcached/memcached-1.5.7.ebuild
deleted file mode 100644
index 7b92758285f1..000000000000
--- a/net-misc/memcached/memcached-1.5.7.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic systemd user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-		 https://www.memcached.org/files/old/${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"
-IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-		 dev-lang/perl
-		 sasl? ( dev-libs/cyrus-sasl )
-		 seccomp? ( sys-libs/libseccomp )
-		 selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/memcached/memcached-1.5.8.ebuild b/net-misc/memcached/memcached-1.5.8.ebuild
deleted file mode 100644
index 7b92758285f1..000000000000
--- a/net-misc/memcached/memcached-1.5.8.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic systemd user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-		 https://www.memcached.org/files/old/${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"
-IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-		 dev-lang/perl
-		 sasl? ( dev-libs/cyrus-sasl )
-		 seccomp? ( sys-libs/libseccomp )
-		 selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 0b313caf1a76..643537eb2d40 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -29,7 +29,6 @@ DIST openssh-7.6p1+x509-11.2.diff.gz 466657 BLAKE2B 3f4f108e2d97eb292c215bc3a6e2
 DIST openssh-7.6p1-hpnssh14v12-r1.tar.xz 15440 BLAKE2B e140852a3ce63e4f744ed4b18b474cf88d09ca55509e5a16d26eef5cf8574466b472073eef56e19467932959d9ba7e941ab561d9ea0704dfee3fd08a6ba7ba8c SHA512 9d0450ec99fe550d790e471cb7815d0863788cf9c41dfef653d102f02be3d38a09e5103e537658279216a5815c1a075ded9f011e05ce216beee2c7daeea8c75a
 DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72
 DIST openssh-7.7p1-hpnssh14v15-gentoo2.patch.xz 22060 BLAKE2B 9ee654f689d4b90bd0fe4f71d57b4a8d9d957012be3a23ff2baa6c45ae99e2f1e4daf5de24479a6a3eb761ee6847deb3c6c3021d4cbabc9089f605d8d7270efc SHA512 856d28ac89c14d01c40c7d7e93cfaebd74b091188b5b469550eb62aa5445177aec1a5f47c1e2f7173013712e98e5f9f5e46bbb3dbd4ec7c5ee8256ef45cda0f8
-DIST openssh-7.7p1-ldap-20180327.patch.xz 19760 BLAKE2B f316ea65de3415b9ee19a621f36c5ce7e4bda7e1fe06e9edbc1e96e9d7296facf1a59dc79822939035c333a07b04a21d33c116fb74f36f1a93ac6849a4182166 SHA512 6439057839341169f9a198b25fdcbbddd50b0db0834aa762c16fb9b9b2e6b95b4ee9b4c6ad1cf2723750aacded4e6cba7f6036cdd91cf8d5e88eb21ea83790dd
 DIST openssh-7.7p1-patches-1.1.tar.xz 16476 BLAKE2B fca2885a9e29faec40700ece37a995ba83e40bd2a6875129a5327770d8ee43663a7c063de33b4653994ed7332adb03730f613c047550d874190b95c66e2e9efa SHA512 aa5e33ce4bb4be16abf27ac1bade1dc85c51d82002be546402e0b8b0685de3ec7029f0f56bf1295ec346eb3960a6bed7cfc882722e57957a19a732f3174b3039
 DIST openssh-7.7p1-sctp-1.1.patch.xz 7548 BLAKE2B 3b960c2377351955007005de560c2a3e8d0d059a0435e5beda14c63e444dad8b4357edaccd1cfe446c6268514f152b2bcfa7fa3612f1ae1324a31fecb0e85ac5 SHA512 093605865262a2b972db8c92990a49ed6178ed4567fb2626518c826c8472553d9be99a9e6052a6f5e545d81867b4118e9fd8a2c0c26a2739f1720b0f13282cba
 DIST openssh-7.7p1-x509-11.3.1.patch.xz 362672 BLAKE2B 55b8b0ef00dc4d962a0db1115406b7b1e84110870c74198e9e4cb081b2ffde8daca67cb281c69d73b4c5cbffde361429d62634be194b57e888a0b434a0f42a37 SHA512 f84744f6d2e5a15017bce37bfa65ebb47dbafeac07ea9aab46bdc780b4062ff70687512d9d512cab81e3b9c701adb6ce17c5474f35cb4b49f57db2e2d45ac9ac
@@ -38,6 +37,6 @@ DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5
 DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e181b1d52b195e6adcd2a78d5c7bf57f33c8ed62c3affa434c8d31c07eae84b59f1a3968a3f2a92e702f9225b121127616cb9d61 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974
 EBUILD openssh-7.5_p1-r4.ebuild 11184 BLAKE2B c6725a371359485803c89cb73b9efad9a69ed6255ff8f411574e218af71880c507567010a749c22bea5f1a12043acb01cbfe452e9aba50e0b508b737f7fb7576 SHA512 414033d873ea94e0a3f087a8739d4266bdb96b6e02702a0385f09911ee2c279666baa837048e825489478b7774126b1dafa48e1f354f50d0d6cfc73b446da286
 EBUILD openssh-7.6_p1-r5.ebuild 11360 BLAKE2B ca0a8157c9c4fbd9219f8e73f6009c18b467e3a1b234bfa346ddb20c8e21438d16230ce0f1062ed947da67435f7e3a50a57675a7e285c37c8b515a9d17430f29 SHA512 fb6ee3771fb67700e596835267c8f26d0c1afe5c3c3366963951c07266a7ab58224d78062256c176e13a00238d9c21ba0ad66965ce6ffd41eb74e28eab81970c
-EBUILD openssh-7.7_p1-r103.ebuild 16934 BLAKE2B d1108c86af72036ea9e64e7ae173c9cc8ae280b133963c1960244a4eb5d6539b5b164dc470f528db4e69b401b78a9fad72977a2865c7cc8b0facf29204418773 SHA512 28146aaf128a80222a0b821f75143b6f58ae31afcf033c54522188ea849cca5ef796b03f5cae31ffe01067949efb07ee2762746ec5810fe52e643f8bc63506fa
 EBUILD openssh-7.7_p1-r6.ebuild 16437 BLAKE2B c51f18e66e44006d0830ca9e692d31967e6208532e8ef2b946b9831a2066257d4a74cbf8fdf432a353ca4c480b9f10aa200e8700743c525bc74e7281b9e99f06 SHA512 6266a68419c4beb5ec624dd41c38386f70f56e321c09925df39406d783b3bbfc420463f50e5b8b5ccc554ef7e9df4422aaee7ca2b5b2c7ffc52e6dade1334f6a
+EBUILD openssh-7.7_p1-r7.ebuild 15931 BLAKE2B 948b3fa5a2fb834fedbccc262df98805a51dec2d1237e11db1b461e70e6ed43d0d0b2a7377782081988e6f3ef9fb31cc74828c369707808545ca93936e3792aa SHA512 15c80f2ded1de0a22b324285f3ee942b5e932ca8d5d742cec666db13fa3507f6213078819697823cf531ec62455bd9ac4e7f25c599fa9dc0a40a80c2ec179a3e
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.7_p1-r103.ebuild b/net-misc/openssh/openssh-7.7_p1-r103.ebuild
deleted file mode 100644
index 3a2abed912ea..000000000000
--- a/net-misc/openssh/openssh-7.7_p1-r103.ebuild
+++ /dev/null
@@ -1,472 +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_VER="14v15-gentoo2" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz"
-SCTP_VER="1.1" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-X509_VER="11.3.1" X509_PATCH="${PARCH}-x509-${X509_VER}.patch.xz"
-LDAP_VER="20180327" LDAP_PATCH="${PARCH}-ldap-${LDAP_VER}.patch.xz"
-
-PATCH_SET="openssh-7.7p1-patches-1.1"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="https://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
-	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )}
-	${HPN_PATCH:+hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/${HPN_PATCH} )}
-	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~whissi/dist/openssh/${LDAP_PATCH} )}
-	${X509_PATCH:+X509? ( https://dev.gentoo.org/~whissi/dist/openssh/${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 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 hpn && maybe_fail hpn HPN_PATCH)
-		$(use ldap && maybe_fail ldap LDAP_PATCH)
-		$(use sctp && maybe_fail sctp SCTP_PATCH)
-		$(use X509 && maybe_fail X509 X509_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
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
-		pathnames.h || die
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	eapply "${FILESDIR}"/${PN}-7.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
-
-	local PATCHSET_VERSION_MACROS=()
-
-	if use X509 ; then
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-
-		# We need to patch package version or any X.509 sshd will reject our ssh client
-		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
-		# error
-		einfo "Patching package version for X.509 patch set ..."
-		sed -i \
-			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
-			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
-
-		einfo "Patching version.h to expose X.509 patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
-
-		einfo "Disabling broken X.509 agent test ..."
-		sed -i \
-			-e "/^ agent$/d" \
-			"${S}"/tests/CA/config || die "Failed to disable broken X.509 agent test"
-
-		# The following patches don't apply on top of X509 patch
-		rm "${WORKDIR}"/patch/2002_all_openssh-7.7p1_upstream_bug2840.patch || die
-		rm "${WORKDIR}"/patch/2009_all_openssh-7.7p1_make-shell-tests-portable.patch || die
-		rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1_implement-EMFILE-mitigation-for-ssh-agent.patch || die
-		rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die
-	else
-		rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1-X509_implement-EMFILE-mitigation-for-ssh-agent.patch || die
-		rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1-X509_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die
-	fi
-
-	if use ldap ; then
-		sed -i \
-			-e "s/ -lfipscheck//" \
-			"${WORKDIR}"/${LDAP_PATCH%.*} || die "Failed to remove fipscheck from LDAP patch"
-		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
-
-		einfo "Patching version.h to expose LDAP patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE.*/a #define SSH_LDAP               \"-ldap-${LDAP_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in LDAP patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_LDAP' )
-	fi
-
-	if use sctp ; then
-		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-
-		einfo "Patching version.h to expose SCTP patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
-
-		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
-		sed -i \
-			-e "/\t\tcfgparse \\\/d" \
-			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
-	fi
-
-	if use hpn ; then
-		eapply "${WORKDIR}"/${HPN_PATCH%.*}
-
-		einfo "Patching Makefile.in for HPN patch set ..."
-		sed -i \
-			-e "/^LIBS=/ s/\$/ -lpthread/" \
-			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
-
-		einfo "Patching version.h to expose HPN patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in HPN patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
-
-		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-			einfo "Disabling known non-working MT AES cipher per default ..."
-
-			cat > "${T}"/disable_mtaes.conf <<- EOF
-
-			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
-			# and therefore disabled per default.
-			DisableMTAES yes
-			EOF
-			sed -i \
-				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
-				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
-
-			sed -i \
-				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
-				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
-		fi
-	fi
-
-	if use X509 || use hpn ; then
-		einfo "Patching packet.c for X509 and/or HPN patch set ..."
-		sed -i \
-			-e "s/const struct sshcipher/struct sshcipher/" \
-			"${S}"/packet.c || die "Failed to patch ssh_packet_set_connection() (packet.c)"
-	fi
-
-	if use X509 || use sctp || use ldap || use hpn ; then
-		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
-
-		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
-
-		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
-		sed -i \
-			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
-			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
-	fi
-
-	sed -i \
-		-e "/#UseLogin no/d" \
-		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
-
-	eapply "${WORKDIR}"/patch/*.patch
-
-	eapply_user #473004
-
-	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
-
-	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 and sctp patch conditionally, so can't pass --without-{ldap,sctp}
-		# unconditionally else we get unknown flag warnings.
-		$(use ldap && use_with ldap)
-		$(use sctp && use_with sctp)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with ssl openssl)
-		$(use_with ssl md5-passwords)
-		$(use_with ssl ssl-engine)
-	)
-
-	# stackprotect is broken on musl x86
-	use elibc_musl && use x86 && myconf+=( --without-stackprotect )
-
-	# 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_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[*]}"
-}
-
-# Gentoo tweaks to default config files.
-tweak_ssh_configs() {
-	local locale_vars=(
-		# These are language variables that POSIX defines.
-		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
-		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
-
-		# These are the GNU extensions.
-		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
-		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
-	)
-
-	# First the server config.
-	cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config
-
-	# Allow client to pass locale environment variables. #367017
-	AcceptEnv ${locale_vars[*]}
-
-	# Allow client to pass COLORTERM to match TERM. #658540
-	AcceptEnv COLORTERM
-	EOF
-
-	# Then the client config.
-	cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config
-
-	# Send locale environment variables. #367017
-	SendEnv ${locale_vars[*]}
-
-	# Send COLORTERM to match TERM. #658540
-	SendEnv COLORTERM
-	EOF
-
-	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
-
-	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
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6.5 sshd
-	newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
-	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-
-	tweak_ssh_configs
-
-	if use ldap && [[ -n ${LDAP_PATCH} ]] ; then
-		insinto /etc/openldap/schema/
-		doins openssh-lpk-{sun,openldap}.schema
-
-		# Set the same libexec directory as in src_configure
-		sed -i \
-			-e "s:libexec/openssh:$(get_libdir)/misc:" \
-			"${ED%/}/usr/$(get_libdir)/misc/ssh-ldap-wrapper" || die
-	fi
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use hpn && dodoc HPN-README
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-
-	keepdir /var/empty
-
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-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
-
-	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-		elog ""
-		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
-		elog "and therefore disabled at runtime per default."
-		elog "Make sure your sshd_config is up to date and contains"
-		elog ""
-		elog "  DisableMTAES yes"
-		elog ""
-		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
-		elog ""
-	fi
-
-	if use ldap && [[ -n ${LDAP_PATCH} ]] && has_version "<${CATEGORY}/${PN}-7.7_p1" ; then
-		elog "Starting with openssh-7.7_p1, the LDAP implementation was changed."
-		elog "You must revise your configuration or your previous LDAP setup will stop working."
-		elog ""
-		elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for migration details."
-	fi
-}
diff --git a/net-misc/openssh/openssh-7.7_p1-r7.ebuild b/net-misc/openssh/openssh-7.7_p1-r7.ebuild
new file mode 100644
index 000000000000..90c537b121a1
--- /dev/null
+++ b/net-misc/openssh/openssh-7.7_p1-r7.ebuild
@@ -0,0 +1,444 @@
+# 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_VER="14v15-gentoo2" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz"
+SCTP_VER="1.1" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+X509_VER="11.3.1" X509_PATCH="${PARCH}-x509-${X509_VER}.patch.xz"
+
+PATCH_SET="openssh-7.7p1-patches-1.1"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )}
+	${HPN_PATCH:+hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/${HPN_PATCH} )}
+	${X509_PATCH:+X509? ( https://dev.gentoo.org/~whissi/dist/openssh/${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 kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !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 )"
+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 hpn && maybe_fail hpn HPN_PATCH)
+		$(use sctp && maybe_fail sctp SCTP_PATCH)
+		$(use X509 && maybe_fail X509 X509_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
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply "${FILESDIR}"/${PN}-7.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
+
+	local PATCHSET_VERSION_MACROS=()
+
+	if use X509 ; then
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+
+		# We need to patch package version or any X.509 sshd will reject our ssh client
+		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
+		# error
+		einfo "Patching package version for X.509 patch set ..."
+		sed -i \
+			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+		einfo "Patching version.h to expose X.509 patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+
+		einfo "Disabling broken X.509 agent test ..."
+		sed -i \
+			-e "/^ agent$/d" \
+			"${S}"/tests/CA/config || die "Failed to disable broken X.509 agent test"
+
+		# The following patches don't apply on top of X509 patch
+		rm "${WORKDIR}"/patch/2002_all_openssh-7.7p1_upstream_bug2840.patch || die
+		rm "${WORKDIR}"/patch/2009_all_openssh-7.7p1_make-shell-tests-portable.patch || die
+		rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1_implement-EMFILE-mitigation-for-ssh-agent.patch || die
+		rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die
+	else
+		rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1-X509_implement-EMFILE-mitigation-for-ssh-agent.patch || die
+		rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1-X509_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die
+	fi
+
+	if use sctp ; then
+		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+
+		einfo "Patching version.h to expose SCTP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
+
+		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
+		sed -i \
+			-e "/\t\tcfgparse \\\/d" \
+			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
+	fi
+
+	if use hpn ; then
+		eapply "${WORKDIR}"/${HPN_PATCH%.*}
+
+		einfo "Patching Makefile.in for HPN patch set ..."
+		sed -i \
+			-e "/^LIBS=/ s/\$/ -lpthread/" \
+			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+		einfo "Patching version.h to expose HPN patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in HPN patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+			einfo "Disabling known non-working MT AES cipher per default ..."
+
+			cat > "${T}"/disable_mtaes.conf <<- EOF
+
+			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+			# and therefore disabled per default.
+			DisableMTAES yes
+			EOF
+			sed -i \
+				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+			sed -i \
+				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+		fi
+	fi
+
+	if use X509 || use hpn ; then
+		einfo "Patching packet.c for X509 and/or HPN patch set ..."
+		sed -i \
+			-e "s/const struct sshcipher/struct sshcipher/" \
+			"${S}"/packet.c || die "Failed to patch ssh_packet_set_connection() (packet.c)"
+	fi
+
+	if use X509 || use sctp || use hpn ; then
+		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+		sed -i \
+			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+	fi
+
+	sed -i \
+		-e "/#UseLogin no/d" \
+		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
+
+	eapply "${WORKDIR}"/patch/*.patch
+
+	eapply_user #473004
+
+	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
+
+	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 sctp patch conditionally, so can't pass --without-sctp
+		# unconditionally else we get unknown flag warnings.
+		$(use sctp && use_with sctp)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# stackprotect is broken on musl x86
+	use elibc_musl && use x86 && myconf+=( --without-stackprotect )
+
+	# 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_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[*]}"
+}
+
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+	local locale_vars=(
+		# These are language variables that POSIX defines.
+		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
+		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+		# These are the GNU extensions.
+		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
+		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+	)
+
+	# First the server config.
+	cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables. #367017
+	AcceptEnv ${locale_vars[*]}
+
+	# Allow client to pass COLORTERM to match TERM. #658540
+	AcceptEnv COLORTERM
+	EOF
+
+	# Then the client config.
+	cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config
+
+	# Send locale environment variables. #367017
+	SendEnv ${locale_vars[*]}
+
+	# Send COLORTERM to match TERM. #658540
+	SendEnv COLORTERM
+	EOF
+
+	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
+
+	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
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.5 sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+
+	tweak_ssh_configs
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use hpn && dodoc HPN-README
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	keepdir /var/empty
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+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 has_version "<${CATEGORY}/${PN}-7.7_p1" ; then
+		elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
+		elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
+		elog "if you need to authenticate against LDAP."
+		elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
+	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
+
+	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+		elog ""
+		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+		elog "and therefore disabled at runtime per default."
+		elog "Make sure your sshd_config is up to date and contains"
+		elog ""
+		elog "  DisableMTAES yes"
+		elog ""
+		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+		elog ""
+	fi
+}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 9be509898612..d9480cb8f923 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,7 +1,5 @@
-DIST Remmina-1.2.30.1.tar.gz 1252587 BLAKE2B ac5f60cf0e92585a157d9649904146d5ff17e53297e3cf041c443309c4526a89f9bf54358d6c61a59eed88783feb214397cd9af5d9ce1ad671bbf28c9ce2617b SHA512 c160655dd05d3b7ae7b3545e7f41d5bed80cb39b103f906a51c27f4653c7a13919fc02928097747fd2cceff1adf50c36e4d0ecccf32efbea6e859f24bf1b4294
+DIST Remmina-1.2.31.2.tar.gz 1247378 BLAKE2B 923b131ea2b4cff57d952bcfc2cdac58ad849ce3220dc6e3084b3905f9fe1203443fe0bb2f8a3fa910e7f367299b1b8c1b2373e8b337da7c4ff99ced1951492b SHA512 e66bd77e3b3e8374773e6029a727d814ada09b90a5620452e8ecce19e6f4327aa2e50b8956b292abce2e9329deec79370665a6a6aecbc2d33557381ce5b8db3b
 DIST remmina-1.2.0_rc24.tar.gz 1052140 BLAKE2B 57b3d2ed8a765f98f1ffd3c79df076d07e00329bf95dfddb9094d8bc62838b0f6742b404b4deef0a037bd88259751799e1842fb97313337e11b8f0faed8ad302 SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e
-DIST remmina-1.2.0_rc29.tar.gz 1194267 BLAKE2B c4059ed56f3903f248009eacc20201fc533d47c2ad5d4e053c2ce225e8bc3fe50fc4c01cf912eb77dde220418589d5a85808b7c5e4b6083f6919dc5695aa049d SHA512 ae1190762588857ac59c86c43c66ba0aa3f584820a6e87ea7b7bb81a63f71acc7407d544d9f25edf9be4f45a536d3a2bb8de34e2448de6cd5d0f130de05ff52c
-EBUILD remmina-1.2.0_rc24.ebuild 2007 BLAKE2B 30c5e90c97fa5c9dc329108320e90d82ebcffc846634e727fe0e6e25d32e5febbe68e249bca955c91449da1c3cc4f22f5a6184c4515d1fef4685236573e37857 SHA512 b69b8a14476ed2ccc75ae82e723d0f780a513f8978d2b27f2331b7c0cfd77797bc1351441fcd048338ad33f1a16cffda4e514e43314c782ccd5e8bf846e18b3a
-EBUILD remmina-1.2.0_rc29-r1.ebuild 2151 BLAKE2B 35512e91077ecf103fe3c3d57d60ccea7eff017af4f09daac52e4f94adb4fb85a952d08e24e90d65f95086cdd4b10931ed4fca821060d2d5c932b1ad5c9ed413 SHA512 21c3dbf8cf7566c4a8207c11868d92983f416d78ae4b710835f01f20c6231f0a905109c7f8fe240b5b33ae160353da90bbc8d4539a48f69369abd9ab1bf02cd6
-EBUILD remmina-1.2.30.1.ebuild 2223 BLAKE2B 475810adc6d4769e4ffe6e3763b5f9539dd110ba33d68f7f2a8c7c6cedfd4d1b95d0a221051a49392b9030f51c03252dc3a28180f4aaf634297612e93bf98050 SHA512 f54b5095ddea11519b03258406b5f36db4afb010020abd9c883028e24690dd36f662d0f8259d3247ee652294dcb04d1a6ac508ce361ee2076148b032fc2d8bca
+EBUILD remmina-1.2.0_rc24.ebuild 2035 BLAKE2B 7490ba779c88bf0caf7f1de2398dec1484acf428f3f1ddd06b021965d3ef255927d9637e24c56a71a3737707ef6a2df0257dc1a486c60e665e99721aaa5c1092 SHA512 058740deb4f072b8677fcb5bcedf2c870dccf748c166594cdf24cc09574b1fd1b8fb0157b89c82e43bd3dabcc892e72f561ed4db816ea269c40b2da9b73ce3cf
+EBUILD remmina-1.2.31.2.ebuild 2223 BLAKE2B 475810adc6d4769e4ffe6e3763b5f9539dd110ba33d68f7f2a8c7c6cedfd4d1b95d0a221051a49392b9030f51c03252dc3a28180f4aaf634297612e93bf98050 SHA512 f54b5095ddea11519b03258406b5f36db4afb010020abd9c883028e24690dd36f662d0f8259d3247ee652294dcb04d1a6ac508ce361ee2076148b032fc2d8bca
 MISC metadata.xml 1150 BLAKE2B b75ab4d0b30c602c1bdf2d9bb5701444570ea7cc53a97e3a27dde34044ab69f0f550fb2f8ca3d76ff04b0ff0a30164fc20696443896f3f732c4ce589a4a57b0d SHA512 9ed39584a65811d52192ff8390d02c3630f88a213c998e7990acf74f1aa26cb2abb54f4f75eb01cfe88b1986756eb9d59f2362e1ccfacc9e81c99e044a739809
diff --git a/net-misc/remmina/remmina-1.2.0_rc24.ebuild b/net-misc/remmina/remmina-1.2.0_rc24.ebuild
index b0a238363e90..7d87cd64d66a 100644
--- a/net-misc/remmina/remmina-1.2.0_rc24.ebuild
+++ b/net-misc/remmina/remmina-1.2.0_rc24.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
@@ -24,7 +24,7 @@ CDEPEND="
 	x11-libs/libxkbfile
 	ayatana? ( dev-libs/libappindicator:3 )
 	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0 )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0 <net-misc/freerdp-2.0.0_rc3 )
 	gnome-keyring? ( app-crypt/libsecret )
 	spice? ( net-misc/spice-gtk[gtk3] )
 	ssh? ( net-libs/libssh[sftp]
diff --git a/net-misc/remmina/remmina-1.2.0_rc29-r1.ebuild b/net-misc/remmina/remmina-1.2.0_rc29-r1.ebuild
deleted file mode 100644
index 6a083c93c027..000000000000
--- a/net-misc/remmina/remmina-1.2.0_rc29-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils gnome2-utils
-
-MY_PV="${PV//_rc/-rcgit.}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ayatana crypt rdp gnome-keyring libressl nls spice ssh telepathy vnc zeroconf"
-
-CDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	ayatana? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0 )
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver )
-	zeroconf? ( net-dns/avahi[gtk3] )
-"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	net-libs/libsoup
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${CDEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/Remmina-${MY_PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex ayatana)
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DGTK_VERSION=3
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "To get additional features, some optional runtime dependencies"
-	elog "may be installed:"
-	elog ""
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/remmina/remmina-1.2.30.1.ebuild b/net-misc/remmina/remmina-1.2.31.2.ebuild
index 9c7e1d7fba7c..9c7e1d7fba7c 100644
--- a/net-misc/remmina/remmina-1.2.30.1.ebuild
+++ b/net-misc/remmina/remmina-1.2.31.2.ebuild
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 496357c519b8..8827d7ce8f43 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,10 +1,7 @@
 AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
-AUX spice-gtk-0.33-sys-sysmacros.h.patch 1459 BLAKE2B 105b5b5d11ecb1b34f69df8d0fe3e3b43b52f23d81affe65018fa1aeb6c2b8bcbe5a015d15cc7321436ef537c4a653a902c6e708b0d552c81426b98cfc8ff524 SHA512 9d3331f3a4d9c3b680ca78a0a8e430067d1cbc551865a3bba33bc4d2df64b716f8ac4d49fd2cb279f6e6ce870aab02aea29e93a8269664063245dcaee5942bc1
 AUX spice-gtk-0.34-libressl.patch 1539 BLAKE2B ff7826221a8e551999004c818be806bed8a254d7447d9233012b566941307b117789f73c32887a1d713fe7352a5dac26dfa0eaf67eeadf32283dc46b5f3c18eb SHA512 243ce8cfce2d5fd26b5dc8f5da985b0cf9e95290cb82336439d015352479018075408092425dbac5cabf815f1be95e85680058d9dc1900e992d37c2a04fb85d2
 AUX spice-gtk-0.34-openssl11.patch 518 BLAKE2B d9c692996f64ccfb61f16f2c8b620559d1321f35c74072c3e0c51a115f7d40039b7c6dd484cf3beec90c8950df5fbb42575ab62e3c309da3405b5217864b746b SHA512 f879a3f26be439a68e1f40e32e654eea301efc9f5494039b7166673337688f0832e180ab77863cde55627ee033572caf04d5bb08816d4272382d9dccf43ef7f1
-DIST spice-gtk-0.33.tar.bz2 1383927 BLAKE2B 96cbe8d3f81d596c4fd0d85cc0fd96588029a3b486327c64c5084b82e2c3acefee648a836ca46363dc03aff33dd72a4001c2ac8513b18b6479b56d11cc86f60e SHA512 ee5750194057a7f568641f6382d6969b67dc7271b4d13037570b79cdecd70a7eeb457ad349d3ed8e576f1fbd9701fac7d24607d5cbde8af0e030433b347abc80
 DIST spice-gtk-0.34.tar.bz2 1480566 BLAKE2B 35350cf930d091fa11df1d573f9eff23696745a20e88fcd20783c108b6ddca9064bc4e75d414f23bd94318e37d509e581866c5dcc955cd21ca7c9384b492f0ec SHA512 17ea737511855b47f5eaf5143756483542cf8ee83f8d276cbfb2c0407355f68ed329fcbed8a67737179f3e53587710634d6faa856590234ee68be7b4b13f2689
-EBUILD spice-gtk-0.33-r2.ebuild 3863 BLAKE2B ae6601e6c94762f4331d6b743b401fe74041982c4f650be44e21ddac374158e6ab46c3dfc6c6ea0fa8cbfe74c96cc6ea22b6a7c66965ab4c3966f8a658f94783 SHA512 c0f85f732c6b1d605ca494b230de817b45b7cf065c2a5be69f8e29aa860dacb8046056d4ac1c5877f842358fd84bc1ffd6526a7824fe7e620951d047179b177d
 EBUILD spice-gtk-0.34-r2.ebuild 3752 BLAKE2B e27f8a92b0284f6fa2296f0a5f7cb38d01eec7e7502e6730186094835d9ce3b397f002206a976a861ef9e2ef904b8256d696c6e46783c30875b16781df597875 SHA512 1c756aa20ca07af0bf3796b7e42bf76337a15ac3d5aa794eee24649ff9f503e014e7bfc8ac815b6117f5ceca3c2f8461af94cdb89b8119217ab21dff78bd7b1c
 EBUILD spice-gtk-0.34-r3.ebuild 3838 BLAKE2B 6a3789e5ec78191addbda947d680fe0adf97970c7a2b47f0b9f015e29d1b9c159f23820a025149dc78df56d0d2c46480a27e53651891413a53b7022d78477b10 SHA512 8f9de4514153f47b1c26fd586dd4cd56a9c68140892d194950fa510755ae2f979ccc75d9e4a696a57ccafa0108464e758fb93216cc8f940debb47d7f0c8623d9
 EBUILD spice-gtk-9999.ebuild 3693 BLAKE2B a85fb7bd44fa36252f13c6d5a25fba4eb213e41a0c5b6d77c2bdbfe4e250981970f42c359175d1de41d81feb86e59ce6e524304eb8e3d8111181f1ec36f2e848 SHA512 3dc59d0315a6e4786a9af9d662647dfc056ce4ab4d2f57c1e308f767e19cd49a769b4fbbc9c8bb985f8b873569641f95e7099719df7fea02c894ecb00d4c882d
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.33-sys-sysmacros.h.patch b/net-misc/spice-gtk/files/spice-gtk-0.33-sys-sysmacros.h.patch
deleted file mode 100644
index 902ee9dd0292..000000000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.33-sys-sysmacros.h.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From a27a83da30d58511b2a5f2cdb13ebd4fca7a3d0a Mon Sep 17 00:00:00 2001
-From: Pavel Grunt <pgrunt@redhat.com>
-Date: Tue, 1 Nov 2016 17:08:01 +0100
-Subject: [PATCH] Adjust include header to new location of macros
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-minor & major macros were moved to sysmacros.h
-
-usbutil.c: In function ‘spice_usbutil_get_sysfs_attribute’:
-usbutil.c:110:14: warning: ‘__major_from_sys_types’ is deprecated:
-  In the GNU C Library, `major' is defined by <sys/sysmacros.h>.
-  For historical compatibility, it is currently defined by
-  <sys/types.h> as well, but we plan to remove this soon.
-  To use `major', include <sys/sysmacros.h> directly.
-  If you did not intend to use a system-defined macro `major',
-  you should #undef it after including <sys/types.h>.
-  [-Wdeprecated-declarations]
-              major(stat_buf.st_rdev), minor(stat_buf.st_rdev), attribute);
-
-Acked-by: Victor Toso <victortoso@redhat.com>
----
- src/usbutil.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/usbutil.c b/src/usbutil.c
-index 7bfbe44..b68a2e1 100644
---- a/src/usbutil.c
-+++ b/src/usbutil.c
-@@ -30,7 +30,10 @@
- #ifdef __linux__
- #include <stdio.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
-+#ifndef major /* major and minor macros were moved to sys/sysmacros.h from sys/types.h */
- #include <sys/types.h>
-+#endif
- #include <sys/stat.h>
- #endif
- #include "usbutil.h"
--- 
-2.10.2
-
diff --git a/net-misc/spice-gtk/spice-gtk-0.33-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.33-r2.ebuild
deleted file mode 100644
index 843d6f96a7ed..000000000000
--- a/net-misc/spice-gtk/spice-gtk-0.33-r2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils xdg-utils vala readme.gentoo-r1
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="dbus gstaudio gstvideo gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
-
-REQUIRED_USE="?? ( pulseaudio gstaudio )"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio[glib] )
-	gstvideo? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		)
-	gstaudio? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		)
-	>=x11-libs/pixman-0.17.7
-	>=media-libs/celt-0.5.1.1:0.5.1
-	media-libs/opus
-	gtk3? ( x11-libs/gtk+:3[introspection?] )
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/cairo-1.2
-	virtual/jpeg:0=
-	sys-libs/zlib
-	introspection? ( dev-libs/gobject-introspection )
-	lz4? ( app-arch/lz4 )
-	sasl? ( dev-libs/cyrus-sasl )
-	smartcard? ( app-emulation/qemu[smartcard] )
-	usbredir? (
-		sys-apps/hwids
-		>=sys-apps/usbredir-0.4.2
-		virtual/libusb:1
-		virtual/libgudev:=
-		policykit? (
-			sys-apps/acl
-			>=sys-auth/polkit-0.110-r1
-			!~sys-auth/polkit-0.111 )
-		)
-	webdav? (
-		net-libs/phodav:2.0
-		>=dev-libs/glib-2.43.90:2
-		>=net-libs/libsoup-2.49.91 )
-"
-DEPEND="${RDEPEND}
-	>=app-emulation/spice-protocol-0.12.12
-	dev-perl/Text-CSV
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.33-sys-sysmacros.h.patch
-)
-
-src_prepare() {
-	# bug 558558
-	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-	echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
-
-	default
-
-	eautoreconf
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# Prevent sandbox violations, bug #581836
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	# Clean up environment, bug #586642
-	xdg_environment_reset
-
-	local myconf
-
-	if use vala ; then
-		# force vala regen for MinGW, etc
-		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
-	fi
-
-	myconf="
-		--disable-maintainer-mode \
-		$(use_enable static-libs static) \
-		$(use_enable introspection) \
-		$(use_with sasl) \
-		$(use_enable smartcard) \
-		$(use_enable usbredir) \
-		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
-		$(use_with usbredir usb-acl-helper-dir /usr/libexec) \
-		$(use_with gtk3 gtk 3.0) \
-		$(use_enable policykit polkit) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable gstaudio) \
-		$(use_enable gstvideo) \
-		$(use_enable mjpeg builtin-mjpeg) \
-		$(use_enable vala) \
-		$(use_enable webdav) \
-		$(use_enable dbus) \
-		--disable-gtk-doc \
-		--disable-werror \
-		--enable-pie"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prevent sandbox violations, bug #581836
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	default
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	# Remove .la files if they're not needed
-	use static-libs || prune_libtool_files
-
-	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-	readme.gentoo_create_doc
-}
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index a6ca2a5d16d9..0d7c5d0369f8 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -12,5 +12,6 @@ DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdc
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
 EBUILD tigervnc-1.8.0-r3.ebuild 4311 BLAKE2B 7335c1bcb3093a44483c6962edcec9809ae0d7cd65b9f565c87cb433572a93085214ece4e804222d7ed354c20d0cd5c168ccc197b0c39860b2188448b2eeba0a SHA512 bbc5b8d0b91cdddfd801f08a9f7432f57dff70d21a3038107ff2cfce15e10e23b31104e59fc0465d7404656a6083a45b0c5431be7ca9d33d761dbd5236a0df62
+EBUILD tigervnc-1.9.0-r1.ebuild 4382 BLAKE2B 7611ab58d21ed0686b543aabd17df9b4db99c727e31db68a0facba3883e9c608787fb3d4ef5c27deffac7a8489a48e1b6ee217fa9a0ecb23ceed75137fab40bd SHA512 6c5bf8262e7796fd4d9aeeed993235ddbf584229a2108a3c99d32a7cd3a3a8a74ec423c1e26f3d71e57e3c909e0306c2d5e149cf90979377b569b54a55e38d8d
 EBUILD tigervnc-1.9.0.ebuild 4372 BLAKE2B 4023fa062416384ff05bd6c91cfda9ff646fb5b7f71be98a84691e946c1e688e051115049178e1e9c6e60bfc73da01fb443f6564920baad11c629b0924822fa5 SHA512 6f82c8338003a3cbfc06d9fe8cf3ea3bc102eb1b6ca7a56f7954c70e4c999381ff54961385a4543f74bf3e3585bfa566a28ac44871ba1a062e9ac1f69c610d30
-MISC metadata.xml 751 BLAKE2B bf9747e015a1815d122b5401816c5b426a5c730d716081ef98ae9490b1d8ce2eeac4265395f4455d6d446b9f1585a8a2218882c600e32cdd7bbe892c68e4a589 SHA512 6890dc4209da80bbf26051bc3aa2b7cd81b1cc3c07b44b618865e3378f4ac42ebe27d3bc73a0460dfa22a1eee388e1996a7cdbe24670f3fc084a413e49868eba
+MISC metadata.xml 750 BLAKE2B 2a76715a23dd2d3797ae85c20ef7e08854ebfcd74f42969d10bc2605870dcd69a03806437483eceeebc3dfbd52006091609e7464a9278aec2d938295b230cab1 SHA512 768e087e274e83dc9347cf719e61db39597d2ab07aae24ab6158fe9851d93f9594e74ec66579b0da2abf9bc839d9d28d3a31f207d7274bc0a9e1e9c8bbee9997
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index ca145c01b567..8568ca4fefbc 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -13,7 +13,7 @@
         <flag name="drm">Build with DRM support</flag>
         <flag name="server">Build TigerVNC server</flag>
         <flag name="xorgmodule">Build the Xorg module</flag>
-        <flag name="dri3">Build with DRI3 support </flag>
+        <flag name="dri3">Build with DRI3 support</flag>
     </use>
     <upstream>
         <remote-id type="github">TigerVNC/tigervnc</remote-id>
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..5719977b3a3d
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd xdg-utils gnome2-utils
+
+XSERVER_VERSION="1.20.0"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="dri3 +drm gnutls java libressl nls +opengl pam server xinerama +xorgmodule"
+
+CDEPEND="
+	virtual/jpeg:0
+	sys-libs/zlib:=
+	>=x11-libs/fltk-1.3.1
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	pam? ( virtual/pam )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	server? (
+		x11-libs/libXau
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfont2
+		x11-libs/libXtst
+		>=x11-libs/pixman-0.27.2
+		>=x11-apps/xauth-1.0.3
+		x11-apps/xsetroot
+		>=x11-misc/xkeyboard-config-2.4.1-r3
+		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+		drm? ( x11-libs/libdrm )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	xinerama? ( x11-libs/libXinerama )
+	"
+
+RDEPEND="${CDEPEND}
+	!net-misc/tightvnc
+	!net-misc/vnc
+	!net-misc/xf4vnc
+	java? ( >=virtual/jre-1.5:* )"
+
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )
+	java? ( >=virtual/jdk-1.5 )
+	x11-base/xorg-proto
+	media-libs/fontconfig
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	server? (
+		dev-libs/libbsd
+		x11-libs/libxkbfile
+		x11-libs/libxshmfence
+		virtual/pkgconfig
+		media-fonts/font-util
+		x11-misc/util-macros
+		>=x11-libs/xtrans-1.3.3
+		opengl? ( >=media-libs/mesa-10.3.4-r1 )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-030_manpages.patch
+	"${FILESDIR}"/${P}-055_xstartup.patch
+)
+
+src_prepare() {
+	if use server ; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+	fi
+
+	cmake-utils_src_prepare
+
+	if use server ; then
+		cd unix/xserver || die
+		eapply "${FILESDIR}"/xserver120.patch
+		eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if use arm || use hppa ; then
+		append-flags "-fPIC"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PAM=$(usex pam)
+		-DBUILD_JAVA=$(usex java)
+	)
+
+	cmake-utils_src_configure
+
+	if use server ; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dmx \
+			--disable-dri \
+			$(use_enable dri3) \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-silent-rules \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			$(use_enable xinerama) \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--disable-xwayland \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--disable-present \
+			--with-sha1=libcrypto
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use server ; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render damageext miext Xi xkb
+			composite dix mi os hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use server ; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		if ! use xorgmodule; then
+			rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die
+		else
+			rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+		fi
+
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+		systemd_douserunit contrib/systemd/user/vncserver@.service
+	else
+		local f
+		cd "${ED}" || die
+		for f in vncserver x0vncserver vncconfig; do
+			rm usr/bin/$f || die
+			rm usr/share/man/man1/$f.1 || die
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index a9dc82bd7f30..787781e81798 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,8 @@
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2018.07.21.tar.gz 3006144 BLAKE2B 63b0fdf38f9e510b163a1737136956c0d4c497b0e3f78caad01170711c359e2ee9638f6448992ff28760cac60d0496c1572a04939f95d060560bc399d3399a4e SHA512 d0c75b8d651a4c401dd706c3ce86882098a16e9bb3e72b3871b3fe5284a345fc04bf5f7a9165a12af63091660a68a9b81f80a523b2090da3556856d69a81b6bf
 DIST youtube-dl-2018.07.29.tar.gz 3012839 BLAKE2B 9550f03b74db95fe26310348113883763240a187d69f1f859fe516848f6d9647555113d12397b7d30f3b4c7799c930b373825b54f2db05ac72b3be0e6b7efad0 SHA512 a41b97b5dca0715a891ff77d8317939d2b86e495fe2ec1cca6aaea72da545f6cdd6c4cf605c2ebd004a0add049d5fb1ed17b6dab9d99fc349f378e37ff6be330
+DIST youtube-dl-2018.08.04.tar.gz 3015718 BLAKE2B e9b64bfa791fdd854b180f58ed81ceead89b5cd8a1d6f537eca54ff041151504bbd1ea125fbb8be9c5e05abcd9a1064c699211378dd53f67ff3aa653df59da4d SHA512 4a23dd644b039a8bc64d5d55821cc5470a29b3ce2c5ccea9eb2aa6ba753d675363e14b9ba959f6b0dfc62a97898032225c21eb4993fd742b273259d89ba99cba
 EBUILD youtube-dl-2017.11.15.ebuild 2376 BLAKE2B 184105b328f74b20fbb61357b33aeff4b3d4a984179398c9ebbd67a3973a0e0730b98e3414e52d7cf89c7bb15340491d110dc0480b033d4c49714c0cd3ff387c SHA512 baefa087e59c737053e923f7a384ab22ba727f3b9ffd02fad2d80d0fea957babe2ca40f19889eabbf4237416df9cdacfe4b5df2b106a3a7dd4fe1aed9c62a49f
-EBUILD youtube-dl-2018.07.21.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
 EBUILD youtube-dl-2018.07.29-r1.ebuild 3312 BLAKE2B 98cedcc93b25d20e32cd550f48f2347f114b7cb34e0317f5dab3cdd26abe08ee875424f6f226f3c53df6ec6a4a88579c561301a3da07b4e25e6423056d0b0f8d SHA512 a43df4e5d3c563bc7ae67728b765387f62b090db24a96bf367f045ed0011db3e24f71014feaaff014b23db06c74cafee816594f2c6090825481346e31e7e7a0f
+EBUILD youtube-dl-2018.08.04.ebuild 3312 BLAKE2B 98cedcc93b25d20e32cd550f48f2347f114b7cb34e0317f5dab3cdd26abe08ee875424f6f226f3c53df6ec6a4a88579c561301a3da07b4e25e6423056d0b0f8d SHA512 a43df4e5d3c563bc7ae67728b765387f62b090db24a96bf367f045ed0011db3e24f71014feaaff014b23db06c74cafee816594f2c6090825481346e31e7e7a0f
 EBUILD youtube-dl-99999999.ebuild 3168 BLAKE2B 2b6c54cc0441d82b300163338ee9f8d61afa8d0418fc860bec168c5a9eb156a4c2e31fda632ff5e69943aaaf98c6d8de49b4d9a38e75020e264b5a3ea3f2b0cf SHA512 23a01cefa9229f12b67c2d01f5a0abf5e463da6bd1dc3affc40ee9aa2305d0f7ff18d2b7de069da5be4fcbed4cbb4a7a26c65e0a60728e2432b3a53ac3d0ce5c
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.07.21.ebuild b/net-misc/youtube-dl/youtube-dl-2018.07.21.ebuild
deleted file mode 100644
index 37bffad45c8e..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2018.07.21.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 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 bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="+offensive test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-python_prepare_all() {
-	if ! use offensive; then
-		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
-			youtube_dl/version.py || die
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink camwithher chaturbate eporner
-			eroprofile extremetube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
-			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
-			slutload spankbang spankwire sunporno thisav vporn watchindianporn
-			xbef xnxx xtube xvideos xxxymovies youjizz youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	eapply_user
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/completions
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
-
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2018.08.04.ebuild b/net-misc/youtube-dl/youtube-dl-2018.08.04.ebuild
new file mode 100644
index 000000000000..033b66fc205e
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2018.08.04.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 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 bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="+offensive test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+python_prepare_all() {
+	if ! use offensive; then
+		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink camwithher chaturbate eporner
+			eroprofile extremetube foxgay goshgay hellporno hentaistigma
+			hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
+			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
+			slutload spankbang spankwire sunporno thisav vporn watchindianporn
+			xbef xnxx xtube xvideos xxxymovies youjizz youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	eapply_user
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins youtube-dl.zsh _youtube-dl
+
+	insinto /usr/share/fish/completions/vendor_completions.d
+	doins youtube-dl.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 672d266c94e9..e55640cd7d64 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/go-ipfs-bin/Manifest b/net-p2p/go-ipfs-bin/Manifest
index 1207d392babb..9646412a452d 100644
--- a/net-p2p/go-ipfs-bin/Manifest
+++ b/net-p2p/go-ipfs-bin/Manifest
@@ -1,11 +1,19 @@
+AUX ipfs.confd 30 BLAKE2B 7ecaa40f2a4097690f9d8091da5891e0bbfb0f298bed4a59769c8d0ef978a2471865a01177950da5869b61f3b8c124f43eab97daf297c06efecdc25785a5846d SHA512 c55afeb3efe381d18258ddf00f58325b77156375cf223fb2daa049df056efe22e9139cce0f81dc4c73759dad5097af5f3201414beb5950bd894df9ae8c7c4ed1
+AUX ipfs.init 464 BLAKE2B f5927ab792427a87c330772fca4adc177ae84899be5c6b856f763d6e71d1cbdf1d151bf6eea46ff13ba5ce5996a55468a4749d37c1e8306c4d07f897f17430a1 SHA512 6616a0114039a7c178ee9788c748e4abf143a875df2a9d6d823249d7adef2024cd3f537cf45a624e76751792e8c24b1d42b0dd536686b14d6f53f59ca53ca1f4
+AUX ipfs.service 245 BLAKE2B b2d528a82a79d1e7fd5cfedac1a4db2412e7e02c87c3e5e902b0bd1a9259fd4156328b8c289df42a898a64a396d83ef93f24743d042b4fe24a2d97f8f0c5235e SHA512 58e21b8c7a7c0af0b05ee936fcd7e8e61903755f1c124a4d59758bb094d520d3dafb9b5b8b92d2a4b414367fbdaf2ec0025c05cbc796d0ee26f2916d12dde472
 DIST go-ipfs-bin-0.4.14.bash 20856 BLAKE2B 60370fabf7dee1f157c242fef5709b486428db4dde24388fca1a21655b44e9cbd07a523af05c66f70e8a7ac43a40cb4a439faaae856bfe52c74853e7539b4f3e SHA512 17568f42a0980734e57a6c22bab4bac149719ab4d586a5a477f4b11610c2c982c1b5c395b9244c73aa95c82bd40688b8368960bfc0fd5db2e6139660d38e6c9a
 DIST go-ipfs-bin-0.4.15.bash 20856 BLAKE2B 60370fabf7dee1f157c242fef5709b486428db4dde24388fca1a21655b44e9cbd07a523af05c66f70e8a7ac43a40cb4a439faaae856bfe52c74853e7539b4f3e SHA512 17568f42a0980734e57a6c22bab4bac149719ab4d586a5a477f4b11610c2c982c1b5c395b9244c73aa95c82bd40688b8368960bfc0fd5db2e6139660d38e6c9a
+DIST go-ipfs-bin-0.4.17.bash 20856 BLAKE2B 60370fabf7dee1f157c242fef5709b486428db4dde24388fca1a21655b44e9cbd07a523af05c66f70e8a7ac43a40cb4a439faaae856bfe52c74853e7539b4f3e SHA512 17568f42a0980734e57a6c22bab4bac149719ab4d586a5a477f4b11610c2c982c1b5c395b9244c73aa95c82bd40688b8368960bfc0fd5db2e6139660d38e6c9a
 DIST go-ipfs_v0.4.14_linux-386.tar.gz 8199245 BLAKE2B 950daceb417126203b803e512a41c004118990a981ead1f4dcc09185994be17d2c0899627f0a3cbb99e20a1e003d704e9bee6ce405dfd992a1871f3cdbc324b7 SHA512 bb2f88f6409adbe79a543bdde8d758a7e0f043b044aac42886fe9f2a973cf3477ef333df52103673aa93dfddc71946cad99021df813a9425f42599ee1ce70270
 DIST go-ipfs_v0.4.14_linux-amd64.tar.gz 10218138 BLAKE2B 10269581a8325172e5a5cebd64a760289864850703e62dc7e29a330d946d51b0b3ce2631a19fe9c7ea32f2eebb2b34a2bdb2682ac86a78bcf87a012d97bf5585 SHA512 71269aca8350e67a70faf7c16d2d7f9885d2e46a5af7cd737d888369d4a231e06ac8b4bebac43eda54c39b8cf345c80fbbc15fd227f0923f8381b3b0720fccb8
 DIST go-ipfs_v0.4.14_linux-arm.tar.gz 8136810 BLAKE2B 4fc6b52fec544cdd0c33ca31dd520821bbba2f8fab2b90994cd092de7ea7a132db4acdad80c2929df11b2e0d36d040efdd1708db5b1c3f05b89dadf60974544e SHA512 d87b5072aab2e3c00c8028f69042dea53523ba43eae01257b6fd25b9f5dc43aa09474368496da40bd62f99f63cc53c9786ce6babae08016d86ec8030c8c06b27
 DIST go-ipfs_v0.4.15_linux-386.tar.gz 8189548 BLAKE2B 6f82260f92b55d863189ad6f0cdeff4972df863953d132cbb11623e06c33b154e650e9fd0bd03d4a3f8477cce22447603a0207f0afc6eed074fcf7d05ead01af SHA512 11b4f11da0754819456dc7b5d149d72670582cd3e9c90b518546024356857c49a9a97ebebf1bc495e48e4bde96884e58f979a51fc57993bdff0509bccc6fad31
 DIST go-ipfs_v0.4.15_linux-amd64.tar.gz 10209630 BLAKE2B ce6fec2968765ac54f1376f0e8f9f3728338b06104a4b841b7993b5955f889e62e0bcf4e79fe6e180ef2e6cb4e9b07745935aaea74d7d6a050b7484e6d6ba9be SHA512 d77790c5c58f49229989b0e08fa537bc084bf9e2953479e307557e96924f96b913f00c4a7a76c687f2db63f098a18a575f34d88a3f226e7933039e8d8910dd10
 DIST go-ipfs_v0.4.15_linux-arm.tar.gz 8124892 BLAKE2B 8f3ab08f83ca7c4067a230fc0557393f107a08d1df069fd2029393cc1320d5cf678316e988472696aeceadea2d4f04e8c0bb85526284627c1d9e5f0acb2cc3e7 SHA512 4e98fda84d0f8c1e118150771b03a238cec96631d8ea798bf5c494f60711f1d272abe0830edfafb9f7fa6e246c59f30fe7896f231217f1b5aa2bdb6ccd3a94a5
+DIST go-ipfs_v0.4.17_linux-386.tar.gz 8625346 BLAKE2B e72b51a25eb0c18958f434483d28c45b43120ec9e583184cad8ac57c9470d685c568d9e166899d355200f89a0fe9fb3b05f9ce4c00c8c03bb928b0714b5d67c8 SHA512 031ee1624499ba9fd72efef780b1a04dee9a69dccc41190cebefcf5c271f676829fc220281db24d75a9159cd52fbbe3c85855911a5925efa23db85d2daefb500
+DIST go-ipfs_v0.4.17_linux-amd64.tar.gz 10726868 BLAKE2B bde05330dec16a9d40cf6ab0a872a2b2640e9d6811bc70b0a77a2149c36f0f9ddca927dcf66a7264b71b9a39ca49ab4e698ddaa7683b4b4ce871e207032ba9f5 SHA512 1d0b1b14b544c81ed6ecf4b5481e9b186d11d29afe1c63ad49abcc54346ec98ba28f7cfd712b5947a988ea7b810c71178ee79aadc87f3a946ecbfd5dcfd00b17
+DIST go-ipfs_v0.4.17_linux-arm.tar.gz 8541559 BLAKE2B a0633f414a2b8e6bfd1679442653cdcecaa1f3e5072ed9ca3afb64dd0183155077af71723a282285f2d70b7ac256d4e2e27515175453f16cd900ee01dcfb7440 SHA512 586b40575a18933eccd3a5af81efac8c0b6ea941bb5cef9e5bfc95ce56134863934c0e2fde29aa24944791c4842f0055ef43d1aab64b339649033801e4739cb6
 EBUILD go-ipfs-bin-0.4.14.ebuild 795 BLAKE2B f095381ec82d12277234f86342b3171e4cc6a15034293ea147a383f077b90d252f4952e0e9e9f33058aba7ea3dc7289177d4f14ebd0a8e93c14383c72ff4cc57 SHA512 afb45caddf2511d8afff6d774fd82d10ac9dd829316a9e26cb7e8e7c0a5890cc3dd751a2eccb6b2cd8bd3de2bbf02a0dfe2919664ee0364960f023d78540032a
-EBUILD go-ipfs-bin-0.4.15.ebuild 772 BLAKE2B 764b2f58ddd2c3fea8955a1bc76aa6c5189d4a1f826b71d8b5684755db3815c4ca908c3237fd9bf7ad10b1f083109b6d92204d4818dc165ca22bcaf816a6626b SHA512 1c7ab86d2ee7f6acdcdccb679b5253dd7ee08c965a0777bc735cbbd215cc03a6ad67cf1395688d63d514761518bb0e24112d51e964403a658717e4e31b1313db
+EBUILD go-ipfs-bin-0.4.15-r1.ebuild 1287 BLAKE2B 3666b649191a0a28df535b602c5b72f710c3e4bbbd6d86a87d6a7738f8f6340c5b339734c8f302601621709b1b3a8a140dbe4d8caa1183ec2261d5091f6e8af7 SHA512 e14ef66905312d4492ad994ba3d51d3e133a9545bfd96ccf04e1086298230324f4677e456f968739dc4dd359269a975cc3267c520a7c8d1bfeeae272fdfd3078
+EBUILD go-ipfs-bin-0.4.17.ebuild 1287 BLAKE2B 3666b649191a0a28df535b602c5b72f710c3e4bbbd6d86a87d6a7738f8f6340c5b339734c8f302601621709b1b3a8a140dbe4d8caa1183ec2261d5091f6e8af7 SHA512 e14ef66905312d4492ad994ba3d51d3e133a9545bfd96ccf04e1086298230324f4677e456f968739dc4dd359269a975cc3267c520a7c8d1bfeeae272fdfd3078
 MISC metadata.xml 606 BLAKE2B a6db8a5d8f57434206cbe3a8d69a3734381fdc2f13c2dd17596f2dd69fce52deca63717920ef0ff8f861451465f4702f967dbe1790916898000c7eeb858604a3 SHA512 3c0ae2eeeb423edc50a5961f9e9f040b33c0a343e77b47dafc1699eea65708df2365944338da691a637ea79680976dfc91346e6572c42cae94a429c0902c8065
diff --git a/net-p2p/go-ipfs-bin/files/ipfs.confd b/net-p2p/go-ipfs-bin/files/ipfs.confd
new file mode 100644
index 000000000000..f1e8eb77adf5
--- /dev/null
+++ b/net-p2p/go-ipfs-bin/files/ipfs.confd
@@ -0,0 +1 @@
+IPFS_PATH=/var/lib/ipfs/.ipfs
diff --git a/net-p2p/go-ipfs-bin/files/ipfs.init b/net-p2p/go-ipfs-bin/files/ipfs.init
new file mode 100644
index 000000000000..7b38cf43049b
--- /dev/null
+++ b/net-p2p/go-ipfs-bin/files/ipfs.init
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+export IPFS_PATH=${IPFS_PATH:-/var/lib/ipfs/.ipfs}
+
+pidfile="/run/ipfs.pid"
+command="/usr/bin/ipfs"
+command_args="daemon --enable-gc --migrate"
+command_user="ipfs:ipfs"
+start_stop_daemon_args="--wait 1000 -b \
+                        -1 /var/log/ipfs/ipfs.log \
+                        -2 /var/log/ipfs/ipfs.log"
+
+depend() {
+	need net
+}
diff --git a/net-p2p/go-ipfs-bin/files/ipfs.service b/net-p2p/go-ipfs-bin/files/ipfs.service
new file mode 100644
index 000000000000..189ace2fd762
--- /dev/null
+++ b/net-p2p/go-ipfs-bin/files/ipfs.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=InterPlanetary File System
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/ipfs daemon --enable-gc --migrate
+ExecStop=/usr/bin/ipfs shutdown
+Group=%i
+Restart=always
+Type=simple
+User=%i
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.15-r1.ebuild b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.15-r1.ebuild
new file mode 100644
index 000000000000..ac6442670566
--- /dev/null
+++ b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.15-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 bash-completion-r1 systemd user
+
+DESCRIPTION="Main implementation of IPFS"
+HOMEPAGE="https://ipfs.io/"
+SRC_URI="amd64? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-amd64.tar.gz )
+	x86? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-386.tar.gz )
+	arm? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-arm.tar.gz )
+
+	https://raw.githubusercontent.com/ipfs/go-ipfs/v${PV}/misc/completion/ipfs-completion.bash -> ${P}.bash"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+
+RDEPEND="sys-fs/fuse"
+S="${WORKDIR}/go-ipfs"
+
+QA_PREBUILT="/usr/bin/ipfs"
+
+src_install() {
+	dobin ipfs
+
+	systemd_dounit "${FILESDIR}/ipfs.service"
+	newinitd "${FILESDIR}/ipfs.init" ipfs
+	newconfd "${FILESDIR}/ipfs.confd" ipfs
+
+	newbashcomp "${DISTDIR}/${P}.bash" "ipfs"
+	keepdir /var/log/ipfs
+}
+
+pkg_preinst() {
+	enewgroup ipfs
+	enewuser ipfs "" "" /var/lib/ipfs ipfs
+
+	fowners -R ipfs:ipfs /var/log/ipfs
+}
+
+pkg_postinst() {
+	elog 'To be able to use the ipfs service you will need to create the ipfs repository'
+	elog '(eg: su -s /bin/sh -c "ipfs init -e" ipfs)'
+	elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.'
+}
diff --git a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.15.ebuild b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.15.ebuild
deleted file mode 100644
index c810e8c42f96..000000000000
--- a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.15.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Main implementation of IPFS"
-HOMEPAGE="https://ipfs.io/"
-SRC_URI="amd64? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-amd64.tar.gz )
-	x86? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-386.tar.gz )
-	arm? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-arm.tar.gz )
-
-	https://raw.githubusercontent.com/ipfs/go-ipfs/v${PV}/misc/completion/ipfs-completion.bash -> ${P}.bash"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
-
-RDEPEND="sys-fs/fuse"
-S="${WORKDIR}/go-ipfs"
-
-QA_PREBUILT="/usr/bin/ipfs"
-
-src_install() {
-	dobin ipfs
-
-	newbashcomp "${DISTDIR}/${P}.bash" "ipfs"
-}
diff --git a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.17.ebuild b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.17.ebuild
new file mode 100644
index 000000000000..ac6442670566
--- /dev/null
+++ b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.17.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 systemd user
+
+DESCRIPTION="Main implementation of IPFS"
+HOMEPAGE="https://ipfs.io/"
+SRC_URI="amd64? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-amd64.tar.gz )
+	x86? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-386.tar.gz )
+	arm? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-arm.tar.gz )
+
+	https://raw.githubusercontent.com/ipfs/go-ipfs/v${PV}/misc/completion/ipfs-completion.bash -> ${P}.bash"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+
+RDEPEND="sys-fs/fuse"
+S="${WORKDIR}/go-ipfs"
+
+QA_PREBUILT="/usr/bin/ipfs"
+
+src_install() {
+	dobin ipfs
+
+	systemd_dounit "${FILESDIR}/ipfs.service"
+	newinitd "${FILESDIR}/ipfs.init" ipfs
+	newconfd "${FILESDIR}/ipfs.confd" ipfs
+
+	newbashcomp "${DISTDIR}/${P}.bash" "ipfs"
+	keepdir /var/log/ipfs
+}
+
+pkg_preinst() {
+	enewgroup ipfs
+	enewuser ipfs "" "" /var/lib/ipfs ipfs
+
+	fowners -R ipfs:ipfs /var/log/ipfs
+}
+
+pkg_postinst() {
+	elog 'To be able to use the ipfs service you will need to create the ipfs repository'
+	elog '(eg: su -s /bin/sh -c "ipfs init -e" ipfs)'
+	elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.'
+}
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 6172f2adfe4f..949a7c6c1530 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -6,6 +6,6 @@ AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3a
 DIST transmission-2.93.tar.xz 3363868 BLAKE2B 786a8daec548d96b05d90c238cc7b67d402dc0d828860bb1a79b8059c687de309288be17fd12fd51abeafa28d9630fd19be9513c76cbf091f81ce9a181596042 SHA512 7565893f67fc10f1b683814fa4d365d841ec833bc8dfdab731432fe68f1a38daeb4c9100653763f16bfb4336fba11c9b0b9730a9817e17a140704a7c4aa5c087
 DIST transmission-2.94.tar.xz 3365952 BLAKE2B d0215a2c595dd3ebb2ed5c94cc3d380c78f62b98388557620534b88b9e2304bb6ac91960395541267f82d70800c4860d0e58125bca33dd158da992d19b4c0def SHA512 ee411743940f2897aa0bbc351ce79f11d860075d2e9e399d60301eae8cfc453e20426ef553fc62ee43019a07c052d512f5d7972cc4411fb57b1312c2c1558da7
 EBUILD transmission-2.93.ebuild 4375 BLAKE2B dd60b643985afdb20cb782f229011535b1c6dd98554e1b28b32dc805ca6b4ffd25485d10ca3dcd0eaa7b0a498d40edbd5c5533965def675e3c7b93193a38acb6 SHA512 5afb734ad2ee190605e6d7204b59afd556cbfd50e3a8c5308d916f2d40fbaf81301c53f5e664ffc0db7bf701d37bb6e01d9b73027de527f1fe036b0638926e91
-EBUILD transmission-2.94.ebuild 4328 BLAKE2B fbd16023e8c77e0269e9840527b515476b23206220d0615e517dcb6893d90d8e99804c7f9f0e1b40bc7b0ffbaf720b64753c94061810e5936fa0ebd20ea22100 SHA512 3fa58bae899c3729fe5b4aa80d0bcd6dae2e5cd802e271831b8302563905348ed7f1bbad1dede63a8fe61de387212ac4edca752a30c8c796094c80646bf524e6
+EBUILD transmission-2.94.ebuild 4327 BLAKE2B e8c81c7d4d55e0bfd0ff3f33d2996829684cedcbe91e9c04587f135b5075a9102608d3489cc6780aa81fe585b57c5dafba8687af7b8d9806b244a0d0efa412a3 SHA512 443e6d83af1bfcef2c9b382efaba710c408a0a2c4c79a89dc08b3232178d3a6efb39b3bc0318c2d81e59c795d3c69cbfe367c3fa05ac13ab928020339c7d90f0
 EBUILD transmission-9999.ebuild 3726 BLAKE2B ed8e5e8ddc738eddfbcd5d562f31f8ff62a7833fcbfac05ef8a9b0c157ec579eb8ad8ec471527371221f14dd00094ec4f5f429a831154a5d2cbc80425c4f2a64 SHA512 af09f34bd910244bea541f350fc8df64229cf1df57332a80d6b109190630b37ccebf835a85aff6f3803d12c00d25dee24ecee93bedd02d6f9a54a118c0fea4cf
 MISC metadata.xml 602 BLAKE2B 05300c81bd2c4df76aaaf8381a788016777e259075aa6a3bf9da239b4832dac1281f718f0fd79ece7d5c238440e07d1aabe15b7da40f34674ac30bbd356d0c6b SHA512 0047a936eda032a4521707ea50dcde06dce3837993e70d43a5b033183ba58633ae46e2d2e56de98a56f3480b30e596c7fbae82fd1e2ee9cbebc7983d9551617d
diff --git a/net-p2p/transmission/transmission-2.94.ebuild b/net-p2p/transmission/transmission-2.94.ebuild
index 7577d88b5daf..246560fb9ad7 100644
--- a/net-p2p/transmission/transmission-2.94.ebuild
+++ b/net-p2p/transmission/transmission-2.94.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/transmission/transmission-releases/raw/master/${P}.t
 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
 SLOT=0
 IUSE="ayatana gtk libressl lightweight systemd qt5 xfs"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
 
 RDEPEND=">=dev-libs/libevent-2.0.10:=
 	!libressl? ( dev-libs/openssl:0= )
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 25c2f296eaad..15b4fafa1238 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index bdddabcbd97e..fb741722910e 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -17,7 +17,7 @@ EBUILD haproxy-1.6.11-r2.ebuild 4672 BLAKE2B 74b3adb390a7fa1d596e8e91f4ca5fbb46d
 EBUILD haproxy-1.6.14.ebuild 4608 BLAKE2B d85f4160498f8af8fcc05ccdbe68d771b9d8b5cc71412be2c7430cf769c091f75030d678bf29f56d3bbb432c04f26fd45686333c8b2e282c25ae2dee7eceeb00 SHA512 32ae8badac30ea423613301815c4ccb07a6b81368dc92dc561f13d7432cde041048735cc4790659b4f1827a77e7009120e7977a54a15d164229a41d54d1b1e1b
 EBUILD haproxy-1.7.10.ebuild 4628 BLAKE2B 267e5228e4c1eb2386ab13a6f21d018e8f8643d9adcdb61851d150b281e2241eda97c701b4577fef8feee00c01409f8f2fc715a9681874fc05fc3f89c09da440 SHA512 941f9c3e0982ee44d51339b3feef43d93c7259413f2d77f8919e63056a0d0504468bd0637965141842af6c8dbb223f23155ffc0728f54bc1bbf539eef678c235
 EBUILD haproxy-1.7.11.ebuild 4632 BLAKE2B 06dd613111ce7410ce9190b2cbd825f4b9acd16d3c9995ca507fda90a77696e6c931b2f2caeb916ed0f6894110edaa056df5923c204107230af6a4f596c061ab SHA512 bb080ed92cbef8e2851262648519b5e0563749e3bd92396707791775801bf19f029e57fbe4fa029ea240cbc8f55b14e91d5656e85101fb2dc1e8ae219d111d51
-EBUILD haproxy-1.8.13.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
+EBUILD haproxy-1.8.13.ebuild 4887 BLAKE2B 1b18977940a0405fe542586d98acda19032e91b9a944eb5345ee8745e8117606a0daa2e983c595d9bb7c38dce3c69913747aa713ddd5b5e1765a5edade3f74b1 SHA512 a0af50c912a19fd75b8a5d3df1eeea363af5b988af061b170b68c6dabea26616bbaddb5aa1296764429dcd8343b074d4080b39d42cf7a73ba6c523fb20f82d81
 EBUILD haproxy-1.8.8.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
 EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727ceae1a503ff1febe3943f6393f8ce99f97c098e4046c17de04a32c4f9d0a8708fd4c81eeb69e82f900f156285a SHA512 93290df98b67334d2c89ced563d15d25943a5c87c691fdce2ace423ca38acc364f9307f8a28a6654fb390d41c72ec627e005d0179d10138d92396365496ab8b8
 EBUILD haproxy-1.9.9999.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
diff --git a/net-proxy/haproxy/haproxy-1.8.13.ebuild b/net-proxy/haproxy/haproxy-1.8.13.ebuild
index 44131da836d2..98f0e6952c30 100644
--- a/net-proxy/haproxy/haproxy-1.8.13.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.13.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://www.haproxy.org"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc x86"
 else
 	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
 	EGIT_BRANCH=master
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 719a86431b5b..a059a9778f99 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 439778f20558..73f1d340de43 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -5,5 +5,5 @@ DIST libreswan-3.23.tar.gz 3836073 BLAKE2B ffb27ed75618afcf39c36b7326bb1e4b70ea8
 DIST libreswan-3.25.tar.gz 3988630 BLAKE2B 8479b5b0d7d49055b7dcefa6c3b2f469b0aa60005e05446d5c1c6f73a32c904835422248c6ead2a1c2dc83b63794fd50f7461fd22c4206414b5890c01b99b722 SHA512 246649cb5bef1d0690217d1080f3f6f175a0d7a5f27e5a7affdf291b2f418a11937e96b64716a33e6312530409a2c1b10b90e2fa5ec339a27c94c990d86ed517
 EBUILD libreswan-3.22.ebuild 2812 BLAKE2B 55b89a58724b02cafcf997295f117a084c1f7e16a65f1adfb0efc783772d3a68be867b24ff038aa8017412b2e4fb716a3aa101d080eda2c9e8a11dfd117c3544 SHA512 23136de2f2a1442318bc692456c32d0675515b508ef6281b33b2f8760bafbbe09ab39d233d552214aecc3e965c22f9fc67bad93902a6be5696117308bf1190cf
 EBUILD libreswan-3.23-r1.ebuild 2867 BLAKE2B f4fb5ffb508732e268199c92ff69d43c14620915bc0b6aa3fb867b56e4c3713a8e2b8dc25ec0e01fd80efad853afb38e54155b0c1a4455b81f0dbb69131c0d79 SHA512 00c4c5399dc14afa872c9b81202bce9d9d1cf5c4eb6a3a34ce2b96f9be5af008edc799fdc7c3c7af8aa36bae2b518f40686e08dc813ba7040e9351c69fcff0bf
-EBUILD libreswan-3.25.ebuild 2855 BLAKE2B 138cb1716d4f2eeca78245b6090c0c0c2c86b715973782f943fea6759e41087720289eca97e4df14bbe608a31c3444a6be8554c9047c408cf4cbc0480898f750 SHA512 fdd3db5f292961d70d2f9cd3577df1cdf0285d1aab5ff8eefed11d4c29a3282af7c2b9e3bbd5d574ac66903d2f485dfd5da7a6ac94b4bef18f32d116dce035b4
+EBUILD libreswan-3.25.ebuild 2854 BLAKE2B 63400801ca0b41f69da5b928f0c42111b574be20279aaf6086aafe78fc683663aa1fc81aace1288016c6f8fee62b56c22e469c26c00d866954f3019312a58b4d SHA512 3ae9ffd9a108948ef5c3d950e4695a174412acd3e97e051441f0c4a972519cf0f5aa7c91c59d4973ce1d00ba43c642530871fba7742036700144b21294d7630e
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.25.ebuild b/net-vpn/libreswan/libreswan-3.25.ebuild
index a830de440be1..7d073e163347 100644
--- a/net-vpn/libreswan/libreswan-3.25.ebuild
+++ b/net-vpn/libreswan/libreswan-3.25.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit systemd toolchain-funcs
 
 SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
 HOMEPAGE="https://libreswan.org/"
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 71c7cfef72eb..5d9cfc9e2e28 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -6,8 +6,8 @@ AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07
 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
 DIST tor-0.3.1.10.tar.gz 6192183 BLAKE2B 4c1b57a3b19d18d735bb7362a08e4c2330350f2e31d52a8eb6d837cebc45ad6e64f3364e368f72d59bb8f51f652d4029a3e237a26efe580551811f5812e8dac4 SHA512 92af34a96bea2a99ab51d766d932da697409e404da4318ba6b3360ff0c2e9369b9afa652445a1651940f5a0502f4137141cc87cff14eba180539ea81be0c21a3
 DIST tor-0.3.3.9.tar.gz 6563091 BLAKE2B 9bb2009c309005ad913aa8f3e175ef8500a571de6210ecaa1a17947633e201092dd819e30e95a55918dff54858b8c420039e960113e9096b2b4f43ca596bb3bd SHA512 3b1fd9926988233c605996281510cd966a08bc1008e1e4bf7e0ed76b40c1820b7789a85555d5a4d9c0b58db992366d7a62d5d3b20e818a0d68df3b2286d0df3d
-DIST tor-0.3.4.5-rc.tar.gz 6643534 BLAKE2B 8e1f045ab2a3afbbdc1208e831848bcc6b9da1f1f2972213337ba9533d8d049ee8e1d50665c8a388a617fddc3878f210ab9f27b2545dca9f25ca52a8f9b175b0 SHA512 d58be09564f3ce59483f0672dffecd56a00c562add6ac4382699cffa568acb251c46dd9a2d5d08d6b8bcf52d28b4d42c832dfe34148ebf31acdea19ca465156f
+DIST tor-0.3.4.6-rc.tar.gz 6643564 BLAKE2B 113b103b7011f01d5a245969290ade694d66f53d889a4b51f7ff5244a442363fb0f67955cc4e1b0cdea2eab9f6bf8919a8b63508367b20b85f9611c13fdf703e SHA512 8aeca72a70fd8de0dbc4c4c1bda9725cc8e1915125b8788ab8389b0b366f7595d1d9db6287f397960468f2661c7edc61d8a2ee94f13735d836e581874f7c13b6
 EBUILD tor-0.3.1.10.ebuild 2018 BLAKE2B 5c001ed0ad1fd3f0d6a3dee6bcc53bc3590a90a5c0aa931c0e67e0cbceb000ef710fa33fe11b06fc08798c6286ffa877376ef6ebf2cbd426e7a26c94311e19c2 SHA512 65f6054ac7b50c46679d88ed1a5b556f5e3c40fe44e784e6b4de324bd317e3d118a8d0d4574ac62bcd17131412c3ad1cbdd0c27f4afd53568091ce400b171244
 EBUILD tor-0.3.3.9.ebuild 2274 BLAKE2B 350ecbd07a4ade222fe94c1d8d3d11f1d302897b8edf8f769d3fedd49f6d4ac298c0795541ff5acce6b1f23fa9eca3f67571637d3ded1192d9df56fd3315a26a SHA512 97cc47b829c5a0fc5ceb22190ba3cecca1a5307416e3b5944584f2cb056f15f69e219d3b018d2203c30ae1cd02ae0cb97ef9d7c0f35dc21c1e76ce6455540617
-EBUILD tor-0.3.4.5_rc-r1.ebuild 2449 BLAKE2B a98e2721a4fe5e4048e99655b1eb14608d100f657731c7c8932fc3d291531542301908a423ea635762e06aa4686a050075dc44a9835c0da5035b06a642bb5df3 SHA512 1b1234b92f062c8b6bd9663d1fe1972c9605bd9c150e35e80303888438ae83378a0d3131d71f6e680accf777787b50446e740e1a82506061ee636ab9b7e7be56
+EBUILD tor-0.3.4.6_rc.ebuild 2449 BLAKE2B a98e2721a4fe5e4048e99655b1eb14608d100f657731c7c8932fc3d291531542301908a423ea635762e06aa4686a050075dc44a9835c0da5035b06a642bb5df3 SHA512 1b1234b92f062c8b6bd9663d1fe1972c9605bd9c150e35e80303888438ae83378a0d3131d71f6e680accf777787b50446e740e1a82506061ee636ab9b7e7be56
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.4.5_rc-r1.ebuild b/net-vpn/tor/tor-0.3.4.6_rc.ebuild
index 03ddb1da8917..03ddb1da8917 100644
--- a/net-vpn/tor/tor-0.3.4.5_rc-r1.ebuild
+++ b/net-vpn/tor/tor-0.3.4.6_rc.ebuild
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index fab36f7a6564..97e94835be4c 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 32d85f20128e..5a2a8e3d40ce 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,5 +1,6 @@
 AUX aircrack-ng-1.2-no-force-stack-protector.patch 2245 BLAKE2B a7f200711a4e24cc92d4626d24c62abe11a2d378e8876a801a516aa2023b7aa7566c868e890186cebf9dacecc59037b23c39380b1b435b0f0985a02f939ccfec SHA512 35e5f717bc3b90507a879bbd4ffd3bb88c7bc98676abac1241cbc50dbb1bcf2c53e5c45514b643d7ad7d86d0b74e662803de155ae6bbf430a1fdb32e50682068
 AUX aircrack-ng-1.2_rc4-openssl.patch 1227 BLAKE2B ac474222d14a25d6ea4f95c313f0f660940cdacd0ed4295e869a91a81f30284a669fd1e49959d1f6c7fd0c015cbc93464181b3e79571751d400400323b276934 SHA512 142542996e83f729bf8c7e77ac0d4be428b60368c7c005c2dda6c7fe7d45cbe029381523059566a35f1c8d748c0aaf9e46086cbf9ce429f22b2c61ae78a6ba1c
+AUX aircrack-ng-1.3-8812au.patch 3453 BLAKE2B 6cc77e78bd1598d9ce1c4accb1ea79d68eb9f3cde9d4306f0d06ec81ad1d3d52b7b6d3de20144de7de5ee9e14274e95bc33fc976d5b34624006f32934c2a6d7f SHA512 9fc1effa2498f8f5f055d50431bb9268ca7307005cc7e9f9e8c91dc296ab352645f883bacbc84464b06faf955a7ad34a2d042ed495f576a7f679c75f291464cb
 DIST aircrack-ng-1.2-rc1.tar.gz 2046476 BLAKE2B aec848a3dedae564cc29fc94475d0dec9cfb33af5185a4bceb9f88c1a3cce7a910439405fd76390ca352e52393b9094e570bf54980af27a50709a36ffab33752 SHA512 897427c535846c0ede58b2f99ed469bc01f50f9b38fc70d5711261fca7342339192cc0c71a724fc04c99114db7534d825a44f09e7bc5754286ec44933a33e40d
 DIST aircrack-ng-1.2-rc4.tar.gz 4379880 BLAKE2B 8034e99a9a7117b0552ecd82603883661d7442970a24d26f4754122abd07cc661fbeb57519cecbefb6eea1fc0e8b0f228a116a04f07e1a7d2eb41ea4b5f6040b SHA512 f1e1d465813a5f00fd8f8b287353033ea30b657a4c3a9fe81281ab2546d3238690f0659076bff53703fbc796ba40efb16115804d21f8516adca2c774fefea20c
 DIST aircrack-ng-1.2.tar.gz 4517658 BLAKE2B 1a3d17608dafe69a7a500526807310bf9ae8f0f14ed4198d06fc1cd6287fa25aeed996bad85c82b9ed87c214951e2bbc73384513361b7e8ce6ba05ef32f6530c SHA512 efc8cd17994fd74dcdd60e4ff26f81dc4f090a368668c2b1d62e204d2a9c001f2614a9d2ad0e4ae0ae38fb71e1957e0342f8216d757e38db105b1e467de82bd9
@@ -7,6 +8,6 @@ DIST aircrack-ng-1.3.tar.gz 4182502 BLAKE2B d18d3644fd5bad7a45d8684a50a42d84d9e0
 EBUILD aircrack-ng-1.2.ebuild 3179 BLAKE2B afccc183aff511d9cbe26c50580b7a9ca3d69d152980927fa9b66f8d7d0feff53142e65e986f64fe46ee5e989a05275f7ec2770478c914f04e451c938ba0ddec SHA512 fa5e63c1fca15ea1830d2ab2a566a65e05d684623ae6cab72f8aa0c3dd3923fd6d01baac519c55134dd05993d801caa93f6e9ce761b4ebe6c1ffc82941bc776a
 EBUILD aircrack-ng-1.2_rc1-r1.ebuild 3523 BLAKE2B eeda867b14d763a397287928b64217635a2b4b11250b98fc818ce0910c9fa9e30e68a78c02a741c79a653f6c9177d733caaae7e63748c20f29ebd6c4819f007f SHA512 151fec44861e17742ec7cbbbc7198eaf24f9cdd4ceee78902c248fced3ab6df49ed1da466b39f203201e9c9124b5e8b1042df75ef705a7024205c5276853a0d7
 EBUILD aircrack-ng-1.2_rc4-r1.ebuild 2918 BLAKE2B f8f585175b7899e3e367875c23642a60a733118677c91daa68ea3087671cbdd3e853a02f48733080bcc3bf7c3040fb9777409a84e2275d1042b73733e03943b8 SHA512 2e396a16de545a0b39f38ffc243b35f041ecc1f4a62c1b2596a13d91793def3dbaba74a873ac635cbc684dec0c8ea21410ee35994ed3af0c00ed6a1d718ca33f
-EBUILD aircrack-ng-1.3.ebuild 3141 BLAKE2B 5d0160b1d4fbcedb63260a347a9d258306c098edd7325bdd442a2cbc42e078d8d24901c8d248a0bb7e965f7dbf663c03bddb2304ce894e533f16d5d4d8d3cc61 SHA512 46db3bec085439eaa894e5b301306bc357152191a5925c16961afa0bb76e5d5ce218a1b63dbb6d1e64f4666897950c65d35172814e1eb43fbe1ac2c11a8c94d9
+EBUILD aircrack-ng-1.3-r1.ebuild 3181 BLAKE2B 2fb30fed14d679e0392a0c6a4f40e2b61e6f329b1bc59f80a9a1eafe0ba8d48ff8f32dca509d8c429ed80a407408ae6a7b94a512488f9307ef043c46f561dfed SHA512 a766354d39a2d4c7f51883c121d3a15a125e2cf7bb035dfb98af0ed2e7143b3a098c5e979142ce0549afbbe1c1c891da99a99478763d516710aa46a27b5285fb
 EBUILD aircrack-ng-9999.ebuild 3110 BLAKE2B 9ca03f75ab07f78157a6cf27014e83c45a3928d0d0a457993e5e86201a30b06cea11485d060cfd7597556dbe227a3ae4915aa0a8cc7a0ee8bde151cff49de848 SHA512 4904ffb8f45ff1e7c63fb033b77543db69b9813e8549a1ef0c4e70da268563058d6d076f51b463c26151f47105aeacf237e70df6f4e54304f13721e66ea9278a
 MISC metadata.xml 1130 BLAKE2B 9d3c0463a4a1cf4360ce77c550a701a805cd3db5f06ee895aa8888180246d6b51970d23b74b723a241e09bb6dde426055ca8f1288afffa90e8e4abc7d9c4b92a SHA512 0ca935ebf651d221657fda9320fc8a8f8dbabd9d10fc4eebb8b301b63ca8f9316069bee16b2468d227ea5acf53a28747c8479eb776983334b9496d68fefa76ee
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.3-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.3-r1.ebuild
new file mode 100644
index 000000000000..c35e3fb3d4af
--- /dev/null
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.3-r1.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 )
+DISTUTILS_OPTIONAL=1
+
+inherit toolchain-funcs distutils-r1 flag-o-matic autotools
+
+DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
+HOMEPAGE="http://www.aircrack-ng.org"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
+	KEYWORDS=""
+else
+	MY_PV=${PV/_/-}
+	SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental"
+
+DEPEND="net-libs/libpcap
+	dev-libs/openssl:0=
+	netlink? ( dev-libs/libnl:3 )
+	pcre? ( dev-libs/libpcre )
+	airdrop-ng? ( ${PYTHON_DEPS} )
+	airgraph-ng? ( ${PYTHON_DEPS} )
+	experimental? ( sys-libs/zlib )
+	sqlite? ( >=dev-db/sqlite-3.4 )"
+RDEPEND="${DEPEND}"
+PDEPEND="kernel_linux? (
+		net-wireless/iw
+		net-wireless/wireless-tools
+		sys-apps/ethtool
+		sys-apps/usbutils
+		sys-apps/pciutils )
+	sys-apps/hwids
+	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
+		airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	MAKE_COMMON=(
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		LD="$(tc-getLD)" \
+		RANLIB="$(tc-getRANLIB)" \
+		DESTDIR="${ED}"
+	)
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-8812au.patch"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-asan \
+		$(use_enable netlink libnl) \
+		$(use_with experimental) \
+		$(use_with sqlite sqlite3) \
+		--enable-shared \
+		--disable-static \
+		--without-opt
+}
+
+src_compile() {
+	if [[ $($(tc-getCC) --version) == clang* ]] ; then
+		#https://bugs.gentoo.org/show_bug.cgi?id=472890
+		filter-flags -frecord-gcc-switches
+	fi
+
+	emake "${MAKE_COMMON[@]}"
+
+	if use airgraph-ng; then
+		cd "${S}/scripts/airgraph-ng"
+		distutils-r1_src_compile
+	fi
+	if use airdrop-ng; then
+		cd "${S}/scripts/airdrop-ng"
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	emake "${MAKE_COMMON[@]}" check
+}
+
+src_install() {
+	einstalldocs
+	emake "${MAKE_COMMON[@]}" install
+
+	if use airgraph-ng; then
+		cd "${S}/scripts/airgraph-ng"
+		distutils-r1_src_install
+	fi
+	if use airdrop-ng; then
+		cd "${S}/scripts/airdrop-ng"
+		distutils-r1_src_install
+	fi
+
+	#we don't need aircrack-ng's oui updater, we have our own
+	rm "${ED}"/usr/sbin/airodump-ng-oui-update
+}
+
+pkg_postinst() {
+	# Message is (c) FreeBSD
+	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
+	if use kernel_FreeBSD ; then
+		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
+		einfo "mode of your wireless card.  So do not care about what the manpages say about"
+		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
+		echo
+		einfo "To return from monitor mode, issue the following command:"
+		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
+		einfo
+		einfo "For aireplay-ng you need FreeBSD >= 7.0."
+	fi
+}
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.3.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.3.ebuild
deleted file mode 100644
index af3515cb4635..000000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.3.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"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit toolchain-funcs distutils-r1 flag-o-matic autotools
-
-DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
-HOMEPAGE="http://www.aircrack-ng.org"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
-	KEYWORDS=""
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental"
-
-DEPEND="net-libs/libpcap
-	dev-libs/openssl:0=
-	netlink? ( dev-libs/libnl:3 )
-	pcre? ( dev-libs/libpcre )
-	airdrop-ng? ( ${PYTHON_DEPS} )
-	airgraph-ng? ( ${PYTHON_DEPS} )
-	experimental? ( sys-libs/zlib )
-	sqlite? ( >=dev-db/sqlite-3.4 )"
-RDEPEND="${DEPEND}"
-PDEPEND="kernel_linux? (
-		net-wireless/iw
-		net-wireless/wireless-tools
-		sys-apps/ethtool
-		sys-apps/usbutils
-		sys-apps/pciutils )
-	sys-apps/hwids
-	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
-		airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	MAKE_COMMON=(
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		LD="$(tc-getLD)" \
-		RANLIB="$(tc-getRANLIB)" \
-		DESTDIR="${ED}"
-	)
-}
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-asan \
-		$(use_enable netlink libnl) \
-		$(use_with experimental) \
-		$(use_with sqlite sqlite3) \
-		--enable-shared \
-		--disable-static \
-		--without-opt
-}
-
-src_compile() {
-	if [[ $($(tc-getCC) --version) == clang* ]] ; then
-		#https://bugs.gentoo.org/show_bug.cgi?id=472890
-		filter-flags -frecord-gcc-switches
-	fi
-
-	emake "${MAKE_COMMON[@]}"
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_compile
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	emake "${MAKE_COMMON[@]}" check
-}
-
-src_install() {
-	einstalldocs
-	emake "${MAKE_COMMON[@]}" install
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_install
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_install
-	fi
-
-	#we don't need aircrack-ng's oui updater, we have our own
-	rm "${ED}"/usr/sbin/airodump-ng-oui-update
-}
-
-pkg_postinst() {
-	# Message is (c) FreeBSD
-	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
-	if use kernel_FreeBSD ; then
-		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
-		einfo "mode of your wireless card.  So do not care about what the manpages say about"
-		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
-		echo
-		einfo "To return from monitor mode, issue the following command:"
-		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
-		einfo
-		einfo "For aireplay-ng you need FreeBSD >= 7.0."
-	fi
-}
diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch
new file mode 100644
index 000000000000..6ce0fbc51eba
--- /dev/null
+++ b/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch
@@ -0,0 +1,118 @@
+commit 3cc9de5e7cbe6565c7e1fe12ebbcf2c6f7413c8d
+Author: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
+Date:   Tue Aug 7 01:27:05 2018 +0000
+
+    airmon-ng support 8812au
+
+diff --git a/scripts/airmon-ng.linux b/scripts/airmon-ng.linux
+index 14e4bdcd..d7328f4b 100755
+--- a/scripts/airmon-ng.linux
++++ b/scripts/airmon-ng.linux
+@@ -354,21 +354,21 @@ ifaceIsUp() {
+ #	fi
+ #}
+ 
+-#startDeprecatedIface() {
+-#	iwconfig ${1} mode monitor > /dev/null 2>&1
+-#	if [ -n "${2}" ]; then
+-#		if [ ${2} -lt 1000 ]; then
+-#			iwconfig ${1} channel ${2} > /dev/null 2>&1
+-#		else
+-#			iwconfig ${1} freq ${2}000000 > /dev/null 2>&1
+-#		fi
+-#	else
+-#		iwconfig ${1} channel ${CH} > /dev/null 2>&1
+-#	fi
+-#	iwconfig ${1} key off > /dev/null 2>&1
+-#	setLink ${1} up
+-#	printf " (monitor mode enabled)"
+-#}
++startDeprecatedIface() {
++	iwconfig ${1} mode monitor > /dev/null 2>&1
++	if [ -n "${2}" ]; then
++		if [ ${2} -lt 1000 ]; then
++			iwconfig ${1} channel ${2} > /dev/null 2>&1
++		else
++			iwconfig ${1} freq ${2}000000 > /dev/null 2>&1
++		fi
++	else
++		iwconfig ${1} channel ${CH} > /dev/null 2>&1
++	fi
++	iwconfig ${1} key off > /dev/null 2>&1
++	setLink ${1} up
++	printf " (monitor mode enabled)"
++}
+ 
+ yesorno() {
+ 	read input
+@@ -426,7 +426,7 @@ startMac80211Iface() {
+ 		done
+ 	fi
+ 	#we didn't bail means we need a monitor interface
+-        if [ ${#1} -gt 12 ]; then
++	if [ ${#1} -gt 12 ]; then
+ 		printf "Interface ${1}mon is too long for linux so it will be renamed to the old style (wlan#) name.\n"
+ 		findFreeInterface monitor
+ 	else
+@@ -438,10 +438,16 @@ startMac80211Iface() {
+ 		fi
+ 		#we didn't bail means our target interface is available
+ 		setLink ${1} down
++		if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ] || [ "${DRIVER}" = "rtl8812au" ]; then
++			#grumble grumble, seriously crap vendor driver
++			startDeprecatedIface ${1}
++			setChannelMac80211 ${1}
++			return
++		fi
+ 		IW_ERROR="$(iw phy ${PHYDEV} interface add ${1}mon type monitor 2>&1)"
+ 		if [ -z "${IW_ERROR}" ]; then
+ 			sleep 1
+-			if [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type)" = "803" ]; then
++			if [ -r "/sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type" ] && [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type)" = "803" ]; then
+ 				setChannelMac80211 ${1}mon
+ 			else
+ 				printf "\nNewly created monitor mode interface ${1}mon is *NOT* in monitor mode.\n"
+@@ -569,12 +575,12 @@ setChannelMac80211() {
+ 	fi
+ }
+ 
+-#stopDeprecatedIface() {
+-#	setLink $1 down
+-#	iwconfig $1 mode Managed > /dev/null 2>&1
+-#	setLink $1 up
+-#	printf " (monitor mode disabled)"
+-#}
++stopDeprecatedIface() {
++	setLink $1 down
++	iwconfig $1 mode Managed > /dev/null 2>&1
++	setLink $1 up
++	printf " (monitor mode disabled)"
++}
+ 
+ stopMac80211Iface() {
+ 	if [ -f /sys/class/net/${1}/type ]; then
+@@ -587,6 +593,11 @@ stopMac80211Iface() {
+ 			printf "please report it.\n"
+ 			exit 1
+ 		else
++			if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ] || [ "${DRIVER}" = "rtl8812au" ]; then
++				#grumble grumble, seriously crap vendor driver
++				stopDeprecatedIface ${1}
++				return
++			fi
+ 			if [ "${ELITE}" = "0" ]; then
+ 				local need_sta=1
+ 				if [ -d /sys/class/ieee80211/${PHYDEV}/device/net ]; then
+@@ -1316,8 +1327,10 @@ if [ "$DEBUG" = "1" ]; then
+ 	fi
+ fi
+ if [ "$VERBOSE" = "1" ]; then
+-	lsb_release -a
+-	printf "\n"
++	if [ -n "$(command -v lsb_release 2> /dev/null)" ]; then
++		lsb_release -a
++		printf "\n"
++	fi
+ 	uname -a
+ 
+ 	checkvm
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 2f45ecd1d1c8..e89b2568f85b 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -11,5 +11,5 @@ AUX rfcomm-init.d-r2 546 BLAKE2B c487e51fcd4837c1cfce8b630062d1a882c084691266fd0
 DIST bluez-5.49.tar.xz 1744860 BLAKE2B 25b350debb016f93d23a2ecf14183197a3b8e8c0496b82b22a51ccc00ccf0241fb43d7d8d9ed04bdfcc0a1111078b8394e8b9ff23963854e51b6a19cf769811f SHA512 bc2988649420232b92e2c6836857027369f05ace005972f575ed0601c02cc97a07a3b7a0707a8bad72be73df7e8096c8bf023530443556e87c2ccb667981b37d
 DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45
 EBUILD bluez-5.49-r1.ebuild 8102 BLAKE2B 92d5688a2b0c476e2ca5767faec68442f8624b482f407db1af683d812e51149e6d8c1fe943b54c31e83227b3819b0d89ea3866a67b27ef5dd3cde27c942609a1 SHA512 20eaed74b8c10cce8dbd116c6be91c2d32f239c7e9fb9a04098e1f16e5a43f85916b9d6567abed9804bca50879ca080d4e9c6abdf45eaa5fb354effe4ca16ea0
-EBUILD bluez-5.50.ebuild 8028 BLAKE2B b62e272587e4c6b3648505e509cfb8f4ba8f3457e0777f62fd77c4bea5570f4b511c03f29bd80ac36cacd28d9c493125e8cc5435224a679611aab2beedba9664 SHA512 ad8969e317f12a6c1bf2d1966cf5c40ffa3b87d87258adca745c6b953f09df9ecc7c33162a52f9780cdb075e8347aceb7a87c858fa693ac76ea2f9e8e1303098
+EBUILD bluez-5.50.ebuild 8035 BLAKE2B 00243ee81ac26ef6e8eaf33237ec073ef6b662c7bdc05d015e0a3759c9bcd0f794a0ff39cb8abd8cc4938b8174264880ada76e5f0fb102e64454e82535098ca8 SHA512 fa4fdb56ee6b53e8a88a08f157cda86839fe8a8c85a2a7fb34a69de3f5aae93a75e2afe912bd332e9aede05868e82bd86160ca188660d7a03f01e9785811b658
 MISC metadata.xml 1173 BLAKE2B 1c9c14538f8686c8b6f99aced931cac0235f0bb86d2e8962ace5174c486b5e7436afc1db3bb493778e70be5b5b389964f0aa8e8925093e08490f98cf6aa6b79f SHA512 151424ecb4edbcb1c632453b42e22114cb9a4ac07a41211735ec28b18072a69a1286b4b9724701016a748df3a519daeb5ef5a3611def327fc2bd461547891de4
diff --git a/net-wireless/bluez/bluez-5.50.ebuild b/net-wireless/bluez/bluez-5.50.ebuild
index 542b0577699c..ff75c0b319b2 100644
--- a/net-wireless/bluez/bluez-5.50.ebuild
+++ b/net-wireless/bluez/bluez-5.50.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
 IUSE="alsa +btpclient 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
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index eeb86fc84697..5cfcab9a3707 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -5,6 +5,6 @@ AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 DIST kismet-2018-08-BETA1.tar.xz 2043136 BLAKE2B f24af4250bb0238073380514413d9501e449cf40507d7a96ac868d76acb34af81b9bf4a49c9b6197b6b903ab33e2318bb5efa22876cc2070e3878ebf030d592c SHA512 09eab9d648f011c95b8632c666990d79f9998465b051a65357f53af19a135a5d58df3025ec60f9ef9a7b7d9b5622d2332bb2defbffd21ca0e25e2e4090ceae2f
 EBUILD kismet-2016.07.1-r1.ebuild 4191 BLAKE2B 121e49130ad54fc963b011b005fa33ea6d01e71cf699232c744f7a497076b489e8913da9a0341becb21657de947204cd260e95ef46fe111716de1b1b6781b521 SHA512 ceefe51d38f6375629708be15a23a9e382578a8b4474503e2ff61bb912ab3ae313b37f417880f180094439505ea36fdbd9aeab95cbd426cc3f744985615080fc
-EBUILD kismet-2018.08_beta1-r1.ebuild 2928 BLAKE2B 9be0cfefabe0b0b69674610a05639360aa50918abd8c3076c215ebb0b85e19e9455bde50c8c881fee2abf824cdc5a4cbc26f1edcd7d651c277e919501d1a875c SHA512 f39423e4130c78335ce6f361315a322fbb5a5c23dcbdcf96055183a995f8a0f255ded74a8fd2cb50f86ce9f8df0694fbe4f91029d7f53000ee703e55e3e42b5f
-EBUILD kismet-9999.ebuild 2928 BLAKE2B 9be0cfefabe0b0b69674610a05639360aa50918abd8c3076c215ebb0b85e19e9455bde50c8c881fee2abf824cdc5a4cbc26f1edcd7d651c277e919501d1a875c SHA512 f39423e4130c78335ce6f361315a322fbb5a5c23dcbdcf96055183a995f8a0f255ded74a8fd2cb50f86ce9f8df0694fbe4f91029d7f53000ee703e55e3e42b5f
+EBUILD kismet-2018.08_beta1-r2.ebuild 2975 BLAKE2B 152d8f5996f1c2ede46629290f371a20aa5d6ccabe7a9741970eb0e85361deb19377a70c64a1c66446a35bc156d9b972f09ed42c7b6d39f5744429bcaac0d0e7 SHA512 6e360c190a2962c656be53400125295cd80dc46b452c725a00feacc2c97ba088a362b5b83c0c390495a2a74d5428c6fa4605a33abbfb637fa9b1441168466660
+EBUILD kismet-9999.ebuild 2975 BLAKE2B 152d8f5996f1c2ede46629290f371a20aa5d6ccabe7a9741970eb0e85361deb19377a70c64a1c66446a35bc156d9b972f09ed42c7b6d39f5744429bcaac0d0e7 SHA512 6e360c190a2962c656be53400125295cd80dc46b452c725a00feacc2c97ba088a362b5b83c0c390495a2a74d5428c6fa4605a33abbfb637fa9b1441168466660
 MISC metadata.xml 1159 BLAKE2B 2e72c1c62f31b52445c83b6b0d7695c7f1231de69fbe865e123a18dc0030a0f57586b058a7e738d561f48413e8a6ff0e8ac73428de2c41688e5baa1e4c255af1 SHA512 cf7c0f4c38f0a5e7b9c51c9fc98f5dd49e51159986443687a81d486c8805aea069168832f406a16b36dc6342be063fdbcade74685273fcdd2111ea9a616437d7
diff --git a/net-wireless/kismet/kismet-2018.08_beta1-r1.ebuild b/net-wireless/kismet/kismet-2018.08_beta1-r1.ebuild
deleted file mode 100644
index ddf8e2e5e783..000000000000
--- a/net-wireless/kismet/kismet-2018.08_beta1-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib user python-single-r1
-
-MY_P=${P/\./-}
-MY_P=${MY_P/_beta/-BETA}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git"
-	SRC_URI=""
-	inherit git-r3
-	KEYWORDS=""
-	RESTRICT="strip"
-else
-	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="https://www.kismetwireless.net"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="lm_sensors networkmanager +pcre selinux +suid"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	net-misc/networkmanager:=
-	dev-libs/glib:=
-	dev-libs/elfutils:=
-	sys-libs/zlib:=
-	dev-db/sqlite:=
-	net-libs/libmicrohttpd
-	kernel_linux? ( sys-libs/libcap
-			dev-libs/libnl:3
-			net-libs/libpcap
-			)
-	dev-libs/protobuf-c:=
-	sys-libs/ncurses:=
-	lm_sensors? ( sys-apps/lm_sensors )
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kismet )
-"
-
-src_prepare() {
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet_logging.conf || die
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
-
-	epatch "${FILESDIR}"/fix-setuptools.patch
-	eapply_user
-
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-
-	if ! use lm_sensors; then
-		sed -i "s#HAVE_LMSENSORS_H=1#HAVE_LMSENSORS_H=0#" configure
-	fi
-	if use networkmanager; then
-		sed -i "s#havelibnm\=no#havelibnm\=yes#" configure
-	else
-		sed -i "s#havelibnm\=yes#havelibnm\=no#" configure
-	fi
-	sed -i 's#-O3##' configure
-}
-
-src_configure() {
-	econf \
-		$(use_enable pcre)
-}
-
-src_install() {
-	emake DESTDIR="${D}" commoninstall
-	emake DESTDIR="${D}" forceconfigs
-
-	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
-	dodoc CHANGELOG README*
-	newinitd "${FILESDIR}"/${PN}.initd kismet
-	newconfd "${FILESDIR}"/${PN}.confd kismet
-}
-
-pkg_preinst() {
-	if use suid; then
-		enewgroup kismet
-		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
-		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
-		fowners root:kismet /usr/bin/kismet_cap_pcapfile
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
-		fperms 4550 /usr/bin/kismet_cap_linux_wifi
-		fperms 4550 /usr/bin/kismet_cap_pcapfile
-		elog "Kismet has been installed with a setuid-root helper binary"
-		elog "to enable minimal-root operation.  Users need to be part of"
-		elog "the 'kismet' group to perform captures from physical devices."
-	fi
-	if ! use suid; then
-		ewarn "It is highly discouraged to run a sniffer as root,"
-		ewarn "Please consider enabling the suid use flag and adding"
-		ewarn "your user to the kismet group."
-	fi
-}
diff --git a/net-wireless/kismet/kismet-2018.08_beta1-r2.ebuild b/net-wireless/kismet/kismet-2018.08_beta1-r2.ebuild
new file mode 100644
index 000000000000..c7a5653873cd
--- /dev/null
+++ b/net-wireless/kismet/kismet-2018.08_beta1-r2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib user python-single-r1
+
+MY_P=${P/\./-}
+MY_P=${MY_P/_beta/-BETA}
+MY_P=${MY_P/./-R}
+S=${WORKDIR}/${MY_P}
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git"
+	SRC_URI=""
+	inherit git-r3
+	KEYWORDS=""
+	RESTRICT="strip"
+else
+	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+fi
+
+DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
+HOMEPAGE="https://www.kismetwireless.net"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="lm_sensors networkmanager +pcre selinux +suid"
+
+CDEPEND="
+	${PYTHON_DEPS}
+	net-misc/networkmanager:=
+	dev-libs/glib:=
+	dev-libs/elfutils:=
+	sys-libs/zlib:=
+	dev-db/sqlite:=
+	net-libs/libmicrohttpd
+	kernel_linux? ( sys-libs/libcap
+			dev-libs/libnl:3
+			net-libs/libpcap
+			)
+	dev-libs/protobuf-c:=
+	sys-libs/ncurses:=
+	lm_sensors? ( sys-apps/lm_sensors )
+	pcre? ( dev-libs/libpcre )
+	suid? ( sys-libs/libcap )
+	"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kismet )
+"
+
+src_prepare() {
+	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+		conf/kismet_logging.conf || die
+
+	# Don't strip and set correct mangrp
+	sed -i -e 's| -s||g' \
+		-e 's|@mangrp@|root|g' Makefile.in
+
+	epatch "${FILESDIR}"/fix-setuptools.patch
+	eapply_user
+
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+
+	if ! use lm_sensors; then
+		sed -i "s#HAVE_LMSENSORS_H=1#HAVE_LMSENSORS_H=0#" configure
+	fi
+	if use networkmanager; then
+		sed -i "s#havelibnm\=no#havelibnm\=yes#" configure
+	else
+		sed -i "s#havelibnm\=yes#havelibnm\=no#" configure
+	fi
+	sed -i 's#-O3##' configure
+}
+
+src_configure() {
+	econf \
+		$(use_enable pcre)
+}
+
+src_install() {
+	emake DESTDIR="${D}" commoninstall
+	emake DESTDIR="${D}" forceconfigs
+
+	insinto /usr/share/${PN}
+	doins -r log_tools
+
+	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
+	dodoc CHANGELOG README*
+	newinitd "${FILESDIR}"/${PN}.initd kismet
+	newconfd "${FILESDIR}"/${PN}.confd kismet
+}
+
+pkg_preinst() {
+	if use suid; then
+		enewgroup kismet
+		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
+		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
+		fowners root:kismet /usr/bin/kismet_cap_pcapfile
+		# Need to set the permissions after chowning.
+		# See chown(2)
+		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
+		fperms 4550 /usr/bin/kismet_cap_linux_wifi
+		fperms 4550 /usr/bin/kismet_cap_pcapfile
+		elog "Kismet has been installed with a setuid-root helper binary"
+		elog "to enable minimal-root operation.  Users need to be part of"
+		elog "the 'kismet' group to perform captures from physical devices."
+	fi
+	if ! use suid; then
+		ewarn "It is highly discouraged to run a sniffer as root,"
+		ewarn "Please consider enabling the suid use flag and adding"
+		ewarn "your user to the kismet group."
+	fi
+}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index ddf8e2e5e783..c7a5653873cd 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -92,6 +92,9 @@ src_install() {
 	emake DESTDIR="${D}" commoninstall
 	emake DESTDIR="${D}" forceconfigs
 
+	insinto /usr/share/${PN}
+	doins -r log_tools
+
 	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
 	dodoc CHANGELOG README*
 	newinitd "${FILESDIR}"/${PN}.initd kismet
diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index 08f3350ee954..e4bc8e31c354 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,4 +1,6 @@
 DIST ubertooth-2017-03-R2.tar.xz 676124 BLAKE2B 1f82c9a6b4b2fcec84d5f69862f843ee4920eb0e17e61940aba48e118fe290f67777eed4bd9826c420e218ab433b94630abaf8793c845d2e68ff5587e8b73fbc SHA512 4806a6ac664ec9b78964caeb47f87a60db8f664c529e6e58bc1e5db4d858eaaa1ae51f0293f4a5227a102e556caf1611e97f6675147af4bc34e23646049e8571
+DIST ubertooth-2018-08-R1.tar.xz 701928 BLAKE2B 031d4178693a4c1734f72d5c7292ba58f0c74b9a57cc1841ecdec286d547994847dc7badabc3efce6eff9a34abe505d942b561bc3291b3cda0f29a42fa7dd340 SHA512 630707583b4fa0683d3f2a40e06697546897e603bd27842886897949ffeaff252d3b34040dee6b8b3319f9bed65eb706f57b885d7a6719fc9cb993e7c1d9c203
 EBUILD ubertooth-2017.03.2-r1.ebuild 2111 BLAKE2B 9e58bdc705487144ae10cb7e8f64d5f5f4f1195e3b23f9d6f873f7a1017ceb85841a8da896eaafb83276a2d99010f8ea6fdf700148d50349e73cb61698cd8026 SHA512 cab20dac721a6bc7bcfca4d8467caad68382d154718b2607507f7d91e9b4f4cc9c351f43859c5a4c66e22d48220a6df1779426459dc4f9fee2706f8f5a2b9672
+EBUILD ubertooth-2018.08.1.ebuild 2111 BLAKE2B 9e58bdc705487144ae10cb7e8f64d5f5f4f1195e3b23f9d6f873f7a1017ceb85841a8da896eaafb83276a2d99010f8ea6fdf700148d50349e73cb61698cd8026 SHA512 cab20dac721a6bc7bcfca4d8467caad68382d154718b2607507f7d91e9b4f4cc9c351f43859c5a4c66e22d48220a6df1779426459dc4f9fee2706f8f5a2b9672
 EBUILD ubertooth-9999.ebuild 2111 BLAKE2B 9e58bdc705487144ae10cb7e8f64d5f5f4f1195e3b23f9d6f873f7a1017ceb85841a8da896eaafb83276a2d99010f8ea6fdf700148d50349e73cb61698cd8026 SHA512 cab20dac721a6bc7bcfca4d8467caad68382d154718b2607507f7d91e9b4f4cc9c351f43859c5a4c66e22d48220a6df1779426459dc4f9fee2706f8f5a2b9672
 MISC metadata.xml 562 BLAKE2B dea6d366f75fbf852510f4b7204d5b51f5d3e52ef0b55020fe3a67edc486ad757c4b388ed6de36611ba14084e985df57f7986c5cc4e17193a59c546608c6f92d SHA512 b266c4914480613ba2f64519152d73cb7c472755fbd378bd0e547d4e0cf2fe6069636e04bd64fd9c686ff42adcb126118936846d2cbc241f1cc081e28b390400
diff --git a/net-wireless/ubertooth/ubertooth-2018.08.1.ebuild b/net-wireless/ubertooth/ubertooth-2018.08.1.ebuild
new file mode 100644
index 000000000000..1341a9478aa6
--- /dev/null
+++ b/net-wireless/ubertooth/ubertooth-2018.08.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils udev
+
+HOMEPAGE="http://ubertooth.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+bluez static-libs +ubertooth1-firmware +udev"
+
+DEPEND="bluez? ( net-wireless/bluez:= )
+	>=net-libs/libbtbb-${PV}:=[static-libs?]
+	static-libs? ( dev-libs/libusb[static-libs] )
+	virtual/libusb:1="
+RDEPEND="${DEPEND}
+	udev? ( virtual/udev )"
+
+MY_PV=${PV/\./-}
+MY_PV=${MY_PV/./-R}
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
+	inherit git-r3
+	KEYWORDS=""
+	S="${WORKDIR}/${P}/host"
+else
+	S="${WORKDIR}/${PN}-${MY_PV}/host"
+	SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+DESCRIPTION="open source wireless development platform suitable for Bluetooth experimentation"
+
+#readd firmware building, but do it right
+#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_BLUEZ=$(usex bluez)
+		-DBUILD_STATIC_LIB=$(usex static-libs)
+		-DINSTALL_UDEV_RULES=$(usex udev)
+		-DENABLE_PYTHON=false
+	)
+	if use udev; then
+		mycmakeargs+=(
+			-DUDEV_RULES_GROUP=usb
+			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/${PN}
+	pushd "${WORKDIR}/${PN}-${MY_PV}" || die
+	if [[ ${PV} == "9999" ]] ; then
+		ewarn "Firmware isn't available for git releases, we assume you are already"
+		ewarn "on the latest and/or can build your own."
+	else
+		use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
+		use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu
+	fi
+	popd
+
+	elog "Everyone can read from the ubertooth, but to talk to it"
+	elog "your user needs to be in the usb group."
+}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index b72f8af8b9c3..aff6685b942e 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -11,5 +11,6 @@ EBUILD unifi-5.6.39-r1.ebuild 1729 BLAKE2B 77a4fb38b6e82763f83f072d595e3f39306ae
 EBUILD unifi-5.8.25.ebuild 1853 BLAKE2B dab351e3ae3b414f81d1b95bdef4d2a1fa406f804dc6d0331169e14138f5436d092803bb8ea86f7000b9d7a9b032dd1995da8130233c3f5db013a0e7bd7e1abf SHA512 cf2b4a2639c1bb4ef8cb73ca9bae37955f3d12e661f2fcf0187b1a880ff3eab67bab41b3292868940f27cf701eedc31a322cd19a0c80686e7bba5a9f7ebf2cc0
 EBUILD unifi-5.8.28.ebuild 1847 BLAKE2B 2165ff736cf596b62291a96d6a7d5967a70fbf3e060c68ed9e21d3658628a93c6f9df441ffd1d75774764a4556f0880dcd3b835767aad87eb2e3c00f9382a76c SHA512 61fc42af8101817953df870a384ce6e156093909f34930c40dcdbb9a3baa402c629ba850a97534384798e8603c33a6b720dec577418c50e039674f8f202515f2
 EBUILD unifi-5.9.16.ebuild 1727 BLAKE2B 892541030e230cf1eff9031e07a7ee31901b2d85ad0c21b8009bab3387fab1f84f4eecc2c841b5d36ca5f44e08e0f4b1b90a81a5f124eaeffc45d45e0424f3b1 SHA512 757ba4eee8b8d40af1d1153e7902ee23b5b632b1dc4eec8c92bb3f0800550ce54711c6a3e7881c26582fe16eefea794df735cafb34f4bff01eead51aad783238
+EBUILD unifi-5.9.20-r1.ebuild 1853 BLAKE2B 147e94e87d0857fb61737e817ff131ba8c9121fba93612be2424b9e0e668b4488e506c0fde9eede0cc7ebb37411a2871b349f359390204d6a6a38bade887d37a SHA512 ccb9dd1c4ae84d1ff2bc69cf6dd69ca13dcd5765380d2cddff76b3e5db7aac1535813e56147a2a51ef9c566fe1f4325286f5691f589a1139c96b3ff7f3c6c99b
 EBUILD unifi-5.9.20.ebuild 1750 BLAKE2B 47a382ab44005600eeefc3edcb9e4e2c06ed28e5da0be7a4ef5461752ce97c6d9ded0f4a194b2c76274d51655bc332c3c8486d28256ebe17a2887ab59501cd44 SHA512 a16c6a7d8d126f26f6272e83f008e33bd7b0969a3697d931a6fd517471ecfd6919a90722971d6c8d385da60727e6868ca11df23aacec8d9c172047028674e48f
 MISC metadata.xml 803 BLAKE2B 5d50d4d0c8353661b471d243682812f77cc9a969d3117c6cf1fff60ecef4e83767b8e235cb0e010383bf1f754a7f1a1261a73427b3bfc1446f7ef08ba837ab36 SHA512 2588b43cf7049379def1b487815c317377e8e04293e54dd6035c50ce612f0ce3ac2039c3802eb7b9b6be172c49aef68f28a547fec5f565e42acaf0d2fdac8abe
diff --git a/net-wireless/unifi/unifi-5.9.20-r1.ebuild b/net-wireless/unifi/unifi-5.9.20-r1.ebuild
new file mode 100644
index 000000000000..45d86d138b02
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.9.20-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Used, when it's an unstable, beta or release candidate
+RC_SUFFIX="-5975c092ea"
+
+inherit systemd user
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/5.9"
+IUSE="systemd"
+
+RDEPEND="dev-db/mongodb
+	virtual/jre:1.8"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+pkg_setup() {
+	enewgroup unifi
+	enewuser unifi -1 -1 /var/lib/unifi unifi
+}
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
+	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+	exeinto /usr/lib/unifi/bin
+	newexe "${FILESDIR}"/mongod-wrapper mongod
+
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index e6a8e4098291..fe9df8bed0c0 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -18,4 +18,5 @@ EBUILD wpa_supplicant-2.6-r3.ebuild 11044 BLAKE2B ec092b2d8c8094c19ce1e019642ff0
 EBUILD wpa_supplicant-2.6-r5.ebuild 11782 BLAKE2B b74866e78cc82cb5e3600135052024c11b628371932b52634754fa578c6f31ed0d58f5ba2e980fdd7f1ddf50c92e721e538098af2270a9061c64ee5e902940fe SHA512 afd5fc95a798031f7ac84fb17737a113db720686d9ad304d2abfd56b4c16468fc446926594ff87b17438d2b9c39762865782de794019a780074df87f9479307e
 EBUILD wpa_supplicant-2.6-r6.ebuild 11810 BLAKE2B 2c4dccf5392657392567b56598a9cf98ab968b34da44210a7608e1eda9e2eea3fbadcd6c51bbd6cffab841295cf49aa8f17d2602be537fc107b7d08370282955 SHA512 eb1a814b2cb50a5b0752061b3563c514c69c4bd637b83f9ee0e477310510869d05a1f5cbc9e2f3f894886e4309fc60c10d2f77b30adcba9d590bf9c8adde93eb
 EBUILD wpa_supplicant-2.6-r8.ebuild 12421 BLAKE2B 83f93e2381b3108939901b18a5222e0a632fd79913ba6f5c2d454e871bceb65f3d9a87dea0a5eaab2f556866ee1e554d570c7181a6e3aa12fb428a06eab677c6 SHA512 03667d27cc8c82df0b3223649f0c1649a055f3bc52dbd2cdaf6ef44a214033c9d073af41e0c569cd25cc8221db058c1112ece26f14697bc088a5719bc8327622
+EBUILD wpa_supplicant-9999.ebuild 11650 BLAKE2B e9b4ed5aac7d60c348184b07f0b56e7b4cb74f530be90a67fece55916e5065cfc82a66310fa682b6a94763e396a1ad15db967288680e1cb758754453cfacc18e SHA512 a37fbc96d8cd2b64d705fdd9f0d7499cfbf17115b42ab9aeb2d66acc277cdf1e3513a45ff95896ee03b992a2fbcaadb5572a2ff32f48428bc8d50a194f17a598
 MISC metadata.xml 1387 BLAKE2B d18ad59ec0e7852ed299596a6217d705f3344b1e215875fa5eb4afb9aeb91d17edd77ed35e5cb83b6868b529d3c173574f7d1810f2f145c8398860f72b0792fe SHA512 ab26df54e5dc68ef0db3f654df1dbf144b38d78e63d11d428bd04a4b374c6b704b334e3812a4042b4827bdab887bebe6de24a82c05edb7df7d614d4d4b8925fb
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
new file mode 100644
index 000000000000..5c5676770af4
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -0,0 +1,454 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="https://w1.fi/wpa_supplicant/"
+LICENSE="|| ( GPL-2 BSD )"
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://w1.fi/hostap.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
+fi
+
+SLOT="0"
+IUSE="ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p privsep ps3 qt5 readline selinux smartcard ssl suiteb tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+REQUIRED_USE="smartcard? ( ssl )"
+
+CDEPEND="dbus? ( sys-apps/dbus )
+	kernel_linux? (
+		dev-libs/libnl:3
+		net-wireless/crda
+		eap-sim? ( sys-apps/pcsc-lite )
+	)
+	!kernel_linux? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)
+	readline? (
+		sys-libs/ncurses:0=
+		sys-libs/readline:0=
+	)
+	ssl? (
+		gnutls? (
+			dev-libs/libgcrypt:0=
+			net-libs/gnutls:=
+		)
+		!gnutls? (
+			!libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	!ssl? ( dev-libs/libtommath )
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-networkmanager )
+"
+
+DOC_CONTENTS="
+	If this is a clean installation of wpa_supplicant, you
+	have to create a configuration file named
+	${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf
+	An example configuration file is available for reference in
+	${EROOT%/}/usr/share/doc/${PF}/
+"
+
+S="${WORKDIR}/${P}/${PN}"
+
+Kconfig_style_config() {
+		#param 1 is CONFIG_* item
+		#param 2 is what to set it = to, defaulting in y
+		CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1"
+		setting="${2:-y}"
+
+		if [ ! $setting = n ]; then
+			#first remove any leading "# " if $2 is not n
+			sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM"
+			#set item = $setting (defaulting to y)
+			sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
+			if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then
+				echo "$CONFIG_PARAM=$setting" >>.config
+			fi
+		else
+			#ensure item commented out
+			sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM"
+		fi
+}
+
+pkg_setup() {
+	if use ssl ; then
+		if use gnutls && use libressl ; then
+			elog "You have both 'gnutls' and 'libressl' USE flags enabled: defaulting to USE=\"gnutls\""
+		fi
+	else
+		elog "You have 'ssl' USE flag disabled: defaulting to internal TLS implementation"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
+	sed -i \
+		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
+		../src/l2_packet/l2_packet_freebsd.c || die
+
+	# People seem to take the example configuration file too literally (bug #102361)
+	sed -i \
+		-e "s:^\(opensc_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_module_path\):#\1:" \
+		wpa_supplicant.conf || die
+
+	# Change configuration to match Gentoo locations (bug #143750)
+	sed -i \
+		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
+		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
+		wpa_supplicant.conf || die
+
+	# systemd entries to D-Bus service files (bug #372877)
+	echo 'SystemdService=wpa_supplicant.service' \
+		| tee -a dbus/*.service >/dev/null || die
+
+	cd "${WORKDIR}/${P}" || die
+
+	if use wimax; then
+		# generate-libeap-peer.patch comes before
+		# fix-undefined-reference-to-random_get_bytes.patch
+		eapply "${FILESDIR}/${P}-generate-libeap-peer.patch"
+
+		# multilib-strict fix (bug #373685)
+		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile || die
+	fi
+
+	# bug (320097)
+	#eapply "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch"
+
+	# bug (596332 & 651314)
+	#eapply "${FILESDIR}/${P}-libressl-compatibility.patch"
+
+	# bug (640492)
+	sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
+}
+
+src_configure() {
+	# Toolchain setup
+	tc-export CC
+
+	cp defconfig .config || die
+
+	# Basic setup
+	Kconfig_style_config CTRL_IFACE
+	Kconfig_style_config MATCH_IFACE
+	Kconfig_style_config BACKEND file
+	Kconfig_style_config IBSS_RSN
+	Kconfig_style_config IEEE80211W
+	Kconfig_style_config IEEE80211R
+
+	# Basic authentication methods
+	# NOTE: we don't set GPSK or SAKE as they conflict
+	# with the below options
+	Kconfig_style_config EAP_GTC
+	Kconfig_style_config EAP_MD5
+	Kconfig_style_config EAP_OTP
+	Kconfig_style_config EAP_PAX
+	Kconfig_style_config EAP_PSK
+	Kconfig_style_config EAP_TLV
+	Kconfig_style_config EAP_EXE
+	Kconfig_style_config IEEE8021X_EAPOL
+	Kconfig_style_config PKCS12
+	Kconfig_style_config PEERKEY
+	Kconfig_style_config EAP_LEAP
+	Kconfig_style_config EAP_MSCHAPV2
+	Kconfig_style_config EAP_PEAP
+	Kconfig_style_config EAP_TLS
+	Kconfig_style_config EAP_TTLS
+
+	# Enabling background scanning.
+	Kconfig_style_config BGSCAN_SIMPLE
+	Kconfig_style_config BGSCAN_LEARN
+
+	if use dbus ; then
+		Kconfig_style_config CTRL_IFACE_DBUS
+		Kconfig_style_config CTRL_IFACE_DBUS_NEW
+		Kconfig_style_config CTRL_IFACE_DBUS_INTRO
+	fi
+
+	if use eapol_test ; then
+		Kconfig_style_config EAPOL_TEST
+	fi
+
+	# Enable support for writing debug info to a log file and syslog.
+	Kconfig_style_config DEBUG_FILE
+	Kconfig_style_config DEBUG_SYSLOG
+
+	if use hs2-0 ; then
+		Kconfig_style_config INTERWORKING
+		Kconfig_style_config HS20
+	fi
+
+	if use uncommon-eap-types; then
+		Kconfig_style_config EAP_GPSK
+		Kconfig_style_config EAP_SAKE
+		Kconfig_style_config EAP_GPSK_SHA256
+		Kconfig_style_config EAP_IKEV2
+		Kconfig_style_config EAP_EKE
+	fi
+
+	if use eap-sim ; then
+		# Smart card authentication
+		Kconfig_style_config EAP_SIM
+		Kconfig_style_config EAP_AKA
+		Kconfig_style_config EAP_AKA_PRIME
+		Kconfig_style_config PCSC
+	fi
+
+	if use fasteap ; then
+		Kconfig_style_config EAP_FAST
+	fi
+
+	if use readline ; then
+		# readline/history support for wpa_cli
+		Kconfig_style_config READLINE
+	else
+		#internal line edit mode for wpa_cli
+		Kconfig_style_config WPA_CLI_EDIT
+	fi
+
+	if use suiteb; then
+		Kconfig_style_config SUITEB
+	fi
+
+	# SSL authentication methods
+	if use ssl ; then
+		if use gnutls ; then
+			Kconfig_style_config TLS gnutls
+			Kconfig_style_config GNUTLS_EXTRA
+		else
+			#this fails for gnutls
+			Kconfig_style_config SUITEB192
+			Kconfig_style_config TLS openssl
+			if ! use bindist; then
+			  #this fails for gnutls
+			  Kconfig_style_config EAP_PWD
+			  # SAE fails on gnutls and everything below here needs SAE
+			  # Enabling mesh networks.
+			  Kconfig_style_config MESH
+			  #WPA3
+			  Kconfig_style_config OWE
+			  Kconfig_style_config SAE
+			  #we also need to disable FILS, except that isn't enabled yet
+			fi
+
+		fi
+	else
+		Kconfig_style_config TLS internal
+	fi
+
+	if use smartcard ; then
+		Kconfig_style_config SMARTCARD
+	fi
+
+	if use tdls ; then
+		Kconfig_style_config TDLS
+	fi
+
+	if use kernel_linux ; then
+		# Linux specific drivers
+		Kconfig_style_config DRIVER_ATMEL
+		Kconfig_style_config DRIVER_HOSTAP
+		Kconfig_style_config DRIVER_IPW
+		Kconfig_style_config DRIVER_NL80211
+		Kconfig_style_config DRIVER_RALINK
+		Kconfig_style_config DRIVER_WEXT
+		Kconfig_style_config DRIVER_WIRED
+
+		if use ps3 ; then
+			Kconfig_style_config DRIVER_PS3
+		fi
+
+	elif use kernel_FreeBSD ; then
+		# FreeBSD specific driver
+		Kconfig_style_config DRIVER_BSD
+	fi
+
+	# Wi-Fi Protected Setup (WPS)
+	if use wps ; then
+		Kconfig_style_config WPS
+		Kconfig_style_config WPS2
+		# USB Flash Drive
+		Kconfig_style_config WPS_UFD
+		# External Registrar
+		Kconfig_style_config WPS_ER
+		# Universal Plug'n'Play
+		Kconfig_style_config WPS_UPNP
+		# Near Field Communication
+		Kconfig_style_config WPS_NFC
+	fi
+
+	# Wi-Fi Direct (WiDi)
+	if use p2p ; then
+		Kconfig_style_config P2P
+		Kconfig_style_config WIFI_DISPLAY
+	fi
+
+	# Access Point Mode
+	if use ap ; then
+		Kconfig_style_config AP
+	fi
+
+	# Enable essentials for AP/P2P
+	if use ap || use p2p ; then
+		# Enabling HT support (802.11n)
+		Kconfig_style_config IEEE80211N
+
+		# Enabling VHT support (802.11ac)
+		Kconfig_style_config IEEE80211AC
+	fi
+
+	# Enable mitigation against certain attacks against TKIP
+	Kconfig_style_config DELAYED_MIC_ERROR_REPORT
+
+	if use privsep ; then
+		Kconfig_style_config PRIVSEP
+	fi
+
+	# If we are using libnl 2.0 and above, enable support for it
+	# Bug 382159
+	# Removed for now, since the 3.2 version is broken, and we don't
+	# support it.
+	if has_version ">=dev-libs/libnl-3.2"; then
+		Kconfig_style_config LIBNL32
+	fi
+
+	if use qt5 ; then
+		pushd "${S}"/wpa_gui-qt4 > /dev/null || die
+		eqmake5 wpa_gui.pro
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	einfo "Building wpa_supplicant"
+	emake V=1 BINDIR=/usr/sbin
+
+	if use wimax; then
+		emake -C ../src/eap_peer clean
+		emake -C ../src/eap_peer
+	fi
+
+	if use qt5; then
+		einfo "Building wpa_gui"
+		emake -C "${S}"/wpa_gui-qt4
+	fi
+
+	if use eapol_test ; then
+		emake eapol_test
+	fi
+}
+
+src_install() {
+	dosbin wpa_supplicant
+	use privsep && dosbin wpa_priv
+	dobin wpa_cli wpa_passphrase
+
+	# baselayout-1 compat
+	if has_version "<sys-apps/baselayout-2.0.0"; then
+		dodir /sbin
+		dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant
+		dodir /bin
+		dosym ../usr/bin/wpa_cli /bin/wpa_cli
+	fi
+
+	if has_version ">=sys-apps/openrc-0.5.0"; then
+		newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
+		newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
+	fi
+
+	exeinto /etc/wpa_supplicant/
+	newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
+
+	readme.gentoo_create_doc
+	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
+		wpa_supplicant.conf
+
+	newdoc .config build-config
+
+	#doman doc/docbook/*.{5,8}
+
+	if use qt5 ; then
+		into /usr
+		dobin wpa_gui-qt4/wpa_gui
+		doicon wpa_gui-qt4/icons/wpa_gui.svg
+		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
+	else
+		rm "${ED}"/usr/share/man/man8/wpa_gui.8
+	fi
+
+	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
+
+	if use dbus ; then
+		pushd "${S}"/dbus > /dev/null || die
+		insinto /etc/dbus-1/system.d
+		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
+		insinto /usr/share/dbus-1/system-services
+		doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service
+		popd > /dev/null || die
+
+		# This unit relies on dbus support, bug 538600.
+		systemd_dounit systemd/wpa_supplicant.service
+	fi
+
+	if use eapol_test ; then
+		dobin eapol_test
+	fi
+
+	systemd_dounit "systemd/wpa_supplicant@.service"
+	systemd_dounit "systemd/wpa_supplicant-nl80211@.service"
+	systemd_dounit "systemd/wpa_supplicant-wired@.service"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -e "${EROOT%/}"/etc/wpa_supplicant.conf ]] ; then
+		echo
+		ewarn "WARNING: your old configuration file ${EROOT%/}/etc/wpa_supplicant.conf"
+		ewarn "needs to be moved to ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf"
+	fi
+
+	if use bindist || use gnutls; then
+		if ! use libressl; then
+			ewarn "Using bindist or gnutls use flags presently breaks WPA3 (specifically SAE and OWE)."
+			ewarn "This is incredibly undesirable"
+		fi
+	fi
+
+	# Mea culpa, feel free to remove that after some time --mgorny.
+	local fn
+	for fn in wpa_supplicant{,@wlan0}.service; do
+		if [[ -e "${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} ]]
+		then
+			ebegin "Moving ${fn} to multi-user.target"
+			mv "${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} \
+				"${EROOT%/}"/etc/systemd/system/multi-user.target.wants/ || die
+			eend ${?} \
+				"Please try to re-enable ${fn}"
+		fi
+	done
+
+	systemd_reenable wpa_supplicant.service
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 0c51624b093e..0fd9ea14b178 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 287262d2c757..c3eb7a952f02 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -398,10 +398,6 @@ www-client/seamonkey custom-optimization
 # quesoglc is not keyworded
 x11-misc/rss-glx quesoglc
 
-# Ben de Groot <yngwin@gentoo.org> (16 Jan 2010)
-# qtmultimedia is not keyworded, bug 293671
-dev-python/PyQt4 multimedia
-
 # Raúl Porcel <armin76@gentoo.org> (07 Jul 2008)
 # Make clisp deps minimal
 dev-lisp/clisp hyperspec pari svm
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 48cd36f11131..25983b9f5b5c 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -193,7 +193,7 @@ dev-python/python-glanceclient test
 dev-python/python-neutronclient test
 
 # NeddySeagoon <neddysegoon@gentoo.org> 24 Aug 2017
-# Support for g15daemon  still needs -9999 packages on all arches 
+# Support for g15daemon still needs -9999 packages on all arches
 media-sound/mumble g15
 
 # NeddySeagoon <neddysegoon@gentoo.org> (21 Aug 2107)
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index f240bc4fdb4c..bffe985b4d1d 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -174,7 +174,7 @@ net-libs/gupnp connman
 dev-libs/libpcre jit
 
 # Arun Raghavan <ford_prefect@gentoo.org> (24 May 2012)
-# media-sound/pulseaudio needs PyQt4[dbus] for making the equalizer module
+# media-sound/pulseaudio needs PyQt5[dbus] for making the equalizer module
 # usable. Mask until this is available.
 # Jeroen Roovers <jer@gentoo.org> (18 Feb 2014)
 # OSS is the only kernel audio interface that works on HPPA
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 7961ffd22c59..fdba3b382a8c 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -341,10 +341,6 @@ mail-client/thunderbird custom-optimization
 www-client/firefox custom-optimization
 www-client/seamonkey custom-optimization
 
-# Ben de Groot <yngwin@gentoo.org> (16 Jan 2010)
-# qtmultimedia is not keyworded, bug 293671
-dev-python/PyQt4 multimedia
-
 # Raúl Porcel <armin76@gentoo.org>
 # Keep deps minimal
 x11-wm/fvwm lock
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index f940e0c6be02..ae2d441f7338 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -359,10 +359,6 @@ net-analyzer/wireshark doc-pdf
 # MKL not available on this arch
 media-gfx/povray mkl
 
-# Ben de Groot <yngwin@gentoo.org> (16 Jan 2010)
-# qtmultimedia is not keyworded, bug 293671
-dev-python/PyQt4 multimedia
-
 # Ben de Groot <yngwin@gentoo.org> (11 Nov 2009)
 # Requires qthelp, which requires qtwebkit, bug 292838
 dev-libs/uriparser doc
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index 55bb8b3a0bcf..e5b715438875 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -40,7 +40,7 @@ app-text/texlive context l10n_ja
 sys-block/thin-provisioning-tools test
 
 # Davide Pesavento <pesa@gentoo.org> (18 Oct 2015)
-# Requires dev-python/PyQt4, which is not stable on sparc
+# Requires dev-python/PyQt5, which is not stable on sparc
 media-sound/pulseaudio equalizer
 
 # Pacho Ramos <pacho@gentoo.org> (02 Aug 2015)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index adcfa1f3ca18..fd2b151749f7 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.
 
+# Mike Gilbert <floppym@gentoo.org> (05 Aug 2018)
+# Fails to build.
+# https://bugs.gentoo.org/661880
+>=www-client/chromium-69 system-icu
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (3 Aug 2018)
 # New and for Gentoo still quite experimental. You've been
 # warned. (Also, works only on x86_64 and with certain CPUs
diff --git a/profiles/package.mask b/profiles/package.mask
index f2262d95cfa8..b926fd34e6c3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,23 @@
 
 #--- END OF EXAMPLES ---
 
+# Ulrich Müller <ulm@gentoo.org> (07 Aug 2018)
+# Fails to build with emacs-26.1. Last release in 2003, last commit
+# to upstream CVS in 2010. Masked for removal in 30 days. Bug #663030.
+app-emacs/cmail
+
+# Thomas Deutschmann <whissi@gentoo.org> (05 Aug 2018)
+# Deprecated. Using recent microcodes with this package either won't work
+# or crash your system. Please change your setup and make use of kernel's
+# early microcode loading feature, see https://wiki.gentoo.org/wiki/Microcode
+# for more details. Removal in 30 days.
+sys-apps/microcode-ctl
+
+# Mike Gilbert <floppym@gentoo.org> (04 Aug 2018)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-70
+
 # Virgil Dupras <vdupras@gentoo.org> (02 Aug 2018)
 # Django 1.8 is unsupported and insecure. These packages haven't been updated
 # to work with up-to-date django. Removal in 30 days. Bug #662632
@@ -166,58 +183,6 @@ dev-python/jaraco-utils
 # for generating new keys and doing key maintenance. Removal in a month
 app-crypt/gkeys-gen
 
-# Andreas Sturmlechner <asturm@gentoo.org> (26 Jun 2018)
-# Mask Qt4 for removal. Bug #631788
-=dev-qt/assistant-4.8.7
-=dev-qt/designer-4.8.7
-=dev-qt/linguist-4.8.7
-=dev-qt/pixeltool-4.8.7
-=dev-qt/qdbusviewer-4.8.7
-=dev-qt/qt3support-4.8.7
-=dev-qt/qtbearer-4.8.7
-=dev-qt/qtcore-4.8.7-r4
-=dev-qt/qtdbus-4.8.7
-=dev-qt/qtdeclarative-4.8.7
-=dev-qt/qtdemo-4.8.7
-=dev-qt/qtgui-4.8.7
-=dev-qt/qthelp-4.8.7
-=dev-qt/qt-meta-4.8.6-r1
-=dev-qt/qtmultimedia-4.8.7
-=dev-qt/qtopengl-4.8.7
-=dev-qt/qtscript-4.8.7
-=dev-qt/qtsql-4.8.7-r1
-=dev-qt/qtsvg-4.8.7
-=dev-qt/qttest-4.8.7
-=dev-qt/qttranslations-4.8.7
-=dev-qt/qtxmlpatterns-4.8.7
-app-eselect/eselect-qtgraphicssystem
-
-# Andreas Sturmlechner <asturm@gentoo.org> (26 Jun 2018)
-# Depends on dead Qt4. Bugs #644360, #644374, #656826, #655382
-<media-sound/mumble-1.3
-<media-sound/murmur-1.3
-<net-analyzer/ostinato-0.9_p20180522
-
-# Andreas Sturmlechner <asturm@gentoo.org> (26 Jun 2018)
-# Depends on dead Qt4. Masked for removal. Bugs #644364, #644368, #644362
-dev-python/pivy
-media-libs/emfengine
-media-libs/quarter
-media-libs/SoQt
-
-# Andreas Sturmlechner <asturm@gentoo.org> (26 Jun 2018)
-# Depends on dead Qt4. Masked for removal.
-dev-python/pyqwt
-dev-python/PyQt4
-dev-python/pyside:0
-dev-python/shiboken:0
-
-# Andreas Sturmlechner <asturm@gentoo.org> (26 Jun 2018)
-# Depends on dead Qt4. Masked for removal in 30 days, bug #644728
-app-i18n/ibus-qt
-app-i18n/qimhangul
-=app-i18n/tagainijisho-1.0*
-
 # Thomas Deutschmann <whissi@gentoo.org> (23 Jun 2018)
 # Doesn't pass QA full boot test
 =sys-kernel/ck-sources-4.16.17
@@ -246,11 +211,6 @@ games-emulation/hatari
 # extra notification of the deprecation and replacement. Bug #658194
 media-plugins/gst-plugins-schroedinger
 
-# Mike Gilbert <floppym@gentoo.org> (15 Jun 2018)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-69
-
 # Brian Evans <grknight@gentoo.org> (14 Jun 2018)
 # Mask new php pre-releases for initial testing
 dev-lang/php:7.3
@@ -285,6 +245,7 @@ media-libs/libglvnd
 # Aaron Bauman <bman@gentoo.org> (30 Apr 2018)
 # Masked for testing
 =dev-libs/libressl-2.7*
+=dev-libs/libressl-2.8*
 
 # Andreas Sturmlechner <asturm@gentoo.org> (26 Apr 2018)
 # Package version depends on Qt-5.10 that was/is/will not be in tree.
@@ -373,10 +334,6 @@ virtual/jre:9
 # (<0.6) that have been punted from the tree.
 net-misc/cocaine-core
 
-# Andreas Sturmlechner <asturm@gentoo.org> (16 Nov 2017)
-# Depends on dead Qt4. Last-rites on hold for chance of Qt5-port. Bug #620702
-<media-gfx/freecad-0.17
-
 # Patrice Clement <monsieurp@gentoo.org> (28 Oct 2017)
 # Missing dependencies.
 >=dev-python/scrapy-1.4.0
@@ -491,11 +448,6 @@ dev-util/mutrace
 www-client/phantomjs
 dev-ruby/poltergeist
 
-# Thomas Deutschmann <whissi@gentoo.org> (24 May 2017)
-# Broken runscript/changed behavior causing lvm2 to fail
-# on boot. Bug #617578
->=sys-fs/lvm2-2.02.171
-
 # Michał Górny <mgorny@gentoo.org> (22 May 2017)
 # for Maciej S. Szmigiero <mail@maciej.szmigiero.name>
 # Any version above 5.100.138 breaks b43 driver in various ways.
@@ -526,14 +478,6 @@ dev-ruby/poltergeist
 <dev-util/nvidia-cuda-toolkit-8
 net-wireless/cpyrit-cuda
 
-# Bernard Cafarelli <voyageur@gentoo.org> (8 May 2017)
-# Coordinated conversion to wxGTK:3.0-gtk3
-# Drop mask after migration of existing wxGTK:3.0 users
-=net-ftp/filezilla-3.34.0-r300
-=net-ftp/filezilla-3.35.1-r300
-=dev-util/codeblocks-17.12-r300
-=dev-util/codeblocks-17.12-r301
-
 # Mart Raudsepp <leio@gentoo.org> (16 Feb 2017)
 # Old gstreamer 0.10 version, which is security vulnerable.
 # Use gstreamer:1.0 with media-plugins/gst-plugins-libav
diff --git a/profiles/updates/1Q-2013 b/profiles/updates/1Q-2013
index 31dfa75743cd..90c8e30996e0 100644
--- a/profiles/updates/1Q-2013
+++ b/profiles/updates/1Q-2013
@@ -18,16 +18,12 @@ move net-wireless/b43-firmware sys-firmware/b43-firmware
 move net-wireless/b43legacy-firmware sys-firmware/b43legacy-firmware
 move dev-util/qt-creator dev-qt/qt-creator
 move x11-libs/qt-assistant dev-qt/qthelp
-move x11-libs/qt-bearer dev-qt/qtbearer
 move x11-libs/qt-core dev-qt/qtcore
 move x11-libs/qt-dbus dev-qt/qtdbus
 move x11-libs/qt-declarative dev-qt/qtdeclarative
-move x11-libs/qt-demo dev-qt/qtdemo
 move x11-libs/qt-gui dev-qt/qtgui
-move x11-libs/qt-meta dev-qt/qt-meta
 move x11-libs/qt-multimedia dev-qt/qtmultimedia
 move x11-libs/qt-opengl dev-qt/qtopengl
-move x11-libs/qt-qt3support dev-qt/qt3support
 move x11-libs/qt-script dev-qt/qtscript
 move x11-libs/qt-sql dev-qt/qtsql
 move x11-libs/qt-svg dev-qt/qtsvg
diff --git a/profiles/updates/1Q-2015 b/profiles/updates/1Q-2015
index 476e272269d3..833b875b77cc 100644
--- a/profiles/updates/1Q-2015
+++ b/profiles/updates/1Q-2015
@@ -47,7 +47,6 @@ move app-admin/eselect-php app-eselect/eselect-php
 move app-admin/eselect-pinentry app-eselect/eselect-pinentry
 move app-admin/eselect-postgresql app-eselect/eselect-postgresql
 move app-admin/eselect-python app-eselect/eselect-python
-move app-admin/eselect-qtgraphicssystem app-eselect/eselect-qtgraphicssystem
 move app-admin/eselect-rails app-eselect/eselect-rails
 move app-admin/eselect-renpy app-eselect/eselect-renpy
 move app-admin/eselect-ruby app-eselect/eselect-ruby
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c1a30297c48b..cfd76a5d69a6 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -83,6 +83,7 @@ app-admin/lastpass-cli:pinentry - Use app-crypt/pinentry to prompt for passwords
 app-admin/logrotate:acl - Installs acl support
 app-admin/logrotate:cron - Installs cron file
 app-admin/logrotate:selinux - Installs Security Enhanced Linux support
+app-admin/logstash-bin:x-pack - Enable additional features (may need a license)
 app-admin/matter:entropy - Add Entropy support
 app-admin/mcollective:client - Install client utilities
 app-admin/mms-agent:monitoring - Install the monitoring agent
@@ -396,6 +397,7 @@ app-editors/emacs-vcs:gsettings - Use gsettings (dev-libs/glib) to read the syst
 app-editors/emacs-vcs:gtk3 - Prefer version 3 of the GIMP Toolkit to version 2 (x11-libs/gtk+)
 app-editors/emacs-vcs:gzip-el - Compress bundled Emacs Lisp source
 app-editors/emacs-vcs:imagemagick - Use media-gfx/imagemagick for image processing
+app-editors/emacs-vcs:json - Compile with native JSON support using dev-libs/jansson
 app-editors/emacs-vcs:libxml2 - Use dev-libs/libxml2 to parse XML instead of the internal Lisp implementations
 app-editors/emacs-vcs:mailutils - Retrieve e-mail using net-mail/mailutils instead of the internal movemail substitute
 app-editors/emacs-vcs:source - Install C source files and make them available for find-function
@@ -913,6 +915,7 @@ app-misc/ddcutil:user-permissions - Adds a udev rules to allow non-root users in
 app-misc/digitemp:ds2490 - Build support for the ds2490 sensor
 app-misc/digitemp:ds9097 - Build support for the ds9097 sensor
 app-misc/digitemp:ds9097u - Build support for the ds9097u sensor
+app-misc/elasticsearch:x-pack - Enable additional features (may need a license)
 app-misc/emelfm2:ansi - Add support for ANSI escape sequences
 app-misc/emelfm2:gtk3 - Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2
 app-misc/freemind:groovy - Build plugin for scripting via Groovy
@@ -1206,6 +1209,7 @@ app-text/enchant:aspell - Adds support for app-text/aspell spell checker
 app-text/enchant:hunspell - Adds support for app-text/hunspell spell checker
 app-text/evince:dvi - Enable the built-in DVI viewer
 app-text/evince:nautilus - Enable property page extension in gnome-base/nautilus
+app-text/evince:postscript - Enable support for PostScript and Adobe Illustrator documents with app-text/libspectre
 app-text/evince:t1lib - Enable the Type-1 fonts for the built-in DVI viewer (media-libs/t1lib)
 app-text/evince:xps - Enable XPS viewer using app-text/libgxps
 app-text/getxbook:ocr - Use app-text/tesseract for optical character recognition
@@ -2255,6 +2259,9 @@ dev-libs/libpcre2:zlib - Add support for pcregrep command to search within gzip-
 dev-libs/libpeas:glade - Install the glade catalog
 dev-libs/libpeas:python - Build support for loading dev-lang/python plugins
 dev-libs/librdkafka:lz4 - Enable support for Kafka's LZ4 compression based on KIP-57 (uses app-arch/lz4)
+dev-libs/librelp:gnutls - Use GnuTLS
+dev-libs/librelp:libressl - Use LibreSSL
+dev-libs/librelp:openssl - Use OpenSSL
 dev-libs/libressl:asm - Enables assembly
 dev-libs/libsecp256k1:asm - Enable x86_64 assembly optimisation
 dev-libs/libsecp256k1:ecdh - Enable ECDH shared secret computation
@@ -2517,22 +2524,6 @@ dev-php/twig:extension - Build the C extension (only for php-5.6.x).
 dev-php/xcache:coverage - Enable the coverager module (not recommended for production servers).
 dev-python/Kivy:camera - Install libraries needed to support camera
 dev-python/Kivy:garden - Install garden tool to manage user maintained widgets
-dev-python/PyQt4:X - Build bindings for the QtGui module
-dev-python/PyQt4:compat - Install the deprecated pyqtconfig module for backward compatibility
-dev-python/PyQt4:dbus - Build bindings for the QtDBus module
-dev-python/PyQt4:declarative - Build bindings for the QtDeclarative module
-dev-python/PyQt4:designer - Build bindings for the QtDesigner module and enable the designer plugin
-dev-python/PyQt4:help - Build bindings for the QtHelp module
-dev-python/PyQt4:multimedia - Build bindings for the QtMultimedia module
-dev-python/PyQt4:opengl - Build bindings for the QtOpenGL module
-dev-python/PyQt4:phonon - Build bindings for the phonon module
-dev-python/PyQt4:script - Build bindings for the QtScript module
-dev-python/PyQt4:scripttools - Build bindings for the QtScriptTools module
-dev-python/PyQt4:sql - Build bindings for the QtSql module
-dev-python/PyQt4:svg - Build bindings for the QtSvg module
-dev-python/PyQt4:testlib - Build bindings for the QtTest module
-dev-python/PyQt4:webkit - Build bindings for the QtWebKit module
-dev-python/PyQt4:xmlpatterns - Build bindings for the QtXmlPatterns module
 dev-python/PyQt5:bluetooth - Build bindings for the QtBluetooth module
 dev-python/PyQt5:dbus - Build bindings for the QtDBus module
 dev-python/PyQt5:declarative - Build bindings for the QtQml/QtQuick modules and enable the qmlscene plugin
@@ -2656,19 +2647,6 @@ dev-python/pypy:low-memory - Build using PyPy with the engine configured towards
 dev-python/pypy:sandbox - Enable sandboxing functionality
 dev-python/pypy3:low-memory - Build using PyPy with the engine configured towards low memory footprint. This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86, at the cost of lengthened build time.
 dev-python/pypy3:sandbox - Enable sandboxing functionality
-dev-python/pyside:X - Build QtGui and QtTest modules
-dev-python/pyside:declarative - Build QtDeclarative module
-dev-python/pyside:designer - Build QtDesigner and QtUiTools modules
-dev-python/pyside:help - Build QtHelp module
-dev-python/pyside:multimedia - Build QtMultimedia module
-dev-python/pyside:opengl - Build QtOpenGL module
-dev-python/pyside:phonon - Build phonon module
-dev-python/pyside:script - Build QtScript module
-dev-python/pyside:scripttools - Build QtScriptTools module
-dev-python/pyside:sql - Build QtSql module
-dev-python/pyside:svg - Build QtSvg module
-dev-python/pyside:webkit - Build QtWebKit module
-dev-python/pyside:xmlpatterns - Build QtXmlPatterns module
 dev-python/python-caja:gtk3 - Build with GTK+3 instead of GTK+2
 dev-python/python-stdnum:vies - Enable VIES
 dev-python/pyudev:pygobject - Install PyGobject bindings
@@ -2715,16 +2693,9 @@ dev-python/wxpython:examples - Install interactive demo module browser and sampl
 dev-python/zeep:async - Add async support
 dev-python/zeep:tornado - Add tornado support
 dev-python/zsi:twisted - add support for python-twisted (needs dev-python/twisted-core and dev-python/twisted-web)
-dev-qt/assistant:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
 dev-qt/designer:declarative - Build the qdeclarativeview plugin
-dev-qt/designer:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
-dev-qt/designer:phonon - Build the phononwidgets plugin
-dev-qt/designer:qt3support - Build the qt3supportwidgets plugin
 dev-qt/designer:webkit - Build the qwebview plugin
-dev-qt/linguist:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
 dev-qt/linguist-tools:qml - Enable QML support in lupdate
-dev-qt/pixeltool:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
-dev-qt/qdbusviewer:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
 dev-qt/qdoc:qml - Enable QML/JS parsing support
 dev-qt/qt-creator:android - Build plugin for Android devices
 dev-qt/qt-creator:autotools - Enable autotools project manager plugin
@@ -2765,54 +2736,28 @@ dev-qt/qt-docs:sensors - Install documentation for dev-qt/qtsensors
 dev-qt/qt-docs:speech - Install documentation for dev-qt/qtspeech
 dev-qt/qt-docs:virtualkeyboard - Install documentation for dev-qt/qtvirtualkeyboard
 dev-qt/qt-docs:webengine - Install documentation for dev-qt/qtwebengine
-dev-qt/qt-meta:qt3support - Enable the Qt3Support library for Qt4
 dev-qt/qt3d:gles2 - Use GLES 2.0 or later instead of full OpenGL
 dev-qt/qt3d:qml - Build QML/QtQuick bindings
-dev-qt/qt3support:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
-dev-qt/qtbearer:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
 dev-qt/qtbluetooth:qml - Build QML/QtQuick bindings and imports
 dev-qt/qtcharts:qml - Build QML/QtQuick bindings and imports
-dev-qt/qtcore:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
-dev-qt/qtcore:glib - Enable dev-libs/glib eventloop support
-dev-qt/qtcore:qt3support - Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4.
 dev-qt/qtcore:systemd - Enable native journald logging support
 dev-qt/qtdatavis3d:gles2 - Use GLES 2.0 or later instead of full OpenGL
 dev-qt/qtdatavis3d:qml - Build QML/QtQuick bindings and imports
-dev-qt/qtdbus:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
-dev-qt/qtdeclarative:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
 dev-qt/qtdeclarative:gles2 - Use GLES 2.0 or later instead of full OpenGL
 dev-qt/qtdeclarative:localstorage - Build the LocalStorage import for QtQuick (requires QtSql)
-dev-qt/qtdeclarative:qt3support - Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4.
-dev-qt/qtdeclarative:webkit - Build the WebView QML component
 dev-qt/qtdeclarative:widgets - Enable QtWidgets support
 dev-qt/qtdeclarative:xml - Build the XmlListModel import for QtQuick (requires QtXmlPatterns)
-dev-qt/qtdemo:dbus - Build QtDBus examples and demos
-dev-qt/qtdemo:declarative - Build QtDeclarative examples and demos
-dev-qt/qtdemo:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
-dev-qt/qtdemo:multimedia - Build QtMultimedia examples and demos
-dev-qt/qtdemo:opengl - Build QtOpenGL examples and demos
-dev-qt/qtdemo:phonon - Build Phonon examples and demos
-dev-qt/qtdemo:webkit - Build QtWebKit examples and demos
-dev-qt/qtdemo:xmlpatterns - Build QtXmlPatterns examples and demos
 dev-qt/qtdiag:network - Report network information
 dev-qt/qtdiag:widgets - Report widget style information
 dev-qt/qtgui:egl - Enable EGL integration
 dev-qt/qtgui:eglfs - Build the EGL Full Screen/Single Surface platform plugin
 dev-qt/qtgui:evdev - Enable support for input devices via evdev
-dev-qt/qtgui:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
 dev-qt/qtgui:gles2 - Use GLES 2.0 or later instead of full OpenGL
-dev-qt/qtgui:glib - Enable integration with the dev-libs/glib event loop
-dev-qt/qtgui:gtkstyle - Build a widgets style that mimics the active GTK+ theme
 dev-qt/qtgui:ibus - Build the IBus input method plugin
 dev-qt/qtgui:libinput - Enable support for input devices via dev-libs/libinput
-dev-qt/qtgui:qt3support - Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4.
-dev-qt/qtgui:trace - Build the 'trace' graphicssystem engine which allows to record all drawing operations into a trace buffer. The trace can be replayed later with the qttracereplay tool.
 dev-qt/qtgui:tslib - Enable support for touchscreen devices via x11-libs/tslib
 dev-qt/qtgui:tuio - Build plugin to receive touch events over the TUIO protocol
 dev-qt/qtgui:xcb - Build the XCB platform plugin and enable X11 integration
-dev-qt/qthelp:compat - Build the extra compatibility layer required by a few packages, see http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
-dev-qt/qthelp:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
-dev-qt/qtmultimedia:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
 dev-qt/qtmultimedia:gles2 - Use GLES 2.0 or later instead of full OpenGL
 dev-qt/qtmultimedia:gstreamer - Enable audio support via media-libs/gstreamer using SLOT 1.0
 dev-qt/qtmultimedia:qml - Build QML/QtQuick bindings and imports
@@ -2821,22 +2766,14 @@ dev-qt/qtnetwork:bindist - Disable EC support via dev-libs/openssl
 dev-qt/qtnetwork:connman - Enable net-misc/connman-based bearer plugin
 dev-qt/qtnetwork:libproxy - Use net-libs/libproxy for automatic HTTP/SOCKS proxy configuration
 dev-qt/qtnetwork:networkmanager - Enable net-misc/networkmanager-based bearer plugin
-dev-qt/qtopengl:egl - Use EGL instead of GLX to manage OpenGL contexts
-dev-qt/qtopengl:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
 dev-qt/qtopengl:gles2 - Use GLES 2.0 or later instead of full OpenGL
-dev-qt/qtopengl:qt3support - Enable the Qt3Support libraries for Qt4
 dev-qt/qtpositioning:geoclue - Use enhanced location information from app-misc/geoclue
 dev-qt/qtpositioning:qml - Build QML bindings
 dev-qt/qtprintsupport:gles2 - Use GLES 2.0 or later instead of full OpenGL
 dev-qt/qtquickcontrols:widgets - Enable QtWidgets support
 dev-qt/qtquickcontrols2:widgets - Enable QtWidgets support
-dev-qt/qtscript:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
 dev-qt/qtscript:scripttools - Build the QtScriptTools module (requires QtWidgets)
 dev-qt/qtsensors:qml - Build QML bindings
-dev-qt/qtsql:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
-dev-qt/qtsql:qt3support - Enable the Qt3Support libraries for Qt4
-dev-qt/qtsvg:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
-dev-qt/qttest:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
 dev-qt/qtvirtualkeyboard:handwriting - Adds handwriting recognition integration support
 dev-qt/qtwayland:libinput - Enable support for input devices via dev-libs/libinput
 dev-qt/qtwebchannel:qml - Build QML/QtQuick bindings and imports
@@ -2949,6 +2886,7 @@ dev-util/catalyst:ccache - Enables ccache support
 dev-util/catalyst:system-bootloader - Pulls in the depends needed to setup livecd bootloader from the host system rather than using a cdtar
 dev-util/cccc:apidoc - Build software docs with doxygen/graphviz and metrics with cccc
 dev-util/cccc:mfc - Add patch for MFC dialect options
+dev-util/clion:custom-jdk - Install and use IntelliJ's custom JRE.
 dev-util/cmake:server - Enable cmake-server support.
 dev-util/cmake:system-jsoncpp - Use system copy of dev-libs/jsoncpp instead of bundled one.
 dev-util/coccigrep:vim - Install the coccigrep vim plugin
@@ -3790,6 +3728,7 @@ mail-client/neomutt:qdbm - Enable QDBM (Quicker Database Manager) database backe
 mail-client/neomutt:smime - Enable support for smime
 mail-client/neomutt:smime_classic - Build classic_smime backend to support S/MIME
 mail-client/neomutt:tokyocabinet - Enable Tokyo Cabinet database backend for header caching
+mail-client/roundcube:change-password - Allow users to change passwords through Roundcube
 mail-client/roundcube:enigma - Add dependencies to support server-side GnuPG signing and/or encryption through the enigma plugin
 mail-client/roundcube:ldap - Add dependencies to support connecting to an LDAP address book server
 mail-client/roundcube:managesieve - Add dependencies to support the sieverules plugin
@@ -4154,7 +4093,6 @@ media-gfx/nvidia-texture-tools:glew - Enable support for The OpenGL Extension Wr
 media-gfx/openclipart:gzip - Compresses clip art using gzip
 media-gfx/openexr_viewers:cg - Add support for nvidia's cg shaders
 media-gfx/openvdb:abi3-compat - Enables compatibility with the old 3.x ABI. enabled by dfault.
-media-gfx/openvdb:openvdb-compression - Adds enhanced compression to files through dev-libs/c-blosc. Very useful so enabled by dfault.
 media-gfx/photoqt:devil - Support additional image formats using media-libs/devil
 media-gfx/photoqt:exiv2 - Use media-gfx/exiv2 as optional dependency
 media-gfx/photoqt:freeimage - Support additional iamge formats using media-libs/freeimage
@@ -7272,6 +7210,7 @@ sci-geosciences/grass:opencl - Enable OpenCL support
 sci-geosciences/gshhs:data - Add earth data with sci-geosciences/gshhs-data
 sci-geosciences/liblas:gdal - Add support for the sci-libs/gdal geospatial raster library
 sci-geosciences/mapnik:gdal - Enable sci-libs/gdal library support
+sci-geosciences/mapnik:osmfonts - Enable openstreetmaps font styles
 sci-geosciences/mapserver:gdal - Enable sci-libs/gdal library support
 sci-geosciences/mapserver:geos - Enable sci-libs/geos library support
 sci-geosciences/mapserver:postgis - Enable dev-db/postgis support
@@ -8508,6 +8447,7 @@ www-apps/guacamole:noauth - enable support for leaving out any authentication on
 www-apps/hugo:sass - Enable SASS/SCSS support
 www-apps/icingaweb2:nginx - Adds support for nginx
 www-apps/ikiwiki:extras - Installs additional modules used by ikiwiki plugins
+www-apps/kibana-bin:x-pack - Enable additional features (may need a license)
 www-apps/klaus:ctags - Enable support for Exuberant ctags; makes all source code symbols hyperlinks to their definitions
 www-apps/nikola:assets - Support web asset management through dev-python/assets
 www-apps/nikola:charts - Support chart generation through dev-python/pygal
@@ -8593,6 +8533,7 @@ www-client/firefox:system-sqlite - Use the system-wide dev-db/sqlite installatio
 www-client/google-chrome:plugins - Add system plugins path to launcher
 www-client/google-chrome-beta:plugins - Add system plugins path to launcher
 www-client/google-chrome-unstable:plugins - Add system plugins path to launcher
+www-client/jd:oniguruma - Use dev-libs/oniguruma for regular expression
 www-client/links:libevent - Enable dev-libs/libevent support
 www-client/lynx:gnutls - Use gnutls library for HTTPS support (openssl is the default library for HTTPS support).
 www-client/lynx:ssl - Enable HTTPS support.
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index ae10c4135068..79836f1d7e08 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/navigation/Manifest b/ros-meta/navigation/Manifest
index 41e759102728..a2dd31d08592 100644
--- a/ros-meta/navigation/Manifest
+++ b/ros-meta/navigation/Manifest
@@ -2,9 +2,11 @@ DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845b
 DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
 DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
 DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
+DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
 EBUILD navigation-1.15.1.ebuild 707 BLAKE2B 82ed7c7ce652e56b309fb73e635568d9abdd8c9024689646bc4df2c50eb4a0e7a38751fb58b2c62e0791412374358c216f3ca8f76a59d0345467bcd9ef8fc236 SHA512 0a435c9140130e7a6552379ca1a007264d74f26731648e5ca76d3d0bf5c79bc37bfe6214517e180b022b446863580e3a7ead9e98b643c1338fee4a1353c5e6af
 EBUILD navigation-1.15.2.ebuild 707 BLAKE2B a3f0ef9c87421c68d8ed46071de3887aa5be4b77a9a254fbcf36306f46c96ef471b2a13cb9d18e9eb40c94462312ab92c2867b740b1274e0912ea6cd9a6d670e SHA512 db7417b213a67515d8255d3cb02e18d88b1e7dd8da729fa8e66c593da5d5ee8cc8ff382767fd48a0b27bcbd8d628d042aac271fcca014731b6351e5df4724b1f
 EBUILD navigation-1.16.0.ebuild 683 BLAKE2B c047ddc1d8d9e8b4d3361187f39b930c0dd101ef007ed3a9ed019d739f11edb754e4e5edb0615cb4c38a08b70f5c5c27ac6920ed770f4c32332bdb6ab5a6cc95 SHA512 278e21532dd3fa90619dbac80bbf7f3ae32147c1e4d3574e742d1b739527dafac1e7da709cb0f85ea00f7ee501f3e9509419e337af005e6383d8b598b0a0dbc3
 EBUILD navigation-1.16.1.ebuild 683 BLAKE2B c047ddc1d8d9e8b4d3361187f39b930c0dd101ef007ed3a9ed019d739f11edb754e4e5edb0615cb4c38a08b70f5c5c27ac6920ed770f4c32332bdb6ab5a6cc95 SHA512 278e21532dd3fa90619dbac80bbf7f3ae32147c1e4d3574e742d1b739527dafac1e7da709cb0f85ea00f7ee501f3e9509419e337af005e6383d8b598b0a0dbc3
+EBUILD navigation-1.16.2.ebuild 683 BLAKE2B c047ddc1d8d9e8b4d3361187f39b930c0dd101ef007ed3a9ed019d739f11edb754e4e5edb0615cb4c38a08b70f5c5c27ac6920ed770f4c32332bdb6ab5a6cc95 SHA512 278e21532dd3fa90619dbac80bbf7f3ae32147c1e4d3574e742d1b739527dafac1e7da709cb0f85ea00f7ee501f3e9509419e337af005e6383d8b598b0a0dbc3
 EBUILD navigation-9999.ebuild 683 BLAKE2B c047ddc1d8d9e8b4d3361187f39b930c0dd101ef007ed3a9ed019d739f11edb754e4e5edb0615cb4c38a08b70f5c5c27ac6920ed770f4c32332bdb6ab5a6cc95 SHA512 278e21532dd3fa90619dbac80bbf7f3ae32147c1e4d3574e742d1b739527dafac1e7da709cb0f85ea00f7ee501f3e9509419e337af005e6383d8b598b0a0dbc3
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/ros-meta/navigation/navigation-1.16.2.ebuild b/ros-meta/navigation/navigation-1.16.2.ebuild
new file mode 100644
index 000000000000..12d224293a7e
--- /dev/null
+++ b/ros-meta/navigation/navigation-1.16.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="2D navigation stack"
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/amcl
+	dev-ros/base_local_planner
+	dev-ros/carrot_planner
+	dev-ros/clear_costmap_recovery
+	dev-ros/costmap_2d
+	dev-ros/dwa_local_planner
+	dev-ros/fake_localization
+	dev-ros/global_planner
+	dev-ros/map_server
+	dev-ros/move_base
+	dev-ros/move_slow_and_clear
+	dev-ros/nav_core
+	dev-ros/navfn
+	dev-ros/rotate_recovery
+	dev-ros/voxel_grid
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/qt_gui_core/Manifest b/ros-meta/qt_gui_core/Manifest
index 85b96f5fabfb..807dd0cf0eb4 100644
--- a/ros-meta/qt_gui_core/Manifest
+++ b/ros-meta/qt_gui_core/Manifest
@@ -1,6 +1,10 @@
+DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
 DIST qt_gui_core-0.3.6.tar.gz 90705 BLAKE2B 7002d22b8deb2d8cd95ddfffcfd60e8cf092a1ada86a5fb6c666b41689d235f000a9375bf2389a082e187b4aa69accf8da1b7ce1b29c980d736fb9860e10a5d5 SHA512 bdd824010552af098f2b9294aef18c73413a1f76fe1cf61daccf9d9f17d7d16f6a9a1ec11c157460c1b89d6c44f21fccbdcab813ca42c052a6bc46de52f86ab0
 DIST qt_gui_core-0.3.8.tar.gz 91248 BLAKE2B 9ed159b8d065e7b2a44dcf9ac496a699675e5ec41d5ed222413894f098e122b092c976c934dc37a99846e0fe80858fb377bf937b3eabc3f0c6df126de7944e88 SHA512 aec926adffc9f1ab84d7d5cccb207d87254496b37e9e2e4c430de191917823424751206647d61821a65dec0aad3241dab22c85f21980fbe1a4bf114bb2c29d70
+DIST qt_gui_core-0.3.9.tar.gz 91495 BLAKE2B c0f2f2b9231a42da68c0032bfb192a47060f4b0915952b77750985be00023f22678480605990a79016b8ed906cacbdb9cd7eafabbb917b06f891f6b7817a999c SHA512 3e7e45001f1749e3ca75c6b33e3e7a131a314a5ec66925b86f2617f6f749f4c2093d33420bbe0f148faa44fb1fb3071241e47180d3c56ed9d1f7a2befb006a95
+EBUILD qt_gui_core-0.3.10.ebuild 499 BLAKE2B 0254aeb67b9e562be30a0ed5ea5ebfe3a05360bb60220b2ae386ac9f92d68695708b2fa11993e0eb10fc65f7b96d552cdd35cfc2007d1c0b40c6a10fa6c63318 SHA512 fe4b6f4e286b5289fc204bd19a669a416b01159521ae50d99283e7f98ba0076a7efd1612748bfe896b85a153b2f3c63cc026dcfc518824e13658e86767d75cd9
 EBUILD qt_gui_core-0.3.6.ebuild 499 BLAKE2B f54361e1191a07eaeeeb150e9f10463c0a833d03b83af0c469da9a7c872780950378b645358698381c3393f7b866f4dda30a442fa0ebffe6536ec9f3781154f2 SHA512 629105df8332c4b4c87d95b344f56fd25c98a9ca8fb7c2dfc3e2ac91f2154d26f3331aa6d377edfdba8b65ed5dfb0593b5cc0b21fcbd9d63a260050ddb567d0c
 EBUILD qt_gui_core-0.3.8.ebuild 499 BLAKE2B f54361e1191a07eaeeeb150e9f10463c0a833d03b83af0c469da9a7c872780950378b645358698381c3393f7b866f4dda30a442fa0ebffe6536ec9f3781154f2 SHA512 629105df8332c4b4c87d95b344f56fd25c98a9ca8fb7c2dfc3e2ac91f2154d26f3331aa6d377edfdba8b65ed5dfb0593b5cc0b21fcbd9d63a260050ddb567d0c
+EBUILD qt_gui_core-0.3.9.ebuild 499 BLAKE2B 0254aeb67b9e562be30a0ed5ea5ebfe3a05360bb60220b2ae386ac9f92d68695708b2fa11993e0eb10fc65f7b96d552cdd35cfc2007d1c0b40c6a10fa6c63318 SHA512 fe4b6f4e286b5289fc204bd19a669a416b01159521ae50d99283e7f98ba0076a7efd1612748bfe896b85a153b2f3c63cc026dcfc518824e13658e86767d75cd9
 EBUILD qt_gui_core-9999.ebuild 499 BLAKE2B e9f3fd6ab3ea176228a43b938d85887074eb7dd2b095fa64869a8c18f203bcfe778d7e3a83043dbe619abc4999aae536fd4a362024dac3602d76e8a33e1323a6 SHA512 c659c0c8d37b745bd36f61b514228b657172f9469825b3ea9e7f1b828367b4853ff6c8abc006207e551b4946fe6ec1f4d9781dd38564960d628bb36e14bff4ca
 MISC metadata.xml 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/ros-meta/qt_gui_core/qt_gui_core-0.3.10.ebuild b/ros-meta/qt_gui_core/qt_gui_core-0.3.10.ebuild
new file mode 100644
index 000000000000..18cbc0b5b14f
--- /dev/null
+++ b/ros-meta/qt_gui_core/qt_gui_core-0.3.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Integration of the ROS package system and ROS-specific plugins for a Qt-based GUI"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/qt_dotgraph
+	dev-ros/qt_gui
+	dev-ros/qt_gui_app
+	dev-ros/qt_gui_cpp
+	dev-ros/qt_gui_py_common
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/qt_gui_core/qt_gui_core-0.3.9.ebuild b/ros-meta/qt_gui_core/qt_gui_core-0.3.9.ebuild
new file mode 100644
index 000000000000..18cbc0b5b14f
--- /dev/null
+++ b/ros-meta/qt_gui_core/qt_gui_core-0.3.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Integration of the ROS package system and ROS-specific plugins for a Qt-based GUI"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/qt_dotgraph
+	dev-ros/qt_gui
+	dev-ros/qt_gui_app
+	dev-ros/qt_gui_cpp
+	dev-ros/qt_gui_py_common
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_comm/Manifest b/ros-meta/ros_comm/Manifest
index dd4cb68ee00e..7ef614355487 100644
--- a/ros-meta/ros_comm/Manifest
+++ b/ros-meta/ros_comm/Manifest
@@ -1,6 +1,8 @@
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD ros_comm-1.13.6.ebuild 1070 BLAKE2B a418d977efffa8d28b8dd6462870b064f926dbec5cf37f1ecab51a64a976707d64afdc24f832c870175654ce56a90dee9a5472eccfeec9aceb530a1ee993315d SHA512 43e9e038061681355fe227e1359c3b926e3af06cebf255e5e9e8dd6e2b72811fff365fa8c978c28817b043979e7c911faa31321d8663720b68f99da2020f4fb9
 EBUILD ros_comm-1.14.2.ebuild 1050 BLAKE2B 33676aca789509533f55ba14beef15041414e0ea7d9b33b5eb5f6d6b212f30f2878b255ae655298b0fb5d6244898e4e3398e2de0535800ba135bdf0fd3f90784 SHA512 af0c800b0d32646214923c658a32c1bd1a44a4f7b8e0e0a1e7ae7f1171fdce0abdffd469fec6b436208f69fc05396ebe57d5f442587c9f435607cbcdbe194133
+EBUILD ros_comm-1.14.3.ebuild 1050 BLAKE2B 33676aca789509533f55ba14beef15041414e0ea7d9b33b5eb5f6d6b212f30f2878b255ae655298b0fb5d6244898e4e3398e2de0535800ba135bdf0fd3f90784 SHA512 af0c800b0d32646214923c658a32c1bd1a44a4f7b8e0e0a1e7ae7f1171fdce0abdffd469fec6b436208f69fc05396ebe57d5f442587c9f435607cbcdbe194133
 EBUILD ros_comm-9999.ebuild 1050 BLAKE2B 33676aca789509533f55ba14beef15041414e0ea7d9b33b5eb5f6d6b212f30f2878b255ae655298b0fb5d6244898e4e3398e2de0535800ba135bdf0fd3f90784 SHA512 af0c800b0d32646214923c658a32c1bd1a44a4f7b8e0e0a1e7ae7f1171fdce0abdffd469fec6b436208f69fc05396ebe57d5f442587c9f435607cbcdbe194133
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/ros-meta/ros_comm/ros_comm-1.14.3.ebuild b/ros-meta/ros_comm/ros_comm-1.14.3.ebuild
new file mode 100644
index 000000000000..b3bda6139bb7
--- /dev/null
+++ b/ros-meta/ros_comm/ros_comm-1.14.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS communications-related packages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+# utilities subdir
+RDEPEND="
+	dev-ros/roslz4
+	dev-ros/xmlrpcpp
+	dev-ros/roswtf
+	dev-ros/message_filters
+"
+# tools subdir
+RDEPEND="${RDEPEND}
+	dev-ros/rosbag
+	dev-ros/rosbag_storage
+	dev-ros/rosgraph
+	dev-ros/roslaunch
+	dev-ros/rosmaster
+	dev-ros/rosmsg
+	dev-ros/rosnode
+	dev-ros/rosout
+	dev-ros/rosparam
+	dev-ros/rosservice
+	dev-ros/rostest
+	dev-ros/rostopic
+	dev-ros/topic_tools
+"
+# clients subdir
+RDEPEND="${RDEPEND}
+	dev-ros/roscpp
+	dev-ros/rospy
+"
+# test subdir
+RDEPEND="${RDEPEND}
+	dev-ros/test_rosbag
+	dev-ros/test_rosbag_storage
+	dev-ros/test_roscpp
+	dev-ros/test_rosgraph
+	dev-ros/test_roslaunch
+	dev-ros/test_roslib_comm
+	dev-ros/test_rosmaster
+	dev-ros/test_rosparam
+	dev-ros/test_rospy
+	dev-ros/test_rosservice
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index ae7fb9ce81da..673d8ec05e69 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest
index 58c7e0ddd471..e6fa85bb4ae2 100644
--- a/sci-electronics/geda/Manifest
+++ b/sci-electronics/geda/Manifest
@@ -2,5 +2,5 @@ AUX geda-1.9.2-guile-2.2.patch 655 BLAKE2B 503f041c3217dc6eaccba95fe5044a88ef08d
 DIST geda-gaf-1.8.2.tar.gz 11282353 BLAKE2B c3c8912d2c89d81533367e35c7c7fd3ebdac7d6641295af34e8bc81165ee473989036ce968af84b04499b8c9430e7716bbcb2bc6a28f976ded380731895b77b2 SHA512 3a6fad455c3fd2b62e9788ff04ca33242f2e4701ec24089d8c4304ad5ca44af4901fc1c396b3f840e14a0be0729ff08561a82c6911e1d23ac4b8636534b4e764
 DIST geda-gaf-1.9.2.tar.gz 10612225 BLAKE2B d09accde32f672b984bc2541404efccc886edb15e985bab287b4a619f11fc10cfd2b3ce3074d82c1a61811c4df9e515ecfbc61bd537c6943188b130062bda97f SHA512 5e26ea2cffffe50bd4f0bdb4594af9cc4510386d29c715c2b4ea99c6522838a08cc2045bf65e8b1da01ab33a266fc9f03da42e28b8cc4d5c030001777ab077e3
 EBUILD geda-1.8.2.ebuild 1738 BLAKE2B 8c6ba251628715598d00c6dbc88037f9d593a3e1acd7efe064d12ab8b9f9aa82ebee8b3b9361800f83b9d206526483ba35d719885a09586f6bb26bdbcabf6940 SHA512 923a49da2a8c57a1e6b22dc89f3a2dea532be9e988dd2f646225300db3da23925ef03a2bd6846e935e34be078439c7a2c07e8c06a3f8560e5ca8c3ac8ae57756
-EBUILD geda-1.9.2-r1.ebuild 1793 BLAKE2B d5fdbe6b3408da7840f24f3b68498eaf0ea1a2e0ebfd515192685bde0f23411f1f434396ac59e542e72fa597aafed488f7b6cecc65047a42e45c8b69716e1681 SHA512 49dc8bff7f3145a24bdef4b6a7cddfea1154d2fea5e48f4d35edc59f53faa37c46170ac0e89bcb37c0c85277d48415729991025011437e26ea7152e9a49b982c
+EBUILD geda-1.9.2-r1.ebuild 1791 BLAKE2B 52189c8edce5ebeeb54ea10f13a4391c4f6ce27f846563c7586e6d63234592e2693274ce2f0ebb005057df8eb6e967f44eedadfffb80a0fdc8c533174908f2aa SHA512 ddc1c07ee9cffd23e8367d7e1762943e72607cb2cf237236ab00cbfabec75c22292ad58ba687ec6788c957834ba6f3356933e4464d3eb20f29fdafdfbc2a60fb
 MISC metadata.xml 1107 BLAKE2B 480a8a14257044a580f952f3e1efd26a02133e0b1ac98cc35c2d11ff08e3515ec38593d773ea2a881e1e3301ea5e1e1785909cc3017e56adec34ee09e11689d6 SHA512 7c64ce6548bc555ace1023c79ae7f74ac90b285f1bcdc65302d6908079a3358b010100ee50d607fdd65321d297d28410041010ca9b1db6599e20dccf0470c2c6
diff --git a/sci-electronics/geda/geda-1.9.2-r1.ebuild b/sci-electronics/geda/geda-1.9.2-r1.ebuild
index eff34da1c8d1..fffb2dbde9ef 100644
--- a/sci-electronics/geda/geda-1.9.2-r1.ebuild
+++ b/sci-electronics/geda/geda-1.9.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.geda-project.org/${MY_PN}/unstable/v$(get_version_component_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug doc examples nls stroke threads"
 
 CDEPEND="
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index ac41fe605c50..fec679743b32 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 57fc54549cdb..08bcdec05bb4 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -1,9 +1,10 @@
 AUX mapnik-2.2.0-configure-only-once.patch 737 BLAKE2B 66233c05272cf12c62c04bd87b5c3ab74894ed2887e6d33f5fe82217344a341ade76c3c9df138baa31629a75bc7c65083baf0470e705fbbd48ae830e36402b0c SHA512 30f044c8501536599d625646dc8930d3cdcd14fc1ef6c3ee64c8226fe03a6d0f3cbc5d175f6aff7bc7dc0575206dcd23288828cb6edad264aed3b2b4d9e7874b
 AUX mapnik-2.2.0-dont-run-ldconfig.patch 243 BLAKE2B 8dffa522b7f8cc7a080ebeb3175c953a7a8f457d5c9288a7857aebc1f76cc8b032c11bd46678e2bd50f59ee0e19e7f7172766658640b4a06530ad0163f600e33 SHA512 dd42f09654de246ff6be4cf68fc2b08bb5ec2ae6515e722e89337081ff4b89c8b269fa70d3393f3c6156a539d7a9b1d1f516e9d6ff7f35639669fcfcd20a26ff
-AUX mapnik-2.2.0-scons.patch 795 BLAKE2B 236a803049779b01b25c16a2ea180a95fb0fd07a13b28f6c9cc4d3a4c024247e69755ad69b3f64dd9aeff2f68dff4e343ab092c84c525b81fc1c8fc3566f0886 SHA512 288efab2528af07d0800278743e762e3ca5a040eae2694c09b1108826e5aa29b8a3c150b0be06ee7e5862f961a34ddcc20528c8b4c99bd962797f553017a319f
+AUX mapnik-3.0.18-scons.patch 1939 BLAKE2B ece0bf49df2959a33af5f58842a59fe59a2e232f41a6e9542e747f24ebcc99d550370cc742e28ba50f10272ac5f2d31cb4c503559fd55ae4323d9ecdcbab1571 SHA512 e17363609928d6654a9949f944dc8d1745336028019f65d7fd12190c8c88de65cc40dae272dab71626ab9fb69009ebc26f0ae2e569dd9d5e8fd84aa2de0370ac
 AUX mapnik-3.0.9-harbuzz_sharper-upstream.patch 746 BLAKE2B 73ad3bcb237e30447336657b541bd794e9e7786b23961d6a7ee94c1c5c7646e9337ea5a8002a68e15a9a9cae05a21f06e5517a07f4dbd65815a06f88c3a76d12 SHA512 08815cf001db531cec2660d53f8afdc83df0bb9e59cb792487a05fb5dff64aa66fa79e8283b7b2b8aca031e90205ab0dcd0097d8129953fed33432e93e34a2e2
 AUX mapnik-3.0.9-unicode-upstream.patch 264 BLAKE2B 9b2b8a062a861c58bfbe3681d7edc1d115ae85955dd1c1b73e37b9d1f1e690a97037144d957b318cc0921071525eaae4b3a94403842bdebf503d0f8bd195a3e6 SHA512 1f1f58477f5d54408320190b369a3039c70147f6d4c8498a318969661c258a6c7b5e2f26c111e8d543409512c7a98ddb31ece12ac75b5256a06105177e303c9d
+DIST mapnik-3.0.18.tar.bz2 10103474 BLAKE2B de914ffe31940b74114cdf07a9ff13f36c7210d27b84cecd16fda7c429f0c4be7ffb9e677cf1bc8d156298b5f10ed2a41adcbf4f7727bbf85d2f0099950f5c4f SHA512 7af04b9437c83cddedf2b43f7da0622e44178b4ecce80c0349bacf551bf747698d9ec9e4d6eee68c0265feeae5833281215a759de5a1394abbdfdd39eef39661
 DIST mapnik-3.0.9.tar.gz 13434729 BLAKE2B 49cf90089b34cfc706f85950d090609d5f9a5a6e9cfb56f6e1f1a6279f864b35f3f8d456caa2365787261affc4acb85ad93621d6471efed85f560c808dc0535a SHA512 ad45ecbb2661e860b7057e0a235542a390ae5790f401ef2c04f1517b6487e83cdb8e307072681847cb72a3abc242e0114bc15d48f504dec1f92df970dd1556e1
-EBUILD mapnik-3.0.9-r1.ebuild 2615 BLAKE2B 8318f5d6182aac97264aa1a9499538e2063debc6f493ce5270ad70c9c05b4d978ee7c5f494b5534bcf3253e162a7e885235011339ee52ad7d7b09f092004fba8 SHA512 94cb8ff699da38ea8749ea49e41ea43ddcbfc2b81377880fe68be6c6e572ac472edb955c76d3ec4ed4626a4998da59bb84f9b9675cafab932134c6d9bc9b0793
-EBUILD mapnik-3.0.9.ebuild 2375 BLAKE2B da5851e20e9a5f4f3b0395ca6abced74613e061ebe1dd4ceaefe4c9b04476530743b787eb6be9bd814529ab05a1e265fbdc26e9bcb2e51d8272bff4b828583d4 SHA512 c2990ff5b334a88482cb561e0ef74f404093b66eef635f5f2badc9f657ea50f6828ac9ea6a86cc91b3c08c7e619658e89ffb3942650db16dfcc4ff93c0d3173c
-MISC metadata.xml 683 BLAKE2B c61252c70d3814876f28f6c156572cedb646e6695c430a1a5083495d53e2ebc3933d9e499a4142ec460334d200172b054bb0c7bbd25adcd5701584b037bff3e7 SHA512 a60caeed695db6aeeee83083f57269db6d6c7a7e649be8848ef560e9043ba8b710441f166498d6d0bfffd80ab10190865a3b5097fb766b0b92c5480f62aab962
+EBUILD mapnik-3.0.18.ebuild 2768 BLAKE2B fa9fb68ad23c4b17d1163492f375735f26925137327f9b1dc6eefdc9d078e67a6f31331d21a3fcd3f90ff75242bc30429ded2c7f46df7aa08c545cecf43d3efe SHA512 0c27792c584dd10f845bff899318b685cdb7fffb08e3d0335628cf37d9a365b2e53fc65023bc0c229d018e6ae50d27dfeeaabf483f2a7a864013e8a09d948823
+EBUILD mapnik-3.0.9-r1.ebuild 2578 BLAKE2B d2c508da64f319b9043ff290f34b3fb99b0bd10f04aa3084108572eeb449ae9ea33131292e06a72807f363b4dc812b560c141e29cb622ffa92ca83e4140a1dac SHA512 8143ee3916c8d4fe4eb54c42dc11e3a5553016a3442b80a5131922a68d9ef47477f91b8c76e3f7a49c418e6b4ffbb78751d64fecef7f191bfb2505e8c6fe7d0a
+MISC metadata.xml 754 BLAKE2B f28f0847b5c78c667dc69f9d7e0ca75b196926ad8b6f98cbc1c529470943b0ecc64bd05fdc1ed3ef289dc60bf54d4f594800fcea44ef20d5e3dd5ba4ad1cfeb7 SHA512 84138433b879b8d48422f7f9d587966b69a28d89effac6cfbf7bd925010c3d118f4296c08de787dbf6649af549acf4fd671a4702acc9d203c3829caca30fc5d1
diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch
deleted file mode 100644
index 0ddcd0f9e0dd..000000000000
--- a/sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -291,7 +291,7 @@ opts.AddVariables(
-     ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)),
- 
-     # Install Variables
--    ('PREFIX', 'The install path "prefix"', '/usr/local'),
-+    ('PREFIX', 'The install path "prefix"', '/usr'),
-     ('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT),
-     ('PYTHON_PREFIX','Custom install path "prefix" for python bindings (default of no prefix)',''),
-     ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'),
diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch b/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch
new file mode 100644
index 000000000000..2414bf95fedd
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch
@@ -0,0 +1,39 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -317,7 +317,7 @@
+     ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)),
+ 
+     # Install Variables
+-    ('PREFIX', 'The install path "prefix"', '/usr/local'),
++    ('PREFIX', 'The install path "prefix"', '/usr'),
+     ('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT),
+     ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'),
+     ('PATH', 'A custom path (or multiple paths divided by ":") to append to the $PATH env to prioritize usage of command line programs (if multiple are present on the system)', ''),
+@@ -1222,6 +1222,8 @@
+ 
+     color_print(4,'Configuring build environment...')
+ 
++    OPTIONAL_LIBSHEADERS = []
++
+     if not env['FAST']:
+         SetCacheMode('force')
+ 
+@@ -1410,7 +1412,8 @@
+     # https://github.com/mapnik/mapnik/issues/913
+     if env.get('XMLPARSER') and env['XMLPARSER'] == 'libxml2':
+         if env.get('XML2_LIBS') or env.get('XML2_INCLUDES'):
+-            OPTIONAL_LIBSHEADERS.insert(0,['libxml2','libxml/parser.h',True,'C'])
++            # code doesn't actually use HAVE_XMML2 but set just to have a fifth value
++            OPTIONAL_LIBSHEADERS.append(['libxml2','libxml/parser.h',True,'C','-DHAVE_XML2'])
+             if env.get('XML2_INCLUDES'):
+                 inc_path = env['XML2_INCLUDES']
+                 env.AppendUnique(CPPPATH = fix_path(inc_path))
+@@ -1428,8 +1431,6 @@
+         else:
+             env['SKIPPED_DEPS'].extend(['dlfcn'])
+ 
+-    OPTIONAL_LIBSHEADERS = []
+-
+     if env['JPEG']:
+         OPTIONAL_LIBSHEADERS.append(['jpeg', ['stdio.h', 'jpeglib.h'], False,'C','-DHAVE_JPEG'])
+         inc_path = env['%s_INCLUDES' % 'JPEG']
diff --git a/sci-geosciences/mapnik/mapnik-3.0.18.ebuild b/sci-geosciences/mapnik/mapnik-3.0.18.ebuild
new file mode 100644
index 000000000000..8c0db9a6c0be
--- /dev/null
+++ b/sci-geosciences/mapnik/mapnik-3.0.18.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils scons-utils toolchain-funcs
+
+DESCRIPTION="A Free Toolkit for developing mapping applications"
+HOMEPAGE="http://www.mapnik.org/"
+SRC_URI="https://github.com/mapnik/mapnik/releases/download/v${PV}/mapnik-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+S="${WORKDIR}/mapnik-v${PV}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo debug doc gdal osmfonts postgres sqlite"
+
+RDEPEND="
+	>=dev-libs/boost-1.48:=[threads]
+	dev-libs/icu:=
+	sys-libs/zlib
+	media-libs/freetype
+	media-libs/harfbuzz
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	virtual/jpeg:0=
+	media-libs/libwebp
+	sci-libs/proj
+	media-fonts/dejavu
+	x11-libs/agg[truetype]
+	cairo? (
+		x11-libs/cairo
+		dev-cpp/cairomm
+	)
+	osmfonts? (
+		media-fonts/dejavu
+		media-fonts/noto
+		media-fonts/noto-cjk
+		media-fonts/unifont
+	)
+	postgres? ( >=dev-db/postgresql-8.3:* )
+	gdal? ( sci-libs/gdal )
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-configure-only-once.patch"
+	"${FILESDIR}/${PN}-2.2.0-dont-run-ldconfig.patch"
+	"${FILESDIR}/${PN}-3.0.18-scons.patch"
+)
+
+src_prepare() {
+	default
+
+	# do not version epidoc data
+	sed -i \
+		-e 's:-`mapnik-config --version`::g' \
+		utils/epydoc_config/build_epydoc.sh || die
+
+	# force user flags, optimization level
+	sed -i -e "s:\-O%s:%s:" \
+		-i -e "s:env\['OPTIMIZATION'\]:'${CXXFLAGS}':" \
+		SConstruct || die
+}
+
+src_configure() {
+#	local PYTHONCMD="$(which python2.7)"
+	local PLUGINS=shape,csv,raster,geojson
+	use gdal && PLUGINS+=,gdal,ogr
+	use postgres && PLUGINS+=,postgis
+	use sqlite && PLUGINS+=,sqlite
+
+	MYSCONS=(
+		"CC=$(tc-getCC)"
+		"CXX=$(tc-getCXX)"
+		"INPUT_PLUGINS=${PLUGINS}"
+		"PREFIX=/usr"
+		"DESTDIR=${D}"
+		"XMLPARSER=libxml2"
+		"LINKING=shared"
+		"RUNTIME_LINK=shared"
+		"PROJ_INCLUDES=/usr/include"
+		"PROJ_LIBS=/usr/$(get_libdir)"
+		"LIBDIR_SCHEMA=$(get_libdir)"
+		"FREETYPE_INCLUDES=/usr/include/freetype2"
+		"FREETYPE_LIBS=/usr/$(get_libdir)"
+		"XML2_INCLUDES=/usr/include/libxml2"
+		"XML2_LIBS=/usr/$(get_libdir)"
+		"SYSTEM_FONTS=/usr/share/fonts"
+		CAIRO="$(usex cairo 1 0)"
+		DEBUG="$(usex debug 1 0)"
+		XML_DEBUG="$(usex debug 1 0)"
+		DEMO="$(usex doc 1 0)"
+		SAMPLE_INPUT_PLUGINS="$(usex doc 1 0)"
+		"CUSTOM_LDFLAGS=${LDFLAGS}"
+		"CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)"
+	)
+	escons "${MYSCONS[@]}" configure
+}
+
+src_compile() {
+	escons "${MYSCONS[@]}"
+}
+
+src_install() {
+	escons "${MYSCONS[@]}" DESTDIR="${D}" install
+
+	dodoc AUTHORS.md README.md CHANGELOG.md
+}
+
+pkg_postinst() {
+	elog ""
+	elog "See the home page or wiki (https://github.com/mapnik/mapnik/wiki) for more info"
+	elog "or the installed examples for the default mapnik ogcserver config."
+	elog ""
+}
diff --git a/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild b/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild
index 9ed3676d7c4b..2e09556336c8 100644
--- a/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild
+++ b/sci-geosciences/mapnik/mapnik-3.0.9-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
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="cairo debug doc gdal postgres sqlite"
 
 RDEPEND="
-	>=dev-libs/boost-1.48[threads]
+	>=dev-libs/boost-1.48:=[threads]
 	dev-libs/icu:=
 	sys-libs/zlib
 	media-libs/freetype
@@ -40,7 +40,6 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-configure-only-once.patch"
 	"${FILESDIR}/${PN}-2.2.0-dont-run-ldconfig.patch"
-	"${FILESDIR}/${PN}-2.2.0-scons.patch"
 	"${FILESDIR}/${P}-harbuzz_sharper-upstream.patch" # upstream patches ported from
 	"${FILESDIR}/${P}-unicode-upstream.patch" # https://github.com/mapnik/mapnik/commit/9e58c890430db6f0b6f1f7a1690877c9d913d92a
 )
diff --git a/sci-geosciences/mapnik/mapnik-3.0.9.ebuild b/sci-geosciences/mapnik/mapnik-3.0.9.ebuild
deleted file mode 100644
index ae28bff85588..000000000000
--- a/sci-geosciences/mapnik/mapnik-3.0.9.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils scons-utils toolchain-funcs
-
-DESCRIPTION="A Free Toolkit for developing mapping applications"
-HOMEPAGE="http://www.mapnik.org/"
-SRC_URI="https://github.com/mapnik/mapnik/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo debug doc gdal postgres sqlite"
-
-RDEPEND="
-	>=dev-libs/boost-1.48[threads]
-	dev-libs/icu:=
-	sys-libs/zlib
-	media-libs/freetype
-	media-libs/harfbuzz
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	virtual/jpeg:0=
-	media-libs/libwebp
-	sci-libs/proj
-	media-fonts/dejavu
-	x11-libs/agg[truetype]
-	cairo? (
-		x11-libs/cairo
-		dev-cpp/cairomm
-	)
-	postgres? ( >=dev-db/postgresql-8.3:* )
-	gdal? ( sci-libs/gdal )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.0-configure-only-once.patch"
-	"${FILESDIR}/${PN}-2.2.0-dont-run-ldconfig.patch"
-	"${FILESDIR}/${PN}-2.2.0-scons.patch"
-)
-
-src_prepare() {
-	default
-
-	# do not version epidoc data
-	sed -i \
-		-e 's:-`mapnik-config --version`::g' \
-		utils/epydoc_config/build_epydoc.sh || die
-
-	# force user flags, optimization level
-	sed -i -e "s:\-O%s:%s:" \
-		-i -e "s:env\['OPTIMIZATION'\]:'${CXXFLAGS}':" \
-		SConstruct || die
-}
-
-src_configure() {
-	local PLUGINS=shape,csv,raster,geojson
-	use gdal && PLUGINS+=,gdal,ogr
-	use postgres && PLUGINS+=,postgis
-	use sqlite && PLUGINS+=,sqlite
-
-	MYSCONS=(
-		"CC=$(tc-getCC)"
-		"CXX=$(tc-getCXX)"
-		"INPUT_PLUGINS=${PLUGINS}"
-		"PREFIX=/usr"
-		"DESTDIR=${D}"
-		"XMLPARSER=libxml2"
-		"LINKING=shared"
-		"RUNTIME_LINK=shared"
-		"PROJ_INCLUDES=/usr/include"
-		"PROJ_LIBS=/usr/$(get_libdir)"
-		"SYSTEM_FONTS=/usr/share/fonts"
-		CAIRO="$(usex cairo 1 0)"
-		DEBUG="$(usex debug 1 0)"
-		XML_DEBUG="$(usex debug 1 0)"
-		DEMO="$(usex doc 1 0)"
-		SAMPLE_INPUT_PLUGINS="$(usex doc 1 0)"
-		"CUSTOM_LDFLAGS=${LDFLAGS}"
-		"CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)"
-	)
-	escons "${MYSCONS[@]}" configure
-}
-
-src_compile() {
-	escons "${MYSCONS[@]}"
-}
-
-src_install() {
-	escons "${MYSCONS[@]}" DESTDIR="${D}" install
-
-	dodoc AUTHORS.md README.md CHANGELOG.md
-}
-
-pkg_postinst() {
-	elog ""
-	elog "See the home page or wiki (https://github.com/mapnik/mapnik/wiki) for more info"
-	elog "or the installed examples for the default mapnik ogcserver config."
-	elog ""
-}
diff --git a/sci-geosciences/mapnik/metadata.xml b/sci-geosciences/mapnik/metadata.xml
index bbbaaa7e4d1d..7f8d2fd981b3 100644
--- a/sci-geosciences/mapnik/metadata.xml
+++ b/sci-geosciences/mapnik/metadata.xml
@@ -11,6 +11,7 @@
     </longdescription>
     <use>
         <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
+        <flag name="osmfonts">Enable openstreetmaps font styles</flag>
     </use>
     <upstream>
         <remote-id type="github">downloads/mapnik</remote-id>
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 81b9de14e8b9..66d924ea4038 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,4 +1,6 @@
+AUX merkaartor-0.18.3-sharedir-pluginsdir.patch 722 BLAKE2B 294f5ff4d2da45d441948fdcf2b642971bdb3ea5fa2649bbe9827fdc50ab72ca77ea6f2c80d690794a9ea539bda91eea1ec34fc98ec073d49cf933002df68747 SHA512 5e2b1d4a8d4294785b59ea3631e7f086c2d52ab8752574872088ae4cb26c5b11851ab1c597a53012797b6ec7c5d9c1012037baf9cfc4135b06542365c5eb60c9
 DIST merkaartor-0.18.3.tar.gz 7104234 BLAKE2B e7d84297452ad20daf2ab18c4aef3736758d98e6f839be1152651aa0196ccee2983d89935f121d4436245d7fdd1fa6b97cd99e6a154158cad4751eba02819a74 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915
 EBUILD merkaartor-0.18.3-r2.ebuild 2096 BLAKE2B 3d3cd7dccd7e89246e288b3df729fd7c21c7d0ce8126594e2e49ea6531c535248033f56f19df867efeec46605c33f8cd2d4506028632d630d0f9b0963d8e09d5 SHA512 8b993b269a2800e47cd86d29e0f91f3e6f98f1c2c52074b58f6bd2b64f0facb3584074612230d88c2d2ab134ac976a9a6c27d79dba20d9a06dcd19c8146e04ee
+EBUILD merkaartor-0.18.3-r3.ebuild 2257 BLAKE2B 54f02ae8d223a955d5e51f5675a25f0309e33cfa7e4118514ee2641b25c99eb60391a1e180c8e9f8cb9c0a9a191809c7f75cfcf804b85831cacb78844dc22d5f SHA512 b7dc364577288741999f114a5d8a1b39d57727b9ef062e27ad479fda9cf1e9393197ed785a3ad14f3117ba0708a8875cea714b1c64bff282d44e8695860313a7
 EBUILD merkaartor-9999.ebuild 2160 BLAKE2B 4fd3917aa1d03f235f79db008a33b056625e8e56232f614eb581924475eee67fe78d91882913868c57b2d0d07d20153c6574a0390052718ca1a65eb182404ebb SHA512 cc487da0ad47cbcea5b107d92fd17a8bc973292c1135ae590f456d99346adec5288dc8f53ce15b16ad4377e93ccce670a67c3bea455ea4c7402c23b2311f89e9
 MISC metadata.xml 575 BLAKE2B d9a30a01f5b6c55e9a4865f6f1aa92ea610ad2f1aa9ab1bcb129dfbf03f9579fe7f3d8bdf604da0564b4d53b65d54b8c32f3628f1e8e389f6368d14cfca9997b SHA512 d9e5293c9bf7a3bfc7fd691d5a61c7de6c284941da73883590e4956bb4a7b26215e003a9096b9fdaa1f7590765aad583bec04ad6ec8778bc4a26a422a3e2da38
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch
new file mode 100644
index 000000000000..46f5964e17cb
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch
@@ -0,0 +1,28 @@
+--- a/src/src.pro	2018-08-05 13:25:02.761849538 +0100
++++ b/src/src.pro	2018-08-05 13:25:55.935846789 +0100
+@@ -155,8 +155,10 @@
+     isEmpty( LIBDIR ) {
+         LIBDIR = $${PREFIX}/lib${LIB_SUFFIX}
+     }
+-
+-    DEFINES += PLUGINS_DIR=$${LIBDIR}/merkaartor/plugins
++    isEmpty( PLUGINS_DIR ){
++	PLUGINS_DIR=$${LIBDIR}/merkaartor/plugins
++    }
++    DEFINES += PLUGINS_DIR=$${PLUGINS_DIR}
+ 
+     target.path = $${PREFIX}/bin
+     SHARE_DIR = $${PREFIX}/share/merkaartor
+
+--- a/src/src.pro	2018-08-05 16:20:33.759305219 +0100
++++ b/src/src.pro	2018-08-05 16:20:53.094304220 +0100
+@@ -181,7 +181,7 @@
+ 
+ 
+ 
+-DEFINES += SHARE_DIR=$${SHARE_DIR}
++DEFINES += SHARE_DIR=$${SHARE_DIR_PATH}
+ INSTALLS += target
+ 
+ win32-msvc* {
+
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild
new file mode 100644
index 000000000000..19e627bdad45
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
+
+inherit gnome2-utils l10n qmake-utils xdg-utils
+
+DESCRIPTION="Qt based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug exif gps libproxy"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtsingleapplication[X,qt5(+)]
+	>=sci-libs/gdal-1.6.0
+	>=sci-libs/proj-4.6
+	sys-libs/zlib
+	exif? ( media-gfx/exiv2:= )
+	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
+	libproxy? ( net-libs/libproxy )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+PATCHES=( "${FILESDIR}/${P}-sharedir-pluginsdir.patch" ) # bug 621826
+DOCS=( AUTHORS CHANGELOG )
+
+src_prepare() {
+	default
+
+	my_rm_loc() {
+		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
+		rm "translations/${PN}_${1}.ts" || die
+	}
+
+	if [[ -n "$(l10n_get_locales)" ]]; then
+		l10n_for_each_disabled_locale_do my_rm_loc
+		$(qt5_get_bindir)/lrelease src/src.pro || die
+	fi
+
+	# build system expects to be building from git
+	sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+}
+
+src_configure() {
+	# TRANSDIR_SYSTEM is for bug #385671
+	eqmake5 \
+		PREFIX="${ED%/}/usr" \
+		LIBDIR="${ED%/}/usr/$(get_libdir)" \
+		PLUGINS_DIR="/usr/$(get_libdir)/plugins" \
+		SHARE_DIR_PATH="/usr/share/${PN}" \
+		TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
+		SYSTEM_QTSA=1 \
+		RELEASE=1 \
+		NODEBUG="$(usex debug '0' '1')" \
+		GEOIMAGE="$(usex exif '1' '0')" \
+		GPSDLIB="$(usex gps '1' '0')" \
+		LIBPROXY="$(usex libproxy '1' '0')" \
+		ZBAR=0 \
+		Merkaartor.pro
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 219756cb465a..d53b8e6eaf8e 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 7b5e2dbf96ea..863740d7aeb6 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -2,9 +2,10 @@ AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b6
 AUX gdal-2.2.3-goocast.patch 540 BLAKE2B 3e80e54dc29d90529a6c705e434b6bd0f99bcc326c9e0e7967bd81ab8b80f3a09657c16f4a95250e6753a3dd463acc0a45301a157279a6408b697c15868f86aa SHA512 2dce2e5f391645c4470d7b08a906a942b1821a0086a4042853ba6a38df96b710b29bb7c32f6a2ac9732d281f3afe9e42aeb6f51fdc2734f896402680aed95d27
 AUX gdal-2.2.3-json-c-0.13.patch 3733 BLAKE2B 34921f8e2717a446bead6d8b07c6a8e2455752bd4534d066c4bb6150f1cd03856269a8510535517cbf60e609053e470107e9ce62d58358afcb48aa819a546563 SHA512 f4beaa11431b1eb2c6986c3da24a696cdade04f025a9bdeb9726c392aecdf597126c7735b1b2c1175bd0de71a2441b2c1e5d01e597acd7869e9c75644660994d
 AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc50e03386131c313cbd71861859a1b8a5a5648307868fee484b8a1dd816b580bb2304cb7e1e72e42df40cea042 SHA512 0f06d8de537ddc19c6c4ee800c0c4b084ceb04a47fd24f28c3095909219e27634e66086158f80f011ccfb7865fc559a966770bfa95d3a8fd144f3f8a3d34571d
+AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6
 DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42 SHA512 841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046
 DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f
 EBUILD gdal-2.2.3-r1.ebuild 7528 BLAKE2B db6fd16c9fa5679cfde4ef85b5ec6ecc161052dbd990da6e6eeae9934f300172bccd020e114067e90ad4ba25714741f24923379246ae29cc1ebdffe69bee0cdc SHA512 444f2a99ca963a4e1359fd888053a7cd8754534c12e4cd28bb4441aeeecc4fe869442eefbc7bcaa23347ee12cff568859f497a6411d0b0de86e3dbc2dd38f9d7
 EBUILD gdal-2.2.3-r2.ebuild 7579 BLAKE2B 3b6d969b924315db0563ba43b1f5b6370f5682c019095b8febdadf8c78807a85a81dd548fafb1826d91b6eddcf694f72f1f873fbfb42ba23a4a0da084e7ad047 SHA512 11f91a0186a6a35d16725894c9f330027eae6124e3903295183f673068c75cfcf08e5c578873bff22017a14a77f67e390c08a7ab75cccc2f154883a624afca12
-EBUILD gdal-2.3.0-r1.ebuild 7873 BLAKE2B cd6aca7f5a96e9144869ff4b03c90ee2e74be61218a5cb3f4f484ecf01ee0eb4fab0d0f54c779e6af47d0e54abdd6ab50c7a40df123e47455276cd4068e6a807 SHA512 132d808875ed202bffb7d6021d90993e9b399772c6bf65c0dbd06e21ee1ea1335a7aa21c6b8c95577af997a7eb72a8c87fd12d955cbf511ac64a8e5b8db42210
+EBUILD gdal-2.3.0-r1.ebuild 7924 BLAKE2B 204fea1f6842576043135fd97dbc707db014d9c6916b61863e47b1acb91e0c9b91ec846aef1ebd33b250ca789572a438b90e95d523f4e9ec35db4b83fb789c01 SHA512 12a75a36205314e53fd1c5c8af40285dbcd4d1a5d52ee383c834a7b0ffd8e7747c47e1b3f0c2f7302b961a350c60a0fa78249a61134bfb3ba59f77ac3b615971
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/files/gdal-2.3.0-curl.patch b/sci-libs/gdal/files/gdal-2.3.0-curl.patch
new file mode 100644
index 000000000000..1cd33243f42b
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.0-curl.patch
@@ -0,0 +1,15 @@
+diff -urNd gdal-2.3.1/port/cpl_vsil_curl.cpp gdal-2.3.1-curl/port/cpl_vsil_curl.cpp
+--- gdal-2.3.1/port/cpl_vsil_curl.cpp	2018-06-24 01:10:23.000000000 +1000
++++ gdal-2.3.1-curl/port/cpl_vsil_curl.cpp	2018-07-13 01:29:31.326347717 +1000
+@@ -8617,8 +8617,10 @@
+         if( poFSHandler )
+             poFSHandler->ClearCache();
+     }
+-
++#if !defined(HAVE_CURL) || defined(CPL_MULTIPROC_STUB)
++#else
+     VSICurlStreamingClearCache();
++#endif
+ }
+ 
+ #endif /* HAVE_CURL */
diff --git a/sci-libs/gdal/gdal-2.3.0-r1.ebuild b/sci-libs/gdal/gdal-2.3.0-r1.ebuild
index 8aacbcb83c78..2ddaa49d4146 100644
--- a/sci-libs/gdal/gdal-2.3.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.0-r1.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.3-soname.patch"
 	"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
 	"${FILESDIR}/${PN}-2.2.3-goocast.patch" # bug 656252
+	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
 )
 
 src_prepare() {
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index edb57d4a6650..181f59950e2e 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -4,6 +4,8 @@ DIST gsl-1.16-cblas.patch.bz2 2810 BLAKE2B 364c9f93a386e5d95c86789a3c00231cdfbe5
 DIST gsl-1.16.tar.gz 3534080 BLAKE2B 1c55a41e5ed57b57f671074240d23416aa8f23e3cc2bb832e455d4f44d307e6be6adfa3671dbbf2aa14604ea49f96ff636de7909f3532cdc811f6bd99b0aa59d SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb
 DIST gsl-2.3-cblas.patch.bz2 12036 BLAKE2B ddad801cc42f925581e2e4995292f3eab0d2faf70c43c3b205fcf521b98e426df1d0824ed7d98b2c4cc89bbc4068fd45f2595dc02d23bded5c702b5a01bbfdb2 SHA512 37b867a21e60cd96c453ae24139bcf16c00c85bb6d5a3dcece81185fd9af5870c5167d2fa3c74cffce55bfb84f72be34d28ea94e0889904f8dda8687f66b4d23
 DIST gsl-2.4.tar.gz 5916715 BLAKE2B f22c07b2d5759a383e05b8bfdba70071672cc27f12ff2a8c755451fe7e10c8e2d80e3fcc601508c5e9942e4cfd05e51c43ba96666326b760e4390eb0c2552886 SHA512 12442b023dd959e8b22a9c486646b5cedec7fdba0daf2604cda365cf96d10d99aefdec2b42e59c536cc071da1525373454e5ed6f4b15293b305ca9b1dc6db130
+DIST gsl-2.5.tar.gz 7303881 BLAKE2B 7c6d10c21071a1af1f03123f83244476d2e90fcd27d05a115b03a74fe631eb7d8081f5260e534ae58ab0997c1111f980a5e4cb50d110ca626fe810c44be70180 SHA512 5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a
 EBUILD gsl-1.16.ebuild 3086 BLAKE2B 19da52fb104356017ae3cbc824783962ac6262c85496a26f9f5a4e4486a17309b0647e386c98a5e8010efcc82c0fe8cf57cf45d0e9a78a52c113edf4a9323d8c SHA512 47658615b8c9dcb1b43f46f1994d1befa73ca79c737a4acff17061e9413191337522d12c2ee274992e6244304d5479d59f45f573f3d400fdaccbcc419d44a1a8
 EBUILD gsl-2.4.ebuild 3201 BLAKE2B b3277c57be36d13fd4d84c8821226cb12ade83582570f20f70daa0b7683c17839445cd9a2c0b9c7ddd6361159f7d49809d01fcd5f889d8cb38ebe0d6478b9b7b SHA512 07784db20ac72dd1004f0736facbf196db0c648c0a8dc1574f4c6eef4fb3970508408a39d072cb2c050e2bae8bcc95d928dcec964e08e2d554eee1440a769b5a
+EBUILD gsl-2.5.ebuild 3194 BLAKE2B 823b1a827c2150b9b48750c10830eace9ed615e2d0620054ebee0c5837dd3241941e3a0dd231792e6b72ef7abe5895b806cb3021ccdac52a96bb5ec7d5dbe3f4 SHA512 c52751657d62ae714bb4526e50ad485f78ecf0b7af1169fba7f2940f5821bd9792a51d24a15b3ea5d2d66af79d9dd08256eb5ffeab5c4668c7d2c7407d9a837b
 MISC metadata.xml 1190 BLAKE2B b9015dc09464b327144a546a0e9dae6e1c5eaf3ce118a24b7ad1853f09af1952284f754aada2436d7e1a1df82638720492445d8f015ccb1cec05c78dd718fc26 SHA512 f56ec87aeb8f257480a631748db79c78193797e1ecd586dbbd78f31a01fbbd3341fa67ffd3244e5dba352478ee552184d6a1d9b5ef5d54d67b038215090eca00
diff --git a/sci-libs/gsl/gsl-2.5.ebuild b/sci-libs/gsl/gsl-2.5.ebuild
new file mode 100644
index 000000000000..da1026f07391
--- /dev/null
+++ b/sci-libs/gsl/gsl-2.5.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Scientific Library"
+HOMEPAGE="https://www.gnu.org/software/gsl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/${PN}-2.3-cblas.patch.bz2"
+
+LICENSE="GPL-3"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cblas-external +deprecated static-libs"
+
+RDEPEND="cblas-external? ( virtual/cblas:= )"
+DEPEND="${RDEPEND}
+	app-eselect/eselect-cblas
+	virtual/pkgconfig"
+
+PATCHES=( "${WORKDIR}"/${PN}-2.3-cblas.patch )
+
+pkg_pretend() {
+	# prevent to use external cblas from a previously installed gsl
+	local current_lib
+	if use cblas-external; then
+		current_lib=$(eselect cblas show | cut -d' ' -f2)
+		if [[ ${current_lib} == gsl ]]; then
+			ewarn "USE flag cblas-external is set: linking gsl with an external cblas."
+			ewarn "However the current selected external cblas is gsl."
+			ewarn "Please install and/or eselect another cblas"
+			die "Circular gsl dependency"
+		fi
+	fi
+}
+
+src_prepare() {
+	ESELECT_PROF="gsl"
+
+	# bug 349005
+	[[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(tc-getCC)$ != *apple* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
+		&& filter-mfpmath sse
+	filter-flags -ffast-math
+
+	default
+	if use deprecated; then
+		sed -i -e "/GSL_DISABLE_DEPRECATED/,+2d" configure.ac || die
+	fi
+	eautoreconf
+
+	cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/ || die
+	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
+			"${T}"/eselect.cblas.gsl || die
+	fi
+}
+
+src_configure() {
+	if use cblas-external; then
+		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
+		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
+	fi
+	econf \
+		--enable-shared \
+		$(use_with cblas-external) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	local MAKEOPTS="${MAKEOPTS} -j1"
+	default
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	# take care of pkgconfig file for cblas implementation.
+	sed \
+		-e "s/@LIBDIR@/$(get_libdir)/" \
+		-e "s/@PV@/${PV}/" \
+		-e "/^prefix=/s:=:=${EPREFIX}:" \
+		-e "/^libdir=/s:=:=${EPREFIX}:" \
+		"${FILESDIR}"/cblas.pc.in > cblas.pc \
+		|| die "sed cblas.pc failed"
+	insinto /usr/$(get_libdir)/blas/gsl
+	doins cblas.pc
+	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.gsl \
+		${ESELECT_PROF}
+}
+
+pkg_postinst() {
+	local p=cblas
+	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
+	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+		# work around eselect bug #189942
+		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
+		[[ -e ${configfile} ]] && rm -f ${configfile}
+		eselect ${p} set ${ESELECT_PROF}
+		elog "${p} has been eselected to ${ESELECT_PROF}"
+	else
+		elog "Current eselected ${p} is ${current_lib}"
+		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+		elog "\t eselect ${p} set ${ESELECT_PROF}"
+	fi
+}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index f6d8247eca7c..4b3c9dfdc754 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -3,6 +3,7 @@ AUX tensorflow-1.8.0-0002-dont-strip.patch 1181 BLAKE2B 98d25909f9b7a40e2f140dc4
 DIST ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz 99753 BLAKE2B 79b0c9e2f3a8de91bb042e55cbc9f589970add4c9bdccd96c9a0f38887418c97aa67fc433b4feffb92a1384039b0d68a7cc6cda141371427a310172422bd41d6 SHA512 a21df040a5b3f67d9be006ae414113fa1ca86d38fa446acfab18afcbbb89ee7c48776fac5565d0694c99f1ff6ead3b10a9915eac7aae4d2a532ef5ac126a0072
 DIST LMDB_0.9.19.tar.gz 143141 BLAKE2B 69f39e2194638989d8a17b79edd7918966d5608f4e611a7446b45e7321adf3b7d4bd69107fe00a1476d32cbd43b83f512c8498cefa3fca7eea8ba615821341fe SHA512 1d9825f09592ad92a540a1dec232cf6649f41cc67b0d59dc8958a71f4090f347c84995f32a166e2c2efecb862981f455814dd07af99bc3489e42fe3fd8bc6191
 DIST abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz 875263 BLAKE2B f11af5582ef3e00155361de2185b703fc9edde1b6cbefce62224da7b13e1beae219076f144b7b8d4bf63d1b21a73beb77fbb437e6d91e6d59a233846d91c1a99 SHA512 a3694d4c74f542f7a55872707548469e1bdc6dcd05d40ffd62de41d7440dc1fb98d260f690a6799ad39142e35226b04aacc6122aa1edf104fc9d396997995a8c
+DIST abseil-py-0.2.2.tar.gz 189357 BLAKE2B b53976b50f1738d671a32df2fabf197785cb4be1f68dbf7f0bdd5bbbb1a73439646f5b6a9ea42d5df40debdbb8e8c72c554f428a948f3117dba5d6a8e2b473f2 SHA512 d2a393e78acc9ac28fc9b1129c23de9c2ab6059a7527eaa29e4182356b16cbce1fede94af2a8b51af9d1c606b162d8ae84eb3036ced784a89d4f7547bfce73ed
 DIST abseil-py-ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz 189090 BLAKE2B ac4e7ffffb6dc2ad922d03cbfee1858335728fffe5721761fb0207b242ccf0f8d9739bed29987c8cc718f7cc3c297e05bf7506b36f31a06b9019be8215f842a7 SHA512 faf00229a062dcf71d9147bc76538dd4ee3adcb76b7e46943663eb43e3023587c68819d1ca157709c3f071e5796bbcf8e10277ccca1f5b83f33fb0025520d373
 DIST abseil_cpp-720c017e30339fd1786ce4aac68bc8559736e53f.tar.gz 529637 BLAKE2B fea7eceda492764613ffe944331e6b08af33d600036e9b2453f4c09e892f22f79a95b00a29a9bdf9e705d11502027d88659e19aa484cf4a02158209b058cec13 SHA512 3ac70cb924518627dfc6ec2eb5f65bc0e1235898eefebb0d0410867270065aa745d21456f1212b916e732b3f5dada18b03e526e02d09a09f445531798219006e
 DIST abseil_py-acec853355ef987eae48a8d87a79351c15dff593.tar.gz 175877 BLAKE2B f3c9b36101321f1e72c4eb2cbf11b42e36dc95bb1682b124b77652d2a2bee912459fa92f40718c80aa22f18611c77d13ad08e2888b20ae8895c115191e2b7397 SHA512 154056acee09b8c193d0bc8c64dd98bab87bfd779b04f81b1da7ace3004fcdf780f3ed0066ca3204850c2b80a6b1185e5e435ed852b73af85a6d899addc1c8bc
@@ -20,13 +21,16 @@ DIST eigen-6913f0cf7d06.tar.gz 2296773 BLAKE2B f3d4ed1577abc7f722fb600e79bcb1294
 DIST eigen-fd6845384b86.tar.gz 2312810 BLAKE2B aae02b053e9b22b0c063d1173b28fd7d71cdec6b6e6702624b8fdeb707ada24e5415079f1a1c7b8fe108c7e632c6c736e13cfbdc101270742565b7045a57616a SHA512 b999e60236abf7a6a5062aa55b0aeefe9254b204416092649d4a88d42fef7c571e3ba563bbbf94033093f789511793d614c1ce94a0a0f3eb4b18df466b6345a5
 DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00
 DIST fft.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd0200371c153ddf54ef6c7c4ec523ee6560547e2d5ef9f3200037c0635bf41c18991ac35f271b1e600d0dbd65d1a9a7 SHA512 f1ceac00cb7b9eb8f625eee7f1f5eea8af363343589a344226628d68baf668c176e6c23b7f904c4e682330352eaa0cd5d00731340d208e94c9657b8f85ae2240
+DIST flatbuffers-1.9.0.tar.gz 681752 BLAKE2B 7886895f79ad5b8b62c4acb479d60a6fe16226a1a9daadf2c457189b7a3381676ba9dd3f8e2af5ebd5f2d78c6ac37d9d83de88ee08b566fd4e4507ecdb887938 SHA512 0ba07dbe5b2fde1d0a6e14ee26ee2816062541d934eda204b846a30c019362f2626761b628c900293928b9b546dba8ca477c13182e022c3e0e0a142fd67f0696
 DIST flatbuffers-971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz 613854 BLAKE2B 982142b7dd81791f221d7f3cbbecf6539549c86c436e0cf3ae0c57bd7535b90083c7d2709abc811abcf3b6fee417a16b1d8dcdedcce58fd8715db7ae785a7bff SHA512 01ffc047483edaaccc13bf256d59eef0c4cb7488618f1e908c74e0dcc599f00856d052d209a079d35e385bef973a4c6daf401107c4be85bba46dcc3b4f453b26
 DIST gast-0.2.0.tar.gz 9400 BLAKE2B 1392b9ef3a007d89b6b7af5ca49f3dcaa0689e166845ea25c2e544578f65915114d763b54503825dc2b6958a71ac284ec7ae2cc2cfa861494da28df786d679b4 SHA512 651719c3035d21e02e39cd83fd54212a12c39addf69f7c9e8810ccb7bb9aae7828e176ad0adf55182f0628f18d76cb1e286e498a9665ddb12e91a51dc2303381
 DIST gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip 916632 BLAKE2B 0bde9faf0e185fc69999173eb0b5a2e106d252ee1bc6caf38b1adc27bde96e4e2b52a3d723c8b1af922386c0e933bfcc674be974cee059c1d9b16ff6ac631c3e SHA512 eb141182dff058048c559723e6aa7127244dcc6a5a0bfd1250bbb262f34378dccf15b1b930cf46dcb6ac22ac16e3fa2781cca63cd93865506a36ab7e463aa537
 DIST gemmlowp-7c7c744640ddc3d0af18fb245b4d23228813a71b.zip 903072 BLAKE2B 26e49a36f7af265ba4fd720864fd148055e9491d0c0100988b474c41920a0b9d698c634a59280f458941a21af15017966bbb2f65e3b399bbcbf836e1232b9d7e SHA512 b754e9b4fb28884e5fbca56bf0fd59d8bbfa3e01900bf6860a2ee24047b21c71cd076ac27d5cc5b3f44c325fb6fb516529dfdcf720fecdb27e7fef38a4f6da13
 DIST giflib-5.1.4.tar.gz 738552 BLAKE2B 414cfdb488a12bcebc6e6e1db9face0e69430e5af94929e7935dc38ff2355182e223b5d87aef53d405f5f79867b4bc1e756f84134d60a01bcb8b5bf5b6859fa1 SHA512 d9a98a593bcfbbfb2fcbeef1382ca9669a6b85276512e6828c92869d16c7cfe980bbb318766fc176be3c9f7deff7878d2be8aeda1d40af2cc4ac723fe6121b83
 DIST google-cloud-cpp-53f822805e77ea7715f5b52c592a162c515c7219.tar.gz 617576 BLAKE2B d59967fa2bff125060d9c7a20b4dd892e414dd0fc5169a26145977383174410492ef184e00409a98736f5f53d6ab97e17a966140cded3c891e1efd6ac4590c51 SHA512 b9b2c39b4e18bb11f15ff573c1565742bfdb5f8acff33d85e592ba38cf38f7ef80981bb8184bf187cf2f0fb7af801d3d31d538029aea243408385e9e64ab61fa
+DIST google-cloud-cpp-f875700a023bdd706333cde45aee8758b272c357.tar.gz 630301 BLAKE2B b3e9a4b692530fcd94a1b41103063085e4368fa627e9b003d9ea1a9d1be473f34a5d2215ec38f54b5154bd72326930b3099d8d6bd2bcb518657c1a44b7a1b9dd SHA512 da838ce2b40b458609f77f0ec5c060b6099884500cfb4e678648ee2e37aeedde9605772ed94eb93f1c503880fbad2703dfc0621063c6f5076fed202136ebb64c
 DIST googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip 1099608 BLAKE2B 7b27f5355d68a0785b7d715d2da71a8e2f9c9609b090d3e2cf3fe974ac13b78c5e9fc43b88cc2ee5e8b268243ef8fe1b81cc4c27cb21b9a26fbe0825724bd8a7 SHA512 d63b5d824bbc73079db44671173f06353ca8c55ad86a86483ffd4dd88b0ef2b5ccb857d56b6e6e73c3bd7fd098b887ffbbbd138faaea9291ade34ff46502bfea
+DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cfa29ff2af71d407e3df25f3ec4b7572335c455d5dd0069eb343f18f8641a4f9326065cc118922942f77d2d2403 SHA512 25a489cd67d12219696c397afa75282eb702bd0af418381990b2eeb4b56483a46276d05314710582dd17be04c80aaf9bb16e01e2c1729d9a59d84ff273baa254
 DIST grpc-bd6bdf93279a39a8cd92978fd7c9d14eccd98fc2.tar.gz 13478349 BLAKE2B 81f6722c893332c6be7875f9bd4f8311eca989c6dcaf87e47de038abe43b4d8eef5aaa0326a15a7c4f5c7a922e85bc006ace244ef4004ed78bf91645711adc12 SHA512 9268fc28bc128d2ad944fff4d9e1764a5cf0ab7c4d3f693607f42413cccdb766ec349b8f2e487bef823ac65007da9b9e3fdf91a7f623634616d91a68477b2951
 DIST grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz 13432340 BLAKE2B 68a0da37600fe15632542da2b477c47488c92a1eff578088187ca3ce2a4feaa8487dd4f6777c62af59be907984a9fa9f8170fc016a31d193bfafb472ed789a75 SHA512 7fc5a3f4a09317cb81a95fc82654379fb4361797f96a5e20e3bda4b425f57b8369922342ddf4ab4d401246abf4be8669ecb0a46f50c9065824901f14d3d21a6a
 DIST highwayhash-dfcb97ca4fe9277bf9dc1802dd979b071896453b.tar.gz 121307 BLAKE2B 73402228c12dd0044960db0a2366d63dc6aaa3b8b093bfed7a1f32dfe063499913094beb4d93d67e1926b6854625bafc2f3e279e84e01220b279a3afd1cc3300 SHA512 235ede2ca52e22aa335e31969d2318fd0e413f07492d599bfc0a605ad53090731fe1285be177e2c66b6eb8379e98cbb8389f4d1c7b2bae20d3808bbcf5ecfb51
@@ -39,13 +43,16 @@ DIST libpng-v1.6.34.tar.gz 1146972 BLAKE2B 5d9c1e38cf5170b8b86a9b8bde380e735cd76
 DIST librdkafka-v0.11.1.tar.gz 859238 BLAKE2B bc53f358320aa40d1acb209daa2594f18421bb6913bad7ba08a5612dfd6683e65489dc31ed67adc9df090d719ea6ab1031f46e524f055c61cab3f1f941a7163b SHA512 24aba6cfbd5df6a010a735fde455a9272c85b26055b172893b8e5259c2d6a7f2adc9637699f7f3b7270200a280cd95d52779a8f89fbb6af5fc035488ff54310e
 DIST libxsmm-1.8.1.tar.gz 893332 BLAKE2B b09879ef45a8d3007846361aaad8536dac526297583d29f28378a91c05fdd3a4c51e399d7d5b05dd4456268d5fd3e7014d889a41be61c1d99425dd7234b0dd6e SHA512 30388de1edf46ae40b2ccdf224bd9febd1ffbb91f8250c89c03044fe1ea75754ce5155107ec9d027fe2e08963f1ac9d2e526ea84618d2cf50c2d5dfe8a1e074d
 DIST llvm-7e78daafdd22f3f17720a103d29d89590534004e.tar.gz 39754833 BLAKE2B 30fe6c9267b89c9e0f046082af114c9eb9c32baeb13ab1f12b6c9c9ce7e8f83643635879fda4b3a82f5039b1aa6ff63f67546806cc7e6834e8e5399fa1d1f2d6 SHA512 b1ccaa3f39ad38946a2c177e08692719469b0747fbb63afa3054e161d24a61b5223a0c35eb0c5cc226d08416accda34035fa538803da320de205a4eb114b4f02
+DIST llvm-bd8c8d759852871609ba2e4e79868420f751949d.tar.gz 42053858 BLAKE2B d8f1e7728eeb7aa7e2eaf8456088b54aa29dbcdf9635823dff4501ec5d1c382d74c8dacfcfc89aed9c42d754a757c755bdd11a5b7be213bebbe4349f972165bc SHA512 470499b7f70a4fe8f4399f74b3e02aa511bf4786ee36fd8d28459e1d426761e110dede19c3786adb824e8d4d49386e27b5a01e752bb1c39e4df294ed71771404
 DIST llvm-bf13d093f13a295d71080614c3036ada591201d5.tar.gz 41052612 BLAKE2B 61ff782a51bbed46ece6cdb7ea2a7bc4e28ffce22d1673444f96fb22373196e1f9851bc1fe98903d78bdeebbaa2de654d355ec91c14c3184bcf5b51657f3400c SHA512 3ebf854611b06889400e004a12478490ba43219202d1086fb4401bae9a6f4e74880f53bf3d3de9110027682a327216ac3016d6d7ec6b23ac288ca2836d615b2c
 DIST mkl_dnn-v0.12.tar.gz 759597 BLAKE2B ad790db940ca5353bc20db9e012356761e5a87d6646eeae983880881e1df271a0a4deb3b6810546fa8cf6f2c35c45509c57630cf8d493d72d557d33864f780f3 SHA512 e6a257679b872d16e320556ca2c1ddb5c04a949ee8b8d6b4de350c46ad4ea79749d5d9f92940c592706719490ad837210335027f782a8df46da1a2029ae5adcc
 DIST nasm-2.12.02.tar.bz2 961257 BLAKE2B f45c35571fa1254ccc01ed59de8a46cb480300404c701b444a7a751d077d23f64a7dbeeeb044d7daed8a6f895b1100f76f2db75ced6417ab56cb83b9494eece1 SHA512 7744a078647861382212de798d200b683cc4044881474fc1931acb14dfa0340ce026d1b3f64ac1ece87878ccd0ddcb69b8c0c850415313f47e01f0332e56a8f8
 DIST nsync-0559ce013feac8db639ee1bf776aca0325d28777.tar.gz 151680 BLAKE2B 280f8800e8674fbab90d15c09ab7e260b3230bfcf0fb44c998955c9bd4aaf07b4a9073a74479c8879811c56863d4c28693e408a4b205e5b5d9c801bb82159216 SHA512 ef61f9f0b12cf1252840966243ef4b4a0cc18afde7eddedb7e3f6ea31fa8a89da5570cfe6be536d721e4b7593249d05bb1c60372f6668635ad8bcde78bfc8dee
+DIST nsync-1.20.1.tar.gz 154106 BLAKE2B 94eeb647de2ca58a3f3837119ef30805f0a72a9d12c19aa705f815955723ddefa1de4d2a3fe5fd0b227ffdd70d5208ab9a300e40b2aff2591a1cef28c79b450a SHA512 d7b9be1052b7d11d896d3fade822f7b1eebbd0a772c9f6e2cd827921f1adc29ed18f7587ebc7d29623d230be384a7a2356c1da3abd53567fc934979d89c70e0c
 DIST nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz 47849 BLAKE2B fb2a6fc1e45057c4150c1dae2a5058a12d8641b3f5dfdd982661b4351ec9df39ac3aefaf4dfa9c8606ddf7fd1c4a8b35683e5e5eddd74cbc63ee025b33d4b731 SHA512 eb555030e9d60d68c4094e85f16e0b74de7f61602c742d57bc2029d12c719084a2fd1214c13467ff262f6f3932508754159af5f014e6f16d279d14e1fafa9b8a
 DIST oourafft-20061228.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd0200371c153ddf54ef6c7c4ec523ee6560547e2d5ef9f3200037c0635bf41c18991ac35f271b1e600d0dbd65d1a9a7 SHA512 f1ceac00cb7b9eb8f625eee7f1f5eea8af363343589a344226628d68baf668c176e6c23b7f904c4e682330352eaa0cd5d00731340d208e94c9657b8f85ae2240
 DIST pcre-8.39.tar.gz 2062258 BLAKE2B 1bc2b7b822383ba67b3e9707178fd100a13370a3a4ce8e6527fe0356f7d3e604a9ece11cef5e9e85925fc309698887389e67759d820b8b7a99703cc1cd3ccc88 SHA512 1724b2d6d8575af19fc20a13e50d71cb8024a66458d63cbc006b5bca01230845730535f3446d3850ddd580c93031f38c3ebf547adce0d279dfd18101677403da
+DIST protobuf-3.6.0.tar.gz 4483224 BLAKE2B b6716d33c14ab98a05676a3369b4762179df88ed3e8c34b93075c12edc10213bf1c427a59a8840bc64b53365264021b8075a02a44478c998062cf04da95c0075 SHA512 46df0187e5c9e7d213930d916f6c89e7a41eca1aaac228d8f56e3f784598a9f323d7cc2d3cf20668ceb776d3237c4eccf685ef8d7808f09107fa8e441f9899f4
 DIST protobuf-396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz 4803167 BLAKE2B 466db7931c46df5f05018f4ebee0f1061a416b43486dce1fb4953a677f73138c74cbb97f333447862a571bcefe34dd0be3aac18e51b24f9921cb344e4e033af9 SHA512 5af4ebdd8a86a5e50c14c18590e372ea9454cadb101555e00008ebffe448acbaa8c57eeae857a53f20c64c0174ffe0a4d19ba393e2ca53beebad61d5b1db06c1
 DIST re2-26cd968b735e227361c9703683266f01e5df7857.tar.gz 387722 BLAKE2B 122b9f30ec2534877580227fadfce6da6db00e9a3ec29140082580d71e6c4c510d5b6b7400633987d9cb546f88d26726ea6cbc7944aa925272a6dfccfbf728c9 SHA512 cbc81a948c8150416ba437f9fd7248d4e15c03160635d41702c79b981f05092dc052c5c0ee89a9fb7e163dffe148585c652207d9707214488c30bfd3aaaec18d
 DIST six-1.10.0.tar.gz 29630 BLAKE2B 1f380dbc7a9e746b4a7909de54a58a008a73d7b6c582611b2481475d5d9971c936b1742ea0821c65150694914af72f43155caa54616268735a4bd2447d5b4ba4 SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e
@@ -53,12 +60,15 @@ DIST snappy-1.1.7.tar.gz 1090550 BLAKE2B e389c96e093de5db92b896a7fa17a90d3ad0be0
 DIST sqlite-amalgamation-3200000.zip 2069628 BLAKE2B 97b641fdd143af8bd1f4b7b733f9823196d09ac1b1c1ea5b093da12592957b66d8be2450a7edf18c54ae83a03e09564d5c7f6b0cb8dd48d4fa8b4f2b153f62a7 SHA512 659b5fe93d526d6121f1530581d3fce5af90c986decf2fab7505fea14dc1ebc9167943261a433207fd70df0019bbcb4faeb5e49e586fc9ba6300439b6e00d1e8
 DIST sqlite-amalgamation-3230100.zip 2183147 BLAKE2B af25542f81ac0592d143695466de785779dc8002ebc5b6cf20cb2d56a66cf12b9d4f73392b6ac696b8107beca0e5c3a3e03efb703fa49fc380355d1e9302e78a SHA512 5784f4dea7f14d7dcf5dd07f0e111c8f0b64ff55c68b32a23fba7a36baf1f095c7a35573fc3b57b84822878218b78f9b0187c4e3f0439d4215471ee5f556eee1
 DIST swig-3.0.8.tar.gz 7937213 BLAKE2B 38f17631a36f178a478bf77f1a7ea77b50b91ed95ca0363f0f75d86bf7da6d855db314c1b7e67634b0e6e1438a0d141d0241595987142154ee356d60955248bc SHA512 85605bd98bf2b56f5bfca23ae23d76d764d76a174b05836c8686825e912d6326c370e9cf2134c0bf4f425560be103b16bf9c9d075077f52e713a69082616e906
+DIST tensorflow-1.10.0_rc1.tar.gz 24486453 BLAKE2B 3b41653695cfa03ae5ca3a4e16d82a0f3248ce674acb76210747614e98fabb9131a298ad947185c462d2e3573dfb7d1580de934d1a0b40710bba16208df7e333 SHA512 889430262f686613f39982b9b2ed328db16b651848cbf1dd06fbf9a5ef2304ddf0b43ca21eef2bbcc86800051497f18ba166427788c74a65aac7d3c10ae60f52
 DIST tensorflow-1.8.0.tar.gz 22649439 BLAKE2B 7384c2cf742fb5a8b4e266e95080ae2513c1b112ab97f74839fa8e81bd91bd24645be8afb02e4447ad5fba9f47c4d146f59aa12085937cd3a364ec34c99590f3 SHA512 7280e65d26fb3f15d95f7217ee3bc08d1424cd144cf25bf638fa114fa835b2505dfaf457c55700067d24f485b77120973d094ec568e6d1b1054857402f9c352d
 DIST tensorflow-1.9.0.tar.gz 23571524 BLAKE2B 2961ef5a35d3271512999478f6e260c90c48537e251b41d60ae9e033386c0dd9e1337af85c5441afca1b8cf5b3726349ba0e56cccdfa95fdf1c5e9e4d4db8af5 SHA512 eb25dafccf2ec600c4ca28612362c8317b8b9160610ca9fb60f265815651c155b19ae5be3f213a0d9e716d9e25637d6502164433955247cf6fa5d75408b7ac84
+DIST tensorflow-patches-1.10.0_rc1.tar.bz2 4032 BLAKE2B 8588deec74179d8044af631de8e651491cc713553ee15ece9dff5052bd95b10924bdbe4301453f00d0f2fccd5d595d496b48fe45b0259837653b2de9e1898ab9 SHA512 1f57995ca9b3278735636cc42c88dc45558fa6a1d656108293f8df3fd9961d75f5e979bf0a9909136134e1cdaab41a34f83e605b48b23dddf17a6b1be684117b
 DIST tensorflow-patches-1.9.0.tar.bz2 8588 BLAKE2B 7fbdaa680b3bc372c760861709776cf333d587398297fb596332bb7394a7747c86cdc87615ae6f74e81d4e6b39a34aa3a9b6ee7cab95237316f20a315773b12b SHA512 35d56a1e71e500f41e423a2b58d58d210737afd2d9cd955aed227036a066506be1b39e7809f71d82c80f055ed43dfe1813213975acfb8d86be38baf24510e0f3
 DIST tensorflow-python-license.txt 45132 BLAKE2B 1f572a06eeb4a58a5563b87a2db381a6e9eb0195cf1d006bda0d3da158e62a1e67e889a7d3d0da83d8609c0d048887bcbbd0d7056fd8e4f56b654047f36936fa SHA512 1b8c2f9733fcf27d560879418c366b5c3e44420d42adb3b857ee741793ddc75ad18324b016909457e5311f2143593392ce4404d12962f076e62f6036afbb521e
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
+EBUILD tensorflow-1.10.0_rc1.ebuild 13829 BLAKE2B dd99f463536047e6b5acaa9aa6341d367b91d1a864f9b641bfab2b4522e73c669bc80641ad8feb5134926ac70eb8b3dee1e8551508ba25ae0c93fe59f713aba4 SHA512 29cf0984492d506aebfcab35e6c889e497c8771a8cf5974abf2b5752b2ea4d082491149f76beb3cc66eda7dd1d173322bab478df5fffe02494eac58a6154541f
 EBUILD tensorflow-1.8.0-r1.ebuild 12704 BLAKE2B 09da9048917ec2a5919179791fe0ef6607d2453e8a0e16ea0809820629a10002fbb157b96a9aad2c4999a78a8cfe75f4d43db8d1ed428741188fa12932ed0f15 SHA512 d6ec346fa14febaefe985c428d151477243cf7f1d4f21ecc24ea19204acaf2ff28fb192879206e46bbb771bfe10958cc0c460d351c9dc9ea5798b9211a40d84e
 EBUILD tensorflow-1.9.0.ebuild 16027 BLAKE2B a3a46215df0dec77d15ef828fe0fc73f9b209d3c1433c7893edd594a46161a30d73b8a811bc73829b540560cfadbf6fdd92fe132c12a374cb768c62d1bcea0de SHA512 ab6bcacacc67714628f7353c22052e6a659eb3d4a1d596c1caaca52157b90f23529a1fa37c192249faaf5909e320d6c54a32a09831494bcfa28611b596894ff5
 MISC metadata.xml 720 BLAKE2B f8069d999e401f2110a64b002912462d9a6f30674dd42efcd4d5f9d16641e320ba078c539f562d9257c5be1028d58963d060672c9df0f4615519bc02baa0bcd2 SHA512 5f5813e3a398381254e86c96c718ecfd3b0503029f10adc6601476ab3f5f80033cbfd5292280c94d4ca1cda7774b66bc13796e62d1d3d3181b7c72dcb6420b47
diff --git a/sci-libs/tensorflow/tensorflow-1.10.0_rc1.ebuild b/sci-libs/tensorflow/tensorflow-1.10.0_rc1.ebuild
new file mode 100644
index 000000000000..cd3af7d25880
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-1.10.0_rc1.ebuild
@@ -0,0 +1,427 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit check-reqs cuda distutils-r1 eapi7-ver multiprocessing toolchain-funcs
+
+DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda jemalloc mpi +python +system-libs"
+CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
+for i in $CPU_USE_FLAGS_X86; do
+	IUSE+=" cpu_flags_x86_$i"
+done
+
+# distfiles that bazel uses for the workspace, will be copied to basel-distdir
+bazel_external_uris="
+	http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
+	https://bitbucket.org/eigen/eigen/get/fd6845384b86.tar.gz -> eigen-fd6845384b86.tar.gz
+	https://github.com/abseil/abseil-cpp/archive/9613678332c976568272c8f4a78631a29159271d.tar.gz -> abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz
+	https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
+	https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip
+	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
+	https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip
+	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
+	https://github.com/google/protobuf/archive/v3.6.0.tar.gz -> protobuf-3.6.0.tar.gz
+	jemalloc? ( https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz -> jemalloc-4.4.0.tar.gz )
+	cuda? (
+		https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz
+		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
+	)
+	python? (
+		https://github.com/abseil/abseil-py/archive/pypi-v0.2.2.tar.gz -> abseil-py-0.2.2.tar.gz
+		https://github.com/googleapis/googleapis/archive/f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip -> googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip
+		https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/f875700a023bdd706333cde45aee8758b272c357.tar.gz -> google-cloud-cpp-f875700a023bdd706333cde45aee8758b272c357.tar.gz
+		https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz
+		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz
+		https://github.com/llvm-mirror/llvm/archive/bd8c8d759852871609ba2e4e79868420f751949d.tar.gz -> llvm-bd8c8d759852871609ba2e4e79868420f751949d.tar.gz
+		https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt
+		https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz
+		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
+		!system-libs? (
+			https://github.com/google/flatbuffers/archive/v1.9.0.tar.gz -> flatbuffers-1.9.0.tar.gz
+		)
+	)
+	!system-libs? (
+		https://github.com/google/nsync/archive/1.20.1.tar.gz -> nsync-1.20.1.tar.gz
+		https://github.com/grpc/grpc/archive/v1.13.0.tar.gz -> grpc-1.13.0.tar.gz
+	)"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
+		${bazel_external_uris}"
+
+RDEPEND="
+	app-arch/snappy
+	dev-db/lmdb
+	dev-db/sqlite
+	>=dev-libs/jsoncpp-1.8.4
+	dev-libs/libpcre
+	>=dev-libs/protobuf-3.6.0
+	>=dev-libs/re2-0.2018.04.01
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng:0
+	net-misc/curl
+	sys-libs/zlib
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-8.0[profiler]
+		>=dev-libs/cudnn-6.0
+	)
+	jemalloc? ( >=dev-libs/jemalloc-4.4.0 )
+	mpi? ( virtual/mpi )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/absl-py[${PYTHON_USEDEP}]
+		dev-python/astor[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+		system-libs? (
+			>=dev-libs/flatbuffers-1.8.0
+		)
+	)
+	system-libs? (
+		dev-libs/nsync
+		>=net-libs/grpc-1.13.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	!python? ( dev-lang/python )
+	app-arch/unzip
+	>=dev-util/bazel-0.16.0
+	dev-java/java-config
+	dev-python/mock
+	dev-lang/nasm
+	dev-lang/swig
+	dev-python/cython"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="5G"
+
+bazel-get-cpu-flags() {
+	local i f=()
+	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
+	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
+		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
+	done
+	use cpu_flags_x86_fma3 && f+=( -mfma )
+	echo "${f[*]}"
+}
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS} $(bazel-get-cpu-flags); do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS} $(bazel-get-cpu-flags); do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+setup_bazelrc() {
+	if [[ -f "${T}/bazelrc" ]]; then
+		return
+	fi
+
+	# F: fopen_wr
+	# P: /proc/self/setgroups
+	# Even with standalone enabled, the Bazel sandbox binary is run for feature test:
+	# https://github.com/bazelbuild/bazel/blob/7b091c1397a82258e26ab5336df6c8dae1d97384/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java#L61
+	# https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113
+	addpredict /proc
+
+	mkdir -p "${T}/bazel-cache" || die
+	mkdir -p "${T}/bazel-distdir" || die
+
+	cat > "${T}/bazelrc" <<-EOF || die
+	startup --batch
+
+	# dont strip HOME, portage sets a temp per-package dir
+	build --action_env HOME
+
+	# make bazel respect MAKEOPTS
+	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
+	build --compilation_mode=opt --host_compilation_mode=opt
+
+	# Use standalone strategy to deactivate the bazel sandbox, since it
+	# conflicts with FEATURES=sandbox.
+	build --spawn_strategy=standalone --genrule_strategy=standalone
+	test --spawn_strategy=standalone --genrule_strategy=standalone
+
+	build --strip=never
+	build --verbose_failures --noshow_loading_progress
+	test --verbose_test_summary --verbose_failures --noshow_loading_progress
+
+	# make bazel only fetch distfiles from the cache
+	fetch --repository_cache=${T}/bazel-cache/ --distdir=${T}/bazel-distdir/
+	build --repository_cache=${T}/bazel-cache/ --distdir=${T}/bazel-distdir/
+	EOF
+}
+
+ebazel() {
+	# Use different build folders for each multibuild variant.
+	local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
+	local output_base="${WORKDIR}/bazel-base${base_suffix}"
+	mkdir -p "${output_base}" || die
+
+	einfo Running: bazel --output_base="${output_base}" "$@"
+	bazel --output_base="${output_base}" $@ || die
+}
+
+load_distfiles() {
+	# Populate the bazel distdir to fetch from since it cannot use the network
+	# Bazel looks in distdir but will only look for the original filename, not
+	# the possibly renamed one that portage downloaded. If the line has -> we
+	# need to rename it back, otherwise a simple copy is fine.
+
+	local src dst uri rename
+
+	while read uri rename dst; do
+		src="${uri##*/}"
+		[[ -z $src ]] && continue
+		if [[ "$rename" != "->" ]]; then
+			dst="${src}"
+		fi
+
+		[[ ${A} =~ ${dst} ]] || continue
+
+		if [[ "$dst" == "$src" ]]; then
+			einfo "Copying $dst to bazel distdir $src ..."
+		else
+			einfo "Copying $dst to bazel distdir ..."
+		fi
+		ln -s "${DISTDIR}/${dst}" "${T}/bazel-distdir/${src}" || die
+	done <<< "$(sed -re 's/!?[A-Za-z]+\?\s+\(\s*//g; s/\s+\)//g' <<< "${bazel_external_uris}")"
+}
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PVR}.tar.bz2
+}
+
+src_prepare() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	setup_bazelrc
+	load_distfiles
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+	use python && python_copy_sources
+
+	if use cuda; then
+		for i in /dev/nvidia*; do
+			addpredict $i
+		done
+	fi
+}
+
+src_configure() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_configure() {
+		export BAZEL_STRIP=0
+		export CC_OPT_FLAGS=" "
+		export TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
+		export TF_NEED_GCP=0
+		export TF_NEED_HDFS=0
+		export TF_NEED_S3=0
+		export TF_NEED_AWS=0
+		export TF_NEED_KAFKA=0
+		export TF_ENABLE_XLA=0
+		export TF_NEED_GDR=0
+		export TF_NEED_VERBS=0
+		export TF_NEED_OPENCL_SYCL=0
+		export TF_NEED_OPENCL=0
+		export TF_NEED_COMPUTECPP=0
+		export TF_NEED_MKL=0
+		export TF_NEED_MPI=$(usex mpi 1 0)
+		export TF_SET_ANDROID_WORKSPACE=0
+
+		if use python; then
+			python_export PYTHON_SITEDIR
+			export PYTHON_BIN_PATH="${PYTHON}"
+			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
+		else
+			export PYTHON_BIN_PATH="$(which python)"
+			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
+		fi
+
+		export TF_NEED_CUDA=$(usex cuda 1 0)
+		export TF_DOWNLOAD_CLANG=0
+		export TF_CUDA_CLANG=0
+		export TF_NEED_TENSORRT=0
+		if use cuda; then
+			export CUDA_TOOLKIT_PATH="${EPREFIX%/}/opt/cuda"
+			export CUDNN_INSTALL_PATH="${EPREFIX%/}/opt/cuda"
+			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+			export TF_NCCL_VERSION="1"
+
+			TF_CUDA_VERSION="$(best_version dev-util/nvidia-cuda-toolkit)"
+			TF_CUDA_VERSION="${TF_CUDA_VERSION##*cuda-toolkit-}"
+			export TF_CUDA_VERSION="$(ver_cut 1-2 ${TF_CUDA_VERSION})"
+			einfo "Setting CUDA version: $TF_CUDA_VERSION"
+
+			TF_CUDNN_VERSION="$(best_version dev-libs/cudnn)"
+			TF_CUDNN_VERSION="${TF_CUDNN_VERSION##*cudnn-}"
+			export TF_CUDNN_VERSION="$(ver_cut 1-2 ${TF_CUDNN_VERSION})"
+			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+		fi
+
+		local SYSLIBS=(
+			astor_archive
+			com_googlesource_code_re2
+			curl
+			cython
+			gif_archive
+			jemalloc
+			jpeg
+			jsoncpp_git
+			lmdb
+			nasm
+			org_sqlite
+			pcre
+			png_archive
+			six_archive
+			snappy
+			swig
+			termcolor_archive
+			zlib_archive
+		)
+		if use system-libs; then
+			SYSLIBS+=( flatbuffers grpc nsync )
+		fi
+
+		SYSLIBS="${SYSLIBS[@]}"
+		export TF_SYSTEM_LIBS="${SYSLIBS// /,}"
+
+		# Only one bazelrc is read, import our one before configure sets its options
+		echo "import ${T}/bazelrc" >> ./.bazelrc
+
+		# This is not autoconf
+		./configure || die
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_configure
+	else
+		do_configure
+	fi
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	if use python; then
+		python_setup
+		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
+		cd "${S}-${MULTIBUILD_VARIANT}" || die
+	fi
+
+	ebazel build \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so
+	ebazel build //tensorflow:libtensorflow_cc.so
+
+	do_compile() {
+		ebazel build //tensorflow/tools/pip_package:build_pip_package
+	}
+	use python && python_foreach_impl run_in_build_dir do_compile
+}
+
+src_install() {
+	local i j
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_install() {
+		einfo "Installing ${EPYTHON} files"
+		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
+		cd "${srcdir}" || die
+		esetup.py install
+
+		# Symlink to the main .so file
+		python_export PYTHON_SITEDIR
+		rm -rf "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
+		dosym "../../../lib${PN}_framework.so" "${PYTHON_SITEDIR#${EPREFIX%/}}/${PN}/lib${PN}_framework.so" || die
+
+		python_optimize
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir do_install
+
+		rm -f "${ED}"/usr/lib/python-exec/*/tensorboard || die "failed to remove tensorboard"
+
+		# Symlink to python-exec scripts
+		for i in "${ED}"/usr/lib/python-exec/*/*; do
+			n="${i##*/}"
+			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/$n"
+		done
+
+		python_setup
+		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
+		cd "${S}-${MULTIBUILD_VARIANT}" || die
+	fi
+
+	einfo "Installing headers"
+	# Install c c++ and core header files
+	for i in $(find ${PN}/{c,cc,core} -name "*.h"); do
+		insinto /usr/include/${PN}/${i%/*}
+		doins ${i}
+	done
+
+	einfo "Installing generated headers"
+	for i in $(find bazel-genfiles/${PN}/{cc,core} -name "*.h"); do
+		j=${i#bazel-genfiles/}
+		insinto /usr/include/${PN}/${j%/*}
+		doins ${i}
+	done
+
+	einfo "Installing Eigen headers"
+	ebazel build //third_party/eigen3:install_eigen_headers
+	insinto /usr/include/${PN}/
+	doins -r bazel-genfiles/third_party/eigen3/include/*
+
+	einfo "Installing libs"
+	# Generate pkg-config file
+	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	dolib.so bazel-bin/tensorflow/lib${PN}_framework.so
+	dolib.so bazel-bin/tensorflow/lib${PN}.so
+	dolib.so bazel-bin/tensorflow/lib${PN}_cc.so
+
+	einstalldocs
+}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 780d5aa9acc0..6c55bb410e2a 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest
index 5c9c6d542f99..aa40b9046dc6 100644
--- a/sci-visualization/veusz/Manifest
+++ b/sci-visualization/veusz/Manifest
@@ -1,9 +1,8 @@
+AUX fix_spline.patch 758 BLAKE2B a0d3af3bf186a6935a88e985931353085ce043e244fddecb7f9a5e0f71a812d0582218e4b544d320b6a380c9b6d2ff964e69799503cb08ab74451617fe1bc815 SHA512 9e0284b7dd879089dc16b28474060c2c53a8955645096e63e435129c237012b9cebcd666f10da4faa0c99b37512952961fa0f1f3d6c2747f3ab791bd8925c26b
 AUX veusz.desktop 248 BLAKE2B 02c9b85f9ea12ef0ee9bf8f538788f577ab4314468e94140b80351accece2dcbcf11b39b26468d8c31e3feb9fc8422a1fe5051b00100743f263eba2558861236 SHA512 986479153d6409a639f0daab4c2c11836927fce93feecf0bffefd7643cfa9c3ee2c24d374f2c6eaef475bc4bcfe39095c6b12bd0731c585ad213f0a4672c8047
 AUX veusz.xml 346 BLAKE2B c99688c930b3901edcf500c4a99447074a01be6abfd2be714f8c1dccd4318a0270d30f47f92636280f406ba9003540434c52683b0a8f66fb4d672e3436fdb5a1 SHA512 c4f049d4648192d932560a2e73088843ecb0a2beea2e628424488d552684a8e69b84628773a08947741690eb732901bc8ae8c52fa926d1b44bf02b9046cb569e
-DIST veusz-2.1.1.tar.gz 2440253 BLAKE2B 1bfbe3bf6a026fbbd4acf5d722a1d2282331d71548650606c474c81399e8f0e8dcef643e0ab61a3eff62e111392a0668e1ae3d0bb2a76d7abc1f57e10a6e0506 SHA512 894dd12ea89671d71bd1abb2367c19d76c599c59edd302c29e5f99bbd1798fea8cb1489ca3446e8f88fedaf287fb48ee63617f928c77e4bd366a4f00a878b994
-DIST veusz-2.2.2.tar.gz 2451495 BLAKE2B 1d6672b932092c9645faaf0f081026963c99fdecb7844270fd674ee30e6257377e2e468cd4590efcaacb255035dfa2dfc61c1db6b4aff72366b374859e2e8601 SHA512 1851a4da9566498bc2eda65a2417e021e7089c0b73cad600c021be9f5561e66a084f92ad18a18d1bd0c0e5eae742500b9e8b313e10e7948ee6a434b40f430b49
+DIST veusz-3.0.1.tar.gz 2554401 BLAKE2B 6e5649eef94ce0bd7fcdfa8325b35de144aaecd792f32c149f5a6f16c7c35f10d29bebeb37531d726e1b87f6d46855d7cdb2af402ec8fd0a2c1af91844d12c03 SHA512 99766c0fee70c12bba7b2ee8434224649763323aa9278d2116159f18257e1e1c5a491d591efb779c1bbb9dba1fb524ad8185fa2e91429ba1cc594fd632cb6238
 DIST veusz-3.0.tar.gz 2550683 BLAKE2B 72f0da8d9b993d8a3252fbb93314a53832fbf319287946e9ebc9317ebdab3f10ef2071012b88a1ff3d31d4732f367ded0b217dfa9766f5a09abe90e96b769e45 SHA512 a740d5677e8f23245e54573de0faaa66b659b54e289b256dc344f5aa0cc2a05db26efce57ff31b19c1235e04a9aa22cfa12125a784d27b0e3725277cbfae1b06
-EBUILD veusz-2.1.1.ebuild 2106 BLAKE2B ed9b696f062a6ee7fd62f9d48867158eef884be820595609831c71f9ccd71e9d39eff5a1d61c783a2496bb7682559c3acf31ad218b076124719fd1a8eceb2c62 SHA512 b3c515b6d8050598d5539caa295e60f0a2656ebdfa41908070d2791816c1b0198799de44263aa3bc688399db2d06291a01348ca03309cc3f4b17e72ab22cf139
-EBUILD veusz-2.2.2.ebuild 2106 BLAKE2B ed9b696f062a6ee7fd62f9d48867158eef884be820595609831c71f9ccd71e9d39eff5a1d61c783a2496bb7682559c3acf31ad218b076124719fd1a8eceb2c62 SHA512 b3c515b6d8050598d5539caa295e60f0a2656ebdfa41908070d2791816c1b0198799de44263aa3bc688399db2d06291a01348ca03309cc3f4b17e72ab22cf139
+EBUILD veusz-3.0.1.ebuild 2148 BLAKE2B f1c5b6201ad123e5c24ff39377acdb1bc6b20a5b8dfdb4b56a5e8919f010c7371d631493d599253c64a53f55076da30fa30f4f8dc1397935ad576964269d3eba SHA512 a09739f15b8a80341b0ee00a949adf8c92cc2e28fdeb1277530ec1b7ba4243f179c9aff2f5b40700c77d6f735f4a0c9908e32a0fc5fd0106b9a8cf23731a95fc
 EBUILD veusz-3.0.ebuild 2106 BLAKE2B ed9b696f062a6ee7fd62f9d48867158eef884be820595609831c71f9ccd71e9d39eff5a1d61c783a2496bb7682559c3acf31ad218b076124719fd1a8eceb2c62 SHA512 b3c515b6d8050598d5539caa295e60f0a2656ebdfa41908070d2791816c1b0198799de44263aa3bc688399db2d06291a01348ca03309cc3f4b17e72ab22cf139
 MISC metadata.xml 885 BLAKE2B 90529e34d78f5225e62c2675e15fef6e0fa1898eca31df061f5438460be53f5bad3d1395d5dcb6e300f861c2c52689bca26fcf012ffbbdaf9cf579b9b252a697 SHA512 2e6838e7cc1a152af665c771950f5b53f942ceedb40b118511c2c9b9801a4a170dbc557e3fa389986b0edf2b12b4f008fbbab9c258c59a1b4acd2063c3ef79ac
diff --git a/sci-visualization/veusz/files/fix_spline.patch b/sci-visualization/veusz/files/fix_spline.patch
new file mode 100644
index 000000000000..a7d6bd85c48b
--- /dev/null
+++ b/sci-visualization/veusz/files/fix_spline.patch
@@ -0,0 +1,16 @@
+# Upstream patch that fixes spline interpolation:
+# https://github.com/veusz/veusz/commit/b4223800744034880fd1ca1165853636b31e576c
+diff -Naur old/veusz/helpers/src/qtloops/beziers.cpp new/veusz/helpers/src/qtloops/beziers.cpp
+--- old/veusz/helpers/src/qtloops/beziers.cpp	2017-09-23 11:10:46.000000000 +0300
++++ new/veusz/helpers/src/qtloops/beziers.cpp	2018-08-04 21:27:01.000000000 +0300
+@@ -1013,8 +1013,8 @@
+     return 0;
+   }
+ 
+-  // factor of 0.1 introduced by JSS to stop more hooks
+-  double const allowed = L2(b - a)*0.1 + tolerance;
++  // factor of 0.2 introduced by JSS to stop more hooks
++  double const allowed = L2(b - a)*0.2 + tolerance;
+   return dist / allowed;
+   /** \todo 
+    * effic: Hooks are very rare.  We could start by comparing 
diff --git a/sci-visualization/veusz/veusz-2.1.1.ebuild b/sci-visualization/veusz/veusz-2.1.1.ebuild
deleted file mode 100644
index 1526a285be19..000000000000
--- a/sci-visualization/veusz/veusz-2.1.1.ebuild
+++ /dev/null
@@ -1,79 +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,6} )
-
-inherit eutils distutils-r1 virtualx xdg-utils gnome2-utils
-
-DESCRIPTION="Qt scientific plotting package with good Postscript output"
-HOMEPAGE="https://veusz.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc emf fits hdf5 minuit"
-
-CDEPEND="dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	emf? ( dev-python/pyemf[$(python_gen_usedep 'python2*')] )
-	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	minuit? ( || ( dev-python/iminuit[${PYTHON_USEDEP}] dev-python/pyminuit[${PYTHON_USEDEP}] ) )"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	VIRTUALX_COMMAND="${EPYTHON}" \
-		VEUSZ_RESOURCE_DIR="${S}" \
-		virtualmake runselftest.py
-}
-
-python_install() {
-	distutils-r1_python_install
-	# symlink the license, bug #341653
-	rm "${D}/$(python_get_sitedir)"/${PN}/{COPYING,AUTHORS,ChangeLog} || die
-	mkdir -p "${D}/$(python_get_sitedir)" || die
-	cat >> "${D}/$(python_get_sitedir)"/${PN}/COPYING <<- EOF
-	Please visit
-
-	https://www.gnu.org/licenses/gpl-2.0.html
-
-	for the full license text.
-	EOF
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dodoc Documents/manual/pdf/${PN}.pdf
-		docinto html
-		dodoc -r Documents/manual/html
-	fi
-
-	doicon icons/veusz.png
-	domenu "${FILESDIR}"/veusz.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/veusz.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-visualization/veusz/veusz-2.2.2.ebuild b/sci-visualization/veusz/veusz-2.2.2.ebuild
deleted file mode 100644
index 1526a285be19..000000000000
--- a/sci-visualization/veusz/veusz-2.2.2.ebuild
+++ /dev/null
@@ -1,79 +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,6} )
-
-inherit eutils distutils-r1 virtualx xdg-utils gnome2-utils
-
-DESCRIPTION="Qt scientific plotting package with good Postscript output"
-HOMEPAGE="https://veusz.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc emf fits hdf5 minuit"
-
-CDEPEND="dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	emf? ( dev-python/pyemf[$(python_gen_usedep 'python2*')] )
-	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	minuit? ( || ( dev-python/iminuit[${PYTHON_USEDEP}] dev-python/pyminuit[${PYTHON_USEDEP}] ) )"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	VIRTUALX_COMMAND="${EPYTHON}" \
-		VEUSZ_RESOURCE_DIR="${S}" \
-		virtualmake runselftest.py
-}
-
-python_install() {
-	distutils-r1_python_install
-	# symlink the license, bug #341653
-	rm "${D}/$(python_get_sitedir)"/${PN}/{COPYING,AUTHORS,ChangeLog} || die
-	mkdir -p "${D}/$(python_get_sitedir)" || die
-	cat >> "${D}/$(python_get_sitedir)"/${PN}/COPYING <<- EOF
-	Please visit
-
-	https://www.gnu.org/licenses/gpl-2.0.html
-
-	for the full license text.
-	EOF
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dodoc Documents/manual/pdf/${PN}.pdf
-		docinto html
-		dodoc -r Documents/manual/html
-	fi
-
-	doicon icons/veusz.png
-	domenu "${FILESDIR}"/veusz.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/veusz.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-visualization/veusz/veusz-3.0.1.ebuild b/sci-visualization/veusz/veusz-3.0.1.ebuild
new file mode 100644
index 000000000000..018f5fd55b23
--- /dev/null
+++ b/sci-visualization/veusz/veusz-3.0.1.ebuild
@@ -0,0 +1,81 @@
+# 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 eutils distutils-r1 virtualx xdg-utils gnome2-utils
+
+DESCRIPTION="Qt scientific plotting package with good Postscript output"
+HOMEPAGE="https://veusz.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dbus doc emf fits hdf5 minuit"
+
+CDEPEND="dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	emf? ( dev-python/pyemf[$(python_gen_usedep 'python2*')] )
+	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
+	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
+	minuit? ( || ( dev-python/iminuit[${PYTHON_USEDEP}] dev-python/pyminuit[${PYTHON_USEDEP}] ) )"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+PATCHES=("${FILESDIR}/fix_spline.patch")
+
+python_test() {
+	distutils_install_for_testing
+	cd tests || die
+	VIRTUALX_COMMAND="${EPYTHON}" \
+		VEUSZ_RESOURCE_DIR="${S}" \
+		virtualmake runselftest.py
+}
+
+python_install() {
+	distutils-r1_python_install
+	# symlink the license, bug #341653
+	rm "${D}/$(python_get_sitedir)"/${PN}/{COPYING,AUTHORS,ChangeLog} || die
+	mkdir -p "${D}/$(python_get_sitedir)" || die
+	cat >> "${D}/$(python_get_sitedir)"/${PN}/COPYING <<- EOF
+	Please visit
+
+	https://www.gnu.org/licenses/gpl-2.0.html
+
+	for the full license text.
+	EOF
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		dodoc Documents/manual/pdf/${PN}.pdf
+		docinto html
+		dodoc -r Documents/manual/html
+	fi
+
+	doicon icons/veusz.png
+	domenu "${FILESDIR}"/veusz.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/veusz.xml
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a2a47023071f..0d3013fcf0b1 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index b896a4f23694..ed02763c349f 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -3,10 +3,10 @@ AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2
 AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9
 DIST dbus-1.10.18.tar.gz 1986589 BLAKE2B 95b8a04362e78001e723301e5f170e923bca8b7b1728e6a7658d606550923d2bd60a6a6916c0fcd88205ecdc4a25ab58309bdcabaeb32c2f6c5e4ef8686af02c SHA512 726f97d0a2016f4f0625ba332e93e2d33bb16857cd35cb6c79da0f44fff297df948c3df62c31ffbec34713a7b85b3ff5b65f31517fe3511ddbd3bf18bd4748ed
 DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5c73ac8a570e1e13f37f9d6b8c2aea2545b1a3979d3a94ce7a2ddda7280afde4ecd9b682d3d31355f82af217f7 SHA512 fc0b88b756affdb4fc7a62e84a6f7757121293afeadc38acf8aac48b6c2b82531e136a575be2ab503a39d7669cb7b609a021e20c1064e28c965c091e94c4f68c
-DIST dbus-1.12.6.tar.gz 2068612 BLAKE2B 3dbb05e899e511a636816393ebc28548cc2ecaabaa0c04737189a0812791da195708ee455d7b0439fc81eea113f4bd8fc64b1b9b93e9dac84664b9c51049e75c SHA512 a0599329190e90d5982215138a19031028ed825f54c76c1ae13b54c2e4ddf14c949eacaac05c667db11bca13fb4bbdf8855fc9e15641cece55be1efde00c41ab
+DIST dbus-1.12.10.tar.gz 2073510 BLAKE2B 27ecd31e2535666a06cb77ab8df4f4a0990e21d43bc9e18e62f2385b9c05515a2f7ea452d4a376ecb4f764379c05235c908cd6392303300b1ff14d9cfeb25554 SHA512 36a16393af6630c32474b971fb8864ded0fb5fe08c5ff5243a4ca312b95af4f20335c5f166b72526a0b8162c1ccfe6542ad6953c5d21a0542d920d7cb4a9ac76
 DIST dbus-1.12.8.tar.gz 2071751 BLAKE2B 9ba26d48f34b4d328335917bbc40d5f4423a48f90b0436783a8d6d290bc8b99c54aa31d23efaf52ef90748d53e68b7c0e3ddce0f4ce26ea5369acbd57d726b84 SHA512 8177898bf2db22e5c6abff0d9ffec8f248f0d155a83b7ae906c1ce3b61d289e7ba7bef9799102e6de3ca64198c7d293dccecf92c7e8b7403c1d9b1bb86e99ea3
 EBUILD dbus-1.10.18.ebuild 7377 BLAKE2B f52e7c26449cd69956b0c23288b620d17ba1c5f916ff47762045ae793761a8883366fd80c5648b147aa1195d5c7acba1743ae01f0c69d025329ea87cbb1b8ebc SHA512 4e1be287542458b080f67e442a47fad1bc2dd8fab0d28d90c516703a4b4a42f7161b06af7dc990913f3a2fb6edb874c620a7cd745f4186555dcf5e407c2c5a61
 EBUILD dbus-1.10.24.ebuild 7385 BLAKE2B 5061ed488e5da35a5c82c1ac023671916fb5a6e68b9fb7eed26d4b74264d4c2e9e04a56a0b64c39d926a078f7e8ba1fa4d9c90fd37a42169f14b455b6c2632cc SHA512 9a39c78efa3ad1b198c0a2c95b39a761fcb1868226dffcf4fb5eb0f14a4412a62e55c0703e35f0ab7de5e14ee0ed9b70e09c46a12cc3282b7e8d30b86c825f5a
-EBUILD dbus-1.12.6.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
+EBUILD dbus-1.12.10.ebuild 7450 BLAKE2B 7d0512a5a88b2517250b5dacde920c261a66e6151963a64d80d0e81a4f4e0907d32a514432b3f06aebdad3774982c542e237e7994a51a994548bba97f6f56294 SHA512 9a7de44b70956441f983f05f4e1c52f59b808f4ebffce447e23f1600c469811b212e229be78d5544c1fe070968a52960d2a422f67c2228076f9d60eeb758d540
 EBUILD dbus-1.12.8.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.10.ebuild b/sys-apps/dbus/dbus-1.12.10.ebuild
new file mode 100644
index 000000000000..7691f4d1a92c
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.12.10.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit autotools linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="https://dbus.freedesktop.org/"
+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"
+IUSE="debug doc elogind selinux static-libs systemd test user-session X"
+
+#RESTRICT="test"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	test? ( debug )
+"
+
+CDEPEND="
+	>=dev-libs/expat-2.1.0
+	selinux? ( sys-libs/libselinux )
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+		)
+"
+DEPEND="${CDEPEND}
+	app-text/xmlto
+	app-text/docbook-xml-dtd:4.4
+	dev-libs/expat
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		>=dev-libs/glib-2.40:2
+		${PYTHON_DEPS}
+		)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-dbus )
+"
+
+DOC_CONTENTS="
+	Some applications require a session bus in addition to the system
+	bus. Please see \`man dbus-launch\` for more information.
+"
+
+# out of sources build dir for make check
+TBD="${WORKDIR}/${P}-tests-build"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-enable-elogind.patch"
+)
+
+pkg_setup() {
+	enewgroup messagebus
+	enewuser messagebus -1 -1 -1 messagebus
+
+	use test && python-any-r1_pkg_setup
+
+	if use kernel_linux; then
+		CONFIG_CHECK="~EPOLL"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Tests were restricted because of this
+	sed -i \
+		-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
+		-e '/"dispatch"/d' \
+		bus/test-main.c || die
+
+	default
+
+	# required for bug 263909, cross-compile so don't remove eautoreconf
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local docconf myconf
+
+	# so we can get backtraces from apps
+	case ${CHOST} in
+		*-mingw*)
+			# error: unrecognized command line option '-rdynamic' wrt #488036
+			;;
+		*)
+			append-flags -rdynamic
+			;;
+	esac
+
+	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
+	# not on an SELinux profile.
+	myconf=(
+		--localstatedir="${EPREFIX}/var"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		$(use_enable static-libs static)
+		$(use_enable debug verbose-mode)
+		--disable-asserts
+		--disable-checks
+		$(use_enable selinux)
+		$(use_enable selinux libaudit)
+		--disable-apparmor
+		$(use_enable kernel_linux inotify)
+		$(use_enable kernel_FreeBSD kqueue)
+		$(use_enable elogind)
+		$(use_enable systemd)
+		$(use_enable user-session)
+		--disable-embedded-tests
+		--disable-modular-tests
+		$(use_enable debug stats)
+		--with-session-socket-dir="${EPREFIX}"/tmp
+		--with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
+		--with-system-socket="${EPREFIX}"/var/run/dbus/system_bus_socket
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-dbus-user=messagebus
+		$(use_with X x)
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=(
+			--enable-launchd
+			--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
+		)
+	fi
+
+	if multilib_is_native_abi; then
+		docconf=(
+			--enable-xml-docs
+			$(use_enable doc doxygen-docs)
+		)
+	else
+		docconf=(
+			--disable-xml-docs
+			--disable-doxygen-docs
+		)
+		myconf+=(
+			--disable-selinux
+			--disable-libaudit
+			--disable-elogind
+			--disable-systemd
+			--without-x
+
+			# expat is used for the daemon only
+			# fake the check for multilib library build
+			ac_cv_lib_expat_XML_ParserCreate_MM=yes
+		)
+	fi
+
+	einfo "Running configure in ${BUILD_DIR}"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
+
+	if multilib_is_native_abi && use test; then
+		mkdir "${TBD}" || die
+		cd "${TBD}" || die
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf "${myconf[@]}" \
+			$(use_enable test asserts) \
+			$(use_enable test checks) \
+			$(use_enable test embedded-tests) \
+			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+	fi
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		# after the compile, it uses a selinuxfs interface to
+		# check if the SELinux policy has the right support
+		use selinux && addwrite /selinux/access
+
+		einfo "Running make in ${BUILD_DIR}"
+		emake
+
+		if use test; then
+			einfo "Running make in ${TBD}"
+			emake -C "${TBD}"
+		fi
+	else
+		emake -C dbus libdbus-1.la
+	fi
+}
+
+src_test() {
+	DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake DESTDIR="${D}" install-pkgconfigDATA
+		emake DESTDIR="${D}" -C dbus \
+			install-libLTLIBRARIES install-dbusincludeHEADERS \
+			install-nodist_dbusarchincludeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	newinitd "${FILESDIR}"/dbus.initd-r1 dbus
+
+	if use X; then
+		# dbus X session script (#77504)
+		# turns out to only work for GDM (and startx). has been merged into
+		# other desktop (kdm and such scripts)
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/80-dbus
+	fi
+
+	# needs to exist for dbus sessions to launch
+	keepdir /usr/share/dbus-1/services
+	keepdir /etc/dbus-1/{session,system}.d
+	# machine-id symlink from pkg_postinst()
+	keepdir /var/lib/dbus
+	# let the init script create the /var/run/dbus directory
+	rm -rf "${ED}"/var/run
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
+	readme.gentoo_create_doc
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
+	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
+	# dependencies with hardcoded paths (although the known ones got fixed already)
+	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		local plist="org.freedesktop.dbus-session.plist"
+		elog
+		elog
+		elog "For MacOS/Darwin we now ship launchd support for dbus."
+		elog "This enables autolaunch of dbus at session login and makes"
+		elog "dbus usable under MacOS/Darwin."
+		elog
+		elog "The launchd plist file ${plist} has been"
+		elog "installed in ${EPREFIX}/Library/LaunchAgents."
+		elog "For it to be used, you will have to do all of the following:"
+		elog " + cd ~/Library/LaunchAgents"
+		elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
+		elog " + logout and log back in"
+		elog
+		elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
+		elog "specified and refused to start otherwise, then export the"
+		elog "the following to your environment:"
+		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
+	fi
+
+	if use user-session; then
+		ewarn "You have enabled user-session. Please note this can cause"
+		ewarn "bogus behaviors in several dbus consumers that are not prepared"
+		ewarn "for this dbus activation method yet."
+		ewarn
+		ewarn "See the following link for background on this change:"
+		ewarn "https://lists.freedesktop.org/archives/systemd-devel/2015-January/027711.html"
+		ewarn
+		ewarn "Known issues are tracked here:"
+		ewarn "https://bugs.gentoo.org/show_bug.cgi?id=576028"
+	fi
+}
diff --git a/sys-apps/dbus/dbus-1.12.6.ebuild b/sys-apps/dbus/dbus-1.12.6.ebuild
deleted file mode 100644
index d53c2a80ec6f..000000000000
--- a/sys-apps/dbus/dbus-1.12.6.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit autotools ltprune linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="https://dbus.freedesktop.org/"
-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"
-IUSE="debug doc elogind selinux static-libs systemd test user-session X"
-
-#RESTRICT="test"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	test? ( debug )
-"
-
-CDEPEND="
-	>=dev-libs/expat-2.1.0
-	selinux? ( sys-libs/libselinux )
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd:0= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-		)
-"
-DEPEND="${CDEPEND}
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/expat
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		>=dev-libs/glib-2.40:2
-		${PYTHON_DEPS}
-		)
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-dbus )
-"
-
-DOC_CONTENTS="
-	Some applications require a session bus in addition to the system
-	bus. Please see \`man dbus-launch\` for more information.
-"
-
-# out of sources build dir for make check
-TBD="${WORKDIR}/${P}-tests-build"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-enable-elogind.patch"
-)
-
-pkg_setup() {
-	enewgroup messagebus
-	enewuser messagebus -1 -1 -1 messagebus
-
-	use test && python-any-r1_pkg_setup
-
-	if use kernel_linux; then
-		CONFIG_CHECK="~EPOLL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Tests were restricted because of this
-	sed -i \
-		-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
-		-e '/"dispatch"/d' \
-		bus/test-main.c || die
-
-	default
-
-	# required for bug 263909, cross-compile so don't remove eautoreconf
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local docconf myconf
-
-	# so we can get backtraces from apps
-	case ${CHOST} in
-		*-mingw*)
-			# error: unrecognized command line option '-rdynamic' wrt #488036
-			;;
-		*)
-			append-flags -rdynamic
-			;;
-	esac
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	myconf=(
-		--localstatedir="${EPREFIX}/var"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		$(use_enable static-libs static)
-		$(use_enable debug verbose-mode)
-		--disable-asserts
-		--disable-checks
-		$(use_enable selinux)
-		$(use_enable selinux libaudit)
-		--disable-apparmor
-		$(use_enable kernel_linux inotify)
-		$(use_enable kernel_FreeBSD kqueue)
-		$(use_enable elogind)
-		$(use_enable systemd)
-		$(use_enable user-session)
-		--disable-embedded-tests
-		--disable-modular-tests
-		$(use_enable debug stats)
-		--with-session-socket-dir="${EPREFIX}"/tmp
-		--with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
-		--with-system-socket="${EPREFIX}"/var/run/dbus/system_bus_socket
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-dbus-user=messagebus
-		$(use_with X x)
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=(
-			--enable-launchd
-			--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
-		)
-	fi
-
-	if multilib_is_native_abi; then
-		docconf=(
-			--enable-xml-docs
-			$(use_enable doc doxygen-docs)
-		)
-	else
-		docconf=(
-			--disable-xml-docs
-			--disable-doxygen-docs
-		)
-		myconf+=(
-			--disable-selinux
-			--disable-libaudit
-			--disable-elogind
-			--disable-systemd
-			--without-x
-
-			# expat is used for the daemon only
-			# fake the check for multilib library build
-			ac_cv_lib_expat_XML_ParserCreate_MM=yes
-		)
-	fi
-
-	einfo "Running configure in ${BUILD_DIR}"
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
-
-	if multilib_is_native_abi && use test; then
-		mkdir "${TBD}" || die
-		cd "${TBD}" || die
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf "${myconf[@]}" \
-			$(use_enable test asserts) \
-			$(use_enable test checks) \
-			$(use_enable test embedded-tests) \
-			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
-	fi
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		# after the compile, it uses a selinuxfs interface to
-		# check if the SELinux policy has the right support
-		use selinux && addwrite /selinux/access
-
-		einfo "Running make in ${BUILD_DIR}"
-		emake
-
-		if use test; then
-			einfo "Running make in ${TBD}"
-			emake -C "${TBD}"
-		fi
-	else
-		emake -C dbus libdbus-1.la
-	fi
-}
-
-src_test() {
-	DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C dbus \
-			install-libLTLIBRARIES install-dbusincludeHEADERS \
-			install-nodist_dbusarchincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	newinitd "${FILESDIR}"/dbus.initd-r1 dbus
-
-	if use X; then
-		# dbus X session script (#77504)
-		# turns out to only work for GDM (and startx). has been merged into
-		# other desktop (kdm and such scripts)
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/80-dbus
-	fi
-
-	# needs to exist for dbus sessions to launch
-	keepdir /usr/share/dbus-1/services
-	keepdir /etc/dbus-1/{session,system}.d
-	# machine-id symlink from pkg_postinst()
-	keepdir /var/lib/dbus
-	# let the init script create the /var/run/dbus directory
-	rm -rf "${ED}"/var/run
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
-	readme.gentoo_create_doc
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
-	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
-	# dependencies with hardcoded paths (although the known ones got fixed already)
-	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
-	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		local plist="org.freedesktop.dbus-session.plist"
-		elog
-		elog
-		elog "For MacOS/Darwin we now ship launchd support for dbus."
-		elog "This enables autolaunch of dbus at session login and makes"
-		elog "dbus usable under MacOS/Darwin."
-		elog
-		elog "The launchd plist file ${plist} has been"
-		elog "installed in ${EPREFIX}/Library/LaunchAgents."
-		elog "For it to be used, you will have to do all of the following:"
-		elog " + cd ~/Library/LaunchAgents"
-		elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
-		elog " + logout and log back in"
-		elog
-		elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
-		elog "specified and refused to start otherwise, then export the"
-		elog "the following to your environment:"
-		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
-	fi
-
-	if use user-session; then
-		ewarn "You have enabled user-session. Please note this can cause"
-		ewarn "bogus behaviors in several dbus consumers that are not prepared"
-		ewarn "for this dbus activation method yet."
-		ewarn
-		ewarn "See the following link for background on this change:"
-		ewarn "https://lists.freedesktop.org/archives/systemd-devel/2015-January/027711.html"
-		ewarn
-		ewarn "Known issues are tracked here:"
-		ewarn "https://bugs.gentoo.org/show_bug.cgi?id=576028"
-	fi
-}
diff --git a/sys-apps/habitat/Manifest b/sys-apps/habitat/Manifest
index 4b6431543962..1daa64446ba5 100644
--- a/sys-apps/habitat/Manifest
+++ b/sys-apps/habitat/Manifest
@@ -1,4 +1,4 @@
 DIST habitat-0.54.0.tar.gz 35324897 BLAKE2B 554a2097c019e61cd6f1facdd0195abbca5e94834819283ddc2d742d196b6768e1da03a8a94f462a17d3c5c751fdddc1499f59a698f73fce170387055a07cbc6 SHA512 4b34de34e6d7b20ab641222636720357c903228aeb6833462ecc3367c6844d9f377d101b3187996e3cf3c179aa7b0c71a83921b4d18d1002fe30e3b25e31a35d
 DIST habitat-cargo-0.54.0.tar.xz 247811208 BLAKE2B 28d79018ff9f1209881908b335a1c77f60c39799fbd02e37ffde6bccc37c46aafe1cb05914c9b373150a0a917fa5b1538a94a8a75127172cf9d15cca5ba90520 SHA512 603e45b6e61b24b5420e57ef1d06bf15a67681525ae7a4210f07d14a072cf116947d28cc754e415f1e35fc6e03ede70cd47706ddf4857b76ac17aa420bf95d07
-EBUILD habitat-0.54.0.ebuild 754 BLAKE2B d9bcfd151b0a52503d55d158fcef886c9854c234b98c0d5b95bc068d8b3b64c4153f304a2961a61ac0ccdfe6bfd81c5010a1f161f8148d57c1b7b17a913dd791 SHA512 16cbb9a4ab24c6daae3eedfb2c2666cc93b2cbb19f1ab9c485db38e82cdafda74f74b662a26720d37beae474e7ae8500baedf2e128200cb8face4c4d8c390c85
+EBUILD habitat-0.54.0.ebuild 753 BLAKE2B ca44968fd068ca7b045fa4c5c5bef285f8a0dd483a0e43eaec3762abb255417dc27135ed9445ff1fe8314edc92db7177c57b86cfb0042a2d490c02844ef71fce SHA512 d9ad93a950ba31da1f0b0d05600055e6a67067d8ab235598ac4f72a78d062e9a9691b1e7bee2dd37a51f1f77e9795770ac4ae3f61244fa53cfbb32aaebe96781
 MISC metadata.xml 250 BLAKE2B a106b4f4027e144e7bccf077c9602554d75cae2a511e63b43c6811db362e367697d1f4c0bd3df91222fe25fd437f3b7e8abcc30938887aa27d7d5af6ba8f5830 SHA512 427ed66d63881efc32787274abdb196c339589c15ffeb5cbde100f3ccd92a2caac9476d28acae4d1ab61b8df714fa1d71d294435784a04ffb2879565cc07796d
diff --git a/sys-apps/habitat/habitat-0.54.0.ebuild b/sys-apps/habitat/habitat-0.54.0.ebuild
index 407816389d25..1f7b48451252 100644
--- a/sys-apps/habitat/habitat-0.54.0.ebuild
+++ b/sys-apps/habitat/habitat-0.54.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DEPEND="dev-util/cargo
+DEPEND="virtual/cargo
 	>=virtual/rust-1.23
 	>=net-libs/zeromq-3.2
 	virtual/pkgconfig"
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index b9142f25b167..91d67bb6e62c 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -16,5 +16,5 @@ DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce5
 EBUILD memtest86+-4.20-r1.ebuild 1950 BLAKE2B 7748912836525d02d7909675f7c8b362f253fc3567495d243b0a08e3570d382c300de6239c3052af5b60db1761157754555f6f98793a7c285aeadc7b2f274cee SHA512 5bff802747e652f95f2b8bd7c4d73efaf581c5008f1bb6c17aa492335939012b9ef661a2986447a0e6f9493c522ea9cbd93f4ca3e6164f7142543b8a05adf2c4
 EBUILD memtest86+-4.20-r3.ebuild 1756 BLAKE2B 1e9d161b3358030cfc89d3b1c439d9494ac2063af1db9c28432e60200b5825a675ea421f6c7161bc7a9f151efdcfb1483a669aa60a4bcdd97961e00b2f643111 SHA512 3cc41d0ccd74282b5ed2929359829f4377478605b06c868728e9446f3b1df8a5f38166d793f0c800428b17b724118e0eafdfb44791ef577c8bef87d614d422e2
 EBUILD memtest86+-5.01-r2.ebuild 2384 BLAKE2B 6a7205c3fa74bd10c7c290151a49c2e6cb4bb966bf193a34956c763eca1969d2930a9abae09f5558facb37ce74c5ae32ae20824f6e75809b8f2e9fde310d6963 SHA512 a2912927e8d490829a187959711c85438649a912e440af637f1a9d401a574dcaf368203337123f5c9168897e5bdca0658170c2b07861bc4b10b40e53693820f4
-EBUILD memtest86+-5.01-r4.ebuild 2803 BLAKE2B 7a403c8b07e6908975ca3c645d23889f84cb454b6ea1bf07ef5a96ff4532447006887c8c6a6ec2657ca308c6314bde760e6680390ff9fcbd0f18a4528a949ada SHA512 49fdc3ef564b050e5a07b9271f536ace2567cdab70f841bb0574558293aee6ce841421c9d8ff3a257ab51793a7290ca604acbcc0a930eed261c80a2531ad7fa1
+EBUILD memtest86+-5.01-r4.ebuild 2802 BLAKE2B 66af00a5567b1cd2475d3c113f000fe7def2954f25b881d1668e7eff7b2272b0adbf94f83e7a0fa308aa9dbe306857e8dec04697b6664f0446304c6ceb61d405 SHA512 85ed667275321e755453c46d051bb1f58c116d22524a348419390caa5c8b78cc026a48e5cb623db27f496b54b33698b19fb63f1c685cca1352c55f0ec94af339
 MISC metadata.xml 563 BLAKE2B bd4e7ef2022ed705fc3902cd113f20b057b672dd50a9cf9362f56d4ccf1be9bab1fdb45d162cd646deb2acdab6829942da59f6dce0475a2d51c060662a33b9dd SHA512 26d725110c8b6214fce06feae590d1c437b64c9884ee5bc5421b4804b9391d7b928e11a270d84421ffbb5ea7a7b551dd26484565706499bdfbe871aef7ffb61b
diff --git a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
index e9528e637a87..1e94fe931689 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE="+boot floppy iso serial"
 
 BOOTDIR="/boot/memtest86plus"
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 33b05611a11b..77f0e39c5bc1 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -5,11 +5,11 @@ DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582d
 DIST openrc-0.35.5.tar.gz 241784 BLAKE2B 6f63dcf30c430949f25108b0ca808f2317b2e58440419fa5c2aac04ed614c5b22105bfa38d51d54ee0d293be8b11f15b756b00d805ab71f9a2e92f44b98ce6e1 SHA512 655a0a32650ed46998ae84473e8a82aadd9de09904c5173cd9b9e2500fc8935e96539672b513a883c077ae862ece12ab768d4f379dbeb4389a7067ce7121dc0d
 DIST openrc-0.36.tar.gz 240179 BLAKE2B 1361d22782d6063e7fce61a98ef1e1f754d0208ec58de02ae60a0950531d248ac6e65e1ed45b412c89288103f6848b24aa51dd66232aa46e7900b339cac21a57 SHA512 f4730489e595a9ac4477c2b410e034b4eea2b8111c12c2695916aa04102020f8c84cb24220d3aa552709898035aa196e2fd48cba9b12a71dff1f5c2b03c3d424
 DIST openrc-0.37.tar.gz 240928 BLAKE2B b802260a3bd71e6d8e6d54b21007024481d42a4f179eff824a39fb91f5b1cd4f7a2fd52d9e7f23b1077965b57d319a99a5b39b8cd2d7f66dfe272b4497d53a22 SHA512 16235774ad28a66308dd1ea00238b4025a4d26c9c0bb6cdb032f28d00479520c4c5fdb349f82d33a535eee3d491d0349b5871b15cae30ef296ec476883965b83
-DIST openrc-0.38.1.tar.gz 241574 BLAKE2B 74ef47159ddad11bec2cf4151ec71492fbd6c9ac74b01050aab236ede23e2471563365dd68c665a54d47ee534a3f2f55a8d7e607d966e6b2bb5b36b85892553e SHA512 3fc4fef60e25ae34039753c3de6471baba89a7ffcd25f6756cf00954ab63262d07c749441a53198099678e5769c9547179074152872aebc66fe7a220d0302804
+DIST openrc-0.38.2.tar.gz 240924 BLAKE2B a50e567aa3ac1edfd4e7cbdfbf3d7ce6ac39b7d7c2b4a9bcc8cf088735fa436a334eb077ecb10b67f6f5faab979ba62729aca4f3f61e12167cbd48fc8a7f3776 SHA512 5c5f1cfa9990970a02619c5b97c0d424d921fe16e83767372beee9a7b296c6ea33b43ae4045cf7266254b98871a5d347de1040443fe8fc68d7b9d164eed909e6
 EBUILD openrc-0.34.11.ebuild 10072 BLAKE2B 5cc312d0a7ebe0f776f815d5b3cd4bc3b68812552393ae82fe270a09b010f0549ef25ec6926bc17205e06d20a9f51a82406d806f5fd597a7caf397f020f2fa54 SHA512 7e76a682408bc28df1892424aa3843f2cd3a38eeec7d5920cbf5de6229ec5bec1324c85a0fd6fdbdfb29e9b785415c59f80a86c39eeba413d82cc8d6124b8844
 EBUILD openrc-0.35.5.ebuild 9976 BLAKE2B e3c47e0f95115e34d7b9084ba2985b854de17030c11301a8ea1b8f6d89a28a2222665737ed2eb8c5f84a282b9d1587bd98ece6965700ca9d85c89815e7a862e6 SHA512 a78575665626eb2c56870429f84eddfae6ceee4ff26fcdaf525584989a538a40266b3dd741d444301b021b615fd401713fca8a24735a126c0a5ca98932bc57f0
 EBUILD openrc-0.36.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
 EBUILD openrc-0.37.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
-EBUILD openrc-0.38.1.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
+EBUILD openrc-0.38.2.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
 EBUILD openrc-9999.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
 MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/openrc-0.38.1.ebuild b/sys-apps/openrc/openrc-0.38.2.ebuild
index 7babd0045d3b..7babd0045d3b 100644
--- a/sys-apps/openrc/openrc-0.38.1.ebuild
+++ b/sys-apps/openrc/openrc-0.38.2.ebuild
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5f2fb2eb44c8..83b164acf8bb 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,4 @@
-AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
+AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 0ad44859f04db529713cc80a51e6dadc767ed6b6d0aef1d070650d82133c05e161eaa9fd1e208b3078c513ccf6f73136b8bf865542f0dc9396de9142bad1d32c SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3
 DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240 SHA512 94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d
@@ -6,15 +6,15 @@ DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9
 DIST portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch 15214 BLAKE2B 0351f82cd46aa1523eb0f70109551009a422546f2fbde1beee7a18dad4ecbfc6465b3b3052a25720196950f7da81adeb66d87940f2b477fbeca27afba56fa18e SHA512 b0482b8dac8af97b841ded426001872c1c708f649dc7774bd3c7003179888fd4d126ece33d001d127b643d88b8a70b9af75bbeb36beeaca7b8ad308f92ff72e7
 DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b051097ef4fb073d22b9ef3472077b4845190ec3839886f462cacbee0996dc4c036549c4beab09025e1bb42f421e5032144e90197e3aa5de08dd7d8d1c50fbb SHA512 5910469816b69afb7a0078dd3b35a5304e2c806ac03ff3949603cf4162900fd9dd1df15661b91a2181528e8406679e525308822a0f6ddf4799c79fa9652c27a9
 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
-DIST portage-2.3.43.tar.bz2 998958 BLAKE2B 28874db4dc989e550aa4a54a91b8ad303f17b2444d6e23a539672c4742ec62c4228f6070f0d36a31b90d1d32998bc4825de706e5a6635bb7051e5b592f8e3eac SHA512 b8f3ab4f700cc72364b38153451a32a371d0b222feacfb206017be7182596cbc83b7e036025d07399e8b32cf3e3889dbc6ba8d26a64fbfc4253f1506da3c8252
 DIST portage-2.3.44.tar.bz2 1008301 BLAKE2B de370ce9f455e6f778dece3be78703f23852caa9185d79b54e6fc35939923f2a28c91aa372a4ae601872b7933970b536e935ea1f8cb8604bf1547dced3d70c33 SHA512 e491998958439dc27fed6e6f9a3b87867c881cae6ec1fe9515db3277fb2f6f866b6ea6298bae5bf6553591ebe75719a5f379ae92e4aede440ac620ce4af9160d
+DIST portage-2.3.45.tar.bz2 1009687 BLAKE2B 396dc6e09e2415ab034963f2b30fe318bd783c873437f3f82e8af233605b7356130c45a18e2423029ec025669f0490542283308011dd60f4c3ee7a95a6d28c2b SHA512 551d24ac168f1cd8dd3affd6bc30e3a6e8a0622956407db72ffb283cfc0937b81b2cb1007ffe7eb8f9c7f94515fab44e1b82c1f45be0375c9d867369b2533792
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
-EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
-EBUILD portage-2.3.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba6decbef29944f5eec3d8091e6b4fd098033da44bffe55a312c23de2e9dbd16b73a9d69ba2d3c2d2ce05ba0d6cf033 SHA512 b4d363547eab3e074da48d9050b1dd091372114ded9ff146df3f0168264f7cc7781d4b5968df42f3a5dea8fcdfa1c483a5e3ecdefc59222503f7daf441c9da20
-EBUILD portage-2.3.24-r1.ebuild 9269 BLAKE2B ba60aee1fba595b80a91ee183275cd0b29d13fb78281c8d62a5b5509a557f8ddbfbd6a641fb2b7c6bc7459f35bd12574e396355363574fc1463081a8e42d22fc SHA512 a2938faf430e68a03bdf42bdfc00ee08392e18bb07ecb9b43dafca26572c0e64b3e74e55fdc8b63d85b3f2cca686df431714ddebac78163586c36be620eee1ea
-EBUILD portage-2.3.40-r1.ebuild 9948 BLAKE2B 148e93c0bda6febdcabe74eea89aabae4d9be7ad68fa284824b78d1b32bab8404b89904a791ba487c0152270d0578a2dd35a07160483703eeb5ccab330f5a54d SHA512 4c184513337bc67deaf118986b5be94e81bf8dba02ade64a767c796525c51e66754674e4e323c0d89c0002b83cf99b5ad56f290fe764ecf1b19a6af84b79dddf
-EBUILD portage-2.3.43-r1.ebuild 9880 BLAKE2B a38b18fbf692f1bfed43c9f85566eb1262f804ff5ed6e0aa95329aa5faa73f14dd18e95dc456ccbb4253df53e0f8c440a2ff0a3714e5a980db066a6e409144eb SHA512 75f3e6d49b41eaa6cbf7a041590994ef79f41535d20af1fc43edd691b3319a221e594c5f1d14bd8bfba640ed863f8ba5235c0d5a0c4e63fd71cb9f3950d6767e
-EBUILD portage-2.3.44.ebuild 9362 BLAKE2B b6707ff66a01b3dc659e2ce1da922fdb7e5e054a8084ff20292cada826704f20a90d0bd8230a275c61c1023c67d0ee9378ede97ac14ecd572b32c4dd85f1b807 SHA512 7a5e773ac818d97a0f44d0b56b7118b413c79cf7f9affeed5d040a154cd39e5155fcfc8b7c118714b7ef1ac0e3218da672f3e7a0b00606b3b3f6462d968770ab
-EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
-EBUILD portage-9999.ebuild 8839 BLAKE2B 1dea8a4b171b64e0dae5818179acfc089a4c3335fce9182a4200652d15fe5f6ff2d044f54b01f6580896da46515278ddd0a107be6b7d5391bf0bb35f6f12f8cf SHA512 d08279a4a54c83baa26447fbb19a6158217e0e6054cd4e74814461d84be8a6b9eca30bf7e523f2b365cdc51cdc858f58390a28954a9b190b6f8c770d1be940db
+EBUILD portage-2.3.13-r1.ebuild 8239 BLAKE2B a98cf19dd9b963a97e2a0b018ec39a8680977fb5d787ce82514b649f73dce01ecf6723e9b5f973c3156449a911a29f6af235cd116761d55b269077499a6acffe SHA512 bb355bfbb9f0e31230aebfc0e2ab00e6a8b684aa83387343a3402db3591aefc416265f574b0a2e96e7f3ef64bd1578a5c63a7fdd722055cc0bfc19ca825f7316
+EBUILD portage-2.3.19-r1.ebuild 8143 BLAKE2B 624c8ab644fcb4a0a7d62d110f17c2112c7043157da9b53ef2d52384ee68adec7d530cc90d4954293b14ddbe7b9499dfffcb8f55e285b2f766c265dedd13649d SHA512 2e81c73d6a5aea4e333a187fe053a803088f6ca17dcdf5db3f287e0b483ce637779d4e1840a6fc7317ef7108d9d358ece9f4ed13df12ef48d88f4fb1344a5383
+EBUILD portage-2.3.24-r1.ebuild 8997 BLAKE2B 66941bf2ca4330b0fa230833f6460044d8063b177fe537192125a6170f6861a1c6182a1ce25efc2c22d04cf76c7ab2c48e8c332120afb7f191a78be065df93dc SHA512 eafc67c5df88075390151a28e1cd9e89bb2ab85d9e2c3cb5dc02ef3cae93d91aaea219c642dd8a59b3ab8d8e06614524dc116459c311b957bed7f4c2c848362d
+EBUILD portage-2.3.40-r1.ebuild 9676 BLAKE2B 143c477c2089c9cd8ab1df8a377cd6c5c65869027744a9fe82acacabd10d74011694772c46983b54d3f222ed0ae2bfb3449e8b899e6b1f3c1a8a06867d51d27a SHA512 4c5c837f5f546cfcb95afd9b1000d65575a3d3ff03d43161e83c2c5b905adec30808b75d58714db091e069cd08f71735964b3373261254a3c445fb236c250053
+EBUILD portage-2.3.44.ebuild 8678 BLAKE2B edeeb0ee8584d7adc647b1be0e101018d89fada9aceef207188e8bf72112633f1a43d428809c489eda5f94d28eee047e78191860da641fac2f43e4652c55caba SHA512 07a19dcd4e12678c4d82d8c1a2fddaaa9a15c99edd8fb0ec1e82d77693a21d1dd3266593461391de85a3472822556bcd2b47490ac53dc0bd3b7040db27bd3eea
+EBUILD portage-2.3.45.ebuild 8678 BLAKE2B edeeb0ee8584d7adc647b1be0e101018d89fada9aceef207188e8bf72112633f1a43d428809c489eda5f94d28eee047e78191860da641fac2f43e4652c55caba SHA512 07a19dcd4e12678c4d82d8c1a2fddaaa9a15c99edd8fb0ec1e82d77693a21d1dd3266593461391de85a3472822556bcd2b47490ac53dc0bd3b7040db27bd3eea
+EBUILD portage-2.3.8.ebuild 7912 BLAKE2B 1ce75b28134fdd89a42bf12973dc87d609f3dc115f125e66159d8fda21f31f7e7629ff0832db995e11b711addb4ecab1500985700527758eaabbaa020fd75b18 SHA512 3b96e079c2c9be6213a40216a6eb0f7ffba6629263cd9f3bb1ad6d48ac66d45cddbf6df724e54252320e964de87a1c0d5cf0e7a8e22f287c3d3401652b745e3c
+EBUILD portage-9999.ebuild 8542 BLAKE2B 4c38d0c06a40d0aeeaa720d5a8b145166d8105dffaf46a202d9ff01c0187a145eeb4130ae34448e9a55564f4157730e6ef0e86e839d2d2c931d095d269eb86dc SHA512 42d98dad2ac11daf92995991963b3cd50a4f7a5baa51e7debcd735923a410b9dec46ff92dcc0ebeb4b83ffc5df05bec446f18e99a520c96828e5e77643627129
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/files/README.RESCUE b/sys-apps/portage/files/README.RESCUE
index 70c494ebb81b..e8f3932ac214 100644
--- a/sys-apps/portage/files/README.RESCUE
+++ b/sys-apps/portage/files/README.RESCUE
@@ -1,2 +1,2 @@
-Please see http://www.gentoo.org/proj/en/portage/doc/manually-fixing-portage.xml
+Please see https://wiki.gentoo.org/wiki/Project:Portage/Fixing_broken_portage
 for a recovery guide for a broken portage installation.
diff --git a/sys-apps/portage/portage-2.3.13-r1.ebuild b/sys-apps/portage/portage-2.3.13-r1.ebuild
index 82326a4eb631..07ce618e0590 100644
--- a/sys-apps/portage/portage-2.3.13-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.13-r1.ebuild
@@ -253,10 +253,4 @@ pkg_postinst() {
 		ewarn "git repositories.  There have been too many problems and"
 		ewarn "performance issues.  See bugs 552814, 559008"
 	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
 }
diff --git a/sys-apps/portage/portage-2.3.19-r1.ebuild b/sys-apps/portage/portage-2.3.19-r1.ebuild
index 9e3a669db1d0..f35f915422f3 100644
--- a/sys-apps/portage/portage-2.3.19-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.19-r1.ebuild
@@ -251,10 +251,4 @@ pkg_postinst() {
 		ewarn "git repositories.  There have been too many problems and"
 		ewarn "performance issues.  See bugs 552814, 559008"
 	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
 }
diff --git a/sys-apps/portage/portage-2.3.24-r1.ebuild b/sys-apps/portage/portage-2.3.24-r1.ebuild
index a1bbe006ba62..2ce6dbe9b0ec 100644
--- a/sys-apps/portage/portage-2.3.24-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.24-r1.ebuild
@@ -275,10 +275,4 @@ pkg_postinst() {
 		ewarn "git repositories.  There have been too many problems and"
 		ewarn "performance issues.  See bugs 552814, 559008"
 	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
 }
diff --git a/sys-apps/portage/portage-2.3.40-r1.ebuild b/sys-apps/portage/portage-2.3.40-r1.ebuild
index ac3cb5f359ef..718b2c5c9df1 100644
--- a/sys-apps/portage/portage-2.3.40-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.40-r1.ebuild
@@ -284,10 +284,4 @@ pkg_postinst() {
 		ewarn "git repositories.  There have been too many problems and"
 		ewarn "performance issues.  See bugs 552814, 559008"
 	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
 }
diff --git a/sys-apps/portage/portage-2.3.43-r1.ebuild b/sys-apps/portage/portage-2.3.43-r1.ebuild
deleted file mode 100644
index 54096df31b3b..000000000000
--- a/sys-apps/portage/portage-2.3.43-r1.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_4 python3_5 python3_6 python3_7
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-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_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-12.1[${PYTHON_USEDEP}]
-			app-crypt/openpgp-keys-gentoo-release
-			>=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_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Apply ae8cc32ccd81 and e46dd735cd4d for python3.7 compat.
-	sed -e 's|\(def call_.*,*args\)):$|\1, **kwargs):|' \
-		-i pym/portage/util/_eventloop/EventLoop.py || die
-
-	# Apply dc1ba7729c42 and de9801740fcb for bug 661906.
-	sed -e 's|^\(					return \)(1, False)|\1False|' \
-		-i pym/portage/sync/modules/git/git.py || die
-
-	# Apply e356d53ceb10 for bug 661834.
-	sed -e 's|subprocess.call(rsynccommand)|portage.process.spawn(rsynccommand, **self.spawn_kwargs)|' \
-		-i pym/portage/sync/modules/rsync/rsync.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i pym/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
-		has_version "<${CATEGORY}/${PN}-2.3.3"; then
-		SYNC_DEPTH_UPGRADE=true
-	else
-		SYNC_DEPTH_UPGRADE=false
-	fi
-}
-
-pkg_postinst() {
-	if ${SYNC_DEPTH_UPGRADE}; then
-		ewarn "Please note that this release no longer respects sync-depth for"
-		ewarn "git repositories.  There have been too many problems and"
-		ewarn "performance issues.  See bugs 552814, 559008"
-	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/sys-apps/portage/portage-2.3.44.ebuild b/sys-apps/portage/portage-2.3.44.ebuild
index 4cf0b294edb7..0da8ed04e4f9 100644
--- a/sys-apps/portage/portage-2.3.44.ebuild
+++ b/sys-apps/portage/portage-2.3.44.ebuild
@@ -261,25 +261,4 @@ pkg_preinst() {
 	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
 		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
 	fi
-
-	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
-		has_version "<${CATEGORY}/${PN}-2.3.3"; then
-		SYNC_DEPTH_UPGRADE=true
-	else
-		SYNC_DEPTH_UPGRADE=false
-	fi
-}
-
-pkg_postinst() {
-	if ${SYNC_DEPTH_UPGRADE}; then
-		ewarn "Please note that this release no longer respects sync-depth for"
-		ewarn "git repositories.  There have been too many problems and"
-		ewarn "performance issues.  See bugs 552814, 559008"
-	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
 }
diff --git a/sys-apps/portage/portage-2.3.45.ebuild b/sys-apps/portage/portage-2.3.45.ebuild
new file mode 100644
index 000000000000..0da8ed04e4f9
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.45.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_4 python3_5 python3_6 python3_7
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+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_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-12.1[${PYTHON_USEDEP}]
+			app-crypt/openpgp-keys-gentoo-release
+			>=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_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i lib/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+}
diff --git a/sys-apps/portage/portage-2.3.8.ebuild b/sys-apps/portage/portage-2.3.8.ebuild
index 58eeac56b574..b6caa53bbad4 100644
--- a/sys-apps/portage/portage-2.3.8.ebuild
+++ b/sys-apps/portage/portage-2.3.8.ebuild
@@ -241,10 +241,4 @@ pkg_postinst() {
 		ewarn "git repositories.  There have been too many problems and"
 		ewarn "performance issues.  See bugs 552814, 559008"
 	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
 }
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 1e2fe5ea47f9..36c253e8dd70 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -260,12 +260,3 @@ pkg_preinst() {
 		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
 	fi
 }
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman now has it's own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index d3788e18f535..d451b95ac1b1 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,48 +1,76 @@
 DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
+DIST aho-corasick-0.6.6.crate 26330 BLAKE2B dbdfcba15832736cf1ec65c9f93943e7ef368fc71e5545e1481788428ce1ebacaf87b4d045cb22695c1738ac6a0c579b38e886a461bd665b07898ca3a7f9e808 SHA512 6ac654a3e670ca53350ae6a4b21f7cc50335a42ac8557f34712575e9e9871991d29e45a45280f8c32a8a44340a54ac33585e7f1ab9b549462002e0ec24da2caa
 DIST ansi_term-0.10.2.crate 16642 BLAKE2B 69c001a07e02f48eeea8d63b1a242fc1eeb2ab9cb874e6c0e6cf40efbb6a1d585572330f9b69abb4d8df3012edc6e861854f816571b35aa55ee759fce79f1203 SHA512 ad4572845913cb21fdd9d8c0bffc5fce1571ef62c32fe83fd41262f7955e918400a446077494038299c4c0dfb0bd030d089336b3f169e726a5e15ee5c78ea3b5
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
 DIST atty-0.2.6.crate 5617 BLAKE2B 52274b58d4ae19cdd57a85a46449be32ac4662da6ce746382eff30c75729dbb5e50a9e9ad59f11b11f6d40b7ec2bc261e290f33127de62636c7f249c174bc4d3 SHA512 ae0aa91616571391eb4a2cc46b4765784dcd96b514fc7c3b64f756d1a180f95c83b9d14086f872fb7466be0e623f44a1a3170e786d7fbff5bdd949ef0cd88997
 DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
+DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8
 DIST bytecount-0.3.1.crate 12347 BLAKE2B 31d4d72e7edd37b78232db9b7a0ad2ea2fd18596891e43cff7f00438f5e033d5b3f901e6750fa179dc4d313424afb4dd853d3f5714a0d14c4faaf83958eb961a SHA512 09f2fda4bcddffc94f9e1f60afe478ba988c74276196e003f652229d7979491b1dc29686d3d11e2a9015b628638288b6dac23b27b157ae1025f64b05c35a5e19
 DIST cfg-if-0.1.2.crate 6668 BLAKE2B fd1960dfd30b3514bdb9943dba6418957068aaad3548667216d6dd4e4921a0df07d96cc4131f7b5121cacfb91aa59a802a47663a7b04ff401fa5b25ee1d321ea SHA512 ed6732d8ef2c99d99861f5dcfec3bcd2d1b62dcf6e8e4e88ca25148b5566f86418270dbbe9a7d2fae62a8320d432c5e0474059fa25a11c0f66787084e36f36aa
+DIST cfg-if-0.1.4.crate 7113 BLAKE2B fe63fee332d08ff50384f5e5d90a30281445f339e29a9d0f036ce2202a72f02c7e78ffc166baa681c3b739afbbbe8727ebf5ca16ea0a6fda2f38e08dd8b94996 SHA512 4a7131fdaec1ab63485b016e0b09d538815dee8b64218bc33230910277344e0631bba80e57b1188ca4fd6247595c6c5e3b2381369614574d7ff17cdb5b8546a2
 DIST clap-2.30.0.crate 190562 BLAKE2B f97f4eb85f5a6775a42f112bd26c48561bf8ae41016b638b4f0fe0c18987896a1a3918f41211330f617b44a40c7ae0a2ccdd107e6f3bbdf53bb6c035439f4139 SHA512 2a4af4035dd92adf00e183d15528ed658ce7dec6d9df592565fbcc86e94b1b41ce9f11996da64a655a85909fc89c9b9404ec9b717bbca78c14d96e85916480bb
+DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
 DIST crossbeam-0.3.2.crate 33440 BLAKE2B a5fe9d77b3fcb4ac890b3ccf4e2548cf82c99571961d3960326210ce63dbe8b04e4a5917b57dbb657777288942dec1689387b73e41175b86e013307e057e7257 SHA512 e467a84c3a3655ed1108e2af2ee75dc1fd7bd435dc28fa29e43c055edd26d24d8a5d95edac86fb428e52ba70fcca68ac960952442d0a451568877c371057f0e9
 DIST encoding_rs-0.7.2.crate 1241345 BLAKE2B f3aea266a3cd48027405d537e8bdf45b5b1084ab2d9d30a17dfdc23806607fc4eae4ecbd20d6faf667084d401f58fbe0fb53babc2aadbbfcdb30b81bd91a325e SHA512 92633620eb915ec3a4b1cc3d9d3ac38134827fa5f750eb7415e31e97c99e65e8532393090202a6a5a86979ac64127a7e8531b7c736f1109f47ea303bcb4f81ee
+DIST encoding_rs-0.8.4.crate 1244691 BLAKE2B 616b2434296fe178c33c8368bdc4c08a1fe5631912eede33ae0f93ae754276c055104f7b7cf92e3cb7ca57b0261b616dc5f9b33f09f93eb0a9ddcc108be63117 SHA512 ca696c7c2200dc95218fdd28aea5a0f59a95ee6811b00b4b504d71674dff275a9c2ffee323923d5acd0d498c90e57109a5f52faf8a593def81baa4a67097b9cd
+DIST encoding_rs_io-0.1.1.crate 15200 BLAKE2B 16f3ccb2f6111f3dff5792c8d66100a286d33fde33310d7533d13a3568bdb447043f1085b8071fe99f38b606e25b0d85acd6032da27fd574a6fb7e04d886c404 SHA512 ced3d52333f62779e7af983550ae9a4617357eb26b7b21f1e38433f9383e3b18aa647b51f3e59fe886608959914baea2256805f6c66676668e725f251fe41311
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
 DIST globset-0.3.0.crate 21315 BLAKE2B ff971a15dd85f7ab420c60f1ffcd1f2b772ee35e7743b8312fd4b45ee6e2160c783458173dffca540f5f7a4c7feeafaf31932ec775e8a99a6c6aaeebc87e98f1 SHA512 53cce0854058e70c869c4d7803dc040866028bb91ef2a5be59f3d93de18452898ec958b035961d536821fe967ad52c074114dcf23d62e0d0a5317b32d264e8bf
+DIST globset-0.4.1.crate 22363 BLAKE2B 8a2c7fbe083bfdb470866bc954579f50944c11d4460ef3d2115f7e523935ba8375c1073346f42d564d1d55f32e4e8fe51fe42fa2e5c31697bd943befefe7c303 SHA512 3cc7fb4b296ebc8c0a20d8080a9cf913ec61f2ed14bd45c2aebd0c73101514b3895123a93c5e1b5037362a74e18057fd6deefb5c91ff3880aa88ca0e1fb9095c
 DIST grep-0.1.8.crate 236744 BLAKE2B f119476878826f0b410770db4b95fa65fdc89b461f6ecdc43d15013d9fc82d91117b76fba6150c193633667243b3e49f88499cc532a3cac21565bd3e68217abc SHA512 d0a4e9dd51402ed8036aa5d2cfcdb184538d2bf0c81baac75c73e80d05945a63cb08a931d87fa526695af93271cecaed6650a045904ceaa05ed6e06fd23e537b
+DIST grep-0.1.9.crate 237472 BLAKE2B 6b5223b45baeaf5257976b07ce1025c6aacf18886f16ef5739f729291841fafdc7dad324cc953c42ef77d8bdf39802776c759e478c0b61c99954c475bf612323 SHA512 1ce3c1c1faf2d001bdafc6e021ec3523e08cfaec611bbaf70492cf0038578c2e738ead0df826229fbc0f5e54ff3f9f9cf928be9223bb53907f12b6f468545ef3
 DIST ignore-0.4.1.crate 41806 BLAKE2B 0c311a0c552d0a4fedd6a410d6482815469caf6ba318714e247d1056426eea803ad8fd15c5cc364b779b162467d482d7eadf1cd0fdefbe266983ba5326b51022 SHA512 3ea888576957cde216c07e003e3a2401d7bb27edf8cdf045e8f37f51488c0d9aeafca71281991109a0d291741a948f0577c4d24e189f448e474fa79829f6f79a
+DIST ignore-0.4.3.crate 42827 BLAKE2B 0ce4296d6a16b2b3f17e2e79c372325408f2ffcbf617024720b600843e91499f00088a74b377e98deb712f0b9aa38c19cfc44857f47f5ad21b7736a4f342de0d SHA512 a4372de85ee945e68c503e743f28621d88e19facd2ec0af5dd2cfccc45c8ad25abc655c16020427a4357bd0c07f48348ccd2d19dc7d6b9046d13fcb33973a06a
 DIST lazy_static-1.0.0.crate 12611 BLAKE2B c7ffeb553b82cacfeacf214ab069cd0abbc6b83d670ad84704ecd30919c390055b3679ddc85e9a7d0add530df588f6cba4cfd7c5e44e9158b609edef2fe85e4e SHA512 73044fce4d00002d35931d4b28810feb5c28c3debfb7bd570d9a8434cf15c29c17f0daf29ac04d748a32f52a205d5f52ecf69aa395f49d46b825e3fc0cbcd41b
+DIST lazy_static-1.0.2.crate 11431 BLAKE2B b427dcfd4a1acfd2f3a1e353e5550d439a3a81f038365b6065d21ad74def83d3107abbc6759a22087c59c141612e17b93b54c3e5cbc268f9715a4af82ce5eb94 SHA512 43ceb14b418143ae6bf46d5bee378e419a005ecf772c5ced809ca79be292568a3e70cca8a0652e5d06fbd76e1a9057adf44831705b2fc564bd4ef7446b2097fb
 DIST libc-0.2.36.crate 310575 BLAKE2B cd61236a99ce86b18329e0bfc34b738b6133a38e90d4a1a257b2739ec0e91e6ff24243f6b2b7e1c5ad3b4aa1301da42adc81e67769698f11928ee712ec31e70b SHA512 97995c49322f5a3c93df2db08b7372ba3a6da0edc9247cbd3bfb58f9b01315953596154c97c5bca1517b56b8e35e8d03bbf89f9b980aff724977b98bc0d938ed
+DIST libc-0.2.42.crate 336080 BLAKE2B 0de0726bfb00ff42d67abf06efa26c1a4f8132b29be2f957b9089da2ef3e4dfddddea49ea23af3449a367d262dc563b70968c6b2b6a1dc81829e6c6a8a1dac63 SHA512 c99a4358805012d7552f416ae68c9651dfd260599bf0cd618b55036acd08ab8eeda8aa18c18b893f074c9613694ef6562e87f032639eb86b86514aa0fd815870
 DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0
+DIST log-0.4.3.crate 21629 BLAKE2B 0656ca6931f7be89fb5c551b33ce2800f0c20f804884ea88ea04eaad27ba595988d6f7cfddcf07973bd2a58d6fa6b2092c3736ae353da0323727336116499555 SHA512 bb92f3ce23ef7361116964d2d0d6d9aca192d99c231385da71b23d0e4d1ed71fefc2ebdccf1f40f047916909df26faeef777aea68edb960298c75799765dfa2f
 DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
 DIST memmap-0.6.2.crate 15015 BLAKE2B 0bcadeff2c355ca77c7828e71f87b1c05ed6eb27d1a244d4bac8c05463903c7c237b1b5aeabaae421af2046a83aea1c4d184a3622d59358e71e083fe2bdd618c SHA512 67e05abb90f5c771f719492b3ac00fb2059e6eb94106be597dd3204cc9f23d91b90476ec1d36b7fcda1fe3d011df596052ac666c239bbd2e1df16bdafed46b4f
 DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
 DIST rand-0.3.22.crate 11318 BLAKE2B 6a8d7bd3a7044a8c1bf8d9e2701a65770365304338ab6b48ccdffdead493213cd7e442dd5a6dae3b5f372d3004c382cd073c60a924f4b2ce50f9e1d5964a996b SHA512 1b3af2048992341ce5a3bb5d5c9bc2580949dc5e92f7aa14d17bc3eb3cde4ff4ffc9201ff2c4dcc02dbfefd5307f0731775ec46825032dc1b576a2d77cb4cee5
 DIST rand-0.4.2.crate 76170 BLAKE2B 28c9965519db48357f23517b5ac43a641d1f0ffc4396c42933d22181fda3c6df1cfe08dae66a188e60df0708112839781daaa5b5cbf667d6850b10bcc4448f99 SHA512 ac6eaf9f0914fd966c835a04ec644c5a8d62a4a634187d538cecfb711955a977234dc5fe487cd4d351514bc0de4f51cbd0f09a8f6aac56aa0467ae5eb17a4fad
 DIST redox_syscall-0.1.37.crate 13980 BLAKE2B 9896615b819ccee17b18093c28a778bf6b4e0b4f6986f071e9e956a9bbc9724e151fd497d394c669d0feb8dcb95c3258a4103af9aacfe8381fc930cd5a1acd8a SHA512 147e48d44227cfe8ea190d543f9f8ab1e49fe2336c80f7e2b83546e617d0eeb8a1e94ce6e4d6f633b92ca72241cbfe0aec082425bc5f7b63d5efd164b51d5e48
+DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-0.2.6.crate 197800 BLAKE2B d135424d756eee989ad9a9180882c773fa4f399cb7f99b454c1b7ce3f2d66ce8daaa19f989878e5676b70f8d5dc2cac30773654156d8cd4b410bef44bc1276d5 SHA512 69c84096834b794227e4937db7598f35e8c489ef8445d3b5f3c0b2a73fe54be029f6db609b046441fda6374485c16943197f7416ed9545c784d14fb61c9e804d
+DIST regex-1.0.2.crate 245163 BLAKE2B 11db7370515901dd40aab09cf37af555b2a48474b4afbe2bf9bc299b0cc0366c42af4a948cd8fed26d4462c090570edd0c1b0e2e942e148330494d8188c55e82 SHA512 546d38e992c4474d6cec812c1b6f57c7a1991f27cc0d5772d814a21f670128ce11f1ea1750a6ade402fba8b31a8485a61891a9ccbccdc8483054316eca84a047
 DIST regex-syntax-0.4.2.crate 126234 BLAKE2B 874339260fc870fcbb8bb982629cfe1b5789877eb3db13181a73a4295b567a2466b3fc17433b890c0a7986ac3640382bd28c155abfec126b650d2a1c99003b3d SHA512 9b37814ab8bf8ba9d0ad125ea4038f505a0d232084faacbc4fa4126afefb3b8bdee03bfb55ee6f29c518a28f25021a31a8eb35d69999c48c739b1c30c2dba98d
+DIST regex-syntax-0.6.2.crate 238572 BLAKE2B 0fcd5a6b20260a2dbd8f4dc611bb8ad8f0eb747ab4ac88682515bbbdeefba5ab149301da4e86e28ccef0fabca7f75258037613ba770b6c45d6024c63bd38f406 SHA512 87ce094b8cf61dd8c026b983199728b8eab876766580d3a8074aee780c8f4f6fc0777f1060652f843e87ba7ed21905bdbcac411f736ff8ae0943900d71f6d068
+DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
 DIST ripgrep-0.8.1.crate 199607 BLAKE2B ba936fb5ad1072d45314abe67f916121e9082cb5fc58779b213ee75db4164576de683c7b616f4558d779dce29944904db510ba3b3ea38432686ef13a3d85af85 SHA512 bd1575d0b2efc9799ad00bf931fee61e5a475db9725c9587f9f157e0dcb6c958defb09ffa4636965806481a09e3d3218b820f601d931bf5a9b8bcde92956d9bb
+DIST ripgrep-0.9.0.crate 205514 BLAKE2B 95de95d5bb4b284c65b585f75013b9033916891eead9e1bc703635148f6ba50020d4b469a04f36f263fc1779cbed28dd147a455cb41b31256dba250763606d2f SHA512 8adab0f95421e853b813d74d6c45cfbcf6fe9485f445fc79e34fe53ac59f81dce727d1551a2a99effdf8b7c479681927c1dbeba86bce55dab8353e8a7e0db60b
 DIST same-file-1.0.2.crate 8870 BLAKE2B 0c723d2f7377e7837babe62ee55807943bb12f013d8608c895701e78f873785b0beb4a2ea84e83e3b44848dcf032b36b573a31be7e4ce9932578fb6ea6a51b7f SHA512 56c923ebd529308c5c1efdeae0314c150ec6fc3d68fe3057ae1a9ec78520f96a78e151985bcea2568775d0d59e4e04e262837d2f3965b175b71569fa703b0951
 DIST simd-0.2.1.crate 35716 BLAKE2B e34e1e937ed92e921603f7aa4b78283a01ee9246c9033c7e16cb95e2585c9145a591ac4f9786f0c51d0b303637203fdf9a0354a0ebc3d658c47edcd055a98546 SHA512 2bf1c2f830d10f60e62def7c5525598e121124e8a4fe1125419c0da3ed97bceec9909550eee171a335ec9c6944958ce5581ae53baad47cccddd234d2b7801535
+DIST simd-0.2.2.crate 37477 BLAKE2B 647b2bc68400f7a1dd126c1954254dca7914d7790a9a47c1685ffb59a42da13de0dc9736556671b844c556f8b6634d24558b30c33500fd518b60c733c13d1a21 SHA512 d4641898dabad23421575024d5240bfa1f6781c57953bc20ab22810ddb9dd015a48a3847ea307a0fe0e66f4099e4f2c7c95608c3813d391489c4745f50fbade1
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST tempdir-0.3.5.crate 10605 BLAKE2B 1c15dca19ae03d6c8c5f189e25b484e3de70327239dbaa48b78d4f9a6231b07249d88e111d0c011ea49d0416438c3b66fa6bda9a6cc09f092b6d07a45ff893a7 SHA512 5ef3cb15064fc51ab2b371f8a48694205ad831fdcd11ff0fd6be85708a8ee955c82c3cbf926360fabc2cac91528a1db90f8425090bb361fa192c8ce9b1e1f0ab
+DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
 DIST termcolor-0.3.5.crate 13539 BLAKE2B d5b9edfa562321ed1efd0d26d634c327d0256f09a0d8d1eb5b35b6095561756a4a374f5b43b5384faa8ca321882b8f2598692734b02909884911dff9825bda8c SHA512 3057a20b5aee2a745180c51605469f7b27c0c15b3073b2ce901558cab19893b4cf2afccf95128596a709464c281e08a66b7ae7bf1d28e64da4fb221865733277
+DIST termcolor-1.0.1.crate 14228 BLAKE2B 795c4c9020d3ab31f59e909640e9de5012d2b2c8af122b072b125172086cccb65743bae6a88e248e9fce62c68b497e33ecbc56d51ede7adbf3d9a71f37e21512 SHA512 4498f619e736501cbad0d242cdb7e64592de8109ed8d2dd1fc51ade5493ce21dfa9110e4ca96a603410348d61a8029e8df33d17e29e53cefd94fa662f0cde320
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
+DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
 DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
 DIST thread_local-0.3.5.crate 11794 BLAKE2B 775c55a2165b942eec4cfaa78653e3ff06a6b951635e95dd176f8bde9c58f789a4e3698cc7fa5eb7a9d173fb6c1eb8da682c65a36aa29beded1facae01817336 SHA512 c17bb6bb58e8ef5f27cd6b0a4290752ec00c9856753c9800664e1debc347a26930970b073ba87d6f95936b1be540f87559a8410151b18d01ecc3fe77c45d6cb6
+DIST ucd-util-0.1.1.crate 24221 BLAKE2B b03c4b21f30b1d7497814e22471f0ec94f52bf9815a8d8c454ab998040593e179e869e6e3d2fde61f993fc8d15ad6cd689f878bac9f0e1ea9a658d2dda242bf3 SHA512 3101bb088f9a804f311c23cfbec1b59ed6daebcc985af3c4a25cee5c1a0c0b8fe15a3b95516361cfc75bf0322895f2acc4835ee94122c782abfc8b0a1e6f8738
 DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
+DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
 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-2.1.4.crate 22695 BLAKE2B 87d989088a5f4a28c6e7a96c534092ed9574525e711a3d5f7e1abb9a7aa3d347da155f5f0d98cfe6653803b1eabae78dad01594beacd7e5281d6187d7c2db5e4 SHA512 db8a52b2708fc344833a0cf67ef96eea77dd0471337d49c806e7418e18b6c09dafd0034bc3c2ac62dcc360f4292c3634f5a20da3f10a071bb734ec8a121a4387
 DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579
+DIST winapi-0.3.5.crate 997942 BLAKE2B 7482b6c313129b1a574d499393a32b9bf4b857dcb6d380baacf3455fa43ec2d18061fad25b83c2022ffa36e30132358f3abf3bfdc74dd3fba6a5b54cf2eb5d10 SHA512 6d79a5cce1a234b5645fd1798d580602f89a202adb0672a213bd2fe54aec94c75b489d3c47320c6d5f53d415766a7cf628874f0713a347d9e3017e904449bf2f
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
+DIST wincolor-1.0.0.crate 4777 BLAKE2B 843d2b3f9d56b332504de707879a490169a790ccb515311d32114c43122f0b13dc8c360f9610361f810b2e23424da35b2918fd30480b7daeeb2a9b2689b5ecbb SHA512 c5a6c6c01fd4cadbd0967d95f69e28b5f6aeac38a7e5297f843be4ebdbed2253db3d5d38f58a91eb2cc7055bad5884a199350a52ae17b06ef11232167f610b04
 EBUILD ripgrep-0.8.1-r2.ebuild 1532 BLAKE2B 1b5dec09d8a0ad05d570534daa72dfd4cff896a20e79b6c26daf151c79234042eaa02a44afa1652c16881b2787e0612d46649fbccbf52fa8008feafd7196ef60 SHA512 d4d4be24db631878e260c1d43b4b2d73bad4a8002cdf2fc404457f587b52b975e836ded7d17a9e9b9343b8dc54941dc06debf717d4532453a67ca8d5b9f525bb
+EBUILD ripgrep-0.9.0.ebuild 1621 BLAKE2B bb7082046a7c58bdc8925cda09b742a0edb6eef23b8f8bea7967d21a275c0090a69b7d90388955cb4182c12d1b2c439197c535b01a23084e0ca65d18aff0bc10 SHA512 c0746daf908533a60254bb6d59308ece831073e7fbe1f4464ae022a7370244e1bab9fb33aa739e089a18c66656dc6b78eb5bb7be49ee7c39091d2cdcd3d50e27
 MISC metadata.xml 339 BLAKE2B 814975935c3042512ae2d83d3964bc94bef9b6b19181adc8c07f538e095983d503af6f6683c61109f4c3515175f02879f07d352845966c04bc774ee47d65db97 SHA512 4501066b64cc47d58915b452027ea603d319b0eae3d9bcd45642f16bcca3e5bbba3fc998fe8501ce63c4717ccf5f404392b98b54d53b93c648e8c8de116141ef
diff --git a/sys-apps/ripgrep/ripgrep-0.9.0.ebuild b/sys-apps/ripgrep/ripgrep-0.9.0.ebuild
new file mode 100644
index 000000000000..0ff2472b266e
--- /dev/null
+++ b/sys-apps/ripgrep/ripgrep-0.9.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.6.6
+ansi_term-0.11.0
+atty-0.2.11
+bitflags-1.0.3
+bytecount-0.3.1
+cfg-if-0.1.4
+clap-2.32.0
+crossbeam-0.3.2
+encoding_rs-0.8.4
+encoding_rs_io-0.1.1
+fnv-1.0.6
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.2.11
+globset-0.4.1
+grep-0.1.9
+ignore-0.4.3
+lazy_static-1.0.2
+libc-0.2.42
+log-0.4.3
+memchr-2.0.1
+memmap-0.6.2
+num_cpus-1.8.0
+rand-0.4.2
+redox_syscall-0.1.40
+redox_termios-0.1.1
+regex-1.0.2
+regex-syntax-0.6.2
+remove_dir_all-0.5.1
+ripgrep-0.9.0
+same-file-1.0.2
+simd-0.2.2
+strsim-0.7.0
+tempdir-0.3.7
+termcolor-1.0.1
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.5
+ucd-util-0.1.1
+unicode-width-0.1.5
+unreachable-1.0.0
+utf8-ranges-1.0.0
+void-1.0.2
+walkdir-2.1.4
+winapi-0.3.5
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.0
+"
+
+inherit cargo bash-completion-r1
+
+DESCRIPTION="a search tool that combines the usability of ag with the raw speed of grep"
+HOMEPAGE="https://github.com/BurntSushi/ripgrep"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( MIT Unlicense )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=virtual/rust-1.20
+	doc? ( app-text/asciidoc )"
+
+src_test() {
+	cargo test || die "tests failed"
+}
+
+src_install() {
+	cargo_src_install
+
+	# hacks to find/install generated files
+	BUILD_DIR=$(dirname $(find target/release -name rg.bash))
+	if use doc ; then
+	    doman "${BUILD_DIR}"/rg.1
+	fi
+	newbashcomp "${BUILD_DIR}"/rg.bash rg
+
+	dodoc CHANGELOG.md README.md
+
+	insinto /usr/share/zsh/site-functions
+	doins complete/_rg
+}
diff --git a/sys-apps/smcipmitool/Manifest b/sys-apps/smcipmitool/Manifest
index a0e7f5ff50e4..da84058bef0f 100644
--- a/sys-apps/smcipmitool/Manifest
+++ b/sys-apps/smcipmitool/Manifest
@@ -1,4 +1,6 @@
-DIST SMCIPMITool_2.19.0_build.171201_bundleJRE_Linux.tar.gz 77155490 BLAKE2B 5e69eb07f80aeb385ba7444a7eb8d14c24006fb8dd58c00976e5dfb1fca86a33b2079c33c6186baefcef2566ceefcaa45e738e9f1cbc0265551eaa89d145d8eb SHA512 c249a9ddfb1ee91eb74fa001e842b09f00ff10048f2b74650b3441794923261f077f3892bf719cb19f769acbf307d404006614f139a844e17135ff2220e5a1d4
-DIST SMCIPMITool_2.19.0_build.171201_bundleJRE_Linux_x64.tar.gz 75724816 BLAKE2B e473a3a2a419fab0c5a450ec23614b65379e5dca1e60ff46d38aa985ff461dc1dcb72565d210ce4cb9e35f8f3c3904f1e8e9fcabbb118e20e341dc0602260270 SHA512 d66688560653f122f086a1e8354065e76849435a3f704cc9e07f3ed8bf892b039547c3f24127d4813fe34ff29db8cfb4ee14a34846ce31c1774bd8b7cdc9bda3
-EBUILD smcipmitool-2.19.0.171201.ebuild 2476 BLAKE2B 7d8d11af4957d4750fef7a9ffba850b313c6264b2b5f2013375f0bd21b2042df3ac67b81bf9779f9c1d02c168956af6599de4f8f5b45124ad2204bb0770b0875 SHA512 65c95f5eca4474431a7b87ba593c15f61177acaf1cab3e003a24d795f19a287f78cf2bc79d2140e548312d83b44868c04203d870c1674ffa8a91017ab0675ee4
+AUX fake-java.bash 301 BLAKE2B e164317201544295dfaa10724c0319a4dc980d25256706172cb8547706725c05244c827489929faf19c0375630db0597427b1e42c758521a4b4d352d1e742d33 SHA512 bb5b4a57a0492df04f9428bbeedb6917fe5cf7273f0c73a300adb13e4d8b6e5cd907729cabfad548bafaa71a98e4ee1d996914fa4dafe0cd6e5a5310b1625e6d
+AUX launcher-pre.bash 149 BLAKE2B 7af8c0fb3d29784008e0c94aefad7d4f586e42f49a3dc9542c82755e1bf9af91cca452f8050b1c8c96f7bac887cb7da1c782efeae9d9eba24350a3a09c958025 SHA512 1d3ae073b2268ef070b4480a7d117091c6bbdc029a33e9f97c8cb5f008aa4b2d951371c17023ee91199b7daee4cd1fcd42f72cd8c3abb50c9932d29e65bb01a7
+DIST SMCIPMITool_2.20.0_build.180525_bundleJRE_Linux.tar.gz 78319288 BLAKE2B 9084894dd52aebce26853c611ca445d20d8d5363771013830ca2a27c4dfdbdfd00a660019755d579eb9bb6a845e196e59ef03c824cd7da5af9c9081406049c2f SHA512 b2c9fdc22c5963e8ab45ded776e823466fc5bd9fb3b1c04d44603f719409c38cc7f3f78fdd82c1230bf015f271607131ba0e00b73ef182ce18426490b9c58e9e
+DIST SMCIPMITool_2.20.0_build.180525_bundleJRE_Linux_x64.tar.gz 76888805 BLAKE2B 73ec6205ce5ed261706ecc2cd0947cdb6f27c930bdd3809581eb06062d2608d76c6696b906a44cd48b065eed1b2f5a83108b7a616cd956c77238c9af0ff1fa46 SHA512 4adab5f7d45eb8a2c88c37c519743af5244509f75800b3dcd6b002d6385309709e8efa15c0dca18f827d054ad7861168d17fcc93d4e1f5427769a0071f5772bc
+EBUILD smcipmitool-2.20.0.180525.ebuild 2188 BLAKE2B 4694471854e6bed78f303b6416f1d433fb4a527687290d7a12285a74a2a8145fd31d5f17a8566da86f2a7649d4d183b3759710ac9a8f4a81bf4401aa2f5189b3 SHA512 2c1722f3b040d2d5bb9ba0c4922d66875eb07a2c442ca3cb5a772943a27b28bfad3d530a924d2a39169f31232d5c0850e540182d6a692c2c3616191c38a697f9
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/sys-apps/smcipmitool/files/fake-java.bash b/sys-apps/smcipmitool/files/fake-java.bash
new file mode 100644
index 000000000000..ed89f4fc6532
--- /dev/null
+++ b/sys-apps/smcipmitool/files/fake-java.bash
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+for ARG in "${@}"; do
+	case ${ARG} in
+		-jar)
+			EXE=${2}
+			shift 2
+			break
+			;;
+		*)
+			shift
+			;;
+	esac
+done
+
+if [[ ${EXE} != *.jar ]]; then
+	echo "error: could not find jar argument in java invocation" >&2
+	exit 1
+fi
+
+EXE=smcipmitool-${EXE%.jar}
+EXE=${EXE,,}
+
+exec "${EXE}" "${@}"
diff --git a/sys-apps/smcipmitool/files/launcher-pre.bash b/sys-apps/smcipmitool/files/launcher-pre.bash
new file mode 100644
index 000000000000..e24bf72544f1
--- /dev/null
+++ b/sys-apps/smcipmitool/files/launcher-pre.bash
@@ -0,0 +1,3 @@
+gjl_pwd=${XDG_CONFIG_HOME:-${HOME}/.config}/smcipmitool
+mkdir -p "${gjl_pwd}" || exit $?
+ln -snf /usr/share/smcipmitool/jre "${gjl_pwd}"/ || exit $?
diff --git a/sys-apps/smcipmitool/smcipmitool-2.19.0.171201.ebuild b/sys-apps/smcipmitool/smcipmitool-2.19.0.171201.ebuild
deleted file mode 100644
index 5f5cb4965929..000000000000
--- a/sys-apps/smcipmitool/smcipmitool-2.19.0.171201.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-MY_DATE="$(ver_cut 4)"
-MY_PN="SMCIPMITool"
-MY_PN_SRC_URI="SMCIPMItool"
-MY_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="An out-of-band utility for interfacing with SuperBlade and IPMI devices via CLI"
-HOMEPAGE="https://www.supermicro.com/"
-SRC_URI="amd64? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz )
-	x86? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux.tar.gz )"
-
-LICENSE="supermicro"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="net-misc/stunnel
-	sys-libs/ncurses:5
-	virtual/jre"
-
-RESTRICT="bindist fetch mirror strip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/smcipmitool/libiKVM*.so
-	opt/smcipmitool/libjcurses*.so
-	opt/smcipmitool/libSharedLibrary*.so"
-
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_install() {
-	# Choose ARCH
-	if use amd64; then
-		local my_arch="${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64"
-	else
-		local my_arch="${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux"
-	fi
-
-	# Install binary
-	exeinto /opt/smcipmitool
-	doexe ${my_arch}/SMCIPMITool
-
-	# Install libs
-	exeinto /opt/smcipmitool
-	if use amd64; then
-		doexe ${my_arch}/*64.so
-	else
-		doexe ${my_arch}/libjcurses.so ${my_arch}/*32.so
-	fi
-
-	# Install java libs
-	exeinto /opt/smcipmitool
-	if use amd64; then
-		doexe ${my_arch}/*64.jnilib
-	fi
-
-	# Install files
-	insinto /opt/smcipmitool
-	doins ${my_arch}/*.jar ${my_arch}/*.lax ${my_arch}/*.properties
-
-	# Use system java
-	dosym ../..${JAVA_VM_SYSTEM}/jre /opt/smcipmitool/jre
-
-	# Install certificates
-	insinto /opt/smcipmitool/BMCSecurity
-	doins ${my_arch}/BMCSecurity/*.crt ${my_arch}/BMCSecurity/*.key ${my_arch}/BMCSecurity/*.pem ${my_arch}/BMCSecurity/*.txt
-
-	# Install Stunnel config
-	insinto /opt/smcipmitool/BMCSecurity/linux
-	doins ${my_arch}/BMCSecurity/linux/stunnel.conf
-
-	# Use system stunnel
-	dosym ../../../../usr/bin/stunnel /opt/smcipmitool/BMCSecurity/linux/stunnel$(usex amd64 64 32)
-
-	# Install symlink
-	dodir /opt/bin
-	dosym ../smcipmitool/SMCIPMITool /opt/bin/smcipmitool
-
-	# Install docs
-	local DOCS=( "${my_arch}/jcurses.README" "${my_arch}/ReleaseNotes.txt" "${my_arch}/SMCIPMITool_User_Guide.pdf" )
-	einstalldocs
-}
diff --git a/sys-apps/smcipmitool/smcipmitool-2.20.0.180525.ebuild b/sys-apps/smcipmitool/smcipmitool-2.20.0.180525.ebuild
new file mode 100644
index 000000000000..67d6d6f7c2bd
--- /dev/null
+++ b/sys-apps/smcipmitool/smcipmitool-2.20.0.180525.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver java-pkg-2 prefix
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="SMCIPMITool"
+MY_PN_SRC_URI="SMCIPMItool"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="An out-of-band utility for interfacing with SuperBlade and IPMI devices via CLI"
+HOMEPAGE="https://www.supermicro.com/"
+SRC_URI="amd64? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz )
+	x86? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux.tar.gz )"
+
+LICENSE="supermicro"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="net-misc/stunnel
+	sys-libs/ncurses:5
+	virtual/jre:1.8"
+
+RESTRICT="bindist fetch mirror strip"
+
+DIR="/usr/share/${PN}"
+QA_PREBUILT="usr/lib*"
+
+pkg_nofetch() {
+	elog "Please download ${A} from"
+	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_unpack() {
+	unpack ${A}
+	mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux$(usex amd64 _x64 "") ${P} || die
+}
+
+src_prepare() {
+	default
+
+	# Don't use their scary launchers
+	rm -v lax.jar || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+	java-pkg_doso libjcurses.so $(usex amd64 '*64.so' '*32.so')
+
+	local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash)
+	java-pkg_dolauncher smcipmitool-ikvm --jar iKVM.jar -pre "${pre}"
+	java-pkg_dolauncher smcipmitool-jviewersmc --jar JViewerSMC.jar -pre "${pre}"
+	java-pkg_dolauncher smcipmitool-jviewerx9 --jar JViewerX9.jar -pre "${pre}"
+	java-pkg_dolauncher smcipmitool --jar SMCIPMITool.jar -pre "${pre}"
+
+	exeinto ${DIR}/jre/bin
+	newexe $(prefixify_ro "${FILESDIR}"/fake-java.bash) java
+
+	insinto ${DIR}/lib/BMCSecurity
+	doins BMCSecurity/*.{crt,key,pem,txt}
+
+	insinto ${DIR}/lib/BMCSecurity/linux
+	doins BMCSecurity/linux/stunnel.conf
+
+	dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel32
+	dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel64
+
+	local DOCS=( "jcurses.README" "ReleaseNotes.txt" "SMCIPMITool_User_Guide.pdf" )
+	einstalldocs
+}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index c86c4e917dba..34f441a57359 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/munge/Manifest b/sys-auth/munge/Manifest
index 798a432e0bbd..b33a2d0d861d 100644
--- a/sys-auth/munge/Manifest
+++ b/sys-auth/munge/Manifest
@@ -2,11 +2,7 @@ AUX fixed-recursive-use-of-make-in-makefiles.patch 4543 BLAKE2B 0c161e41a2097e27
 AUX munged.confd 410 BLAKE2B e220ad22fc0367a9ec7766e768aac8907b34edaf5bfb00593e88dc5ce6f47cddae2df0cf1c7dd8a57ec3e644f1e489a5bae538992ce3fef191750e0ef1e7ff6d SHA512 571e9d1862be1e0389e1a45685853a1819f44cd7a89188223099703268f788f3097f8ee4e8abf36f30bb5fe81e7c57a9ec7981867b3528a37e63eb11f5b2e232
 AUX munged.initd 1100 BLAKE2B 21be4c74fadf9708b1a748da1e51fa8eab8a0f649c2ee38350a586e6ebeb1f7abb5d9f44db47b9dcad19361930ee0ac2282770ff9fc2df7b07314e700fa82681 SHA512 b3d95e7ccb18f75a4b19d6f2bd11c3484a82c0dc79dd58caaa74107bc6bbaf2d950c14123d5cec32e3762d7c3be89b20d8ef915796717bee82b953169b41793f
 DIST munge-0.5.10.tar.bz2 424285 BLAKE2B 07c6423ba799400e9a99e3f33a7dee61ed35b8caa8b290f7da5ffc1e7fbdc37ad985d10101b9a18ccae4ca4274c44999549f9754b0e782cda98976b5f15e3f30 SHA512 b1b780d205d6cfbadfe6096156840d559c70de5b0023cbd604acfc29e1135036c98a949981d5c022e994c77213ee3d8d70e8fe825b645b030ad1adef92ed9479
-DIST munge-0.5.11.tar.bz2 423232 BLAKE2B ffa8da9d94464a0f646b39b286efa94bd65ceee8910a2dc734569a3fa0c945c0130ab3aa10b9ce71a12f029e8915dd2e41c74ab87663bdf0e37bd468547f9f73 SHA512 b9d4cd76c4fe605ad67934af48809205de0f0e5fa1a10dd3b6e382da2cb8bc274bd2a8c0d4bc49d1d58155bf008945a584afd0b6e01cc8052aa1d21c8de2815b
-DIST munge-0.5.12.tar.xz 370160 BLAKE2B f9c268732d1d49351d93593fb2bc1b3fb8b33cd43fe238407e2544c714ee836447d78cbc599b796c458b317436dd162e23883f71694115d61a796dfb0beae156 SHA512 088f5ee7f5f37011d90666b87db05de6a2b8bb7cec1b43167bc3459cb365a45ebdf09d583095fabdc1e547c3c96433ca9d71a79ff05b983e8623f8d429a6852b
 DIST munge-0.5.13.tar.xz 389952 BLAKE2B 67887469dccf0f4e136a3fba12660dd8d0bfbd5d5024582c6be164b7e837959380ee9d09055ea95db2a307b1da75a8e7c643844fceb56b8a35f59ab7b1b811d8 SHA512 2e024c0438f9208379a037daabd1c31f206820ab74a410e2bb69870755e99f9c9fbf60c294c96941008bc43425fbb31dd2374e5f088b7978479e7c65816e9002
 EBUILD munge-0.5.10-r2.ebuild 1279 BLAKE2B f10801f9e56cee24915bde79848d1716ddfeb38e19bed65a5711beb10582a606c90d0b80d25ad9b442c71dda98093229c1684eeba4338f160139ce4129304015 SHA512 6dfbdc292b7f2d7fe5b888bc5186ce099a6c55a3e5300788ba43f3d638a995a654a6e25917200a8166f4f737bbf9bca4a0ec08930e9f06a2f2122082fe7625b6
-EBUILD munge-0.5.11-r1.ebuild 1379 BLAKE2B 984a90dc322870b1fba564cdea59d452b8ad920a389bea7c09d92ec340b44e30f42dc356cde7656de453ac3abb9e2864e31d225362ff9aa0d8cc6d2dcf81e9da SHA512 7f626f3ede2e8d97dfcd1527cc1f3b15bd4c9f91337919128f4b72a17cb870fcfd65e93510c81f8fb9d8ac621ec50c2e8b963b481a00b7da4054710100e0e024
-EBUILD munge-0.5.12.ebuild 1251 BLAKE2B 5fe6b9452794081b71f0e96c0026a35a4968439fe31fff02c23b71b85eeaddd4c96ea2f3838178c49acfb2e405b515e8e0dab5d4c9c49c454dc99234bfe3277d SHA512 ed451241c93b86d9eea41b3aff7d6aaf47054d81f09e08241560d4341787b9da7f79e6fab8e10d53839eccfcd0e7261d06d4cb094143d42a059af9079c028e11
 EBUILD munge-0.5.13.ebuild 1412 BLAKE2B 5addc03e48062bb73eec8b25b0d35c612e9500d57ae6cda0301942c29fd43243c52001def1ff2cab749dcd08a551d01d92d146b17112b823a4f02f980009397f SHA512 9787c7291ad91f8c9d7f29283d2f54ddb125fbc4f3ac72d09277fc9da80f5a9d5c4728a37b092e01c94969c5553bc7e57be4484f51d98cea8347c6fb81a4752a
 MISC metadata.xml 1059 BLAKE2B 5b0f3f02298161ba2c929463fce32d74fdac822376dc7f9a852df211f6e37f3d53bfe93723b773f2268b5e2ffb58179562ed0ae26194ce024e3ad59915ef901e SHA512 0018c8101643023b01f621e7d5c23cfe6a3946dcb0f6e57ca05c998dc413b8cd1725eec88c5a6bdb5ddf2d6041793879aa04de6d53802f102b12070d0114c59d
diff --git a/sys-auth/munge/munge-0.5.11-r1.ebuild b/sys-auth/munge/munge-0.5.11-r1.ebuild
deleted file mode 100644
index ee2f11fd1508..000000000000
--- a/sys-auth/munge/munge-0.5.11-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils user
-
-DESCRIPTION="An authentication service for creating and validating credentials"
-HOMEPAGE="https://github.com/dun/munge"
-SRC_URI="https://github.com/dun/munge/releases/download/munge-${PV}/munge-${PV}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="gcrypt"
-
-DEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	!gcrypt? ( dev-libs/openssl:0 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup munge
-	enewuser munge -1 -1 /var/lib/munge munge
-}
-
-src_prepare() {
-	# Accepted upstream, https://github.com/dun/munge/pull/40
-	epatch "${FILESDIR}"/fixed-recursive-use-of-make-in-makefiles.patch
-
-	hprefixify config/x_ac_path_openssl.m4
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-crypto-lib=$(usex gcrypt libgcrypt openssl)
-}
-
-src_install() {
-	local d
-
-	default
-
-	# 450830
-	if [ -d "${ED}"/var/run ]; then
-		rm -rf "${ED}"/var/run || die
-	fi
-
-	dodir /etc/munge
-
-	for d in "init.d" "default" "sysconfig"; do
-		if [ -d "${ED}"/etc/${d} ]; then
-			rm -r "${ED}"/etc/${d} || die
-		fi
-	done
-
-	newconfd "$(prefixify_ro "${FILESDIR}"/${PN}d.confd)" ${PN}d
-	newinitd "$(prefixify_ro "${FILESDIR}"/${PN}d.initd)" ${PN}d
-}
diff --git a/sys-auth/munge/munge-0.5.12.ebuild b/sys-auth/munge/munge-0.5.12.ebuild
deleted file mode 100644
index 1c250f99b3f6..000000000000
--- a/sys-auth/munge/munge-0.5.12.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
-
-inherit autotools user
-
-DESCRIPTION="An authentication service for creating and validating credentials"
-HOMEPAGE="https://github.com/dun/munge"
-SRC_URI="https://github.com/dun/munge/releases/download/munge-${PV}/munge-${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gcrypt"
-
-DEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	!gcrypt? ( dev-libs/openssl:0 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup munge
-	enewuser munge -1 -1 /var/lib/munge munge
-}
-
-src_prepare() {
-	default
-
-	hprefixify config/x_ac_path_openssl.m4
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-crypto-lib=$(usex gcrypt libgcrypt openssl)
-}
-
-src_install() {
-	local d
-
-	default
-
-	# 450830
-	if [ -d "${ED}"/var/run ]; then
-		rm -rf "${ED}"/var/run || die
-	fi
-
-	dodir /etc/munge
-
-	for d in "init.d" "default" "sysconfig"; do
-		if [ -d "${ED}"/etc/${d} ]; then
-			rm -r "${ED}"/etc/${d} || die
-		fi
-	done
-
-	newconfd "$(prefixify_ro "${FILESDIR}"/${PN}d.confd)" ${PN}d
-	newinitd "$(prefixify_ro "${FILESDIR}"/${PN}d.initd)" ${PN}d
-}
diff --git a/sys-auth/sakcl/Manifest b/sys-auth/sakcl/Manifest
new file mode 100644
index 000000000000..cf51dda9cb1a
--- /dev/null
+++ b/sys-auth/sakcl/Manifest
@@ -0,0 +1,106 @@
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST arrayvec-0.4.7.crate 22946 BLAKE2B 93d17ae9e706969e319980b4e00dd0a6c040c8d62cd41d1de34ab997e28798329e00d3dc3893da45ce5bc066fcf70dd5d8e98a79fbac8fc06d33a073a97b7b89 SHA512 195faecd7709eb908227cda7111e1b736ecf96120f9b615f1dc0a9a1cc61947e2ad4fedc7fc81d14405b51a4c8a216f81b8ed1d1d603a9fa451a38b4637e2bae
+DIST atty-0.2.10.crate 5962 BLAKE2B 36a2fe57eb500124f20464a7d67f86bc6270c2143f8273683011599adee180ee71fb0ea565c38171b9d471479d63041e4bbba4f713dfb92239b7d298e9d89e7e SHA512 76cbf960475073101d617bdaf12ed1e93dfdd96e22182674e1ec04c955fb1de2e3aa132345c50a1bebc579932d43c74c9aac64ae64107e98648a0f1f6562285b
+DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
+DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8
+DIST byteorder-1.2.3.crate 18805 BLAKE2B 2d5a74233f17778ee20220f9bafed13185b08fee92279a597d2169225bfd48e087031f2f7350ddc0344c002d97bbf992136d4b98416c70e2bde7e0e502a4d67d SHA512 336c9ac26d897042554d4c7c00a5c47cfdfa2a181511a7247b292c342156450c6cac95a2137d6f6a45f59ff1ef351a18dc73fb75e9e0c5b0b3a90d7026d39dc1
+DIST bytes-0.4.8.crate 46023 BLAKE2B e83cf53fda9c1e9338e644d0f8b4c33565b693b8c39b26ae8ad2f82dc74b9337361354f6ab5f1eae9cfe928955443b094f0f0627d6aee80e8529ebcc44f54ec4 SHA512 f56cae4af641757bfce2d444c235e92e01a9d4db66efa96e39c06b49af53c966a3bfa351130f3a5f13b4ea156b8ae9416065f66188361433cfaba475b8f321b5
+DIST cc-1.0.15.crate 41839 BLAKE2B a00d432720c168b0d69fc7d321d3abec3e18662c6e0c44e6092482e7215dc51688b1f01888150f060e57c88f3003e58b5f8985f1dd31731bb259921bd7a45d9f SHA512 220b88ad675b076b6fc322253f4f8de641fb2c3b27814a3fa5fdc2f79c52e93f2de4e6fc176a6d3a0b7a9fff46d9bd2d4396310cfde4a68f7082224510a9a831
+DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d
+DIST clap-2.31.2.crate 194051 BLAKE2B 67ff210e200d387008fb5ddbb4b0a7961f568886a4df57b12b8aa1dd4c87b0408d11d9797980f3dadfbc9aa30bdf71586474a3d905d0d45eee13165692505bb8 SHA512 f43c3e2736a7fcd5c59ba4c80bcdb28fe436b85fe33ef74a53b76b7aab009d9315d2be007a52c1abdee2f754b118ab8132640e6e6954fd60017a17d0cc086127
+DIST core-foundation-0.2.3.crate 8323 BLAKE2B cf848a8345a2d2952b2646772bdf204b56e4406a4ee6b5820424b3d633e0eb3993fe0269aac0fedfebe84221a9693b7bc53f60e85a7e95a6da19178d24a660fa SHA512 e14659d440f2ade3d4db9b307d649a4dffe7dfd7dac5f0e7df5f391531fc94f66e10fb5a22c2ff0b95d44d1fb539d6b11c4088beff43632dd6edca270c5b1719
+DIST core-foundation-sys-0.2.3.crate 9128 BLAKE2B edb0757a904b40ae5b403af2d3d396b50ec70dd918ca9e03e90a9a40b71ec8de6c70cfbcc20107549ba5be7ae4de57f0cd2b6373256201b54dae1ef9398c4197 SHA512 bb650b13251288fae1f83998684aad7869d9a6aaea4cec8e1164e626d4cf4833337ccb9d3ad3a84a7ade711cc650fa03f1d945e2e10d6cbcb7b55d857cd46ad0
+DIST crossbeam-deque-0.3.1.crate 13280 BLAKE2B 7cb7b71e43f55dc9cf7bb553e5b53f33e7ae58a05f832b54a6975dbcba2b6e96d2c80c23c8c7e12fb5876a1fd12289113dd6a684092a55b0f83f0ad314fb9733 SHA512 5737e3461d37ba027ad5efd537e8700fe8f3143e64059099cc2fa25e7d7bb5418a858df0745d7d051b9d00ef6919cc5aa699f031eb540f2eb30b6093dbf66939
+DIST crossbeam-epoch-0.4.1.crate 33739 BLAKE2B e32c8744a4a4808f846e431295a13fce8da8c5722921a70635e56e6d787aedd63aa8d2e2778d0d476b251a1d5eeef138754b535113d9421998fbd3cb717ca127 SHA512 172e34568df9f87b5b7ff6fc69fa0b19b486d22916b8d67338f85f200fb39afbd586cc34b7d71b56e2f64c8670ce14e83f2c40bdee7be508cb5106c338a0a7d8
+DIST crossbeam-utils-0.3.2.crate 12704 BLAKE2B db0cbd2775e94084966877313cb681983e4937471f555494d95260a1c9a40b5225c7dd06ae52af8a06446ef84c3a3bdc401d31fe8e7c4536fb0b56351d4123a5 SHA512 897f7d226e3a5e8f7c3323b017dd481da0fa5fb82c806cfd40ccb57a0ff599adc6b3079e6b5d21fea88c0b09a936b285c3f15b5223d4bcb2116592c9fbc30022
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST futures-0.1.21.crate 155902 BLAKE2B 224db9e9767d76daccb8dac39f8b9f536d53829334a8dca0e14ec9f1b84aaf387d4bedbf116b635a4f3d63c7ec38a771f4ecee269a64d514e813f7a21f14b679 SHA512 b6079674974489fc325182404896ddd6c2fb3a3a230d0a5ebb611a418a404378442550c92c9895aad9742a6d305a90f3099c9d6ca5bdce55ed1dab2b3e01e755
+DIST idna-0.1.4.crate 289112 BLAKE2B dfd3449388dcf894188bbc4bf36f82afd640a13d6aa091a876e6048ccd47f4f4e4c44510a27187ae978c9bb8d71fbd76058c2e501618dcd3b94f8762e2333721 SHA512 45e04b1e4619be105866ed098e486700951e1765ebc4aa84122266fc3995ceb2a99f30465ca9202cc5f35db049c7a64711b77f347e9c983b11c0840f7654a9a0
+DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6
+DIST lazy_static-1.0.0.crate 12611 BLAKE2B c7ffeb553b82cacfeacf214ab069cd0abbc6b83d670ad84704ecd30919c390055b3679ddc85e9a7d0add530df588f6cba4cfd7c5e44e9158b609edef2fe85e4e SHA512 73044fce4d00002d35931d4b28810feb5c28c3debfb7bd570d9a8434cf15c29c17f0daf29ac04d748a32f52a205d5f52ecf69aa395f49d46b825e3fc0cbcd41b
+DIST lazycell-0.6.0.crate 10099 BLAKE2B a0746580ca979298416c595c6e5683ec1c1f17c3652a18a393589441b8632a7c8a369af4991b11fd857b5c4cb533219e1e21635159e651ab0dd480936e38b811 SHA512 3e3267c6b64a32142b1ed7533073dff1a9dd4304528a13838efe9fd6165beda40a2ab0613fca44ae639e67d94b4aff1c004039c52f2990a741c84358db1dcd84
+DIST lber-0.1.6.crate 8367 BLAKE2B e5f5e1b954ac8430de7f614a69430724415d9f869531bfaa9faa81fa2a4ced560239fee486c2b5dce85c2de2177dee697e96bf5295361243a564bbcfd368df54 SHA512 a68d602f76264e9ee03994ed1cae7dd2d7de3beba39304155620a99e49a4b5de64c47ef0ba1a13ab3668344d880f0be58706817fcd9732260d5e481481e840ec
+DIST ldap3-0.6.0.crate 66107 BLAKE2B c90019c7f748240659c1b4bd5339205348bf3b8109c98b9bfaa9a4ba303b8e52dce3edc907a497d9643cbedaa95222158dda11d0fdb11cd5465b8012d86c6939 SHA512 3295e07de6fb335edcd8478f54ff15998857aa014539bfbdb7ad058a3df68fa3289d03a8616920904261ceea1c8b3702cf987cb3abb2e9fdbc1d5086ff2cef59
+DIST libc-0.2.41.crate 333728 BLAKE2B 4b6d8a3ddedfbd01114878b14dcd7f4cdb663ab19c3f325d1785d9fc0c752634a7efe7777b3b14cac77ac5a2a3b8ae70a9e413006dafdcfe268b6e3c30bec8ab SHA512 6666f28673f765817dc6c989876a53031b117d281a6b148976b900ddeaa220fcb04c0e2bfe8b07d46f7e1b212e9c2fd7273b3300be548a3af0d2c9025bef7b26
+DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
+DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0
+DIST matches-0.1.6.crate 1916 BLAKE2B 0ed7a81450fc9f639755f4dde72c226e107d8f5d9eec7e191efaaa4423d0739e3778ea358294b17eb35f3ac2918bc04b4009aea52d7c5f4335144180b444e881 SHA512 0a613c6daba26056da06cbc4a8a66751412b8e5709bf0e24e45caef76e308b918a2f6038342f3428633e388fe7631fc3978673560829b0842c9ceadb4037fa90
+DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
+DIST mio-0.6.14.crate 129384 BLAKE2B df1daeae01b678dec8af6eb2c2d287159b4522ecb564f74f5b6b6e4e74c9fe7f46c9788a69b6d9b31981f5e30afe1de223aa360f8c3f478701c111ed8f42ba8a SHA512 37b45856d74cd03cdaeb015dfca85065a04175568cda985e59bb0e4b2ca85523d52789d8e9cc2f5336e6a346d2ed50c2bdfe078ed4953613e95ca8d52dd90bb1
+DIST mio-uds-0.6.6.crate 14449 BLAKE2B 50c0b2a8b7341194a1f544b82f7ef6e84b015ed726b921ca5255b8cddbd00511e1bad902e53b2f7c932533f36fe002f30f6711813ce482bb5cca2c0cadefd212 SHA512 3d9d3722945250e3f95226d2ef7c0541cbab059af7cc9c068f070308f5faaafa6a43d21c5ef760835c509d50b98be1b3e290e9198ce74bac46431b2be8be758a
+DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
+DIST native-tls-0.1.5.crate 24838 BLAKE2B 4e24ecaa32f7f5c64e7725325296836a56b2ddf7a5ba4fdc8a246df618140e718a6784bb4b54555e6f8a1284563f9656dae403032f4c6e9f8eca570d6259399c SHA512 867b73e360625df1a803c80c9b89cbfa5d0ae09a82b1c041d3326b3d73e04821a22eb2ffa25ff6876dcaf50906012755d7712cc3049c15b70d135852561577de
+DIST net2-0.2.32.crate 20524 BLAKE2B 128d3379cdd8c36a615cb07211c6d8b2cac969ae7333efb3f855e75304a6ccde246e955166e199a1c391d8917771e90af64f784ab05609f712424b595fac2ecb SHA512 c0a67b842fd712553f99c330c75fa31cc77941805ca59888efd31deed6d9413baa1018c5b7d781265b73d142c9b792cb4fedd4bcfa77e4502c5cb09132fef4d7
+DIST nodrop-0.1.12.crate 3033 BLAKE2B 69792f5ac9722dc570749795b6e0e6c6373c44614bf5861846af08d426d18e5929ad3c5b957adf3480e8c77444cec9d33b3e8b272eea9c7200f0cedf0d78e7ac SHA512 8f2856a6467715565ea5b3be181fc957f6cbc885797c15582ef5be5a71089201292ea58f94877496737dfd427b19523228fa4bde49d9413a8399d2e7888b99aa
+DIST nom-2.2.1.crate 95289 BLAKE2B 1f5ae66f897499f3a24d89b133cecfde5f38b80a05da4dcd4cdbd87cce6f37a690ebd624c0c190c77338afae74e25cbbc9b1f2fc765ec474eb8798372d11ed4f SHA512 f628351d0c9d4346aed3406777bb87d34a53be739b98712f80e17fc31598a75d165f81870f2e633599190ae1be850147502b5b7855bc184fddaa2dabd3314377
+DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
+DIST openssl-0.9.24.crate 149235 BLAKE2B cb5c1d735aacea51e7cfcdda283a3466cace755a50282ea43e648dd09d37bff066bf9b6d8c1688a5415ad1d2bc2f11aa64d891fa5770b3e79c8a3502cb36d505 SHA512 3e969e0986b820ce83afa49ad38402d5d56591181fa3d01100ca5911b040949c5344afa3f78658a553dbf77d61eaf302cc35c901b9d160dd782015e08b6add27
+DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-sys-0.9.31.crate 42957 BLAKE2B c78ab4b1079022b64758c22a5ae5ab4aa1ca204dde095a75d1bc0f318104195cd2a4e301088f198dae33220c9e30ec807f8364fcc9cf3cd0770da9641e810db9 SHA512 b2d1545f543b42c168f7dc8248059e41c13d9b3fe5da71cf694d94797ce1c55827568c4c41ad4e4298d09e403e62715b0bb1d43b4706c736c117908c08650dd3
+DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
+DIST pkg-config-0.3.11.crate 13227 BLAKE2B f22a748d9330848379d9bcc32026c9ba4bcffc043495b864af95dde36ce3fe71344bf5b0534aa61574f677b9a3d1ec0e09f774dea0ee57c1810f1e6bd7edc1e4 SHA512 c5e53a9dd777bce55889fdf7028418443896890ff120beb2fda5e5fcc55624aaefc2ac058c2b4bc88519d48bacc477351b0ab1c4d4a65b4e4bf66a69a419aae6
+DIST proc-macro2-0.3.8.crate 24412 BLAKE2B 42895039c67122199619256b567ea66f6e0b6a45d688440ae1211c8bb45bfb87e7a599f978b04414ddf78384df3147ff8faadcea662bff647256567ea6be565b SHA512 df6d48a5d9c2b7c3f071de3336343ac00c61427c74675512c457ce23d30879350fc995809154289fe9c2d08b7bc39a9137898f651bed8c3646695abfb8368a9d
+DIST proc-macro2-0.4.3.crate 28456 BLAKE2B 51c7ac69629abddbc4aa505ab1033f2d12974256cb33757ab777d41c1bab82d114b43b66949954e6b761b0c2ce0f0824ec0c486e5e218a419e1d299eebd1b28c SHA512 35c09658b099ad4b4fe3f65ac18f78fb5ad8447243c2ae70813577a011302f417c1efbd414905464d12e3d66359f751fe15751560aefa9cc6868ceff603a898d
+DIST quote-0.5.2.crate 14982 BLAKE2B 5600742b8da27015c0a461c04414dd61be208cad10a3a1212e43d7a2aa3a8fde947b700ca230f79d9d8c13da1742a7caf70810d4b6ebd6669b020513be00974c SHA512 66c0469bf1970164e87a4960791932ca06726c79bc522fe0bdfbd41ed23428e32448aa01a0f02066169c165364465eacbd19cdde47e96b4dba017a491842e6ac
+DIST quote-0.6.2.crate 14151 BLAKE2B 86184ea581a592894e594eda7b8be7504da8ca08accd162755b91fc032b750c40d64b97432fdf16c54b263fc6a3aa324f30454c5953f5d6f6645abe04f4c9e5b SHA512 268107557949e57f6e17592fd1d1ec65cd48ed1df18266169004d0f8a687f1ec7c6028c016eb39b8afbc01cfdced4d246d5ced921fd120991a8a09f42dbc0d64
+DIST rand-0.3.22.crate 11318 BLAKE2B 6a8d7bd3a7044a8c1bf8d9e2701a65770365304338ab6b48ccdffdead493213cd7e442dd5a6dae3b5f372d3004c382cd073c60a924f4b2ce50f9e1d5964a996b SHA512 1b3af2048992341ce5a3bb5d5c9bc2580949dc5e92f7aa14d17bc3eb3cde4ff4ffc9201ff2c4dcc02dbfefd5307f0731775ec46825032dc1b576a2d77cb4cee5
+DIST rand-0.4.2.crate 76170 BLAKE2B 28c9965519db48357f23517b5ac43a641d1f0ffc4396c42933d22181fda3c6df1cfe08dae66a188e60df0708112839781daaa5b5cbf667d6850b10bcc4448f99 SHA512 ac6eaf9f0914fd966c835a04ec644c5a8d62a4a634187d538cecfb711955a977234dc5fe487cd4d351514bc0de4f51cbd0f09a8f6aac56aa0467ae5eb17a4fad
+DIST redox_syscall-0.1.38.crate 13949 BLAKE2B be050b932e7d2b7edffcd462624c4db0dca59d8921073b0c5c493dd323ffe04ccb876c413d17243a7afca5d7c2ef797f92dec9e16d18b7e0f1a3df747b8a1c99 SHA512 1153bd9d0935d8ca34d3f211a5cfbd5b11699dae10ec16fd11fa989f790ac6173d31bda27ec250ae8a160452bef858502101259a0fc241bafff69169fd1efeaa
+DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
+DIST sakcl-0.1.0.crate 4316 BLAKE2B 1ede2572e63c9d1068fe9f6f1f848491661ba3a216ce5c62ae5f6d754e04ef1e5dd16e25a66803f3f909c42b039100c98c6091b0990f67bf89acab69fecf2a39 SHA512 3c20c9fe61b0a26c9a340c88062f015c6e709a07d4417a065e80663dc6642ed561a935dd4239004f6c21642181d9b6c4cc897f93446c804f0cf621106befd069
+DIST schannel-0.1.12.crate 38498 BLAKE2B ec67cfea467925e2bb31ae6afb3502689bc0bb89d6afc19efb1ecef52fe02aaf3f6523194a249a7f61b475104b29eb86177290af341af103f3a1e34268f193c8 SHA512 9599a2793ff16b14252300b8040d337d230e0e5cd003167c6e453d98de61736a694a5a48d39ee79a2c7b96da914abbb10e8de8ed40505522a62781ad59ea81ae
+DIST scoped-tls-0.1.2.crate 9079 BLAKE2B 35e15480e05c48d5b886bf94f2fc58f79e7b5f6132c8e81ca8f37140f58d21e8a30dab56de35cc395b1878083f9e7b187af7e580bc61f8f38975b2e1193abb57 SHA512 9e1a517994f06dcdafa05f3ebe67958ed5bc751e6180cff6c891f48fbc143f3279aa841e6109be2c403b492162bdd90b23cf74aeb2154a34748c5d495789fd73
+DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
+DIST security-framework-0.1.16.crate 38648 BLAKE2B 73b1d36e8c977185485d21e5c13eeae034137e1e3d9c1db193a893129229ee10ee4e7103aafba5772467d6d751c59bd9aded0c6f828ebd937c18aff677348f25 SHA512 c7c51d0bc54255f02945d970f918a3e378adce2563b6a5ed81eaff1c50fa6610e17ce18bc3491c74e1481519f5b9007d9052f476602a7b96b319637d92672c42
+DIST security-framework-sys-0.1.16.crate 7754 BLAKE2B 713b72887d95a85182052b1706706551b6d11279647fb55cfeabde1377b2940fe9ea680a6977873ce96aa7661cd17b3d793ee292cb0a0f4ef94cb1da5636eb24 SHA512 5a5084bd0b63e831a13882723a7e7487460c718c871552dea09d4c6bc0a0535c3becb535260b7623a7e009aff026a49490b7dc0bb4699f2f69d21fd929938709
+DIST serde-1.0.60.crate 69789 BLAKE2B 9d9de7ba939d952470855bb24a1d102d4f05f7cbc7a6284cb936576c1b14283aad48f368f1f83c318c154c4e541d6e23733539ce5e94f51e3fa360ff119eb434 SHA512 70cb7b555da7b96cd6900ad86e0596324dfa9e534f6b4200c27b4d3ede6fd6b4b9f6361676658648d92db1c8f2c8e2dcc1ecc0b22688aa74985ba334ec3b77e3
+DIST serde_derive-1.0.60.crate 45755 BLAKE2B a7bf473521c92199b2e64f3878768d0f5ddee92666c7b271cfd07f420966573efd17c5e8a9efefbf001a6eb3ddd489d36466e0f683f1da70b8ecaefec3b65355 SHA512 2b86d646906a5d32e029ff826323825e5dc2b64848353215b6794233ede11fce274737155f18a8ae28c7833ae6325415749c1faf8b0823004b797893f37fa524
+DIST slab-0.3.0.crate 4807 BLAKE2B 9c6cedb83d0b45316beb74dea08e9a0d1a1992f472da1c28eee656b0e73e704847a31a1570115c4d69d78746ae213839b671a1aeb6e718ced4a259a9503c8dce SHA512 cf138b3cd99fcf7c3e6b8e1a39f6b03d0eed1208620643faafd550c74cdccd1796810c5c847ab9de6e7608c8b5c5a3e14651e0c97455896bf2c10d230257f317
+DIST slab-0.4.0.crate 12919 BLAKE2B 06293ec14dafa955260cc882c5462cb7924b738ef4b31b9317e40f93f88a4a82f540724e34a0b94fc86a883cef28688f2fd5e81f237fc8c52361a2911f640f85 SHA512 70c08eb6d465f3c619ad841e3e3aade47099dcbdc35b48e1f4d172565e0d4027f6ab94b5c53d49b836103bc364e121fe94656f730474b77990745dfda4be2cdc
+DIST smallvec-0.2.1.crate 6065 BLAKE2B a008035f83ec5d8b3ffa3be3552aeb5e5d3a4341a7978afe97fc46739e9411f56397567cc699f671270fb8cf3096a891a675f8c518dd4f0988a74fce9c62d0bd SHA512 3123d125baa3cec1368de5bb6b38ead60df2cd60de9ed1286aef53e08ce416c82fcb32b624fb4e4cf79721cb0beca3bb19910aa3798db00ae445054b7b62df45
+DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST structopt-0.2.8.crate 21030 BLAKE2B 4ac52ca0230dbb3e657c02a8f903f909768ea2215d91186d7904138de8c185d6f1b89184b1f0400a98a7cbdb16a002cdcd0661fedfccfee51d0a525710108924 SHA512 6ddd018d38f7ea3db6d98decb8edce1a87e8e07ae4788addb4c505425a786f5f347439f76d2a6b8e430fb92f980fb61d47fcfb170a15b0d8ec8ff09cbbca1e90
+DIST structopt-derive-0.2.8.crate 10978 BLAKE2B 543a3793a2ada57ca573499d6787b9f9eb8cbb1dffd3b6b7cce4b1d8858a13f09e5e441968a212340619605d61a853d46f07caa1b30b0fe1cd8d90e11c653a6b SHA512 407f2c46ec6600b7f81fd2858a306b6799c7a5cece5f693aa41014f391ed44386e741085c23e0828bca8ce422f700d0d5635ab05091d2e7c24af76dbe6c8719f
+DIST syn-0.13.11.crate 134240 BLAKE2B 6661d1ea3cb20a3bd4650b95324a201fbe143d31733eb8910ce126b0983043fb569d2250875996588831a6112fe45976d4a103e9ee6e373a1374644ac33fd420 SHA512 e14192e7bdc91d5bffbfc1e7091a46c340b4f5a9a6336b9cc12c78c328f9feaa432b4261346431fac1b5a11f93e122f1e902f1fae0927f9df6b5294e0abc3fa5
+DIST syn-0.14.0.crate 133420 BLAKE2B f601ed7664ff8242f2e4f260d3305e97b0edd436d60226124f246e8b1d9e945fdf9df1e33980a5b023ccbcabe4499dc9a06acc7fb31cdfbbddc4eb18b4b4090d SHA512 5e737f691f82f8e0ce16aa77d49904a7c8d707e88d610a0ff25fc1c2ac24531a0c8f644125731be2035dd7067e74027dc1ad1393921afc0b2706dd70f34b0f1a
+DIST take-0.1.0.crate 5543 BLAKE2B e3cb0b38a64089090b477531b1bfb36e5f8baf508f0be66fa1b393ad7eaacc0c668b42e882e923f8c3c4013915f5cd286994c8c27114483ac475b6a6abc89403 SHA512 b2fe508bd7e77f1f38a9981c0d2633e28205ec03bff8e21bb49670c24b8be6049609d417b34375327707049bafe5ee09db2c998de7eb47da75c282fedf4d7dd3
+DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
+DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
+DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
+DIST tokio-0.1.6.crate 69479 BLAKE2B 30b2f2d22f35fe8acbac3f11b319e541172ccd4fc375674b6fad9e51ea638bd3114e0315266e85adeb372ac416faf77185ac22d0f5a06608bb1d2c706cb45064 SHA512 c0d2b62d235b0e58bf1c446b558b7a0aba63abb717dbe8a345e10d4df5e61c0dd56b8380525c29739223df250847e8b23aa63f1caab72bbae275c02e81f6d4a8
+DIST tokio-core-0.1.17.crate 73933 BLAKE2B 055028a3c6fa910bb94f3a40c445b65103f87661655489c3e40e24cad0040c2e2c11e28cd6e14ba61269eb7bd091e93b68e718c9343ae09325aa320e998fbf48 SHA512 ecf3a38f88bcce8003cd334292217efb406e31e9cdeea115fd2b2c79c126cfac615aa6c975d5b08be30ac449e5bffa552e2b002b1b9a5e2f4e3969cdfe19d520
+DIST tokio-executor-0.1.2.crate 9670 BLAKE2B 834900733150c4271820d143858c56d92cd97eaa23e92347ecd9b70d44f95a168e3fa0b43c635e6b2d70a3f2c32e796f8618fcb714fa56e8ef29343afb9c11a0 SHA512 79282acb9fe1087dbc65537181234660d7eedaa9a723523e394e0bcd5bcb61a75b82ec3b8601ddbf21af2493f46420b46198e89d1001236ba233f8ac8fb39f1b
+DIST tokio-fs-0.1.0.crate 6523 BLAKE2B fad5c6e16e9c3c4e8424718b301e1f0d91864ae4f35147e93c230a610eb39f35bad925fdc07f107ab69526c460b77c7fca940b78641944cd74bf558c5e51bbe5 SHA512 8b0af83d49c460368856833193c2375e0bf61ae79b430394cb59f829540c512226794b18b70382e8a0f905ef0d3a3b6df9787ac44f4620af3ccabb443d7f749b
+DIST tokio-io-0.1.6.crate 29972 BLAKE2B e76e6b798bb145752f605886e8c6f70e9fd3b642731629ebc072d945cb30520faac0b9ecd034fb3243291900891412dc31b45b3d2b1d0c43598e82d766a2d24e SHA512 a14a9c0c2044614e8ef0b24e0b2bb28533f219c99513c54bf574897ae0fe590ba96740b3ced7c2014fbae2844ba80bbb418474cec365e18a856521fba8019cd1
+DIST tokio-proto-0.1.1.crate 44268 BLAKE2B c692a0eb5774141d5fda504eb07f5989f81b939533f1e69b6dbc79bcca05bb44331c3a218f2aec9eda9a235195404e2265bb124b8e7746e9ab73430a9639cd44 SHA512 72854f0926ee82b677747df5c8e2a0e2b81227eeef2dd9f758e72433e93918a53177c29f11bbe08712e98fe8dbeb95fbad0ab884a6041fdf7d81da11d1a3a4f1
+DIST tokio-reactor-0.1.1.crate 20742 BLAKE2B 4251af205eaf3b871f50df1a05b02a7477e8373b2a349666c90402ebd7bcf5c6f37b1ac437f6fb008c3de15152e47e9aa0b02d8968c91cf1db82c3d873b83b9a SHA512 b008f29935d88006e888601160e6e7e167dd30831e1e525e9a3b2c8e73aadc1793f44b839f8ec87227fbc2a92ec0ee62e2f054b62c4241bb0687f3976245b1b6
+DIST tokio-service-0.1.0.crate 8376 BLAKE2B bb2193af371d14c19a7f79760d4544bc5ebcba46d38d9b2836e46b6041c4b0c68f7902af51dcd3c83970084f271b1f29591b1fa461b854cb1bcc46b4db2c4d4c SHA512 a22b5a33fc957abeb8556ad1f01c6574a855b24053f7bf1ec23376df42b1e83f2fa0a538828742f24f586456e0e1314abe74ca3ac62d364f905b74c2e45903c8
+DIST tokio-tcp-0.1.0.crate 11349 BLAKE2B 39cbafc4b260add399d7906f5fdf6c0bef61401bbf5aae662b4d966c174c938099c75ef76ea64bd877155cd72fa0e6482a8455f99b8203252edb20e9d42cd24a SHA512 a828368aa4ce8b5d8ae748307aa3925550d142d25fded39382f2852be85acf44121b12ecce23ab168911036694eb29c763c7ce9779e82554b4f9fc57e4e1cd11
+DIST tokio-threadpool-0.1.3.crate 47068 BLAKE2B 3936546b6f3dd7e735315e341f58b33f9c7ae6a9cf3cd856d5906eed20790c3c09b4ecb7c954123519e2e1a2dd71356624706861741a623111bd4a77df0d69eb SHA512 4b00ae4b93a283015182c8f5ba1f12d2390039f673cde6ce84eb2aa472da347261a16eab40ea275bdfe81af5c85ceff2a22bdabc0c3dafef368a7d1c4ccfd37e
+DIST tokio-timer-0.2.3.crate 22556 BLAKE2B 84b28727499c39bad5a78fe19ac316cdfc79d46b9671b257e8f03fd226ecfd67c873e8a753b4e91b28cec2bfef6956930607fc47ef822813758209d50c5ed969 SHA512 ea5c896da6684b32383e032d48ed4eae4b87b0260f16efcc4366eb7ef83c3dd3b47da9997f0b474cadd367cff799d72207bd77d2cdecc1c9463b991b4d197f18
+DIST tokio-tls-0.1.4.crate 25780 BLAKE2B 5d643d0cfd8d8093e61224f6be23563d955188735b7c98cf53c7a162a64e3bc2d1f14c11575f1cfd69133e1b02aceba090f3061eea842a97627398ed11be9e4c SHA512 d1308ffaa7ff1f2fe59e4ea9484d79bdfcb09d19c01d9b4599613d450ca304d27117ed535806394fa219fcd6ea4a859ffa1491b5905bb419c7a8478664e29cc3
+DIST tokio-udp-0.1.0.crate 9449 BLAKE2B 7c2d99b480261c78bbe8a3526642e273d254bfc6450df6aad4cf1f4c1ef5231a61fb458713ec963f40e9d47fc811dda6a1997a0fbdaceab123558a9ce6a8c4b7 SHA512 2b5d4a3bf0d6eff751bbf6a42d48bbaf4309d2b9dd47899a22c11c9cb421ba00d884b72f32bfc45169d9a4646b9efed7ae17537504c9aee54c8a7ea9cdd13c33
+DIST tokio-uds-0.1.7.crate 15094 BLAKE2B 82b9eb1726c3f5c6c52e70c40be42618bf0bb42eb61f045999af04809d98a40afb64f9e0b31097c6d6ade4d7a2239d72f28462a126a204b4a8c318c341374c50 SHA512 2d21490ceef08554e5633d602ba1c15751a9e36d3a51b58358bb99ee117de1cb029b262ec0174545ef5c88f7cf2e54823c678715e8b83ca91e6491213eeeb9eb
+DIST tokio-uds-proto-0.1.1.crate 5098 BLAKE2B 6161333ae3b2c4fca1e8955453f049da6e54d53061d33abc6eb7077e55444dc72b4e85fe21164328e9394cec0a77c955219d760f7af5e1a0a9fb53deb0e191b8 SHA512 ec04619ee8c82c32f21c0fd98200a765283b12562dbf4205b101f4fd29dc223c6967ec4f427899c461c071672c37a2256e40abf7dc20d07efce3b59f381f6684
+DIST toml-0.4.6.crate 40203 BLAKE2B 7b26566bd7a94cfb7907867d84cf097ad44158fe59086af82e059b0eb3dea3934831d61db11bd3cd6b2fb8a909e02b6f369d93eeb09dfcc1cba4859a793c5907 SHA512 659a243957649c987a509ad3b410d37ff7b16fb8e0ca5a1de183ea017e5dd63b88dd2f9770f386b739486bea28250c9853020d29b194994a7c22c5b78490ae95
+DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-normalization-0.1.7.crate 330545 BLAKE2B abffe09db26d75c7ff8d09a485c0966e3a6ff1192b5edbbf4fd1e6915bbc9214242d6ae9d99dccf304c0d75b61006b4edbcd680d7823cdd47b8ed5a7075ef685 SHA512 4b4d3737244b1425ef8000318316decf8e167d3c92524e92bdd3c34798cf6fd1388ba7651da67d565f07d4640e9881145334fbcdfb8f20c33873d6e40ef3630e
+DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST url-1.7.0.crate 67909 BLAKE2B 342d0a01774102625e7411c067e1949d0d5fdcd11e2381aaeaa416c9123f977e5b8c1b988e94007a4abf654fe58c9723f3b1bf8644515473e79976da4c0327c1 SHA512 080c4b3a7e576fd4cd269605a5bd51c3e04fe9157200f7f411fc10d6f5a86b49c0e5c1dbb0bd522fe4be652836785ab716a80fd73474476040a0a7055772d90f
+DIST vcpkg-0.2.3.crate 6015 BLAKE2B 8259f1e9c137fdbbc0277976bfaec28074af3ce87149fffb441a5692c84b0e4a9c70b61b57d82c82d7603569fb3a9a86244a68a1834797e4745f179b941d1ce6 SHA512 ff1440f2d7d2e231fd959a328fc07ac1d4e4041f42723d2edf2226b74024aa13016eaaa364d7221ca8440381769ca03c24bc1c8d49aa2b5708871541b8a9ef0a
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579
+DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
+EBUILD sakcl-0.1.0.ebuild 2249 BLAKE2B f46fb927d596525daeb6c7b0b12a8844a576cf900ef45ef3e5c77afedab04ea79b41cda79af0a81f2691fe49f96e09b9ede4c7d378a4f385e7f75f0683801e60 SHA512 50f4847b09e33ff7ebcc6aef35bd9cfef473f920257177d944e74fc7aa10d403e215f35cebed85d2541d3a963edee57409a7663927d06dd2e9196456981b020b
+MISC metadata.xml 324 BLAKE2B 5d7fd03823e79ac64adb2876944d9d866eaeb26476cd32679b1bb786db219c83dde67975ef6520a3bf826c700119798a51cb9a6db5484d44cc2bfe116d6b7263 SHA512 b2a5ed95983a9fd4b630e92ae1b3579d2b31edcbf08c5564c9fd7303908c4eff2b02bb5e338202c84b78692a6c628bf92aaef592ae9d2116e05217cada9804bb
diff --git a/sys-auth/sakcl/metadata.xml b/sys-auth/sakcl/metadata.xml
new file mode 100644
index 000000000000..52445b8dfdd0
--- /dev/null
+++ b/sys-auth/sakcl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cardoe@gentoo.org</email>
+		<name>Doug Goldstein</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">cardoe/sakcl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-auth/sakcl/sakcl-0.1.0.ebuild b/sys-auth/sakcl/sakcl-0.1.0.ebuild
new file mode 100644
index 000000000000..7314b35fd5f1
--- /dev/null
+++ b/sys-auth/sakcl/sakcl-0.1.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 2017-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="
+ansi_term-0.11.0
+arrayvec-0.4.7
+atty-0.2.10
+bitflags-0.9.1
+bitflags-1.0.3
+byteorder-1.2.3
+bytes-0.4.8
+cc-1.0.15
+cfg-if-0.1.3
+clap-2.31.2
+core-foundation-0.2.3
+core-foundation-sys-0.2.3
+crossbeam-deque-0.3.1
+crossbeam-epoch-0.4.1
+crossbeam-utils-0.3.2
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.21
+idna-0.1.4
+iovec-0.1.2
+kernel32-sys-0.2.2
+lazy_static-0.2.11
+lazy_static-1.0.0
+lazycell-0.6.0
+lber-0.1.6
+ldap3-0.6.0
+libc-0.2.41
+log-0.3.9
+log-0.4.1
+matches-0.1.6
+memoffset-0.2.1
+mio-0.6.14
+mio-uds-0.6.6
+miow-0.2.1
+native-tls-0.1.5
+net2-0.2.32
+nodrop-0.1.12
+nom-2.2.1
+num_cpus-1.8.0
+openssl-0.9.24
+openssl-probe-0.1.2
+openssl-sys-0.9.31
+percent-encoding-1.0.1
+pkg-config-0.3.11
+proc-macro2-0.3.8
+proc-macro2-0.4.3
+quote-0.5.2
+quote-0.6.2
+rand-0.3.22
+rand-0.4.2
+redox_syscall-0.1.38
+redox_termios-0.1.1
+remove_dir_all-0.5.1
+sakcl-0.1.0
+schannel-0.1.12
+scoped-tls-0.1.2
+scopeguard-0.3.3
+security-framework-0.1.16
+security-framework-sys-0.1.16
+serde-1.0.60
+serde_derive-1.0.60
+slab-0.3.0
+slab-0.4.0
+smallvec-0.2.1
+strsim-0.7.0
+structopt-0.2.8
+structopt-derive-0.2.8
+syn-0.13.11
+syn-0.14.0
+take-0.1.0
+tempdir-0.3.7
+termion-1.5.1
+textwrap-0.9.0
+tokio-0.1.6
+tokio-core-0.1.17
+tokio-executor-0.1.2
+tokio-fs-0.1.0
+tokio-io-0.1.6
+tokio-proto-0.1.1
+tokio-reactor-0.1.1
+tokio-service-0.1.0
+tokio-tcp-0.1.0
+tokio-threadpool-0.1.3
+tokio-timer-0.2.3
+tokio-tls-0.1.4
+tokio-udp-0.1.0
+tokio-uds-0.1.7
+tokio-uds-proto-0.1.1
+toml-0.4.6
+unicode-bidi-0.3.4
+unicode-normalization-0.1.7
+unicode-width-0.1.5
+unicode-xid-0.1.0
+url-1.7.0
+vcpkg-0.2.3
+vec_map-0.8.1
+winapi-0.2.8
+winapi-0.3.4
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo
+
+DESCRIPTION="OpenSSH AuthorizedKeysCmd provider utilizing LDAP"
+HOMEPAGE="https://gitlab.com/cardoe/sakcl"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+RESTRICT="mirror"
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libressl"
+
+DEPEND="!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}"
diff --git a/sys-auth/ssh-ldap-pubkey/Manifest b/sys-auth/ssh-ldap-pubkey/Manifest
new file mode 100644
index 000000000000..4273b17816e0
--- /dev/null
+++ b/sys-auth/ssh-ldap-pubkey/Manifest
@@ -0,0 +1,3 @@
+DIST ssh-ldap-pubkey-1.3.0.tar.gz 14530 BLAKE2B 1de6913e4abb25d441731b3c36b64361f5fa8900c289b1f4ef58776ab0018414d20b4b24716833e1e27e5dc18079ec77c283bab88879e3fb719fc9ad054267ea SHA512 0c675b0bf68ccecdabda5f4f559772fd0d34151794c2a3855e063befffe9777ceb79e99b5649f15e5bd0c4ea40c22f734d1748a8053d49bffea58077b72efe16
+EBUILD ssh-ldap-pubkey-1.3.0.ebuild 1542 BLAKE2B 262b6f41ac54c8aa167ce4205340ab6f63672e491f0adce5e2181c267916f7e310d3aee2875d4f9c92fb8852b3ef10919540e88aac38952f2352b45f36b4fdf4 SHA512 67f3acc5ada84204cbe254c965dc6b25b07ede329f52e65ec71d6fcbd6ce058fcce13dd661d09cb664b1e605b656315bce7fc6169160c7d84c425dbcbb6ec0a1
+MISC metadata.xml 416 BLAKE2B f3aafc3351de51af856f2b046be4071d01801110e952bca75fceea99f4216c6cceefb97f4b5847136ea3c6f842eb4b088b44958a31e5c0ca9dc0c739cc06e404 SHA512 a58364a55b4ff512e42eaa31b2003b40ab16db428e5305d8637d166e7357dadad3f608ccbe01e9bae8e41e996ea6bba216865df7bcc662553082be812a7f7ec6
diff --git a/sys-auth/ssh-ldap-pubkey/metadata.xml b/sys-auth/ssh-ldap-pubkey/metadata.xml
new file mode 100644
index 000000000000..798419df9115
--- /dev/null
+++ b/sys-auth/ssh-ldap-pubkey/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="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/jirutka/ssh-ldap-pubkey/issues</bugs-to>
+		<remote-id type="github">jirutka/ssh-ldap-pubkey</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
new file mode 100644
index 000000000000..6381fe6c4296
--- /dev/null
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
@@ -0,0 +1,64 @@
+# 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
+
+DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
+HOMEPAGE="https://github.com/jirutka/ssh-ldap-pubkey"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/jirutka/${PN}/${PN}.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+MY_CDEPEND="
+	dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pyldap[${PYTHON_USEDEP}]
+	virtual/logger"
+
+DEPEND="
+	${MY_CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-describe[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+# We need to block previous net-misc/openssh packages
+# to avoid file collision on "/etc/openldap/schema/openssh-lpk.schema"
+RDEPEND="${MY_CDEPEND}
+	!net-misc/openssh[ldap]"
+
+DOCS=( README.md CHANGELOG.adoc )
+
+python_test() {
+	pytest -vv || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/openldap/schema
+	doins etc/openssh-lpk.schema
+
+	local MY_DOCDIR="/usr/share/doc/${PF}/examples"
+	insinto "${MY_DOCDIR}"
+	doins etc/ldap.conf
+
+	# We don't want to compress this small file to allow user
+	# to diff configuration against upstream's default
+	docompress -x "${MY_DOCDIR}"
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 61aece6d7686..b256d2fdeb31 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 091380ad9c9e..a8e23a987020 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -9,19 +9,10 @@ AUX ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch 2155 BLA
 AUX ceph-10.2.7-fix-compilation-with-zstd.patch 1782 BLAKE2B 35c63ded6f1a4740befe952e3685743f0f4cb2500f6451406133d3074179cba0703389c07a9936ecee7d2afc83db24aa212aaea3a856f240230bb6ea76fcb975 SHA512 5929217f64deb45fd803e33cd277443cbb5f5f956fc4be05490a07dae0b02467317426993c7fc44173a18955261e3a73e603775db12e788a93c851f992539ad6
 AUX ceph-10.2.9-cflags.patch 449 BLAKE2B a1fc3d1a1e5bb891932d0697631b9a604a47e4c564dc99ef1247cb9e5c26ba7bb5e421b4ca624e78b31d279c93db2965eab31d38f1d3b8fd93d247789ae9408c SHA512 17a165710b0effacc34257daf077f70f55e27f0bddd4dd58bbc8638653ebd13eeabffbb4ead40ddc3a69586c65e01f911ee5f8e1bde94576d66928f0928fa510
 AUX ceph-10.2.9-dont-run-lsb_release.patch 2862 BLAKE2B 94e31ddba114ff798f3334c71df551fd267ca716a4aa4aa8e8ebf534a5e38d1b55d7a102306b60cb7dc7337ba009898c02f953a74b34580a85369788a7169018 SHA512 e97a0c2a40c886029bbff12f8591147b88d5eae86dc79a63b267f10745a465da62786cf41c9fd0f01f51805907633c1fe954ebe09b0730660cf690f2c53a8252
-AUX ceph-10.2.9-filestore_fix_infinit_loops_in_fiemap.patch 2970 BLAKE2B 24bcf9d00532b0712d5de34ca1422c2f8774571c4b15fb0a3345f5e161a5d6c33b88b33ac96c81afa0517e8619dcd1dd0fb982c56e1967e705fa081ffff62776 SHA512 e0adf5b7c299a69393dcf0ff31def1ad7f39eb242f8d9e170c84ee5c1ea92442287575af1f64fd630ac6877500b9e2ccb34dee1286cf91b1d52094042dfdb0d8
-AUX ceph-10.2.9-libradosstriper_fix_format_injection_vulnerability.patch 1412 BLAKE2B b1768b95c109bb281a4963e9fcc4d471eb6a0b19484273965a3cf1dfc6ba4ef239b14c67b0e98118356840ef709544813bb3a1defb97e2ab1d8aadce42e9461b SHA512 23dd7651edb176419d62648e9d29957b9819129f1f50ac97608c16d658d21787ded5f162b6f4c3e6b404f2d5aee47514a84278692684f0d6f7506c84cc71f37a
-AUX ceph-10.2.9-librbd_filter_expected_error_codes_from_is_exclusive_lock_owner.patch 1017 BLAKE2B a76eaa64db3e19848fc9b1ae964b355783b30f24e998f16e121f29227ff4de4cb3b7e1552e437f1681c7826ed77b4a11a3b7bf489b8159c91c718cd834b949a2 SHA512 76a051a0fb2cf2f2b38655f7cc1866c745b6e59d999bc49666efc0e29d5e72aa26259241b9a9f4cc20a1863c3636a42a4d49d6d942d2d7456ce122b346a0f378
-AUX ceph-10.2.9-osd-scrub_to_specifies_clone_ver_but_transaction_include.patch 1422 BLAKE2B 4413687757d944c43d216a46db731d5dc3594f795e836d95c9367a5d66b8a828b614ad1079fef2459ccc7ff5ae1fdd448244aa9d2f18f78d1fe0e6c221cd1aa2 SHA512 62351c1ac682938e138cb1b6f668f9d9b841d3d57b84fbe6402ae9f7d7e2379c538c5d83335535d842da2870c3449bfcd39f66118f89422e7eb6fe8f04b0a52b
-AUX ceph-10.2.9-rbd-do_not_attempt_to_load_key_if_auth_is_disabled.patch 1358 BLAKE2B 433acfc3a777fdce8b636d73848d06c6de03f68a53480d1523c5518f9350072fbbe1562ae0723c32f4f048019b7221ef9278a6b2c95f70d3d3a4dfa9da46590e SHA512 0c07702ca78195575a66efecb8e75393da8dc5706e08ffc1e598daab288f6678f6333085d929d69dc5828494c360a83bae3df2b96efb7ddaf782d43691eedba9
-AUX ceph-10.2.9-rbd-nbd_relax_size_check_for_newer_kernel_versions.patch 1111 BLAKE2B fc109bb20f3f6259f5ca78b2ac076dac0077e2f8466c76d9db1fcff2b59ab28991b69484e73b6cbe9618b74e1d3141079950ff183382c72f03a92f922b92089d SHA512 cf475d9de2ae0c4c41389458f9f256da0f584650ce8204779e7a537cf62195cb5017233b3dcdbe0a5aeed8d7512e4db964a43ac4856e779b6ebcb7a6f676e7bc
-AUX ceph-10.2.9-unlock_sdata_op_ordering_lock_with_sdata_lock.patch 1353 BLAKE2B 9bc3a246093f851c51ec3b094f22b90727eda6ac88ab1eef671184370cd3c70de613b97bf96ad9fd01cdf4dd9cc6a44f17b4aa6918f86c1eb4c281b30677e483 SHA512 050d4439fb66b8dcb3ec3fe010bc6193e287dae2a7d25e7a58c4ce733e32a596271f6a69667039abe3e21b66918396a65d579b5da5665fb6e1e292be4b78ffa1
 AUX ceph-12.2.0-cflags.patch 536 BLAKE2B 9eb8dc48db09d35f86de280a36763b7a56d980adbaa2d68045e6378cb68904e939d8e7f7325fc5102151ea4e1f5133751b620885d1d0b3d6fe565291272b4b2a SHA512 9864da1a83c1145d143eedd73fd3ff142b354fd0bffa73a25f30eabd68d7eddee82208be7b7da74536ba4c996808aa77fc55bcf562a409240d69cbd249ef1d75
 AUX ceph-12.2.0-use-provided-cpu-flag-values.patch 1590 BLAKE2B 684dfd301a144e2958497bf588515b0319d4e2c5cc5a6c5949d4c2c6f0d41f94aca2c43c020285f4b467f42f9f9a3944ce3a5600dc95e3b8443c8420cfb76128 SHA512 ecf4067776a146cf2aaf0b83298e508a6073147e555f4f9ba73cf2d9e0fe26d9ea72fff8af1c67eaa436e30d32ed260f75683c7d77b27a88fbb098b561d13f0d
 AUX ceph-12.2.1-systemd-unitdir.patch 345 BLAKE2B b97856edd071beb28e46301e97f996176dd62b6824ccc2154b7640ce629b1c0698c2d79e074a2df3af91ab34d6f7e84b2a5a04d41d8fa3b64b571a016ab14f19 SHA512 a29373704f645f5b52597f5482fb4538f3d335bb1020c206a089ba58707f988cf42d335f17a36911f373936f8e769613c3d3fa98f55c1fd91d433d036b769bcc
-AUX ceph-12.2.2-build-without-radosgw.patch 999 BLAKE2B 2e4d995f82c43ca3d96c3e5f9acd8bf827b85055f4d558688de899b52573d7445ed72979bec5cd074b6ed3a7139227605571f79a5fbc5b2f0a2ce942d11d2296 SHA512 8ff2efef0bcf0fcf339cefeee6a54384ea6a2c219bc8b171e2306ca9043ffd9d95468c567966fabb5c1373adb00b4fe036daddb7715c232c029cda1e3d21bb83
 AUX ceph-12.2.4-boost-build-none-options.patch 932 BLAKE2B 7925da8f8f18e26af24a00a4fe595f900d9f676769614576c059513299c05cae1c982db8bdd3a571c04ace1ff1ea6171631c1373c408f465261b73e05f66580e SHA512 6ff46a90d76f667fa23be0f9eb1ed2fb7e30af9a2621aec19944d0a22a431a0f5721603c588286e483ff55c14aac920adfccb039c9678a87cc59640dd70367ae
-AUX ceph-12.2.4-boost-sonames.patch 5145 BLAKE2B 70609fbcf98c556bc681a27da37abaf0178f0d60850f3d5dd7806f71dcc21affd103bbc4ffcd21be7ebe6a82a04eab5a46548aeb1d18ad398860e14f50b86ec6 SHA512 d8a69c34c02848ba918bf65f318bb02f27cbbbd618a337cc21153cad4ab33a07dfef27d8cfb1d2839b145a245483c57dfdbddb87061a5f9ce215fb6df94ef591
 AUX ceph-12.2.4-cflags.patch 1473 BLAKE2B 971ae7673ed21485248eb582762529c20991b487fae16221a7b6b6d30e29795e26ef83b5af3f7003f58a86784e9c846d2512cee76a440bf5f12b2b5b64968ec6 SHA512 402a5948e90f7daeb29c84a6204d88f6198fab17ac78ef69b5e7d8f54f9f61ed4995c4da2b37bed4448049077bd6167f69ad1c7c62105e924d5d8f8313f68f4e
 AUX ceph-12.2.4-rocksdb-cflags.patch 601 BLAKE2B e434a0e05148e4df0848d9d0d36c7894ecadef0f1c9254dcc1eda782002f473471803372130e12a6b070f857b5f0279e8a7ee2dcf3623b8ca8e02234d4b9d6c1 SHA512 324acb8b94a050bee19e149d6a48a73f596fdf921c5f06d75475069bafcf2a230e0c12f3bb25ec6cd78f1f12334702691b73c2e2643dac63ba4bc71ac9ad0a48
 AUX ceph-12.2.5-boost-sonames.patch 5546 BLAKE2B 8062f550dd36371b1f89981ed2c63e5d8ff4273a6843f8cb8227c38fcfe29c1ce42c07578c3491a9b04e548d0c76a27481a7cb9ae2afad2870191090697c6f4b SHA512 0f48e5107be166306c832bc998c4375759e783ce0159250b3440f22ed7ef3b16fefc9e2258b53829145361d2e2e6bae97e09dde6ed81149a137f3ce84fe4ee47
@@ -35,13 +26,9 @@ AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0
 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300
 AUX ceph-osd_at.service.conf 115 BLAKE2B d234b9bd718585baf43f229f583e211607aab02942590f90e41d646205c44c9d4c7778c844fcc268d69410a6e76ca825882a5e1d4b1e86b0123905b1d6c081de SHA512 8f169a73f21968f550c6fb21ca7b1efde522b7cccaae0e0c4e22c67ee9c7ccfec7845de3cf84af1075ac9f8840b044dc9440e7936fb9079899df06df350ff9f2
 AUX ceph.confd-r1 69 BLAKE2B 2e75612a1c36057ab41939b4022c8211e32082a812e9636862fd97b4250594fbf3fbd6739e4faf84c056a8b5402a9089250ea84ce504f2bf2453c09f34dc2fee SHA512 b7f7ebb48b94398eaabb6df2cf3a5697d9a055ea4dd9b73c40d2bbf0e1445f418ed760b1f4ebb13cbb7315b2583847eb97b8649f67b6b7cf98081c0599c86aaa
-AUX ceph.confd-r2 171 BLAKE2B 1d36905fdf12edd863679ddaede09b479091a972eba05fab9a6db402e49907e270ecc395524326d6d7fb37901224e4ba45a3eaa23adb2227e2d1b78d9661fd0a SHA512 f7170644341e6c8dcb71ca3a4325c8da3325ebe83898cbf11b47b41ea4f899781b9bc87fd21e006292de78fe9e905ac4703d10afcf91a4687002663469201ba9
 AUX ceph.confd-r3 1315 BLAKE2B bf5c573be6bcfd2c7f077087c36f8e918f027ad81b18ec496348ed155c97332ad6d1567a9c69a3c887fa0bdd184b98cbe7b73198db32aae248e31c7599857a96 SHA512 1d192cc8eec9b294440ee6c43966ccc36669b94007dd6b990c5ee8d18ee1b36730a9a0082ef7170846dcc64adcc61481808e854b6c9bdb2eb1db1c71435d3f05
 AUX ceph.confd-r4 1502 BLAKE2B 51b3d14ce7078a1ba3c458e3c028ceb8b7de02f8187b242c856efab51e64f36ae5435bec761bd85f7b42bfe78ebc28c267ba80ee0b4123b960ffaf35b749ff25 SHA512 ea3e7b668f6fcdf7f1884968a33d06c86448426a83cb132f927c32d83e28adaf8789489e7e817d4349479e3647577ef40190fc75fa88553aac1c7b4f515184c9
 AUX ceph.initd-r2 958 BLAKE2B 9aeda4d2a0bad2fc1c190b19b78dd165230aeef932a5335038e650439ff3420a41d2a43ac527fadf700919ba9944b6da551b2fc5a665f915104717ef45474421 SHA512 6f42b8540797d3f55d64b9842e190ca2973c1779c720b7c9923b8bcc06dddf95672bee066275599e4feafeff38652235746433305dd4d7df8ad086a8deb960c0
-AUX ceph.initd-r4 1189 BLAKE2B 065554902fdd5c44fff69868e72817ee24916c6f93a3e332b7a673414dc27f80dc73f9f4266fb3c367ccdce036bb90a03b09cdd152f64567d1ba250d711ba0d0 SHA512 dbb69228ee566490bec93823040885e419bfbd7dc076c802cc97b47dde9fbb06a99f61498cc438c90fd0474b2ad7247d756b977fb415b0f1168442036a48bd97
-AUX ceph.initd-r5 2178 BLAKE2B d943da59449e796a9c592e173654275b40ba3701fd6c694521a1975e3070ee465b9dbc2ba748cbd99d94e00a82d792ca88f6b4c1cd299572bdd3d8829adcedbe SHA512 4037639b6de65e0966f1aa850778b87f4f8f926af621f68155e98f103e233b7ebb2fba18a65ca150b16767bb80581259f4720c925ed00777d640f19471147c90
-AUX ceph.initd-r6 2180 BLAKE2B c262225412e6e5bf61d315f661721c27f97726dd5eb4cb8696845c29ab95d2ad29b011db6e8d488ce58d71ac875008588737a453de8472ef7f6bb9309fd4f100 SHA512 9f19186da7a6150b4d371fdd5523a07979ef9c318242422f04ed0178b33e6886ac1333cad8a41aa0d75af2aa08d7ee8ec9075d980d32fcddc8558d143a425a01
 AUX ceph.initd-r7 2197 BLAKE2B 7df3ab975cd14a3cc782ed58f8e6c2f0bfdc3f1b96383400490d7cab27b4d5afa6381cdb02843c1bbfe30f62e5d801ccecf2b61178013855e13ec504da84aa4c SHA512 93890b9e049ff5925ce56b524389873e22560315bf25c40ac86ec11dd2375d184215e7a217d863d4e32bb817a3e0577fdea71a76bb5d5c28ecbeb8544f1b763c
 AUX ceph.initd-r8 2363 BLAKE2B 43dd8f5eb9516b76609a91b1884cbe81d3afbd7634bc39987ecceab612a431e6b967d07c9b7d4a02352fe6545d999eaf1a137bb8d49865830a865ff2ed979186 SHA512 9061c97848e1826ae731202c763d8464f09dff013ae5855ce698d839f99d5184a533c3a81bba223d8f50051573e1fec92e915db32b26ac278b01bf17406cbba8
 AUX ceph.logrotate 427 BLAKE2B 9677f1a2a4872addff71527c800dd06bf65e18b589de3869e2a742c43070de789d5089f8739367efb913a64aeec5a8b82f47c129fac580e7c34e4f8cdc8b7332 SHA512 6edace611f46683ca3b8d2154b86ec77cc241909704e0362b728a5f51c2a809c22e83d69df0d58ec6b3a6b8dc8ef2518c220cac920f51e63fe668cdfe1b48bae
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-filestore_fix_infinit_loops_in_fiemap.patch b/sys-cluster/ceph/files/ceph-10.2.9-filestore_fix_infinit_loops_in_fiemap.patch
deleted file mode 100644
index e67113e51cc8..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-filestore_fix_infinit_loops_in_fiemap.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From b52bfe6b443f0ff88c8614441752102058063699 Mon Sep 17 00:00:00 2001
-From: Ning Yao <yaoning@unitedstack.com>
-Date: Thu, 6 Apr 2017 11:12:04 +0000
-Subject: [PATCH] os/filestore: fix infinit loops in fiemap()
-
-since fiemap can get extents based on offset --> len
-but we should consider last extents is retrieved when len == 0
-even though it is not last fiemap extents
-
-Signed-off-by: Ning Yao <yaoning@unitedstack.com>
-(cherry picked from commit 36f6b668a8910d76847674086cbc86910c78faee)
----
- src/os/filestore/FileStore.cc      | 13 +++++--------
- src/test/objectstore/store_test.cc | 21 +++++++++++++++++++++
- 2 files changed, 26 insertions(+), 8 deletions(-)
-
-diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
-index c47b0d0d2eae..95f48cdf4960 100644
---- a/src/os/filestore/FileStore.cc
-+++ b/src/os/filestore/FileStore.cc
-@@ -3102,17 +3102,14 @@ int FileStore::_do_fiemap(int fd, uint64_t offset, size_t len,
-     i++;
-     last = extent++;
-   }
--  const bool is_last = last->fe_flags & FIEMAP_EXTENT_LAST;
-+  uint64_t xoffset = last->fe_logical + last->fe_length - offset;
-+  offset = last->fe_logical + last->fe_length;
-+  len -= xoffset;
-+  const bool is_last = (last->fe_flags & FIEMAP_EXTENT_LAST) || (len == 0);
-+  free(fiemap);
-   if (!is_last) {
--    uint64_t xoffset = last->fe_logical + last->fe_length - offset;
--    offset = last->fe_logical + last->fe_length;
--    len -= xoffset;
--    free(fiemap); /* fix clang warn: use-after-free */
-     goto more;
-   }
--  else {
--    free(fiemap);
--  }
- 
-   return r;
- }
-diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
-index 5ab011ad17d8..4cada7e2e435 100644
---- a/src/test/objectstore/store_test.cc
-+++ b/src/test/objectstore/store_test.cc
-@@ -279,6 +279,7 @@ TEST_P(StoreTest, FiemapHoles) {
-     ASSERT_EQ(r, 0);
-   }
-   {
-+    //fiemap test from 0 to SKIP_STEP * (MAX_EXTENTS - 1) + 3
-     bufferlist bl;
-     store->fiemap(cid, oid, 0, SKIP_STEP * (MAX_EXTENTS - 1) + 3, bl);
-     map<uint64_t,uint64_t> m, e;
-@@ -295,6 +296,26 @@ TEST_P(StoreTest, FiemapHoles) {
-     ASSERT_TRUE((m.size() == 1 &&
- 		 m[0] > SKIP_STEP * (MAX_EXTENTS - 1)) ||
- 		 (m.size() == MAX_EXTENTS && extents_exist));
-+
-+    // fiemap test from SKIP_STEP to SKIP_STEP * (MAX_EXTENTS - 2) + 3
-+    // reset bufferlist and map
-+    bl.clear();
-+    m.clear();
-+    e.clear();
-+    store->fiemap(cid, oid, SKIP_STEP, SKIP_STEP * (MAX_EXTENTS - 2) + 3, bl);
-+    p = bl.begin();
-+    ::decode(m, p);
-+    cout << " got " << m << std::endl;
-+    ASSERT_TRUE(!m.empty());
-+    ASSERT_GE(m[SKIP_STEP], 3u);
-+    extents_exist = true;
-+    if (m.size() == (MAX_EXTENTS - 2)) {
-+      for (uint64_t i = 1; i < MAX_EXTENTS - 1; i++)
-+	extents_exist = extents_exist && m.count(SKIP_STEP*i);
-+    }
-+    ASSERT_TRUE((m.size() == 1 &&
-+		 m[SKIP_STEP] > SKIP_STEP * (MAX_EXTENTS - 2)) ||
-+		 (m.size() == (MAX_EXTENTS - 1) && extents_exist));
-   }
-   {
-     ObjectStore::Transaction t;
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-libradosstriper_fix_format_injection_vulnerability.patch b/sys-cluster/ceph/files/ceph-10.2.9-libradosstriper_fix_format_injection_vulnerability.patch
deleted file mode 100644
index eaf18c35783d..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-libradosstriper_fix_format_injection_vulnerability.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/src/libradosstriper/RadosStriperImpl.cc b/src/libradosstriper/RadosStriperImpl.cc
-index 22352d9125..70dcb7569f 100644
---- a/src/libradosstriper/RadosStriperImpl.cc
-+++ b/src/libradosstriper/RadosStriperImpl.cc
-@@ -12,6 +12,8 @@
-  *
-  */
- 
-+#include <boost/algorithm/string/replace.hpp>
-+
- #include "libradosstriper/RadosStriperImpl.h"
- 
- #include <errno.h>
-@@ -466,7 +468,9 @@ int libradosstriper::RadosStriperImpl::aio_read(const std::string& soid,
-   // get list of extents to be read from
-   vector<ObjectExtent> *extents = new vector<ObjectExtent>();
-   if (read_len > 0) {
--    std::string format = soid + RADOS_OBJECT_EXTENSION_FORMAT;
-+    std::string format = soid;
-+    boost::replace_all(format, "%", "%%");
-+    format += RADOS_OBJECT_EXTENSION_FORMAT;
-     file_layout_t l;
-     l.from_legacy(layout);
-     Striper::file_to_extents(cct(), format.c_str(), &l, off, read_len,
-@@ -776,7 +780,9 @@ libradosstriper::RadosStriperImpl::internal_aio_write(const std::string& soid,
-   if (len > 0) {
-     // get list of extents to be written to
-     vector<ObjectExtent> extents;
--    std::string format = soid + RADOS_OBJECT_EXTENSION_FORMAT;
-+    std::string format = soid;
-+    boost::replace_all(format, "%", "%%");
-+    format += RADOS_OBJECT_EXTENSION_FORMAT;
-     file_layout_t l;
-     l.from_legacy(layout);
-     Striper::file_to_extents(cct(), format.c_str(), &l, off, len, 0, extents);
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-librbd_filter_expected_error_codes_from_is_exclusive_lock_owner.patch b/sys-cluster/ceph/files/ceph-10.2.9-librbd_filter_expected_error_codes_from_is_exclusive_lock_owner.patch
deleted file mode 100644
index 6800285318f0..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-librbd_filter_expected_error_codes_from_is_exclusive_lock_owner.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 787ba33e5dba285dff874955a8f0d7aabd3f87fe Mon Sep 17 00:00:00 2001
-From: Jason Dillaman <dillaman@redhat.com>
-Date: Mon, 5 Jun 2017 08:17:05 -0400
-Subject: [PATCH] librbd: filter expected error codes from
- is_exclusive_lock_owner
-
-Fixes: http://tracker.ceph.com/issues/20182
-Signed-off-by: Jason Dillaman <dillaman@redhat.com>
-(cherry picked from commit d4daaf54e6bc42cd4fb2111ea20b2042941b0c31)
----
- src/librbd/internal.cc | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
-index 9fecb1e1688f..6021be078090 100644
---- a/src/librbd/internal.cc
-+++ b/src/librbd/internal.cc
-@@ -2110,7 +2110,9 @@ int mirror_image_disable_internal(ImageCtx *ictx, bool force,
-     // might have been blacklisted by peer -- ensure we still own
-     // the lock by pinging the OSD
-     int r = ictx->exclusive_lock->assert_header_locked();
--    if (r < 0) {
-+    if (r == -EBUSY || r == -ENOENT) {
-+      return 0;
-+    } else if (r < 0) {
-       return r;
-     }
- 
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-osd-scrub_to_specifies_clone_ver_but_transaction_include.patch b/sys-cluster/ceph/files/ceph-10.2.9-osd-scrub_to_specifies_clone_ver_but_transaction_include.patch
deleted file mode 100644
index 8bf14c2944ba..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-osd-scrub_to_specifies_clone_ver_but_transaction_include.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 153f77544118613e19d5e88c030c3901234cf950 Mon Sep 17 00:00:00 2001
-From: David Zafman <dzafman@redhat.com>
-Date: Tue, 18 Jul 2017 15:08:14 -0700
-Subject: [PATCH] osd: scrub_to specifies clone ver, but transaction include
- head write ver
-
-Fixes: http://tracker.ceph.com/issues/20041
-
-Signed-off-by: David Zafman <dzafman@redhat.com>
-(cherry picked from commit fd598a0d23d61c645633ae774c3404a43d035e3c)
-
-Conflicts:
-	src/osd/ReplicatedPG.cc (trivial)
----
- src/osd/ReplicatedPG.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
-index 4b4dc34c602a..4d80ad1770e1 100644
---- a/src/osd/ReplicatedPG.cc
-+++ b/src/osd/ReplicatedPG.cc
-@@ -8318,7 +8318,7 @@ void ReplicatedPG::op_applied(const eversion_t &applied_version)
-   last_update_applied = applied_version;
-   if (is_primary()) {
-     if (scrubber.active) {
--      if (last_update_applied == scrubber.subset_last_update) {
-+      if (last_update_applied >= scrubber.subset_last_update) {
-         requeue_scrub();
-       }
-     } else {
-@@ -8326,7 +8326,7 @@ void ReplicatedPG::op_applied(const eversion_t &applied_version)
-     }
-   } else {
-     if (scrubber.active_rep_scrub) {
--      if (last_update_applied == static_cast<MOSDRepScrub*>(
-+      if (last_update_applied >= static_cast<MOSDRepScrub*>(
- 	    scrubber.active_rep_scrub->get_req())->scrub_to) {
- 	osd->op_wq.queue(
- 	  make_pair(
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-rbd-do_not_attempt_to_load_key_if_auth_is_disabled.patch b/sys-cluster/ceph/files/ceph-10.2.9-rbd-do_not_attempt_to_load_key_if_auth_is_disabled.patch
deleted file mode 100644
index 4b03e335bc58..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-rbd-do_not_attempt_to_load_key_if_auth_is_disabled.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0cd7df3649d7486d444a61cab89c48a89ddd3e8d Mon Sep 17 00:00:00 2001
-From: Jason Dillaman <dillaman@redhat.com>
-Date: Thu, 29 Jun 2017 14:54:40 -0400
-Subject: [PATCH] rbd: do not attempt to load key if auth is disabled
-
-Fixes: http://tracker.ceph.com/issues/19035
-Signed-off-by: Jason Dillaman <dillaman@redhat.com>
-(cherry picked from commit 8b9c8df6d7f0b75c5451953bb322bc1f9afb6299)
----
- src/krbd.cc | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/src/krbd.cc b/src/krbd.cc
-index a0e546fa7f6f..2bb6b4270abd 100644
---- a/src/krbd.cc
-+++ b/src/krbd.cc
-@@ -129,13 +129,15 @@ static int build_map_buf(CephContext *cct, const char *pool, const char *image,
-   oss << " name=" << cct->_conf->name.get_id();
- 
-   KeyRing keyring;
--  r = keyring.from_ceph_context(cct);
--  if (r == -ENOENT && !(cct->_conf->keyfile.length() ||
--                        cct->_conf->key.length()))
--    r = 0;
--  if (r < 0) {
--    cerr << "rbd: failed to get secret" << std::endl;
--    return r;
-+  if (cct->_conf->auth_client_required != "none") {
-+    r = keyring.from_ceph_context(cct);
-+    if (r == -ENOENT && !(cct->_conf->keyfile.length() ||
-+                          cct->_conf->key.length()))
-+      r = 0;
-+    if (r < 0) {
-+      cerr << "rbd: failed to get secret" << std::endl;
-+      return r;
-+    }
-   }
- 
-   CryptoKey secret;
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-rbd-nbd_relax_size_check_for_newer_kernel_versions.patch b/sys-cluster/ceph/files/ceph-10.2.9-rbd-nbd_relax_size_check_for_newer_kernel_versions.patch
deleted file mode 100644
index 5cb89be0edf1..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-rbd-nbd_relax_size_check_for_newer_kernel_versions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
-index 2e399ab832..88e1e0ff65 100644
---- a/src/tools/rbd_nbd/rbd-nbd.cc
-+++ b/src/tools/rbd_nbd/rbd-nbd.cc
-@@ -469,6 +469,10 @@ static int open_device(const char* path, bool try_load_moudle = false)
- 
- static int check_device_size(int nbd_index, unsigned long expected_size)
- {
-+  // There are bugs with some older kernel versions that result in an
-+  // overflow for large image sizes. This check is to ensure we are
-+  // not affected.
-+
-   unsigned long size = 0;
-   std::string path = "/sys/block/nbd" + stringify(nbd_index) + "/size";
-   std::ifstream ifs;
-@@ -480,6 +484,12 @@ static int check_device_size(int nbd_index, unsigned long expected_size)
-   ifs >> size;
-   size *= RBD_NBD_BLKSIZE;
- 
-+  if (size == 0) {
-+    // Newer kernel versions will report real size only after nbd
-+    // connect. Assume this is the case and return success.
-+    return 0;
-+  }
-+
-   if (size != expected_size) {
-     cerr << "rbd-nbd: kernel reported invalid device size (" << size
-          << ", expected " << expected_size << ")" << std::endl;
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-unlock_sdata_op_ordering_lock_with_sdata_lock.patch b/sys-cluster/ceph/files/ceph-10.2.9-unlock_sdata_op_ordering_lock_with_sdata_lock.patch
deleted file mode 100644
index 60f46ab36a40..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-unlock_sdata_op_ordering_lock_with_sdata_lock.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3fa277b479d69699bf5a6875cd4a5efcf9ae0788 Mon Sep 17 00:00:00 2001
-From: Alexey Sheplyakov <asheplyakov@mirantis.com>
-Date: Tue, 27 Jun 2017 16:07:01 +0400
-Subject: [PATCH] jewel: osd: unlock sdata_op_ordering_lock with sdata_lock
- hold to avoid missing wakeup signal
-
-Based on commit bc683385819146f3f6f096ceec97e1226a3cd237. The OSD code has
-been refactored a lot since Jewel, hence cherry-picking that patch introduces
-a lot of unrelated changes, and is much more difficult than reusing the idea.
-
-Fixes: http://tracker.ceph.com/issues/20428
-
-Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
----
- src/osd/OSD.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
-index f5cfda3b686a..38a2711f6f92 100644
---- a/src/osd/OSD.cc
-+++ b/src/osd/OSD.cc
-@@ -8727,9 +8727,9 @@ void OSD::ShardedOpWQ::_process(uint32_t thread_index, heartbeat_handle_d *hb )
-   assert(NULL != sdata);
-   sdata->sdata_op_ordering_lock.Lock();
-   if (sdata->pqueue->empty()) {
--    sdata->sdata_op_ordering_lock.Unlock();
-     osd->cct->get_heartbeat_map()->reset_timeout(hb, 4, 0);
-     sdata->sdata_lock.Lock();
-+    sdata->sdata_op_ordering_lock.Unlock();
-     sdata->sdata_cond.WaitInterval(osd->cct, sdata->sdata_lock, utime_t(2, 0));
-     sdata->sdata_lock.Unlock();
-     sdata->sdata_op_ordering_lock.Lock();
diff --git a/sys-cluster/ceph/files/ceph-12.2.2-build-without-radosgw.patch b/sys-cluster/ceph/files/ceph-12.2.2-build-without-radosgw.patch
deleted file mode 100644
index 29257c4747d6..000000000000
--- a/sys-cluster/ceph/files/ceph-12.2.2-build-without-radosgw.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b00ac12f4045cd39ac9a436cf32d233d16bc3485 Mon Sep 17 00:00:00 2001
-From: Jason Dillaman <dillaman@redhat.com>
-Date: Tue, 5 Dec 2017 09:58:04 -0500
-Subject: [PATCH] ceph-dencoder: moved RBD types outside of RGW preprocessor
- guard
-
-Fixes: http://tracker.ceph.com/issues/22321
-Signed-off-by: Jason Dillaman <dillaman@redhat.com>
----
- src/test/encoding/types.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
-index c061e93bd58c..4cfcb15edff1 100644
---- a/src/test/encoding/types.h
-+++ b/src/test/encoding/types.h
-@@ -405,6 +405,8 @@ TYPE(rgw_data_sync_info)
- TYPE(rgw_data_sync_marker)
- TYPE(rgw_data_sync_status)
- 
-+#endif
-+
- #ifdef WITH_RBD
- #include "cls/rbd/cls_rbd.h"
- TYPE(cls_rbd_parent)
-@@ -416,8 +418,6 @@ TYPE(cls::rbd::MirrorImage)
- TYPE(cls::rbd::MirrorImageMap)
- #endif
- 
--#endif
--
- #include "cls/lock/cls_lock_types.h"
- TYPE(rados::cls::lock::locker_id_t)
- TYPE_FEATUREFUL(rados::cls::lock::locker_info_t)
diff --git a/sys-cluster/ceph/files/ceph-12.2.4-boost-sonames.patch b/sys-cluster/ceph/files/ceph-12.2.4-boost-sonames.patch
deleted file mode 100644
index 59c645dea95c..000000000000
--- a/sys-cluster/ceph/files/ceph-12.2.4-boost-sonames.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7aa8a4392e..111f669f2e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -622,13 +622,13 @@ set(ceph_common_objs
-   $<TARGET_OBJECTS:crush_objs>)
- set(ceph_common_deps
-   json_spirit erasure_code rt ${LIB_RESOLV}
--  Boost::thread
--  Boost::system
--  Boost::regex
--  Boost::random
--  Boost::program_options
--  Boost::date_time
--  Boost::iostreams
-+  boost_thread
-+  boost_system
-+  boost_regex
-+  boost_random
-+  boost_program_options
-+  boost_date_time
-+  boost_iostreams
-   ${BLKID_LIBRARIES}
-   ${Backtrace_LIBRARIES}
-   ${BLKIN_LIBRARIES}
-@@ -712,7 +712,7 @@ if (WITH_MGR)
-                  $<TARGET_OBJECTS:heap_profiler_objs>)
-   target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}")
-   target_link_libraries(ceph-mgr osdc client global-static common
--      Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
-+	  boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
-   install(TARGETS ceph-mgr DESTINATION bin)
- endif (WITH_MGR)
- 
-@@ -885,7 +885,7 @@ set(ceph_mds_srcs
-   ceph_mds.cc)
- add_executable(ceph-mds ${ceph_mds_srcs})
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common
--  Boost::thread)
-+  boost_thread)
- install(TARGETS ceph-mds DESTINATION bin)
- 
- add_subdirectory(erasure-code)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index f3999e3b01..0ce7fca1ba 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -148,7 +148,7 @@ add_executable(ceph_omapbench
-   )
- target_link_libraries(ceph_omapbench
-   librados
--  Boost::program_options
-+  boost_program_options
-   global
-   ${BLKID_LIBRARIES}
-   ${CMAKE_DL_LIBS}
-@@ -202,7 +202,7 @@ if(${WITH_RADOSGW})
-     cls_rgw_client
-     cls_user_client
-     cls_lock_client
--    Boost::regex
-+    boost_regex
-     ${BLKID_LIBRARIES}
-     ${CURL_LIBRARIES}
-     ${EXPAT_LIBRARIES}
-@@ -232,7 +232,7 @@ if(${WITH_RADOSGW})
-     cls_rgw_client
-     cls_user_client
-     cls_lock_client
--    Boost::regex
-+    boost_regex
-     ${BLKID_LIBRARIES}
-     ${CURL_LIBRARIES}
-     ${EXPAT_LIBRARIES}
-diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt
-index 9fba701e05..da3cbcfe96 100644
---- a/src/test/bench/CMakeLists.txt
-+++ b/src/test/bench/CMakeLists.txt
-@@ -8,7 +8,7 @@ set(smalliobench_srcs
- add_executable(ceph_smalliobench
-   ${smalliobench_srcs}
-   )
--target_link_libraries(ceph_smalliobench librados Boost::program_options global
-+target_link_libraries(ceph_smalliobench librados boost_program_options global
-   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
- 
- # ceph_smalliobenchrbd
-@@ -27,7 +27,7 @@ if(WITH_RBD)
-     librados
-     os
-     global
--    Boost::program_options
-+    boost_program_options
-     ${BLKID_LIBRARIES}
-     ${CMAKE_DL_LIBS}
-     )
-@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs
- add_executable(ceph_smalliobenchfs
-   ${ceph_smalliobenchfs_srcs}
-   )
--target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os global
-+target_link_libraries(ceph_smalliobenchfs librados boost_program_options os global
-   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
- 
- # ceph_smalliobenchdumb
-@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs
- add_executable(ceph_smalliobenchdumb
-   ${smalliobenchdumb_srcs}
-   )
--target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options os global
-+target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os global
-   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
- 
- # ceph_tpbench
-@@ -73,7 +73,7 @@ set(tpbench_srcs
- add_executable(ceph_tpbench
-   ${tpbench_srcs}
-   )
--target_link_libraries(ceph_tpbench librados Boost::program_options global
-+target_link_libraries(ceph_tpbench librados boost_program_options global
-   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
- 
- install(TARGETS
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index 7502085895..1a430c201a 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -23,13 +23,13 @@ target_link_libraries(ceph_radosacl librados global)
- install(TARGETS ceph_radosacl DESTINATION bin)
- 
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
- 
- add_executable(ceph-monstore-tool
-   ceph_monstore_tool.cc
-   ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
- install(PROGRAMS
-   ceph-monstore-update-crush.sh
-@@ -40,7 +40,7 @@ add_executable(ceph-objectstore-tool
-   ceph_objectstore_tool.cc
-   rebuild_mondb.cc
-   RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
-   target_link_libraries(ceph-objectstore-tool fuse)
- endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph.confd-r2 b/sys-cluster/ceph/files/ceph.confd-r2
deleted file mode 100644
index 13b1cfad4588..000000000000
--- a/sys-cluster/ceph/files/ceph.confd-r2
+++ /dev/null
@@ -1,8 +0,0 @@
-# default ceph conf file
-#ceph_conf="/etc/ceph/ceph.conf"
-
-# Set ulimits for Ceph services.
-rc_ulimit="-n 32768"
-
-# initd stop timeout.
-#CEPH_TERMTIMEOUT="TERM/60/KILL/5"
diff --git a/sys-cluster/ceph/files/ceph.initd-r4 b/sys-cluster/ceph/files/ceph.initd-r4
deleted file mode 100644
index 33e1a3002ac9..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r4
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-command="/usr/bin/ceph-${daemon_type}"
-pidfile="/run/ceph/${daemon_type}.${daemon_id}.pid"
-command_args="-i ${daemon_id} --pid-file ${pidfile} -c ${ceph_conf}"
-start_stop_daemon_args="--user ceph --group ceph"
-retry="${CEPH_TERMTIMEOUT:-TERM/60/KILL/5}"
-
-depend() {
-	after net ntpd ntp-client chronyd
-	before netmount
-}
-
-is_type_valid() {
-	case ${daemon_type} in
-		mon|mds|osd) return 0;;
-		*) return 1;;
-	esac
-}
-
-start_pre() {
-	export CEPH_CONF="${ceph_conf}"
-
-	checkpath -d -q -o ceph "$(dirname "${pidfile}")"
-
-	if ! is_type_valid ;then
-		eerror "Please give valid Ceph Server Type: mds, mon, osd"
-		return 1
-	fi
-
-	if pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
-		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
-		return 1
-	fi
-}
-
-reload() {
-	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
-	start-stop-daemon --signal 1 ${start_stop_daemon_args} --pidfile "${pidfile}"
-	eend $?
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.initd-r5 b/sys-cluster/ceph/files/ceph.initd-r5
deleted file mode 100644
index 18f539a57a8f..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r5
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: ${rundir:=/run/ceph}
-: ${user:=ceph}
-: ${group:=ceph}
-: ${rc_ulimit:=-n 131072 -u 257256}
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: ${supervisor:=supervise-daemon}
-: ${stdout:=/dev/null}
-: ${stderr:=/dev/null}
-: ${respawn_delay:=10}
-: ${respawn_max:=5}
-: ${respawn_period:=1800}
-
-: ${osd_respawn_delay:=15}
-: ${osd_respawn_max:=10}
-
-: ${radosgw_respawn_max:=5}
-: ${radosgw_respawn_period:=30}
-
-depend() {
-	use dns logger
-	after net ntpd ntp-client chronyd
-	before netmount
-}
-
-is_type_valid() {
-	case ${daemon_type} in
-		mon|mds|osd|mgr|radosgw) return 0;;
-		*) return 1;;
-	esac
-}
-
-start_pre() {
-	export CEPH_CONF="${ceph_conf}"
-
-	checkpath -d -q -o "${user}:${group}" "${rundir}"
-
-	if ! is_type_valid ;then
-		eerror "Please give valid Ceph Server Type: mds, mon, osd"
-		return 1
-
-	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
-		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
-		return 1
-	fi
-	
-	local arg_name arg_val
-	for arg_name in std{out,err} respawn_{delay,max,period}; do
-		eval arg_val="\${${daemon_type}_${arg_name}}"
-
-		if [ -z "${arg_val}" ]; then
-			eval arg_val="\${${arg_name}}"
-		else
-			eval "${arg_name}=\"${arg_val}\""
-		fi
-
-		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
-			supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}.${daemon_id}-${arg_name}.log"
-		fi
-	done
-}
-
-reload() {
-	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
-	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
-	eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.initd-r6 b/sys-cluster/ceph/files/ceph.initd-r6
deleted file mode 100644
index fd31b17eb5e3..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r6
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: ${rundir:=/run/ceph}
-: ${user:=ceph}
-: ${group:=ceph}
-: ${rc_ulimit:=-n 1048576 -u 1048576}
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: ${supervisor:=supervise-daemon}
-: ${stdout:=/dev/null}
-: ${stderr:=/dev/null}
-: ${respawn_delay:=10}
-: ${respawn_max:=5}
-: ${respawn_period:=1800}
-
-: ${osd_respawn_delay:=15}
-: ${osd_respawn_max:=10}
-
-: ${radosgw_respawn_max:=5}
-: ${radosgw_respawn_period:=30}
-
-depend() {
-	use dns logger
-	after net ntpd ntp-client chronyd
-	before netmount
-}
-
-is_type_valid() {
-	case ${daemon_type} in
-		mon|mds|osd|mgr|radosgw) return 0;;
-		*) return 1;;
-	esac
-}
-
-start_pre() {
-	export CEPH_CONF="${ceph_conf}"
-
-	checkpath -d -q -o "${user}:${group}" "${rundir}"
-
-	if ! is_type_valid ;then
-		eerror "Please give valid Ceph Server Type: mds, mon, osd"
-		return 1
-
-	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
-		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
-		return 1
-	fi
-	
-	local arg_name arg_val
-	for arg_name in std{out,err} respawn_{delay,max,period}; do
-		eval arg_val="\${${daemon_type}_${arg_name}}"
-
-		if [ -z "${arg_val}" ]; then
-			eval arg_val="\${${arg_name}}"
-		else
-			eval "${arg_name}=\"${arg_val}\""
-		fi
-
-		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
-			supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}.${daemon_id}-${arg_name}.log"
-		fi
-	done
-}
-
-reload() {
-	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
-	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
-	eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 21939746e0c8..24ed81c5010d 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -4,11 +4,13 @@ AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528
 DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
 DIST kubernetes-1.11.1.tar.gz 24774820 BLAKE2B 2b4ffda2258fbdf7f05eeea57f7fad8ca2eb574895d016475ceae35d8506d9c09d5874e689c0f25c806d0b0b957fca166a8930a8fc5aca98cbe3174dfd217653 SHA512 4afb54ae389aa414c7e64a7ab60d586c8f3c75afe4da00bcf2221b4b273e164a09548e61c24a0cdaf9d0e52394c3421e6c70f4fbfc80ed62c40ba7816b03afcf
+DIST kubernetes-1.9.10.tar.gz 23592498 BLAKE2B 021ffbb933a5b541d43617fe36967b91cb1895d4fb6ce7f3651b682976699288646b45d5d0a5698131eedc19f4aa7a125d353971d2ecd44a2fd8510a95fac423 SHA512 621a2c1c76f993ad61087916fc5946aa3f1b3dec93c7024e518de613063a605500d38e763ed55a35967acb8548d63b65a7d8482f68695dc7600c23d3c38187e9
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
 EBUILD kube-proxy-1.10.4.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 EBUILD kube-proxy-1.10.5.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 EBUILD kube-proxy-1.11.1.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
+EBUILD kube-proxy-1.9.10.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 EBUILD kube-proxy-1.9.8.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 EBUILD kube-proxy-1.9.9.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.9.10.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.9.10.ebuild
new file mode 100644
index 000000000000..882a7f40ebcc
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.9.10.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 7ad4a48d8091..6195f58e250c 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -4,11 +4,13 @@ AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba8320
 DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
 DIST kubernetes-1.11.1.tar.gz 24774820 BLAKE2B 2b4ffda2258fbdf7f05eeea57f7fad8ca2eb574895d016475ceae35d8506d9c09d5874e689c0f25c806d0b0b957fca166a8930a8fc5aca98cbe3174dfd217653 SHA512 4afb54ae389aa414c7e64a7ab60d586c8f3c75afe4da00bcf2221b4b273e164a09548e61c24a0cdaf9d0e52394c3421e6c70f4fbfc80ed62c40ba7816b03afcf
+DIST kubernetes-1.9.10.tar.gz 23592498 BLAKE2B 021ffbb933a5b541d43617fe36967b91cb1895d4fb6ce7f3651b682976699288646b45d5d0a5698131eedc19f4aa7a125d353971d2ecd44a2fd8510a95fac423 SHA512 621a2c1c76f993ad61087916fc5946aa3f1b3dec93c7024e518de613063a605500d38e763ed55a35967acb8548d63b65a7d8482f68695dc7600c23d3c38187e9
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
 EBUILD kubelet-1.10.4.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 EBUILD kubelet-1.10.5.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 EBUILD kubelet-1.11.1.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
+EBUILD kubelet-1.9.10.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 EBUILD kubelet-1.9.8.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 EBUILD kubelet-1.9.9.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.9.10.ebuild b/sys-cluster/kubelet/kubelet-1.9.10.ebuild
new file mode 100644
index 000000000000..e1a41e8ec6bc
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.9.10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/pconsole/Manifest b/sys-cluster/pconsole/Manifest
index f26033c41c5c..5056aff9a879 100644
--- a/sys-cluster/pconsole/Manifest
+++ b/sys-cluster/pconsole/Manifest
@@ -1,4 +1,4 @@
-AUX pconsole-1.0-exit-warn.patch 248 BLAKE2B 7b67c7176d03f7597ef4ce64815782b7912629271133a02319e1f79376f570ae006df426da8281ef9a1d8e826df334c87178764e2756bcae7a925b7e73ec0462 SHA512 583f869efa7d11db5c1de623af473fced1b0b7a07d363246702b705ff7e50e8ecce817fbb8fe98584f3cc266f420165f5255dbc666a741611d92b6688a9aff3c
+AUX pconsole-1.0-exit-warn.patch 248 BLAKE2B 3786e24b1cbc7fc88162218fd58969bd9d542b9215c95063413c034c1b24a339d8ea95fac8e13c390fc2bcdee764013a5510af9db0f70d31cc81cf13788d567b SHA512 34f2bd00b09e244dbb6d36d0c392986f05929f71a71117c541fc79d16b67ca208624a3ef8f3085b936835ea92a4bce570dc9ed18e1324d6062ce0f6ce5101b33
 DIST pconsole-1.0.tar.gz 215426 BLAKE2B 1b3e130c1b44a9ddd039a1cfa281cc5345f488c8b3ca6209c6a42f4e34ab47ac46f66d87429227c90c74abbee8fd9440189f7e26951677eeb02986f6157a14f1 SHA512 b03f189e4030a417bbe1ee19dc55f5149581b084d89edecdf857916d66c0e235f1b4bfecf6a198f865ad187d7630b0c266940eafadd576e829d20366dc9cc248
-EBUILD pconsole-1.0-r3.ebuild 818 BLAKE2B 652d0c4c329b449c289d1a69b00ada93eafa2cc7aac5df050490c64e676131ef8df84d87475ebbd932b99b562b42e1d1c6c88bed98d26773200a95b51dfa69b8 SHA512 2deab7f0b0cb8aaa8628e5322731b5191d0401f3dd036d779ace8336adf4646b28ebb6df2d9fe75d15cd8f8151e850a14b19f47fa5dc4f8b4148ca3b1dfe4fc8
-MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
+EBUILD pconsole-1.0-r4.ebuild 712 BLAKE2B b1e14d70383c2c2d3687a4286c28e806d76db08fde082c0f03ea5b8b94fa132c572d78e2ceb8a8d784f1846b1133d185762954abb2c32b3a075b66c7dce8f2b8 SHA512 b85a2016661afd89372b4549036adb4600f6eaa4e84b007ed711564393054ea222d41cff8fa81bc480eb0a14486bfc7fa5c25cad1687c6552bc96253c5376279
+MISC metadata.xml 336 BLAKE2B 2aacd2986e49a9d1a9ee34cde95d025db68f8c9aa85f8eaf24da827ba7da5354fb8c312c209d378060886492bc5987cf6782c03c58168100ffe9cbbb28e0fb3b SHA512 1b4fae61bd9a13212818fdb2602b3cbd9571066a507a89ee6ca2deec79602ef7508b234b0a684f66bcafb772318d55b94d1d91ba9823354f8984a171267e90fe
diff --git a/sys-cluster/pconsole/files/pconsole-1.0-exit-warn.patch b/sys-cluster/pconsole/files/pconsole-1.0-exit-warn.patch
index f306d6408ee8..f06d46ba6b53 100644
--- a/sys-cluster/pconsole/files/pconsole-1.0-exit-warn.patch
+++ b/sys-cluster/pconsole/files/pconsole-1.0-exit-warn.patch
@@ -1,5 +1,5 @@
---- pconsole.c	2001-04-09 12:51:49.000000000 +0400
-+++ pconsole.c~vox	2004-08-16 11:37:49.606267087 +0400
+--- a/pconsole.c	2001-04-09 12:51:49.000000000 +0400
++++ b/pconsole.c	2004-08-16 11:37:49.606267087 +0400
 @@ -28,6 +28,7 @@
  #include "Conn.h"
  
diff --git a/sys-cluster/pconsole/metadata.xml b/sys-cluster/pconsole/metadata.xml
index 4a09d7ba8d61..e0f52c2e3959 100644
--- a/sys-cluster/pconsole/metadata.xml
+++ b/sys-cluster/pconsole/metadata.xml
@@ -5,4 +5,7 @@
 	<email>cluster@gentoo.org</email>
 	<name>Gentoo Cluster Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">walterdejong/pconsole</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/pconsole/pconsole-1.0-r3.ebuild b/sys-cluster/pconsole/pconsole-1.0-r3.ebuild
deleted file mode 100644
index e071f8b28ba4..000000000000
--- a/sys-cluster/pconsole/pconsole-1.0-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tool for managing multiple xterms simultaneously"
-HOMEPAGE="http://www.heiho.net/pconsole/"
-SRC_URI="http://www.xs4all.nl/~walterj/pconsole/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/ssh"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-exit-warn.patch
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" \
-		CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	dobin pconsole || die
-	fperms 4110 /usr/bin/pconsole || die
-	dodoc ChangeLog README.pconsole || die
-	dohtml public_html/pconsole.html || die
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Warning:"
-	ewarn "pconsole installed with suid root!"
-	echo
-}
diff --git a/sys-cluster/pconsole/pconsole-1.0-r4.ebuild b/sys-cluster/pconsole/pconsole-1.0-r4.ebuild
new file mode 100644
index 000000000000..1d6ce3d826e4
--- /dev/null
+++ b/sys-cluster/pconsole/pconsole-1.0-r4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tool for managing multiple xterms simultaneously"
+HOMEPAGE="https://github.com/walterdejong/pconsole"
+SRC_URI="http://www.xs4all.nl/~walterj/pconsole/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+PATCHES=( "${FILESDIR}"/${P}-exit-warn.patch )
+
+src_compile() {
+	emake LFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin pconsole
+	fperms 4110 /usr/bin/pconsole
+	dodoc ChangeLog README.pconsole public_html/pconsole.html
+}
+
+pkg_postinst() {
+	ewarn "Warning:"
+	ewarn "pconsole installed with suid root!"
+}
diff --git a/sys-cluster/teleport/Manifest b/sys-cluster/teleport/Manifest
index 5e1d46a511db..b659b5f45921 100644
--- a/sys-cluster/teleport/Manifest
+++ b/sys-cluster/teleport/Manifest
@@ -1,12 +1,11 @@
-AUX teleport-2.6.yaml 4823 BLAKE2B ed9fc1cf1d70872fb7e0798707f4bc6b121a0ac417a5062451937240abd9f51999a8990bdf6714abd9517118aa9dc87c2bfbf4f8b8e9e309a080cc5e04f10d68 SHA512 1430a78b89fd758e967acf76c3166b9c50017d6df2f4e6e23b6e683c39e5a1e5cb13012dc218482f38abaca14d45b7df7ba0a55d1598f13dd2c46732d12f1b45
 AUX teleport.conf.d 442 BLAKE2B 089128fa5d277f5b7cda5d054a079c4cfd7990b503df2ac6818c83f79ea73b7ded2abf7eed2a66cd32394483e5494502355837e03883085db8afd92e537bfb47 SHA512 e50e3d0030e467afcfaf42c8f56ba1c0397e3dc6a445981b3f1533d7a0a9e550aabdc8bff394a5b01e44d3445b1981e2e955ea38b079386f675df8a37d7d20de
 AUX teleport.init.d 940 BLAKE2B a3b5fd197e6d8e173903aac6e9db4a684a986ab7d52227d40128ec16457990e78bc8345153b3c87558d3073b6acc7337050f4d21aa9f41acde8334aae8fc1c3e SHA512 9dd26daa519e9fef30b25ef5af505b8b35d8566eaa02f0ec47a6f7805227e94eb25ffb8fd007b73e7c3a91f9e783d47391c55dd8d659d683770aa9d5a02df923
 AUX teleport.service 310 BLAKE2B 410a8ca2e1273a0b9ef1ad93f4ff21f71ecedc979e52eb4f7e1b807b5434fba2b88bd1e0a5544ac68489d6e0db641cda4d76e606bed9cc96527156088b9b088b SHA512 72a43cce5f16bbed63e3b25917d3a4d63641b735acf63975c13c3cd2624c7971f40dc697d1da0d9b94b54e675e051d0a4e863696f7ebcea14f1c4b86e9e1218b
 AUX teleport.service.conf 90 BLAKE2B 7f12f281d73ac6573c882a7910e400f901ff6392e0c576e4b7076972f4ced046f709c8898766aaf38cc38fbfcf450b526d3045ff859eed2a48e19dbd92ec3131 SHA512 d17faa0deaf3c864e5159d3567e542e36d09c6ea0ac91c663d3ae9729d1bccf7d2139f1f48fec132eccc473e023ffdaed0b8f2ee75db5dedc6ff36f637f68e1c
-AUX teleport.yaml 5177 BLAKE2B 8280b9924497af772574faad5d01351d9c49dd1916dca8e3e0384579e7628b2c0b1833b72882231bfef4ae11b2fa9820a4785393ea8c9d00aef105263bbf5c15 SHA512 f9f854472d469d0822d5766517cc68364feca4f3345a69d616d073aaaf9af7be6f72aa55c7d0c801426c3fef42714c09b884e0e086a58a07208ebef0ffe3ca80
-DIST teleport-2.5.8.tar.gz 16219666 BLAKE2B dd64ef4ca5b26e025e46c88d58e7ec226810b583c4b740416f6cc0caec5ea7d050c732368917ec34c5f8a36c7670d2903baa6c32203a2c5cac972e3a2b4bcbbb SHA512 070eebc889adde017641a833ee0e414c5f56848ac36fa96fb66e83062212307904e8264da758042765ba13d6a0c1b4f5314c1b0e90a2c37723ef1c0aa22889be
+AUX teleport.yaml 4823 BLAKE2B ed9fc1cf1d70872fb7e0798707f4bc6b121a0ac417a5062451937240abd9f51999a8990bdf6714abd9517118aa9dc87c2bfbf4f8b8e9e309a080cc5e04f10d68 SHA512 1430a78b89fd758e967acf76c3166b9c50017d6df2f4e6e23b6e683c39e5a1e5cb13012dc218482f38abaca14d45b7df7ba0a55d1598f13dd2c46732d12f1b45
 DIST teleport-2.6.7.tar.gz 16655508 BLAKE2B a020ab999b7503cb7aec54ed81532baf9d08b98000f2c659f63859d89f7f2b5fb311c41d6fcafb7d9bf72ea1c97eecfc6ac621b7c90d74f5afe2717edb8b0402 SHA512 45002dcf7b99108ca6fffae94d6608188eb9b0bea05cd14068618bfb11c496cad5546e261f349fee70f2acb574e7fc44093683dd991001e01406da6982c5c4c3
-EBUILD teleport-2.5.8.ebuild 1302 BLAKE2B 052c06f2b2b00694483212d92e889e38f03e8e7834afeff7b9cdecde2397c82ff5e5ea6647e0e7c6c1a364a6c88f1be1ece55a38bd2d3c6fd0f8a91ce5b69838 SHA512 d8a4fab271d5cf26f76374914186f350f2740aa3fa696776d50b25f891d46a30d03757a4a527638eb60f32a881f32bc443a56d8cf274018db526f63b6f74aba5
-EBUILD teleport-2.6.7.ebuild 1253 BLAKE2B 3bfec03d58f100e08942cc138961af2b18e517db8551b495a2882824145f85c1c2e8434343ed84583b967d60de1414214f7b14f9c9c110cbdfbdbc067e69dd1e SHA512 ab51cd95e9e3ba9bf2c032dfa808c6d7fbd7d6819d83ba8fce0fe62d118e3788d09cc469b7a0d117f8058941ed1c2ba55a7b8621d131076d84c861946ee5dccd
+DIST teleport-2.7.1.tar.gz 18222601 BLAKE2B 86852a1c7f0b083d8fc46bb2e51e287f0d54ca8bd1a6306e21ad325b6f1487682f853eb313a1f6f6fc4dc4d25d93e909ed65dad6d00eb37f878904d6df30f98c SHA512 703056eb99aa91062c8d9cfa7852e3573c8968ce9dea0ff5b076d5225caf8d67b965948a47785cdc7e4341993ef3ed005677859d37653f7d22c05cb2db51efd7
+EBUILD teleport-2.6.7.ebuild 1249 BLAKE2B 01c6f8a1581bc6fd38569b67721f4e5a24447cd9c6ccf625bba939605663f5bb643e343d6c46da1091bc872d64d049e639a4be55a5a375c20ddb59d609c9e119 SHA512 c921673cf7955253255dd41b7f53954acce2a9b53b55b88c7385bf65d087b084159152966d172151f5567a67c3794c50fc5756f871ffd1b0e5c3253553ac2cc8
+EBUILD teleport-2.7.1.ebuild 1249 BLAKE2B 01c6f8a1581bc6fd38569b67721f4e5a24447cd9c6ccf625bba939605663f5bb643e343d6c46da1091bc872d64d049e639a4be55a5a375c20ddb59d609c9e119 SHA512 c921673cf7955253255dd41b7f53954acce2a9b53b55b88c7385bf65d087b084159152966d172151f5567a67c3794c50fc5756f871ffd1b0e5c3253553ac2cc8
 EBUILD teleport-9999.ebuild 1237 BLAKE2B 8b5f4312a98799074029bbb3ccc66105ba7534434b4a553905e467114fccfb2ae0636c71fe2d6556dff2c5fa2667fe9f8e36a36df74e7bf21fa4c3ff7da85a1e SHA512 e526b41dc228bbf1143ea15e879360e94e4ad6dd10764f4d31a07eb682605247ba4d653ed3d91f0e0dc076c015c796d9a24a2ff6bccbd91c73510385ca9d3030
 MISC metadata.xml 630 BLAKE2B ad22bb63ecf79ddd45b62fe0dcadd6d0d7fd475938b18ec868b56b0f4afe7ee5d3e0908eb0b13249a7c7b5031a3296bec406fea6fb487069a087c9e29dcf0ef2 SHA512 2aa911f2a91bfdea340b38715d69cbe59bcd460d34ac6d1d641f2badf2ba72f4e02cdd2f8a2ca387c9a9d19ea2c22e2be80ab4bb582d9395c1517b818f343c74
diff --git a/sys-cluster/teleport/files/teleport-2.6.yaml b/sys-cluster/teleport/files/teleport-2.6.yaml
deleted file mode 100644
index 384dea937c97..000000000000
--- a/sys-cluster/teleport/files/teleport-2.6.yaml
+++ /dev/null
@@ -1,130 +0,0 @@
-# By default, this file should be stored in /etc/teleport.yaml
-## IMPORTANT ##
-#When editing YAML configuration, please pay attention to how your editor handles white space. YAML requires consistent handling of tab characters
-# This section of the configuration file applies to all teleport
-# services.
-teleport:
-    # nodename allows to assign an alternative name this node can be reached by.
-    # by default it's equal to hostname
-    # nodename: graviton
-
-    # Data directory where Teleport keeps its data, like keys/users for 
-    # authentication (if using the default BoltDB back-end)
-    data_dir: /var/lib/teleport
-
-    # one-time invitation token used to join a cluster. it is not used on 
-    # subsequent starts
-    auth_token: xxxx-token-xxxx
-
-    # when running in multi-homed or NATed environments Teleport nodes need 
-    # to know which IP it will be reachable at by other nodes
-    # public_addr: 10.1.0.5
-
-    # list of auth servers in a cluster. you will have more than one auth server
-    # if you configure teleport auth to run in HA configuration
-    auth_servers: 
-        - localhost:3025
-
-    # Teleport throttles all connections to avoid abuse. These settings allow
-    # you to adjust the default limits
-    connection_limits:
-        max_connections: 1000
-        max_users: 250
-
-    # Logging configuration. Possible output values are 'stdout', 'stderr' and 
-    # 'syslog'. Possible severity values are INFO, WARN and ERROR (default).
-    log:
-        output: stderr
-        severity: ERROR
-
-    # Type of storage used for keys. You need to configure this to use etcd
-    # backend if you want to run Teleport in HA configuration.
-    storage:
-        type: bolt
-
-# This section configures the 'auth service':
-auth_service:
-    enabled: yes
-
-    # defines the types and second factors the auth server supports
-    authentication:
-        # second_factor can be off, otp, or u2f
-        second_factor: otp
-
-        # this section is only used if using u2f
-        u2f:
-            # app_id should point to the Web UI.
-            app_id: https://localhost:3080
-
-            # facets should list all proxy servers.
-            facets:
-            - https://localhost
-            - https://localhost:3080
-
-    # IP and the port to bind to. Other Teleport nodes will be connecting to
-    # this port (AKA "Auth API" or "Cluster API") to validate client 
-    # certificates 
-    listen_addr: 0.0.0.0:3025
-
-    # Pre-defined tokens for adding new nodes to a cluster. Each token specifies
-    # the role a new node will be allowed to assume. The more secure way to 
-    # add nodes is to use `ttl node add --ttl` command to generate auto-expiring 
-    # tokens. 
-    #
-    # We recommend to use tools like `pwgen` to generate sufficiently random
-    # tokens of 32+ byte length.
-    tokens:
-        - "proxy,node:xxxxx"
-        - "auth:yyyy"
-
-    # Optional "cluster name" is needed when configuring trust between multiple
-    # auth servers. A cluster name is used as part of a signature in certificates
-    # generated by this CA.
-    # 
-    # By default an automatically generated GUID is used.
-    #
-    # IMPORTANT: if you change cluster_name, it will invalidate all generated 
-    # certificates and keys (may need to wipe out /var/lib/teleport directory)
-    cluster_name: "main"
-
-# This section configures the 'node service':
-ssh_service:
-    enabled: yes
-    # IP and the port for SSH service to bind to. 
-    listen_addr: 0.0.0.0:3022
-    # See explanation of labels in "Labeling Nodes" section below
-    labels:
-        role: master
-        type: postgres
-    # List (YAML array) of commands to periodically execute and use
-    # their output as labels. 
-    # See explanation of how this works in "Labeling Nodes" section below
-    commands:
-    - name: hostname
-      command: [/usr/bin/hostname]
-      period: 1m0s
-    - name: arch
-      command: [/usr/bin/uname, -p]
-      period: 1h0m0s
-
-# This section configures the 'proxy servie'
-proxy_service:
-    enabled: yes
-    # SSH forwarding/proxy address. Command line (CLI) clients always begin their
-    # SSH sessions by connecting to this port
-    listen_addr: 0.0.0.0:3023
-
-    # Reverse tunnel listening address. An auth server (CA) can establish an 
-    # outbound (from behind the firewall) connection to this address. 
-    # This will allow users of the outside CA to connect to behind-the-firewall 
-    # nodes.
-    tunnel_listen_addr: 0.0.0.0:3024
-
-    # The HTTPS listen address to serve the Web UI and also to authenticate the 
-    # command line (CLI) users via password+HOTP
-    web_listen_addr: 0.0.0.0:3080
-
-    # TLS certificate for the HTTPS connection. Configuring these properly is 
-    # critical for Teleport security.
-    https_key_file: /etc/teleport/teleport.key
-    https_cert_file: /etc/teleport/teleport.crt
diff --git a/sys-cluster/teleport/files/teleport.yaml b/sys-cluster/teleport/files/teleport.yaml
index e297bb89b571..384dea937c97 100644
--- a/sys-cluster/teleport/files/teleport.yaml
+++ b/sys-cluster/teleport/files/teleport.yaml
@@ -1,5 +1,6 @@
 # By default, this file should be stored in /etc/teleport.yaml
-
+## IMPORTANT ##
+#When editing YAML configuration, please pay attention to how your editor handles white space. YAML requires consistent handling of tab characters
 # This section of the configuration file applies to all teleport
 # services.
 teleport:
@@ -17,7 +18,7 @@ teleport:
 
     # when running in multi-homed or NATed environments Teleport nodes need 
     # to know which IP it will be reachable at by other nodes
-    # advertise_ip: 10.1.0.5
+    # public_addr: 10.1.0.5
 
     # list of auth servers in a cluster. you will have more than one auth server
     # if you configure teleport auth to run in HA configuration
@@ -43,19 +44,10 @@ teleport:
 
 # This section configures the 'auth service':
 auth_service:
-    # Turns 'auth' role on. Default is 'yes'
     enabled: yes
 
-    # Turns on dynamic configuration. Dynamic configuration defines the source
-    # for configuration information, configuration files on disk or what's
-    # stored in the backend. Default is false if no backend is specified,
-    # otherwise if backend is specified, it is assumed to be true.
-    dynamic_config: false
-
     # defines the types and second factors the auth server supports
     authentication:
-        # type can be local or oidc
-        type: local
         # second_factor can be off, otp, or u2f
         second_factor: otp
 
@@ -97,9 +89,7 @@ auth_service:
 
 # This section configures the 'node service':
 ssh_service:
-    # Turns 'ssh' role on. Default is 'yes'
     enabled: yes
-
     # IP and the port for SSH service to bind to. 
     listen_addr: 0.0.0.0:3022
     # See explanation of labels in "Labeling Nodes" section below
@@ -119,9 +109,7 @@ ssh_service:
 
 # This section configures the 'proxy servie'
 proxy_service:
-    # Turns 'proxy' role on. Default is 'yes'
     enabled: yes
-
     # SSH forwarding/proxy address. Command line (CLI) clients always begin their
     # SSH sessions by connecting to this port
     listen_addr: 0.0.0.0:3023
diff --git a/sys-cluster/teleport/teleport-2.5.8.ebuild b/sys-cluster/teleport/teleport-2.5.8.ebuild
deleted file mode 100644
index 597ac0e391f4..000000000000
--- a/sys-cluster/teleport/teleport-2.5.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build systemd
-
-DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
-HOMEPAGE="https://gravitational.com/teleport"
-
-EGO_PN="github.com/gravitational/${PN}/..."
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 golang-vcs
-	EGIT_REPO_URI="https://github.com/gravitational/${PN}.git"
-else
-	inherit golang-vcs-snapshot
-	SRC_URI="https://github.com/gravitational/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-IUSE=""
-LICENSE="Apache-2.0"
-RESTRICT="test strip"
-SLOT="0"
-
-DEPEND="app-arch/zip"
-RDEPEND=""
-
-src_prepare() {
-	default
-
-	sed -i -e 's/-j 3/-j 1/g' src/${EGO_PN%/*}/Makefile || die
-}
-
-src_compile() {
-	BUILDFLAGS="" GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full
-}
-
-src_install() {
-	keepdir /var/lib/${PN} /etc/${PN}
-	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
-
-	insinto /etc/${PN}
-	doins "${FILESDIR}"/${PN}.yaml
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
-}
-
-src_test() {
-	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} test
-}
diff --git a/sys-cluster/teleport/teleport-2.6.7.ebuild b/sys-cluster/teleport/teleport-2.6.7.ebuild
index a187d11ee22a..4a7a27e42a48 100644
--- a/sys-cluster/teleport/teleport-2.6.7.ebuild
+++ b/sys-cluster/teleport/teleport-2.6.7.ebuild
@@ -35,7 +35,7 @@ src_install() {
 	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
 
 	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}-2.6.yaml ${PN}.yaml
+	newins "${FILESDIR}"/${PN}.yaml ${PN}.yaml
 
 	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
diff --git a/sys-cluster/teleport/teleport-2.7.1.ebuild b/sys-cluster/teleport/teleport-2.7.1.ebuild
new file mode 100644
index 000000000000..4a7a27e42a48
--- /dev/null
+++ b/sys-cluster/teleport/teleport-2.7.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build systemd
+
+DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
+HOMEPAGE="https://gravitational.com/teleport"
+
+EGO_PN="github.com/gravitational/${PN}/..."
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 golang-vcs
+	EGIT_REPO_URI="https://github.com/gravitational/${PN}.git"
+else
+	inherit golang-vcs-snapshot
+	SRC_URI="https://github.com/gravitational/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+IUSE="pam"
+LICENSE="Apache-2.0"
+RESTRICT="test strip"
+SLOT="0"
+
+DEPEND="app-arch/zip"
+RDEPEND="pam? ( sys-libs/pam )"
+
+src_compile() {
+	BUILDFLAGS="" GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full
+}
+
+src_install() {
+	keepdir /var/lib/${PN} /etc/${PN}
+	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
+
+	insinto /etc/${PN}
+	newins "${FILESDIR}"/${PN}.yaml ${PN}.yaml
+
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
+}
+
+src_test() {
+	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} test
+}
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 390eaf13891d..f0d64fade05b 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -2,4 +2,4 @@ AUX bash_completion 7568 BLAKE2B 853a448c7675888ae8e8a79218c2f156684a0189e27e94a
 DIST util-vserver-0.30.216-pre3120.tar.gz 990833 BLAKE2B a9227d4b4074300f188617c48ec7884f8cf34e8b2c2685eab7678b00fbca6ea5ad4bc9dd926f88e49633165b0402802a3077d029ee4c75447112705fdb41ca4c SHA512 eca7680a8b06fecd678b4dad5824c92b53d872b3e7ec9cc275425437fb7fcfb3991f58770096f20d8274e37927a39b64ed9db082ef806e76d0c603b2cd64ef32
 EBUILD util-vserver-0.30.216_pre3120-r1.ebuild 2587 BLAKE2B 9b809d0457bf6280a2e48bc1bed38e2349595df9a3f5467bf6d27441c0fc2370de4ac9782304b0e611bec80fb8f997119ff5495f1177455558ce3cd53252b071 SHA512 50ca8ce43ebd0b107f5b164c16b8cdb4aba3fdc445ef33f3f5a2d20f7bb2a8aa7d58e688e7fac8950377c77e28ea3cb16cdb3a695402129863dcc707b8839e66
 EBUILD util-vserver-0.30.216_pre3120.ebuild 2636 BLAKE2B d7feb7dfd1ebdc2096a89499009fd38e22155d9b69ea0ffac7b828bfea33bbc469ec951c3b8b911b5f22a03974e71d1d032c6cbd1c3abb48c0d75a4f15b3822f SHA512 7a2be4456a29ee7abb0b0b612624c5e642f50789cf430edea9146e412e6b14324de90c2cc52c44a0313b9365017876910f545e9db8cb87647b3328684d04ff0e
-MISC metadata.xml 826 BLAKE2B 2e042209da50699b4f9eb5e190c7cd4bca6ac8ef5bf5209e31427e37370b177bb6eb998b1c373779ad8cd073b3b97d54d3084baf40e5f9f6ff20a4fd6b4fbff7 SHA512 00a80f74087a57e6c6de437fea22d4b44924d57b45b2e8df7644b7709930ef8b5ef0219277bdb2bc04b21b25ef17a19f2627ec86893f66b0021cdb4f60155d3f
+MISC metadata.xml 608 BLAKE2B 08f33a158673400b65c252f2baefce7e21cbc227ff8e8f0d5fb0470dfb721d8c1936784958d67b9575ba56bd466af4d8a7c369d8712ff9d600f45b48cd88c9c6 SHA512 38db9a382d90e296630c14ab82f175f955f82429fb1dae2e63c1b8cc9924dc527772bd5d6aa302a41dbacc2d3d330e2bc67a010570179c265ebd6f377d214931
diff --git a/sys-cluster/util-vserver/metadata.xml b/sys-cluster/util-vserver/metadata.xml
index 6d0f75926dd9..39c113a225e0 100644
--- a/sys-cluster/util-vserver/metadata.xml
+++ b/sys-cluster/util-vserver/metadata.xml
@@ -5,14 +5,6 @@
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>ccx@volny.cz</email>
-		<name>Jan Pobrislo</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		util-vserver is a Linux virtual server utility framework,
 		allowing an administrator to set up multiple, isolated
diff --git a/sys-cluster/zookeeper-bin/Manifest b/sys-cluster/zookeeper-bin/Manifest
index 3a9e56027b1c..4e0aa38183a4 100644
--- a/sys-cluster/zookeeper-bin/Manifest
+++ b/sys-cluster/zookeeper-bin/Manifest
@@ -4,7 +4,9 @@ AUX zookeeper.initd 373 BLAKE2B c60740f691d186861e3f101c84e5904774de6235a0423f4f
 DIST zookeeper-3.4.10.tar.gz 35042811 BLAKE2B c17100d2179688665cfc9efededd378543492e2a839df9da7ab72097b954200c527375cadae1d7b30d83c511c21c1470d0b86a4a19df5abe0c82980920cad92f SHA512 4c54e40ac8d0b267db4a188a30e39ed0ac2c3e8a8fadaf244be45ff5adee956df28f6cb9f1eb56f175e924fa3629b64f98286a090c46764c91c017613c80a51b
 DIST zookeeper-3.4.11.tar.gz 36668066 BLAKE2B 4bf963d41280bd6227b4e81721576bf1f973a765c7049e78c5fae4d9dbc7e4d034304208af0f68b894bd4624e1945c9e4492b3217ff7f0e05d9b822c1843d96d SHA512 1ed2df11dbff2fbbb70d992d02427c4f694ccb4fe493db10a087b04d934b132b970956099edbdf1c2c636d5eb248bca1528846fcb449ae8bee4b9a82f7936f9e
 DIST zookeeper-3.4.12.tar.gz 36667596 BLAKE2B e4aac98f86fc4fcc576ecfb55381fd37efe3fa56cebc1632abda59b6ba71fecca17ace29124ef9f59ca0de627ff463f9d6fc7ff7fbbe77c2bbf30ae25a9f99f8 SHA512 026c7feb4a660bf8d99b1b719fec2b7e4603c3c46f2b77bac372df15ed0ceb4d971aa9c954082d61d73929ef8dc38c31693604ae75244f746cafb4eb6e67320c
+DIST zookeeper-3.4.13.tar.gz 37191810 BLAKE2B 994eecf982a19bbf3ae648c5d140746f5836f0f5d8921ed005ebccdedf0098591005b9038eb75fc660b48ae12b09b8db9dd68d3ac3b4ac9f847de214996e1efd SHA512 3481bd19945d80848f81d9dc2896a682ae8b62269b8164ffbae532e55aa4219961403e0208c8e72cf784605eae436d70ddae2b26e0deba0f1f84c74188c32c0a
 EBUILD zookeeper-bin-3.4.10.ebuild 1956 BLAKE2B 09d13cfe913fb3626e25ca677fa38bb7d23220424fc34745b04ae9a8e85d9c103ee6c82b856c732df89f70810eb17c3f01d9b7ad98fedf7b8a09534c58108ce6 SHA512 21b72660fbd7cfe4aa3b9a6af3d04641e2cee78b0eaf249ef678a93d1c1cb8aee1f12ff61152f9d33fed1a880956e54fbd5c7141916976eeec5679423675f437
 EBUILD zookeeper-bin-3.4.11.ebuild 1956 BLAKE2B 09d13cfe913fb3626e25ca677fa38bb7d23220424fc34745b04ae9a8e85d9c103ee6c82b856c732df89f70810eb17c3f01d9b7ad98fedf7b8a09534c58108ce6 SHA512 21b72660fbd7cfe4aa3b9a6af3d04641e2cee78b0eaf249ef678a93d1c1cb8aee1f12ff61152f9d33fed1a880956e54fbd5c7141916976eeec5679423675f437
 EBUILD zookeeper-bin-3.4.12.ebuild 1956 BLAKE2B 96cb31edbc31b9da04f51d1b94adb1e403a106e3d1fa8e50eed7a144f0c57c0769b17df4135a07ba218bb25aa5ae6784f143406cc56ff0bb1fa77463b07234ce SHA512 18e2c107a885f3dac119029738870615dbc4613f5cb707c8d689ab50f1c1c9b868e6d804e3f4aa7ccd3a578034df4cd03e9652f120fe0ea88a8000dd47a4b180
+EBUILD zookeeper-bin-3.4.13.ebuild 2076 BLAKE2B fdf9459c8ee9e1e895c98272b3d2e9a2608be4efe2b41934fd8d95cfb561608981f270a50bb9e95d37b6c6fd6dd6eeecf8a7fc63bcb4d2946693e47afee82350 SHA512 e1b963cceeb053d9d57f481edd9c0d56b3a3069aaf3f3f20bdfcf453d31b8c48358b2448e20adc45582bc4e1bbd10fb5c7e0d2879ea2131728d5eea7080fbdbc
 MISC metadata.xml 377 BLAKE2B ab2582cf60510f072415cc1dd008bd744f66d76fe6b34b779eba8acf7c28a0d055d70d16c2712af7324b6b11193ed2526b6b8bb1b101084e8a5ca8d96993ef3d SHA512 2ad1600101d36b70c32cb76894e55f01717a544d689bd28ffb41a727d7d23b6f8e9565eea71f252a721bcd4e516692921796f24266485a216a6015a5a9e74f26
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild
new file mode 100644
index 000000000000..0ed0f10b5ef0
--- /dev/null
+++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils java-utils-2 user
+
+MY_P="zookeeper"
+MY_PN=${MY_P}-${PV}
+
+DESCRIPTION="A high-performance coordination service for distributed applications."
+HOMEPAGE="http://zookeeper.apache.org/"
+SRC_URI="mirror://apache/${MY_P}/${MY_PN}/${MY_PN}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror binchecks"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.7"
+
+S=${WORKDIR}/${MY_PN}
+
+INSTALL_DIR=/opt/${PN}
+export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
+
+pkg_setup() {
+	enewgroup zookeeper
+	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
+}
+
+src_prepare() {
+	# python
+	sed -e "s|src/c/zookeeper.c|zookeeper.c|g" \
+		-e "s|../../../|${S}|g" \
+		-i contrib/zkpython/src/python/setup.py || die
+
+	# whyyyy u -Werror ?! so horribal!
+	sed -e 's/-Werror//g' -i src/c/Makefile.* || die "Failed to rectify the Makefile"
+}
+
+src_configure() {
+	cd "${S}"/src/c || die
+	econf
+}
+
+src_compile() {
+	cd "${S}"/src/c || die
+	emake
+}
+
+src_install() {
+	local DATA_DIR=/var/lib/${MY_P}
+
+	# python
+	cd "${S}"/contrib/zkpython/ || die
+	mv src/python/setup.py .
+	mv src/c/* .
+	python_foreach_impl distutils-r1_src_install
+	cd "${S}" || die
+
+	# cleanup sources
+	rm -rf src/ || die
+	rm bin/*.cmd || die
+
+	keepdir "${DATA_DIR}"
+	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
+	cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
+
+	dodir "${INSTALL_DIR}"
+	cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
+
+	# data dir perms
+	fowners zookeeper:zookeeper "${DATA_DIR}"
+
+	# log dir
+	keepdir /var/log/zookeeper
+	fowners zookeeper:zookeeper /var/log/zookeeper
+
+	# init script
+	newinitd "${FILESDIR}"/zookeeper.initd zookeeper
+	newconfd "${FILESDIR}"/zookeeper.confd zookeeper
+
+	# env file
+	cat > 99"${PN}" <<-EOF
+		PATH=${INSTALL_DIR}/bin
+		CONFIG_PROTECT=${INSTALL_DIR}/conf
+	EOF
+	doenvd 99"${PN}" || die "doenvd failed"
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index a411f8ab1863..c9f95d638c8a 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index f80ed70b75c2..045e2ac8ce39 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -15,10 +15,8 @@ DIST binutils-2.29.tar.bz2 29073316 BLAKE2B 0eb7bbefa1ac5f4d753ca9328d339a466d4f
 DIST binutils-2.30-patches-2.tar.xz 490272 BLAKE2B a28a5b5bb8faa33fec269f2c69d6ed0e4e7d5a9169861aa4b3c45511794e1e749c216862a8258c2029f1b40c511dcb2a0aeaecda57e75d52418f10d6f345718f SHA512 1686d5b58ee968f2000647acab2bee4c263d1c85fd43fed8c820fccfc0d7024a01211e7853cd5ce452fa90da500bc17309edf6dbc901c7fd6fc7b3e3d6f42581
 DIST binutils-2.30-patches-3.tar.xz 548804 BLAKE2B 428a1750233ae3f019e20cb5ed1d8e6fe6455181e8f5961dbfe7b66493d1c42050f889e45c02c1fc1a84d545c9e61f81ad6ffd5afc0b1099a702ccc7637c3abe SHA512 c91e902d1d9fc2e9782df04c93173c3207c771f1c063e2ff12c9336593c954ea3f1b2474a8fc045927d72fe18f7401874059599d100c4a1fd152081f05913d03
 DIST binutils-2.30.tar.xz 20286700 BLAKE2B 2dd5436a15a601011a1950e6082ec00082f5916fb82ce95ceab424fd8dc19f6daa7ac32a149f222ccdcc603354165cc206fde070eaa44fe2cc5e57486efc7868 SHA512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839
-DIST binutils-2.31-patches-1.tar.xz 16692 BLAKE2B ee9c7b344b12073c881eaf6fa80e8cb3187add720a26b60e7ef7db9dc3eb8e6e2b83cd0afb3115c4846aa914f8957554bd010f67af34dc5ad81e676639cf361e SHA512 4004d52327babd00f946b199f71e9eca840e66c65a287730af80b5a69138fe5f946f33c13400e028088238314c644f00b858049f8923948d2e6144dc779c24c0
 DIST binutils-2.31.1-patches-1.tar.xz 10644 BLAKE2B 3c2e09713593fc01d78d45ee4e4ac92020d5de781325c8ea98a5193a36a2a0a814f1b6730ae718ad92f92c5876e8e47d0eee7c42d2fce281cc0b37fadb85c42b SHA512 d701e6e2c9d22ca5c7ac4bf08d9206a6648b299b7b04a053aaabc34fa94d7c5fd074a08e3f3af66365069918d9000986c646430bf2adf94213cbf0d55d6e6c51
 DIST binutils-2.31.1.tar.xz 20467996 BLAKE2B 6b914df1fbb7cf54f2159f71b2c2b09f3f6a569b7a3cb4cf9790d0a3733a7548bc0ea32334a178ed3b56e8b97656ae99c7abaf212601beeaeae9a0884c0f6051 SHA512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30
-DIST binutils-2.31.tar.xz 20445772 BLAKE2B 02d9ef7f8ea0d24682716b6890916d507762b4672a3148192afbbc1d6323b3f3970eb630ec9af5e18c60ba1d4579d49d847e571bcd8b1236c24b04c9e3815481 SHA512 3448a71c42d790569c1159c1042aa520b2d8ac8af7506fb1f2a4199dfb13b39f1c2271a5cb3a643d10c7d8a388a73f190e90503d4793a016da7893473aa1c635
 EBUILD binutils-hppa64-2.25.1.ebuild 649 BLAKE2B 46ddf5d41f1a24566dcb4ea8d935d45267bbe2b437c3ad0c4ec7302acf463ffe818c96d15aa55a2606d74486bbce3418b86fda08b19ed7eef47252fe3e948724 SHA512 8061b215177024cd77e73cf1897a83bf353f7cff162f035ddfc983d1d2f6c1fecb3b5bc0e4275889b45e450ec98133e8d90e9dacd305c101b1cf6002090fb682
 EBUILD binutils-hppa64-2.26.1.ebuild 649 BLAKE2B 7634f79d45f03490a2c5f336fec707880792966bafc8ee07ebc0bf5102d2ba1be51a1a4123b415d6e5e28fee784fbb2fdb86d7cd68a873f941c67286f7edf779 SHA512 8174c2a92d336ecd685eab3a2680bcadd30d7d15205b441d179ade7d3f2e87862062115a45d7ab1e7ab8fe811530f47584ca34d2a2157c09be7468386bfa5d16
 EBUILD binutils-hppa64-2.27.ebuild 650 BLAKE2B 29e8b49ece3105c38b4ac8b12addfa8d157022d306fc014d12f07bf82fc126d8e3fb8655e5b6c74d273a497a203120e00bbd9374df03d06fd0524719aae0978e SHA512 bb28312060d697c45df0deba91c207c57a3ff88134fbfb7a666c3e41370b57004d1e48aca42f7df15e9c2c1f745f7a699b39e0e2a134690be9e24c29e0c9d724
@@ -29,6 +27,5 @@ EBUILD binutils-hppa64-2.29.1.ebuild 676 BLAKE2B bf9da84ae57d3756e147bd875941758
 EBUILD binutils-hppa64-2.29.ebuild 650 BLAKE2B d5fe2e9a8c5fc3d906838e6c0621329e0082d4705d222a2c4d513bcbaf4e5e6cc64582ea8a8e41ae1deda4d8651bc299892990dcf15670eb8fb5248ea9b8333f SHA512 7786209f9e2c4e1fa40ec08b8a4ff1c89d1471a2f438a7b750cb4067b19520a1a9b9be0c46396b2e0d0b9ad4c0f2d82cbacf4e77397661b04d49da45ebac70fa
 EBUILD binutils-hppa64-2.30-r2.ebuild 10688 BLAKE2B 17ad6713868d47398f7a08d4510d0e403ceceb07dd62e6fade49f721f7f3cbe45f2793ad4cc3b52d89e51ace2996b74fa27c05fbd6364cada107f30edfbb44ba SHA512 8226d4dc2d24550222165deb982e97e597c0ef5ddf48ece858a048ea9cf3e6a6cdab1cdfdb5c76d8bf3994b1f7b5c79645ee170de9e6e7c9e873cf2f048ff2af
 EBUILD binutils-hppa64-2.30-r3.ebuild 10689 BLAKE2B 4dc6ce16fa2e3e2e39da1b8eb132de17e98dbc86878454192d52fcecbe834b9b63b5201a36866353fb698d35e6b558074056f22b430d962c356962ec9c9709dd SHA512 d092f185d5dabd98cb3ba6bc6ac5f7355c033ad8b0d94b1a562a75eab0f6fde93bdcfb56dfd724eca5e58c384d21702746617c92eec1561af48f93cb5fda069e
-EBUILD binutils-hppa64-2.31.1.ebuild 10715 BLAKE2B e821a27f1e81207ebcb240e211eadae05462b0878aa0d4eeb49c82b81dfb0f1eef52bac486b3b90efdeaf3608fae63d59376a154844123d02a5780fa18d0d4a1 SHA512 9abc883392cd58b7599ff78f87e07348584da5fef8e99a47850e0401f975273780dafd2702aa3ed20a918e32f42411a7798579a01cf9d9391ff7118dbb1e8a3f
-EBUILD binutils-hppa64-2.31.ebuild 10690 BLAKE2B f83706cedbe55c19834384e421350280f99e6e2f0b76cd1c1e08011dc4eb75afa01758be248aa79b1a706a5c155c2180121d0c71a8a7660ccadc503437f9445b SHA512 5a81ee7937288a0f3bf5d9b463f821582df01a6d344dbd85178c8088cb433afc73e0d00db4d80a3d1b7b3ee84a13220f8326df10993fef041ccc5cf0bbdf3380
+EBUILD binutils-hppa64-2.31.1.ebuild 10714 BLAKE2B 44e639a9bb050a5f9e245145ab29de95defcdd93624a51a5d1b1b045b52d2e7cf8b05d387a21d0accae5fd03238b8f5f3ab8515a42f32b31f00175e29e3a7635 SHA512 25aca58ab25d19650642d8046cbf2271d33087967fd0cfc0ab49e7e174e3becd0ed93152e5a4cf52a04da4281a440dae0cf67019d348fc08ba7da619b9996b41
 MISC metadata.xml 445 BLAKE2B 38db0981b080e996e57421a2c75b2ebb2172ef38c0cfadf4b6105901985e9d46b5ba1c939641747be35cfacb4e1928a9f711465b2e17909a282d0acf244b8be3 SHA512 dd2ce9defb3a005665ad2f495513c40b5420629e31a336f6640ef91c9effc6f062bd338a87fe70de8a6a2993dda9e141396b602a1e2b7445f15e6f33473d29ef
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1.ebuild
index 3abdfc717b01..f885043c8a25 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1.ebuild
@@ -37,7 +37,7 @@ case ${PV} in
 		;;
 esac
 SLOT=$(get_version_component_range 1-2)
-#KEYWORDS="-* ~hppa"
+KEYWORDS="-* ~hppa"
 
 #
 # The Gentoo patchset
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.31.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.31.ebuild
deleted file mode 100644
index 463c8b77f7d1..000000000000
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.31.ebuild
+++ /dev/null
@@ -1,393 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CTARGET=hppa64-${CHOST#*-}
-
-inherit eutils libtool flag-o-matic gnuconfig multilib versionator
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-IUSE="+cxx doc multitarget +nls static-libs test"
-
-# Variables that can be set here:
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-#                      Default: dilfridge :)
-
-PATCH_VER=1
-
-case ${PV} in
-	9999)
-		BVER="git"
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		;;
-	*)
-		BVER=${PV}
-		SRC_URI="mirror://gnu/binutils/binutils-${BVER}.tar.xz https://sourceware.org/pub/binutils/releases/binutils-${BVER}.tar.xz"
-		;;
-esac
-SLOT="${BVER}"
-#KEYWORDS="-* ~hppa"
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${BVER}}
-PATCH_DEV=${PATCH_DEV:-dilfridge}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-if is_cross ; then
-	# The build assumes the host has libiberty and such when cross-compiling
-	# its build tools.  We should probably make binutils itself build a local
-	# copy to use, but until then, be lazy.
-	DEPEND+=" >=sys-libs/binutils-libs-${PV}"
-fi
-
-MY_BUILDDIR=${WORKDIR}/build
-S=${WORKDIR}/${P/-hppa64/}
-
-src_unpack() {
-	case ${PV} in
-		9999)
-			git-r3_src_unpack;
-			;;
-		*)
-			default
-			;;
-	esac
-	mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# This check should probably go somewhere else, like pkg_pretend.
-	if [[ ${CTARGET} == *-uclibc* ]] ; then
-		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
-			die "sorry, but this binutils doesn't yet support uClibc :("
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${BVER}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER}
-	if is_cross ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${BVER}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${BVER}
-	fi
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use cxx ; then
-		myconf+=( --enable-gold )
-		myconf+=( --enable-plugins )
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-	)
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	emake all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${BVER} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}" || die
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${BVER}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${BVER}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-
-	# the hppa64 hack; this should go into 9999 as a PN-conditional
-	# tweak the default fake list a little bit
-	cd "${D}"/etc/env.d/binutils
-	sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${BVER} || die
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${BVER}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then
-		binutils-config ${CTARGET}-${BVER}
-	fi
-}
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index c5b84701b858..14f11d65dd89 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -14,10 +14,8 @@ DIST binutils-2.29.1.tar.bz2 29123355 BLAKE2B 83de518a27bae0f13c57b1979493dd7f7c
 DIST binutils-2.30-patches-2.tar.xz 490272 BLAKE2B a28a5b5bb8faa33fec269f2c69d6ed0e4e7d5a9169861aa4b3c45511794e1e749c216862a8258c2029f1b40c511dcb2a0aeaecda57e75d52418f10d6f345718f SHA512 1686d5b58ee968f2000647acab2bee4c263d1c85fd43fed8c820fccfc0d7024a01211e7853cd5ce452fa90da500bc17309edf6dbc901c7fd6fc7b3e3d6f42581
 DIST binutils-2.30-patches-3.tar.xz 548804 BLAKE2B 428a1750233ae3f019e20cb5ed1d8e6fe6455181e8f5961dbfe7b66493d1c42050f889e45c02c1fc1a84d545c9e61f81ad6ffd5afc0b1099a702ccc7637c3abe SHA512 c91e902d1d9fc2e9782df04c93173c3207c771f1c063e2ff12c9336593c954ea3f1b2474a8fc045927d72fe18f7401874059599d100c4a1fd152081f05913d03
 DIST binutils-2.30.tar.xz 20286700 BLAKE2B 2dd5436a15a601011a1950e6082ec00082f5916fb82ce95ceab424fd8dc19f6daa7ac32a149f222ccdcc603354165cc206fde070eaa44fe2cc5e57486efc7868 SHA512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839
-DIST binutils-2.31-patches-1.tar.xz 16692 BLAKE2B ee9c7b344b12073c881eaf6fa80e8cb3187add720a26b60e7ef7db9dc3eb8e6e2b83cd0afb3115c4846aa914f8957554bd010f67af34dc5ad81e676639cf361e SHA512 4004d52327babd00f946b199f71e9eca840e66c65a287730af80b5a69138fe5f946f33c13400e028088238314c644f00b858049f8923948d2e6144dc779c24c0
 DIST binutils-2.31.1-patches-1.tar.xz 10644 BLAKE2B 3c2e09713593fc01d78d45ee4e4ac92020d5de781325c8ea98a5193a36a2a0a814f1b6730ae718ad92f92c5876e8e47d0eee7c42d2fce281cc0b37fadb85c42b SHA512 d701e6e2c9d22ca5c7ac4bf08d9206a6648b299b7b04a053aaabc34fa94d7c5fd074a08e3f3af66365069918d9000986c646430bf2adf94213cbf0d55d6e6c51
 DIST binutils-2.31.1.tar.xz 20467996 BLAKE2B 6b914df1fbb7cf54f2159f71b2c2b09f3f6a569b7a3cb4cf9790d0a3733a7548bc0ea32334a178ed3b56e8b97656ae99c7abaf212601beeaeae9a0884c0f6051 SHA512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30
-DIST binutils-2.31.tar.xz 20445772 BLAKE2B 02d9ef7f8ea0d24682716b6890916d507762b4672a3148192afbbc1d6323b3f3970eb630ec9af5e18c60ba1d4579d49d847e571bcd8b1236c24b04c9e3815481 SHA512 3448a71c42d790569c1159c1042aa520b2d8ac8af7506fb1f2a4199dfb13b39f1c2271a5cb3a643d10c7d8a388a73f190e90503d4793a016da7893473aa1c635
 DIST binutils-9999-patches-1.tar.xz 10116 BLAKE2B 1ae970fd13ea1b94f554ed5b3fde4b6bdd90efcfc2488efc2f1465511279027c2e7f2a7371069afadb91bf833680a24e1a5df50d3169c9ee132c933b3c1fdba9 SHA512 a5d97d7070b876bf072db2a99a2876c239e03409849b9c93467bd3e70cd97c468110031a09e1c182c05d48004ec3e1651f44a1850b0275a385c3bae598cd98d7
 EBUILD binutils-2.25.1-r1.ebuild 280 BLAKE2B 6c3abc3c6b80becab91ec1f2c88c1f5dba11e862035355a9ce2c029b865865ca58c359f25496c50aa63cadb3ca08de77eb2a86c2d2286441870f65a7a943b42a SHA512 4cc55460454f6ae62fb900bdbce4896279dd27dfc5b09126d8942675970776cafccdd6d7adfdfba74862ee2e84ad7d2be9b7ddc79319a6dfc09b745e16b18a54
 EBUILD binutils-2.26.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bddc950a6b103036e3b8dff1933f9b8d803fe2c85b1497119ee1fb6358c08234cf44eb5a57a43061c815fbd510080 SHA512 322c2cbc01135c2c22afeeeef1a6147e9c896432ee81cee131965013e67d569f49e4017e76d9fec90a00175fd4af2cf0fd3e00ef1e76157f85506e5d33e3035d
@@ -26,8 +24,6 @@ EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bdd
 EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289
 EBUILD binutils-2.30-r2.ebuild 11855 BLAKE2B f4d0d50e0718c867f15c66596cee68fbb539dccc40f2f9e8a52915c418532825eb8449bbbc6fdb057cf64dcf55d11f989cc7329b6025814b0c27b8e3229a7cfe SHA512 661c80866154b049255385bbe36b404e1c25779c5695203aee2b3ddae50000efc19511a6a214582c6c8b8a4e2f28667c9af40154fd08bc6968cfa1d2847b2f5b
 EBUILD binutils-2.30-r3.ebuild 11864 BLAKE2B 18001b8d905368b565e15ab852cb0e18a3354cfc31db5f3799b0d84ab837dabc50a7e0bb2656622c972fb46525b8007fe641f4ef76e837006791ecca9aa46131 SHA512 ddeedc8aa8c1a72ea16855c15e4660e5db335b8d50e45444233c755928eb9138168819e7ea9998759e71dd6582b296445679333363e0f5abe62788d17417999f
-EBUILD binutils-2.31.1.ebuild 11946 BLAKE2B 7e2875532efd8fc52f9604613896b00e2d6bca8fd52812fcc9b5c50c8201164fb20c534ebffbc02ed8c691bcbaf4a6ad9e440dc89adbdf99403972b22b2a8b3a SHA512 1f478898470f11f1b3b1d939ae143d3377098a98385efa01b5372f18137f84acab52b9d1cc7ceff835effa0a9c9b364064aacb3fd53bf82d246531854a1daa38
-EBUILD binutils-2.31.9999.ebuild 11970 BLAKE2B a93befebe54cf9531de140a9275eb7215f367cd072165f05e9e6592746e85ee0b42bd376af7b003c42f0f7432301988867234b32e5904746b373b969b15ec7fb SHA512 a2702494f594ccaf3a0698b9c555a2bd68638937f43ca33b5c4c2bac1ba391ea26e9987e6fc5807b1b160af6ff83af45eee8343ac44a080ccd1ee3564efbdf36
-EBUILD binutils-2.31.ebuild 12037 BLAKE2B ff89a7afccdbfef0a78f73ca192c3c4a70ba5111fa15b20098fada0dbb1e3347cf077ae682e345e5571ce63381704cd8bc7ea94de57e7c420bfa64d9a2f6c20d SHA512 55dd53e0e57496e057132e3977145e7fe8bdc271fe41923e15f8d2d5a7d9501f17427de84e8fb72a97f0cf0e493072998b7eae8c6c501b98fb6f77a470f58692
+EBUILD binutils-2.31.1.ebuild 12065 BLAKE2B d7b31543b2e138b5b586d6509387028af5856bf610cb94f42880be77d0fffb57bfd5ad3bdbca18762afeb1c096b8177fabdae5a452fa3c8f09f7fdcabd83d906 SHA512 fcfd5cf8da131b442cdfeb648cf496e46f1d20aeb259511da17faf9e5866386c653e8de573522174e3e62a2e7d2ea30f4eaf3fe0b3fef0efced6468c6f37f572
 EBUILD binutils-9999.ebuild 11970 BLAKE2B a93befebe54cf9531de140a9275eb7215f367cd072165f05e9e6592746e85ee0b42bd376af7b003c42f0f7432301988867234b32e5904746b373b969b15ec7fb SHA512 a2702494f594ccaf3a0698b9c555a2bd68638937f43ca33b5c4c2bac1ba391ea26e9987e6fc5807b1b160af6ff83af45eee8343ac44a080ccd1ee3564efbdf36
 MISC metadata.xml 447 BLAKE2B 78d0b6e0a34f19d0f90f568fb84fcddbc995eb2c64f9c4feef2545d49322311fc6825b3b208dc03718bd75d550581efbdc9ee26e7f7a6f856902e640f90bf0f5 SHA512 73cb18db3a677767a78d5cab44ca721083ef17b4a158c10a66a186835b57a3d763b6f6753c836620b32ec912834ae8da2148c8fa0e4932170956b92c75169a9d
diff --git a/sys-devel/binutils/binutils-2.31.1.ebuild b/sys-devel/binutils/binutils-2.31.1.ebuild
index 46fc4e24954f..d28b62827bcf 100644
--- a/sys-devel/binutils/binutils-2.31.1.ebuild
+++ b/sys-devel/binutils/binutils-2.31.1.ebuild
@@ -41,6 +41,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(get_version_component_range 1-2)
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 		;;
 esac
 
diff --git a/sys-devel/binutils/binutils-2.31.9999.ebuild b/sys-devel/binutils/binutils-2.31.9999.ebuild
deleted file mode 100644
index b51be8aa269b..000000000000
--- a/sys-devel/binutils/binutils-2.31.9999.ebuild
+++ /dev/null
@@ -1,424 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils libtool flag-o-matic gnuconfig multilib versionator
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-IUSE="+cxx doc multitarget +nls static-libs test"
-
-# Variables that can be set here:
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-#                      Default: dilfridge :)
-
-PATCH_VER=1
-PATCH_BINUTILS_VER=9999
-
-case ${PV} in
-	9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		SLOT=${PV}
-		;;
-	*.9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		EGIT_BRANCH=$(get_version_component_range 1-2)
-		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
-		SLOT=$(get_version_component_range 1-2)
-		;;
-	*)
-		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-		SLOT=$(get_version_component_range 1-2)
-		;;
-esac
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-dilfridge}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-if is_cross ; then
-	# The build assumes the host has libiberty and such when cross-compiling
-	# its build tools.  We should probably make binutils itself build a local
-	# copy to use, but until then, be lazy.
-	DEPEND+=" >=sys-libs/binutils-libs-${PV}"
-fi
-
-MY_BUILDDIR=${WORKDIR}/build
-
-src_unpack() {
-	case ${PV} in
-		*9999)
-			git-r3_src_unpack
-			;;
-		*)
-			;;
-	esac
-	default
-	mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# This check should probably go somewhere else, like pkg_pretend.
-	if [[ ${CTARGET} == *-uclibc* ]] ; then
-		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
-			die "sorry, but this binutils doesn't yet support uClibc :("
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use cxx ; then
-		myconf+=( --enable-gold )
-		myconf+=( --enable-plugins )
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-	)
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}" || die
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/binutils-2.31.ebuild b/sys-devel/binutils/binutils-2.31.ebuild
deleted file mode 100644
index ea7e40bf9672..000000000000
--- a/sys-devel/binutils/binutils-2.31.ebuild
+++ /dev/null
@@ -1,427 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils libtool flag-o-matic gnuconfig multilib versionator
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-IUSE="+cxx doc multitarget +nls static-libs test"
-
-# Variables that can be set here:
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-#                      Default: dilfridge :)
-
-PATCH_VER=1
-
-case ${PV} in
-	9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		SLOT=${PV}
-		;;
-	*.9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		EGIT_BRANCH=${PV%.9999}
-		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
-		SLOT=${PV%.9999}
-		;;
-	*)
-		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-		SLOT=${PV}
-		;;
-esac
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-dilfridge}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-if is_cross ; then
-	# The build assumes the host has libiberty and such when cross-compiling
-	# its build tools.  We should probably make binutils itself build a local
-	# copy to use, but until then, be lazy.
-	DEPEND+=" >=sys-libs/binutils-libs-${PV}"
-fi
-
-MY_BUILDDIR=${WORKDIR}/build
-
-src_unpack() {
-	case ${PV} in
-		*9999)
-			git-r3_src_unpack
-			;;
-		*)
-			;;
-	esac
-	default
-	mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
-	# this file is missing in the 2.31 tarball, affects gold testsuite
-	cp "${FILESDIR}/${P}-test-driver" "${S}/test-driver" || die
-	chmod +x "${S}/test-driver" || die
-
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# This check should probably go somewhere else, like pkg_pretend.
-	if [[ ${CTARGET} == *-uclibc* ]] ; then
-		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
-			die "sorry, but this binutils doesn't yet support uClibc :("
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use cxx ; then
-		myconf+=( --enable-gold )
-		myconf+=( --enable-plugins )
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-	)
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}" || die
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 878114b19cda..8925d11a5e5d 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -72,6 +72,7 @@ DIST gcc-7.3.0-patches-1.4.tar.bz2 8238 BLAKE2B 72a5dcb046558c8f5c3a75040fe24ce1
 DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
 DIST gcc-8.1.0-patches-1.3.tar.bz2 10713 BLAKE2B 3e5cddf5b0c0b9b2bbd2b0aa546dc3aee9bf0e8421656c9260bb7561baa8bb53f7b6ad651bf12d68102fd9e9f97fa17c3306d52a657a46d2dedd16e9a1a74579 SHA512 37c785fbfd801d48c46c65e21d33085c1470942531b8f13c28f933debcec944a1389a50fe0f72afa7dbba25a931959a3ebb1c42911abadd11ee530812f1034bb
 DIST gcc-8.1.0.tar.xz 63372320 BLAKE2B 6465809cf90f4c65c0a82d0390de86c98f954e0b910e2f2de2282b828cca8b6aaf0a5243548854048344ec4840046017887fc0b253fb0ced4238da67ef68f946 SHA512 c96246f34a7aeb404c4525b754dc7f7708a18e06271aadb2b32fef00e6e0940f584e52430bfe2ab01e699c93e3cb418adc113d2622fa826facbec0ec8ce3eb2c
+DIST gcc-8.2.0-patches-1.0.tar.bz2 9805 BLAKE2B 3b732c1e8e63aafd664b3d2a465fb8172c517f54e9581dff8f25afb99db4ae57dfa54437fae4a98561acc4164e53fd21150b5900088b5e92be4393ea90d615e2 SHA512 819eb1acdbfd12105728cbc09349dbdbf22d0f6ede50c38a7108fe278911dcb54b3215713697d7eae77c1e40cb5930bae424f02ae1a1a944f0e3cad0e8ec6b0d
 DIST gcc-8.2.0.tar.xz 63460876 BLAKE2B c5372b0bdfcd2729577dca287b294623b78c583491998404eb307768c573618bdaaedb7d9ae0e39ba41a62a14b9525dff0e3083285754b7f5bb9987ecf635185 SHA512 64898a165f67e136d802a92e7633bf1b06c85266027e52127ea025bf5fc2291b5e858288aac0bdba246e6cdf7c6ec88bc8e0e7f3f6f1985f4297710cafde56ed
 DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
 EBUILD gcc-2.95.3-r10.ebuild 752 BLAKE2B 45764d63636c0fa25a7b7538a814f8e3088e5b584f0ccdfd290064bf2d2282ec0804d5c525736e7d1d97bbdf4798710fd79a71ce8216c9665e3388efb1f34a0b SHA512 88e3a89474f1b46077b74a7c9931cdb7275bedc72d2be4ebb0272f45ae7a64b533fc80263275839a6c67fd2ce5cfde6580d28b613a37608db26b3c62590dbd82
@@ -92,5 +93,5 @@ EBUILD gcc-6.4.0-r1.ebuild 525 BLAKE2B 4ef6e95caec3cd198f9eac05585a691ea6babeca2
 EBUILD gcc-6.4.0-r2.ebuild 593 BLAKE2B 818b2c9e89d0309b5c12b6eda290f40607e2a2cbd456072eaefe9409c3140c614bd2e30618d7204fa0b7caf54f8754a007c17263f3f3e53def586a83d4fe717e SHA512 6ee2a73319826a51d2db816490a04a2c2ce740570089c3bd711243b8b1561b6b14aa7eacb3eaefccd867a1e18d32749b45f1f7c865c3568b62a0fc21dbbcc76e
 EBUILD gcc-7.3.0-r3.ebuild 536 BLAKE2B 0dc56a5a86bb440c0cd3a6ab98fb03bbd7433ea196ca9b02cc9fd38b734be1753b391d59ae081d2d81efe4288968ef4b1665310a229d58f4f637e01fee347d5f SHA512 bf7fbe3e011bb7f0ceba93cdce355a793d11e9d2f5e7747109685a0109db3b4291d42c4c7f0377556617567801935416fc04a8447ed01156357565430d390271
 EBUILD gcc-8.1.0-r3.ebuild 577 BLAKE2B 891a45aa2515e3769f2ae7ec6c618a8cfcf88b9f2832a4f19ae477231823f3fb7d15234b4fcd225e3c51fe6e4c2a445f3a07417529c98c81792fb1550a484ea1 SHA512 3442b806a35ab0f04fe34771c885ee64f7bf218743ad8281c6e8739857ad7145fd4ffe73418378523dc3df1bdb24b423435a45b8b44029cf548b77677c97515e
-EBUILD gcc-8.2.0.ebuild 704 BLAKE2B 4cdfb4b1e94a41e2a3490edb86e5c8a4886eb079c08318030f9b4f6822bbababf37198f09fc8f613d030b75c3452fb4e76ea3adfb408a4fa2889e19d96ce0e53 SHA512 8c47173ab279a5dd85f4a3cc224ed69c77342558c05976cc20cd0c7fb9ad6af9b4a8fc1cb15f19ddd3c58921c4a18e38fd2c36c180fdb8e430f02d8a75ec9366
+EBUILD gcc-8.2.0.ebuild 535 BLAKE2B 017071247f9f0c584428d65ffbc062a52871a8909176f5f9e7cf0827c5ceda64f2cb12d10bfe913f965dcd1de5a8472d318d9d76a7adf31807b193dd61ea7b1c SHA512 31b460cd9d00770bbfd314f6684f81e76215814b697b342a223a66409c0c7f948f0e4a18baf4d658626e7e28ebca76b538e15c5c6e733d5c31c68b8f59d87cc9
 MISC metadata.xml 2591 BLAKE2B ac029d38d0b2001f9d21214ccd272347f16f541cae5b86a00aa24802af42cc5e85a6447c854ca540274b991c77112b6083fd710209a785638ad64f0d4c78292a SHA512 3691a50f215303f18c8624852dba09f9486fc3818a9dac770c1e4c1a4be15b1bc5291e2584ed7e48510160ce264e1eef26126c075cc7d09b62e1963cc84edc7d
diff --git a/sys-devel/gcc/gcc-8.2.0.ebuild b/sys-devel/gcc/gcc-8.2.0.ebuild
index cf75791e9131..3ef4a73216fa 100644
--- a/sys-devel/gcc/gcc-8.2.0.ebuild
+++ b/sys-devel/gcc/gcc-8.2.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI="5"
 
-PATCH_GCC_VER="8.1.0"
-PATCH_VER="1.3"
+PATCH_VER="1.0"
 #UCLIBC_VER="1.0"
 
 inherit toolchain
@@ -20,10 +19,3 @@ DEPEND="${RDEPEND}
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
 fi
-
-src_prepare() {
-	# upstreamed patches since 8.1.0
-	EPATCH_EXCLUDE+=" 93_all_arm-arch.patch 96_all_lto-O2-PR85655.patch"
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index f420e4735c24..2a7745d461a0 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -1,14 +1,9 @@
 AUX make-3.82-darwin-library_search-dylib.patch 386 BLAKE2B 4341e38aa89d08442dde331a7640b95771fb2cad824a32642c8b6bfbcffe609ae1af189d3e49c2eb529cfcbe10e137b9dc34cee3d7aecc8995c9a4459817bc8a SHA512 abd63b6a6d0b3bf77c5f26f0f711d148dd47964564d17562d9714272ff37700afffad50d77d5921c47b1f3eb705112b854ad15933740751071d2579123f9f259
-AUX make-4.1-fix_null_returns_from_ttyname.patch 1888 BLAKE2B 2aee82af5c6d2f8b5fb1d45be2708b6c0f5632236a0be948f16e1e59bd6619145913d4920c8428907479ae29fbc105663f9bbcbd3951ba60b8cead5793b34f65 SHA512 47eb22909be25618fbc120fe5b844207989135101ada960c69557f898b2345c52a25fc329945324cd968f19fc3835330d939cf4ec2faf5ccf5c54e20dc02a1da
 AUX make-4.2-default-cxx.patch 269 BLAKE2B 6bbadfe43e3494c7dbd423edc5caf1eba1b6c3bb8f3b2f04368ccbe5c03f248a2692ba1b2299b966bd630c94e2b66674c079eaafa9b3b3c54bd163e75ac53f9f SHA512 b9c6254c8111111d9986de617023fad1673a8992d5a8b2e1e5ce32a92f5e4d064e1a9677b44f1d647a54ddd1c62782eccfd2d71ddc8d41baee141f65bdc894fe
 AUX make-4.2.1-glob-internals.patch 1752 BLAKE2B 97616f18dcc30dbda296942d7dfa5b1a70c65e6d0c24314c5ae6b30102b81ff5ca0114f9c2a2fa777173204bf5bb0ea9b793317d2d7f7d44ae734e9174c6f361 SHA512 79b5454fa2f1e976611ecf5de99e764d4c9a85917d3d97ce424cd56b0954430f3e31fd2254a30320469f0b30c464734e3633b89d8374b3e4b8d182a342325ab1
 AUX make-4.2.1-glob-v2.patch 1073 BLAKE2B bcced0694ed0206394d750452cec2c0ee8356fd8b779b9ee4d6fbf0d3dd736a0465b0f12a1629508669efb7c4ffe1d17f1aeb9b925d86e9e75a5b90119ddd5c9 SHA512 2f19578979cc5af622d6571e4d9c97e5567acd4036076e9c426a8d4505b6da191cf9b6edb1cecc0aff14efce52d3062c21d10a36d569743acdfc660007f928f4
 AUX make-4.2.1-guile-2.2.patch 11401 BLAKE2B 0bd3c4d813d0205eb2a204f4819fcad3f188bd3a2656e9883643561c82cbf2a58aa22cae46429094856aea76e0396529df3c39aa37f6f69ea9fbc2379e686a62 SHA512 c1c827f1f6400a973fee87d143061c0635b1d37c6aa25b0d1c92a83dc535aff1edf515d92006d029575e10b4199be4ac290a01a8ab433c71e075852274a8ae43
 AUX make-4.2.1-perl526.patch 655 BLAKE2B 98bc8bf7ec5bcdb0d726b046ae58cebada8e360087da4c212da19a4cda622c5bbc1c00782802589aee3142a62c3b8a2df18cfa8bc98c523e2eb65aaa29398a6d SHA512 3817f6efed5fbcd2bb9d1747bea4af5a197ef4aa552ab79accee5139d25241956eca669edd19eff32df2a51fee666b6bc398fb6277b1f92f6175eca2d2228d6e
-DIST make-4.1.tar.bz2 1327342 BLAKE2B 4a93f893d219e2ac16a87f19de018f1d794a1f4c70c2a57dea52ccaa452b288bfbea0e422a880efcb457f666f41a40913a214e0feae4cc7edcebb8ec945bd72c SHA512 3fcaf06660b7a5019937b81ee69fe54cdfe0a24d66286fc5cc6a34fa996d76dfe6fd5bc49ee59b727ae2b24ddca261ada0fdb5873ba2b38dcc63647ad3cdb193
 DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8
-EBUILD make-4.1-r1.ebuild 1294 BLAKE2B 79312e1a1af06a8a44aa014226e5c1dbdb16ffdeeb65053181552257f62231f0f5b0e88287a97c4c6eb721d76e02f4a07ea5f7523329ee5497f3f180034e9de5 SHA512 87afba6be03d935e44f94547d12f1bc265774481a065834694b42f083675fb7b01ad00233321c096e1e93e23436cdacb20933b164687b4713d821daecaaff0d1
-EBUILD make-4.2.1-r2.ebuild 1634 BLAKE2B f8a2a88bd7fb97e3f8723ea977d1b56e4a1030a91fd13f819eb9d2027efe1bee13d6722f2d48b30f6eaddc3d6b2b8d31dda076e95db1330ab30d554d206ee0b7 SHA512 ad948abed2465ee7ab3597a57d5ea1d301249d8dd85be4dda3959885f482df80a0346cb9bd3edc0ccea2cb504b638d4d5ebedff82917d6785dedaef45cd56562
-EBUILD make-4.2.1-r3.ebuild 1675 BLAKE2B 506992c596fd5ed50895e695070b5f7415cfd5e6d1dc877792a8309f3348d02d977fcecc8346aedd6824b314878b1e7bbc8becf0021579502b2dd752e31778a2 SHA512 ddfa50ecba7aa2fe0e1f7dd9b2a75edc0203cbbfb6a2e502408d7a4d7b6cda8994c95c681fca1ec49ae8ff06c1f811cb6a1e364e55bf8b8efec2c93f16297e8c
-EBUILD make-4.2.1.ebuild 1332 BLAKE2B ab744c309f5028fea543a233361ed9841470bac7995e8a28f917eff6b75f62f75f927172a73653d61b7fab316d673d05f0c5b43e70b2f3694b0bb2bea8adcf86 SHA512 53acda59b308a096c8ccb6e571437f2745d6e9ad734780798d2df8b4693e93f2c3fc50646de6c6c5d5c0a9bee6a313c33ae1eb56713166ddfb6f3b4f7e003cb4
+EBUILD make-4.2.1-r3.ebuild 1662 BLAKE2B 996e5bc27c0e26ffef1a876e79f5dfef58cda43a6a676f45bf05aad301cb7c11e5c8cd7c786a2d751720b73f0f276edd3da826f43c6bab422a3e7a345ef1b5cf SHA512 12360a215fa6fc924bcf34bef9c544ac989b6db4cc76463e3134356a1201fc8d73a31d256cbd5b9746a381a4aa3b486b17fc386a70a80fc8f4a7a2d96ff1ee83
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch b/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch
deleted file mode 100644
index f6be5c9f06af..000000000000
--- a/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 292da6f6867b75a5af7ddbb639a1feae022f438f Mon Sep 17 00:00:00 2001
-From: Paul Smith <psmith@gnu.org>
-Date: Mon, 20 Oct 2014 05:54:56 +0000
-Subject: * main.c (main): [SV 43434] Handle NULL returns from ttyname().
-
----
-diff --git a/main.c b/main.c
-index b2d169c..0cdb8a8 100644
---- a/main.c
-+++ b/main.c
-@@ -1429,13 +1429,18 @@ main (int argc, char **argv, char **envp)
- #ifdef HAVE_ISATTY
-     if (isatty (fileno (stdout)))
-       if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT")))
--        define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)),
--                               o_default, 0)->export = v_export;
--
-+        {
-+          const char *tty = TTYNAME (fileno (stdout));
-+          define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME,
-+                                 o_default, 0)->export = v_export;
-+        }
-     if (isatty (fileno (stderr)))
-       if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR")))
--        define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)),
--                               o_default, 0)->export = v_export;
-+        {
-+          const char *tty = TTYNAME (fileno (stderr));
-+          define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME,
-+                                 o_default, 0)->export = v_export;
-+        }
- #endif
- 
-   /* Reset in case the switches changed our minds.  */
-diff --git a/makeint.h b/makeint.h
-index 6223936..2009f41 100644
---- a/makeint.h
-+++ b/makeint.h
-@@ -436,10 +436,11 @@ extern struct rlimit stack_limit;
- /* The number of bytes needed to represent the largest integer as a string.  */
- #define INTSTR_LENGTH         CSTRLEN ("18446744073709551616")
- 
-+#define DEFAULT_TTYNAME "true"
- #ifdef HAVE_TTYNAME
- # define TTYNAME(_f) ttyname (_f)
- #else
--# define TTYNAME(_f) "true"
-+# define TTYNAME(_f) DEFAULT_TTYNAME
- #endif
- 
- 
---
-cgit v0.9.0.2
diff --git a/sys-devel/make/make-4.1-r1.ebuild b/sys-devel/make/make-4.1-r1.ebuild
deleted file mode 100644
index b893857aa79d..000000000000
--- a/sys-devel/make/make-4.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="https://www.gnu.org/software/make/make.html"
-SRC_URI="mirror://gnu//make/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="guile nls static"
-
-CDEPEND="guile? ( >=dev-scheme/guile-1.8 )"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libintl )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch \
-		"${FILESDIR}"/${P}-fix_null_returns_from_ttyname.patch
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	econf \
-		--program-prefix=g \
-		$(use_with guile) \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
-}
diff --git a/sys-devel/make/make-4.2.1-r2.ebuild b/sys-devel/make/make-4.2.1-r2.ebuild
deleted file mode 100644
index c52a434b513b..000000000000
--- a/sys-devel/make/make-4.2.1-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="https://www.gnu.org/software/make/make.html"
-SRC_URI="mirror://gnu//make/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-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"
-IUSE="guile nls static"
-
-CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libintl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
-	"${FILESDIR}"/${PN}-4.2-default-cxx.patch
-	"${FILESDIR}"/${PN}-4.2.1-perl526.patch
-	"${FILESDIR}"/${PN}-4.2.1-glob-internals.patch
-)
-
-src_prepare() {
-	default
-	# This patch requires special handling as it modifies configure.ac
-	# which in turn triggers maintainer-mode when being applied the
-	# usual way.
-	eapply -Z "${FILESDIR}"/${PN}-4.2.1-glob-v2.patch
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--program-prefix=g
-		$(use_with guile)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
-}
diff --git a/sys-devel/make/make-4.2.1-r3.ebuild b/sys-devel/make/make-4.2.1-r3.ebuild
index ca1d92161ca9..fe3212023775 100644
--- a/sys-devel/make/make-4.2.1-r3.ebuild
+++ b/sys-devel/make/make-4.2.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="guile nls static"
 
 CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild
deleted file mode 100644
index 807b071729f2..000000000000
--- a/sys-devel/make/make-4.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="https://www.gnu.org/software/make/make.html"
-SRC_URI="mirror://gnu//make/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-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"
-IUSE="guile nls static"
-
-CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libintl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
-	"${FILESDIR}"/${PN}-4.2.1-perl526.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	econf \
-		--program-prefix=g \
-		$(use_with guile) \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
-}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index a38e6868e0f1..4cfa65240ce0 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index f967bb948861..39bdd8b916a3 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,4 +1,4 @@
-DIST intel-microcode-collection-20180728.tar.xz 4463372 BLAKE2B ae0f6fa46944cf159762c4b5eeaf4094c6b05fea3668c90a38587d673ec95dcbcbd15ec3f0834a6bec6f2172d89598562ef89d82960bea5e73602a6ed28d3392 SHA512 457f666ba643746159295711ec5c4d2cde47b7a609df1b3d3f528f0dab4aef54641ecf32977f723bd70090da9485c2583413b2673a65e0d6ab078523c5186e45
+DIST intel-microcode-collection-20180804.tar.xz 4389012 BLAKE2B f77a226107f7529b12b95ed312e79338d20697378769f8cfcd91e7ed63e3d2044371fd9305ba4b7068a9467b7910150d6b288742ca5393c428cb2c167c4dfb62 SHA512 4cd2c5d2237fcf63727d6b2fc111e0b4d798ffb134e13b7e2a4b7373a09ae879237f8406358d09e724ab632bffadf08b528bf76530a25446f0ba60fb4ae490e1
 DIST microcode-20180703.tgz 1550181 BLAKE2B edf86dcc8dedeffd22a9b608cc11e5b043d36617ae6325e14326d402388f42ead29c8483a0312ab9ea2015604803cc07506d6f119b314b922639a71f9d65a39d SHA512 25af4158f97fba2fb88f05a44f42ed7d2415001ccc58f573d366f405ff198472517468f619628f4f6e5a371793c41ea8faf5a932d2362b2a51726bb5c84e0eed
-EBUILD intel-microcode-20180728.ebuild 7275 BLAKE2B 792e0a433715f383a225c2f80ee855ec800b2c66edc7de3131fb168e0789166a78387e9c509c68dd2eb9622b990ba7d3e1cdc0fcc043e9fb9c481764863ef6c1 SHA512 3989b5dd637fb17e2f358ce16664355239a91327f1635173571c60f898b02f671aeb8afa5e5cc10bb6345c8b80c4935d5547c57c2eff06f3777392979cf89fe8
+EBUILD intel-microcode-20180804.ebuild 7275 BLAKE2B f2d68b19b407054dc07ee8878d6f80e5ded54717783f787da85de840571158a35dd42bdc44f3eae15641d916e1438b535ee3f17bd88edf91f607683652f857c1 SHA512 ed043b0b9b692312586140ec60c0c590fd6daf65c6c429fba520ed73ec951ec203aa41cbe44e2b1332f8003e3de52f83d91b9555012c99759b365c2b614116fc
 MISC metadata.xml 667 BLAKE2B f229775df839b3ddf34fcc289803ae113ad4b0ce293e036c24f3025bbd146d51c6e3ac55b4a7eb9b2ff0b6829aa020179ea4603f5e481de1c822a1deb66fd594 SHA512 a2d6bc54901a9eb12732e8fa0720c03b51ab615383f12a52019453b3a13f5c70233ee88a8d81706ce7e86eaec6d85155484cf32da288c3486d4b1a19647d2698
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180728.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180728.ebuild
deleted file mode 100644
index f629e1b2b14f..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20180728.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-COLLECTION_SNAPSHOT="20180728"
-INTEL_SNAPSHOT="20180703"
-NUM="27945"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
-	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="hostonly initramfs +split-ucode vanilla"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-DEPEND="sys-apps/iucode_tool"
-
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2
-	hostonly? ( sys-apps/iucode_tool )"
-
-RESTRICT="binchecks strip"
-
-S=${WORKDIR}
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-MICROCODE_BLACKLIST="${MICROCODE_BLACKLIST:=${MICROCODE_BLACKLIST_DEFAULT}}"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only:
-# merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-MICROCODE_SIGNATURES="${MICROCODE_SIGNATURES:=${MICROCODE_SIGNATURES_DEFAULT}}"
-
-pkg_pretend() {
-	if [[ "${MICROCODE_BLACKLIST}" != "${MICROCODE_BLACKLIST_DEFAULT}" ]]; then
-		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
-	fi
-
-	if [[ "${MICROCODE_SIGNATURES}" != "${MICROCODE_SIGNATURES_DEFAULT}" ]]; then
-		ewarn "The user has opted in for advanced use:"
-		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
-	fi
-
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# Prevent "invalid file format" errors from iucode_tool
-	rm -f "${S}"/intel-ucod*/list || die
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/intel-ucode/
-		"${S}"/intel-ucode-with-caveats/
-	)
-
-	# Allow users who are scared about microcode updates not included in Intel's official
-	# microcode tarball to opt-out and comply with Intel marketing
-	if ! use vanilla; then
-		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
-	fi
-
-	opts=(
-		${MICROCODE_BLACKLIST}
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# we want to install latest version
-		--no-downgrade
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
-	# split location (we use a temporary location so that we are able
-	# to re-run iucode_tool in pkg_preinst; use keepdir instead of dodir to carry
-	# this folder to pkg_preinst to avoid an error even if no microcode was selected):
-	keepdir /tmp/intel-ucode && opts+=( --write-firmware="${ED%/}"/tmp/intel-ucode )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote
-}
-
-pkg_preinst() {
-	use initramfs && mount-boot_pkg_preinst
-
-	if use hostonly; then
-		einfo "Removing ucode(s) not supported by any currently available (=online) processor(s) due to USE=hostonly ..."
-		opts=(
-			--scan-system
-			# be strict about what we are doing
-			--overwrite
-			--strict-checks
-			--no-ignore-broken
-			# we want to install latest version
-			--no-downgrade
-			# show everything we find
-			--list-all
-			# show what we selected
-			--list
-		)
-
-		# The earlyfw cpio needs to be in /boot because it must be loaded before
-		# rootfs is mounted.
-		use initramfs && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
-		# split location:
-		use split-ucode && dodir /lib/firmware/intel-ucode && opts+=( --write-firmware="${ED%/}"/lib/firmware/intel-ucode )
-
-		iucode_tool \
-			"${opts[@]}" \
-			"${ED%/}"/tmp/intel-ucode \
-			|| die "iucode_tool ${opts[@]} ${ED%/}/tmp/intel-ucode"
-
-	else
-		if use split-ucode; then
-			# Temporary /tmp/intel-ucode will become final /lib/firmware/intel-ucode ...
-			dodir /lib/firmware
-			mv "${ED%/}/tmp/intel-ucode" "${ED%/}/lib/firmware" || die "Failed to install splitted ucodes!"
-		fi
-	fi
-
-	# Cleanup any temporary leftovers so that we don't merge any
-	# unneeded files on disk
-	rm -r "${ED%/}/tmp" || die "Failed to cleanup '${ED%/}/tmp'"
-}
-
-pkg_prerm() {
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	use initramfs && mount-boot_pkg_postinst
-
-	local _has_installed_something=
-	if use initramfs && [[ -s "${EROOT%/}/boot/intel-uc.img" ]]; then
-		_has_installed_something="yes"
-	elif use split-ucode; then
-		_has_installed_something=$(find "${EROOT%/}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
-	fi
-
-	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
-		elog "You only installed ucode(s) for all currently available (=online)"
-		elog "processor(s). Remember to re-emerge this package whenever you"
-		elog "change the system's processor model."
-		elog ""
-	elif [[ -z "${_has_installed_something}" ]]; then
-		ewarn "WARNING:"
-		ewarn "No ucode was installed! You can ignore this warning if there"
-		ewarn "aren't any microcode updates available for your processor(s)."
-		ewarn "But if you use MICROCODE_SIGNATURES variable please double check"
-		ewarn "if you have an invalid select."
-		ewarn ""
-
-		if use hostonly; then
-			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
-			ewarn ""
-		fi
-	fi
-
-	# We cannot give detailed information if user is affected or not:
-	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
-	# to to force a specific, otherwise blacklisted, microcode. So we
-	# only show a generic warning based on running kernel version:
-	if kernel_is -lt 4 14 34; then
-		ewarn "${P} contains microcode updates which require"
-		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
-		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
-		ewarn "can crash your system!"
-		ewarn ""
-		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
-		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
-		ewarn "re-enabled those microcodes...!"
-		ewarn ""
-		ewarn "Check \"${EROOT%/}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
-		ewarn "requires additional kernel patches or not."
-	fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180804.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180804.ebuild
new file mode 100644
index 000000000000..67dd7794d266
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20180804.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info toolchain-funcs mount-boot
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+COLLECTION_SNAPSHOT="20180804"
+INTEL_SNAPSHOT="20180703"
+NUM="27945"
+DESCRIPTION="Intel IA32/IA64 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
+	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="hostonly initramfs +split-ucode vanilla"
+REQUIRED_USE="|| ( initramfs split-ucode )"
+
+DEPEND="sys-apps/iucode_tool"
+
+# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2
+	hostonly? ( sys-apps/iucode_tool )"
+
+RESTRICT="binchecks strip"
+
+S=${WORKDIR}
+
+# Blacklist bad microcode here.
+# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
+MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
+MICROCODE_BLACKLIST="${MICROCODE_BLACKLIST:=${MICROCODE_BLACKLIST_DEFAULT}}"
+
+# In case we want to set some defaults ...
+MICROCODE_SIGNATURES_DEFAULT=""
+
+# Advanced users only:
+# merge with:
+# only current CPU: MICROCODE_SIGNATURES="-S"
+# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
+# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
+MICROCODE_SIGNATURES="${MICROCODE_SIGNATURES:=${MICROCODE_SIGNATURES_DEFAULT}}"
+
+pkg_pretend() {
+	if [[ "${MICROCODE_BLACKLIST}" != "${MICROCODE_BLACKLIST_DEFAULT}" ]]; then
+		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
+	fi
+
+	if [[ "${MICROCODE_SIGNATURES}" != "${MICROCODE_SIGNATURES_DEFAULT}" ]]; then
+		ewarn "The user has opted in for advanced use:"
+		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
+	fi
+
+	use initramfs && mount-boot_pkg_pretend
+}
+
+src_prepare() {
+	default
+
+	# Prevent "invalid file format" errors from iucode_tool
+	rm -f "${S}"/intel-ucod*/list || die
+}
+
+src_install() {
+	# This will take ALL of the upstream microcode sources:
+	# - microcode.dat
+	# - intel-ucode/
+	# In some cases, they have not contained the same content (eg the directory has newer stuff).
+	MICROCODE_SRC=(
+		"${S}"/intel-ucode/
+		"${S}"/intel-ucode-with-caveats/
+	)
+
+	# Allow users who are scared about microcode updates not included in Intel's official
+	# microcode tarball to opt-out and comply with Intel marketing
+	if ! use vanilla; then
+		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
+	fi
+
+	opts=(
+		${MICROCODE_BLACKLIST}
+		${MICROCODE_SIGNATURES}
+		# be strict about what we are doing
+		--overwrite
+		--strict-checks
+		--no-ignore-broken
+		# we want to install latest version
+		--no-downgrade
+		# show everything we find
+		--list-all
+		# show what we selected
+		--list
+	)
+
+	# The earlyfw cpio needs to be in /boot because it must be loaded before
+	# rootfs is mounted.
+	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
+	# split location (we use a temporary location so that we are able
+	# to re-run iucode_tool in pkg_preinst; use keepdir instead of dodir to carry
+	# this folder to pkg_preinst to avoid an error even if no microcode was selected):
+	keepdir /tmp/intel-ucode && opts+=( --write-firmware="${ED%/}"/tmp/intel-ucode )
+
+	iucode_tool \
+		"${opts[@]}" \
+		"${MICROCODE_SRC[@]}" \
+		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
+
+	dodoc releasenote
+}
+
+pkg_preinst() {
+	use initramfs && mount-boot_pkg_preinst
+
+	if use hostonly; then
+		einfo "Removing ucode(s) not supported by any currently available (=online) processor(s) due to USE=hostonly ..."
+		opts=(
+			--scan-system
+			# be strict about what we are doing
+			--overwrite
+			--strict-checks
+			--no-ignore-broken
+			# we want to install latest version
+			--no-downgrade
+			# show everything we find
+			--list-all
+			# show what we selected
+			--list
+		)
+
+		# The earlyfw cpio needs to be in /boot because it must be loaded before
+		# rootfs is mounted.
+		use initramfs && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
+		# split location:
+		use split-ucode && dodir /lib/firmware/intel-ucode && opts+=( --write-firmware="${ED%/}"/lib/firmware/intel-ucode )
+
+		iucode_tool \
+			"${opts[@]}" \
+			"${ED%/}"/tmp/intel-ucode \
+			|| die "iucode_tool ${opts[@]} ${ED%/}/tmp/intel-ucode"
+
+	else
+		if use split-ucode; then
+			# Temporary /tmp/intel-ucode will become final /lib/firmware/intel-ucode ...
+			dodir /lib/firmware
+			mv "${ED%/}/tmp/intel-ucode" "${ED%/}/lib/firmware" || die "Failed to install splitted ucodes!"
+		fi
+	fi
+
+	# Cleanup any temporary leftovers so that we don't merge any
+	# unneeded files on disk
+	rm -r "${ED%/}/tmp" || die "Failed to cleanup '${ED%/}/tmp'"
+}
+
+pkg_prerm() {
+	use initramfs && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	use initramfs && mount-boot_pkg_postrm
+}
+
+pkg_postinst() {
+	use initramfs && mount-boot_pkg_postinst
+
+	local _has_installed_something=
+	if use initramfs && [[ -s "${EROOT%/}/boot/intel-uc.img" ]]; then
+		_has_installed_something="yes"
+	elif use split-ucode; then
+		_has_installed_something=$(find "${EROOT%/}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
+	fi
+
+	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
+		elog "You only installed ucode(s) for all currently available (=online)"
+		elog "processor(s). Remember to re-emerge this package whenever you"
+		elog "change the system's processor model."
+		elog ""
+	elif [[ -z "${_has_installed_something}" ]]; then
+		ewarn "WARNING:"
+		ewarn "No ucode was installed! You can ignore this warning if there"
+		ewarn "aren't any microcode updates available for your processor(s)."
+		ewarn "But if you use MICROCODE_SIGNATURES variable please double check"
+		ewarn "if you have an invalid select."
+		ewarn ""
+
+		if use hostonly; then
+			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
+			ewarn ""
+		fi
+	fi
+
+	# We cannot give detailed information if user is affected or not:
+	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
+	# to to force a specific, otherwise blacklisted, microcode. So we
+	# only show a generic warning based on running kernel version:
+	if kernel_is -lt 4 14 34; then
+		ewarn "${P} contains microcode updates which require"
+		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
+		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
+		ewarn "can crash your system!"
+		ewarn ""
+		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
+		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
+		ewarn "re-enabled those microcodes...!"
+		ewarn ""
+		ewarn "Check \"${EROOT%/}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
+		ewarn "requires additional kernel patches or not."
+	fi
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index aac62723232f..139f663adc93 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 8c79ae6ceaa8..779bfda4bef8 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,5 +1,6 @@
 AUX btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch 1168 BLAKE2B d2ebad85f6f15dfe97fbdce1f32170a14655ec3280ee5720fc6abece9b29c1a60eb3ad7207f396f9a4edd792a9f09928dc396e6906f1d2ce561d5d27ed8266b4 SHA512 de99775ec92dd87ed2bcb29885a18a69f781490bd71a26c0b5536f8b180d8a03ebb4fd52eb8b3939c2f28dcae01bcbddc93c0b7b347f15e5295939f5e5dfe9e4
 AUX btrfs-progs-4.16-static-linkage.patch 1215 BLAKE2B 8bf5d8523859c628e0cc4ea9ed42acaf6a0b1600209b1cd4934d80b6f5cd7c6df5c2e42769dc7e95152d252031eadf84f853d070414d4328c63388eab6671f99 SHA512 1e74dc0d350b30195c4b3b0ceed2a76310518dae1819acfba496c51f3ccf70bbb528f539eebaa96129dae09b7bc2172490eb852e17ccb405bc779e5e983eedb1
+AUX btrfs-progs-man-no-gz.patch 2206 BLAKE2B f195b10aa96230e056b4d5b94019a799cbe9717a1fdb2141a293c3916a929181ea12a1d32da6db7113b888da066463ebd55ae64712d54458cba0c7b654d6487b SHA512 94f0cf810f4f800f40a478595cfd062b0a523cb7538030152ee21d5a0adeceaafa310aab95c119c98309ee606a2ee6d6c4ff7014fe8026d43288ceb04c2773cd
 DIST btrfs-progs-v3.16.2.tar.xz 291604 BLAKE2B 66c19a47062386888209b2bb569cc5db8629446554387af971f5ba13ee49b654b2706fd6ed391115075533e6aa5637c7ebfe87b9abc2fa941739baee9fffe1aa SHA512 7dc0f2f8f0bbddbbf1d4d99854425341c4b3997334c65d7e936bcec1ee5ca880101b8b45498721502857b478edae6237a934c7d4acb735de43c6d8ff35efe53b
 DIST btrfs-progs-v3.18.2.tar.xz 1029228 BLAKE2B be8b3e0151c939135bcac11cdd118b7cafdfefa9d06de4629a0727db781b42dfdfa447265d1b4dafce8711a65ac838b19c38a2a93c0439d92d5b8fb4b4d974f5 SHA512 7fd125eeedabd54178f5198ac09c364b6772125124adcdb2620515a51c331307205ae06ff81375a49ebc62650d537c6f9eed2b63bf1f7e97b9ff047cda8a2cc4
 DIST btrfs-progs-v4.1.2.tar.xz 1123080 BLAKE2B 4b6395080c1456321d6923609544da066bd86806588e5860bc2750162a257a94a64cd4e3fb1362065eaa38a73fdee92f053cd2a26c367fe179aa13f068e8b1d2 SHA512 dd159bcc3adb65efd4f612d75f5a6b30df8ad9fa06ef952dd03dac965256de37eab26f4cc2fb3840178403ccbb7368cae11638e27eadb9b1835b636c4b126e2e
@@ -8,6 +9,7 @@ DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be24331
 DIST btrfs-progs-v4.15.1.tar.xz 1931820 BLAKE2B 00c4b9f6ec2039ad680cd625e5ece1cd306b8eaa4572f262cd2272c9d1e03923834ec7af7e59afc9e931cf95d224aea883cc544ba8e26de03119d85c67f19b64 SHA512 6e6a9799f6716bbf772d5f0c8069579815060db20d30807e12948e7274448bca09a12c385ea05a95afc23722d12067a8d99623ea0091dca8ae75ea646aa84b88
 DIST btrfs-progs-v4.16.1.tar.xz 1980696 BLAKE2B 85854fd025c92bd31c957623b78ad72efd536fc8c9d72cc7ad65b9a435b3d57405208e355a86d95ea46ed0179a04e34c3693c4e465e7d6a8edfacdbd185e1421 SHA512 9f0e8c593a10c1c09749ccc00f470ba44d4357fabca8d89ce5891ab0d9cd70f1356f1c6677288019387a6b3b3746431537da205627791a35955bb8bed33d807e
 DIST btrfs-progs-v4.16.tar.xz 1980420 BLAKE2B 979dffe990ea92f44582fa29f634ba4fa8e75917c9907ae4d4c5a72f6623450b29b6b0f3c40423711bc11856bc7d7775fb134fc5210e092d2c61ebe2165352cc SHA512 3d794f890a7772c27c285410892b9de4c0629f6de6cd96e42d1e25c9263dd519d14428eaba75a3595f2d03a1154ffbbfe6a02449d7527a2ab6a1911a8736358e
+DIST btrfs-progs-v4.17.1.tar.xz 2045192 BLAKE2B cfc696f32ae8f02865206ff0b1f749a5af072b147537e2c6389a4fb7e93e437754b6af23f122722837612a08d86485bcf110e069facb6c5b76f193dc89a6d433 SHA512 90f291e362b640a22b41036351619e7b8a793a3b57d0537e7865edf4b830d6dc57b3051c0aed9e1ff38b602441a20fea7f974ccff789a3b4a622a0ea57756538
 DIST btrfs-progs-v4.17.tar.xz 2002792 BLAKE2B beb63b0dcbd7f84b9ec95338d50c13e410fd967dcee56449328eb40d0ed89def4136675ffc86fc693d961175e74f11bf89f725e101e5cf35e7cbf2e228887d77 SHA512 1d238ea6c75f2493f0c5f3995bcfd592e945e20e407a71d962a8ce534fe829f5aa139c0e2d2cb497435de6ddf5c29f0e9dfb900419cc0c9d91cac3ae8154ee75
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5
@@ -19,8 +21,9 @@ EBUILD btrfs-progs-4.14.1.ebuild 2481 BLAKE2B 3e4db698cb95fdcdb982b424364cced1aa
 EBUILD btrfs-progs-4.15.1.ebuild 2586 BLAKE2B a4f784458b56797d6018ed5bcc84d5270419c3507cc861af002ee7756420e864889414deb713f5f78154d7e0c84bf2ec63e2509ae62cc1b00560f85b37a4a9f8 SHA512 94662ed43680e269ad10be9209b59e5e882839d30ff28e6311420f6298d4e37aeff328ec889b66f661f61bae0b21d0541c79733521dec0b4b8cc0d0c8ab652dc
 EBUILD btrfs-progs-4.16.1.ebuild 2861 BLAKE2B cd4e072ef8183ff769336767957e2b9528b4c9811170f91758cfc296fde24d23077d72cb6fe44af4b75e6ce8510e5f8db2b54545b461a6d358d75fc1705a93af SHA512 edb7fbdc799d29430afb45d6249ff533079d7fe8b60be61e9601fe285a3b332ddce80cd36e50d1a92cfd12be683e57c2ddacffd0b3c52a716903429af3967f2c
 EBUILD btrfs-progs-4.16.ebuild 2915 BLAKE2B e9215110a23394a2aca7a9eb087b37c9d7968c793fe3d8b8f45728c12b84915e26e96dc6b1642469b44d1b00c623951cb08c8c6f663e4428ba708cca48b26488 SHA512 d15f0318d5abdedcc2939cffcf53ded96f32163fb00e24ee4b49891abfd88f5fc9588a767971a711ea13d8a9ed71977798fae1152c2a0821006a8202a3ff4675
-EBUILD btrfs-progs-4.17.ebuild 2861 BLAKE2B cd4e072ef8183ff769336767957e2b9528b4c9811170f91758cfc296fde24d23077d72cb6fe44af4b75e6ce8510e5f8db2b54545b461a6d358d75fc1705a93af SHA512 edb7fbdc799d29430afb45d6249ff533079d7fe8b60be61e9601fe285a3b332ddce80cd36e50d1a92cfd12be683e57c2ddacffd0b3c52a716903429af3967f2c
+EBUILD btrfs-progs-4.17-r1.ebuild 2917 BLAKE2B ca3a8cf3f52a6df6b528b16aa01b9b3259d16e4e00fa268582ced9edd302a7d822f2be0364da0b0c16f1a1c88882199c8e7e4e438a06d5d48194d0e8486df594 SHA512 d3a99cc49e1771fedf29209b3787545ecd69636fb0033744b8e58b1242221be66f4caa80c69466a7e0bce36b3382314491f622f707a4210ca2332ec6e821c208
+EBUILD btrfs-progs-4.17.1.ebuild 2912 BLAKE2B cd9161dd0c7fa433d03020dc951e1bd0a6974fc02bbbf48353f6fea4d2724ced5c5187e6ab050d46dae41027338a9a55a8f97d65eb9899c282c0dcaf488bb426 SHA512 4b27b69c325883fd5728a6efd4fd9110dfa6e013dfd6ad56a447049097108247e62adcceae768980afd15f3a433eed5c041f70331d55495fd52875281019bbd5
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd
 EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4
-EBUILD btrfs-progs-9999.ebuild 2861 BLAKE2B cd4e072ef8183ff769336767957e2b9528b4c9811170f91758cfc296fde24d23077d72cb6fe44af4b75e6ce8510e5f8db2b54545b461a6d358d75fc1705a93af SHA512 edb7fbdc799d29430afb45d6249ff533079d7fe8b60be61e9601fe285a3b332ddce80cd36e50d1a92cfd12be683e57c2ddacffd0b3c52a716903429af3967f2c
+EBUILD btrfs-progs-9999.ebuild 2856 BLAKE2B eb48d619159a59b5e5984fbdf04ef1068ca276f7d348606ca6122684934ef085f43064e1d54145fa6c6d257459feb43a04b01ef89ccd73676073440a724067ab SHA512 2d7107291e4ff1cc82bc9bad3572fc0b5791b593de6901821ce77ec7052f0c9491dc12b94cabcd445d32758d594b7eb2c1bb50f5b8410860ec7eaf9467d55916
 MISC metadata.xml 934 BLAKE2B eb3a4c7fba09e537bcb97c3bdcc70b1cf7adf6c66a60abc7ab977f3d35ab0189ece1eb3994490a0418c3ad513a2896ee8bd19edbcef6f57ff3ab1d2af060289e SHA512 83c68333a33df7b836f3fe90c2dfe09789b8c3ecab7c1573534c37d745d565127ec291a91df400cf83d88ec7c284f1bf1a2f37130ec33b7f5e149f10edd80cee
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild
new file mode 100644
index 000000000000..b11eba1014a7
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit bash-completion-r1 python-single-r1
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV="v${PV/_/-}"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+else
+	WANT_LIBTOOL=none
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert python reiserfs static static-libs +zstd"
+
+RESTRICT=test # tries to mount repared filesystems
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-apps/util-linux:0=[static-libs(+)?]
+	sys-libs/zlib:0=
+	convert? (
+		sys-fs/e2fsprogs:0=
+		sys-libs/e2fsprogs-libs:0=
+		reiserfs? (
+			>=sys-fs/reiserfsprogs-3.6.27
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	zstd? ( app-arch/zstd:0= )
+"
+DEPEND="${RDEPEND}
+	convert? ( sys-apps/acl )
+	>=app-text/asciidoc-8.6.0
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	static? (
+		dev-libs/lzo:2[static-libs(+)]
+		sys-apps/util-linux:0[static-libs(+)]
+		sys-libs/zlib:0[static-libs(+)]
+		convert? (
+			sys-fs/e2fsprogs:0[static-libs(+)]
+			sys-libs/e2fsprogs-libs:0[static-libs(+)]
+			reiserfs? (
+				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+			)
+		)
+		zstd? ( app-arch/zstd:0[static-libs(+)] )
+	)
+"
+
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" sys-devel/gnuconfig"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/btrfs-progs-man-no-gz.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		AT_M4DIR=m4 eautoreconf
+		mkdir config || die
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		$(use_enable convert)
+		$(use_enable elibc_glibc backtrace)
+		$(use_enable python)
+		$(use_enable zstd)
+		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_install() {
+	local makeargs=(
+		$(usex python install_python '')
+		$(usex static-libs '' 'libs_static=')
+		$(usex static install-static '')
+	)
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+	newbashcomp btrfs-completion btrfs
+	use python && python_optimize
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild
new file mode 100644
index 000000000000..5f71a58e642e
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit bash-completion-r1 python-single-r1
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV="v${PV/_/-}"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+else
+	WANT_LIBTOOL=none
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert python reiserfs static static-libs +zstd"
+
+RESTRICT=test # tries to mount repared filesystems
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-apps/util-linux:0=[static-libs(+)?]
+	sys-libs/zlib:0=
+	convert? (
+		sys-fs/e2fsprogs:0=
+		sys-libs/e2fsprogs-libs:0=
+		reiserfs? (
+			>=sys-fs/reiserfsprogs-3.6.27
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	zstd? ( app-arch/zstd:0= )
+"
+DEPEND="${RDEPEND}
+	convert? ( sys-apps/acl )
+	>=app-text/asciidoc-8.6.0
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	static? (
+		dev-libs/lzo:2[static-libs(+)]
+		sys-apps/util-linux:0[static-libs(+)]
+		sys-libs/zlib:0[static-libs(+)]
+		convert? (
+			sys-fs/e2fsprogs:0[static-libs(+)]
+			sys-libs/e2fsprogs-libs:0[static-libs(+)]
+			reiserfs? (
+				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+			)
+		)
+		zstd? ( app-arch/zstd:0[static-libs(+)] )
+	)
+"
+
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" sys-devel/gnuconfig"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/btrfs-progs-man-no-gz.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		AT_M4DIR=m4 eautoreconf
+		mkdir config || die
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		$(use_enable convert)
+		$(use_enable elibc_glibc backtrace)
+		$(use_enable python)
+		$(use_enable static-libs static)
+		$(use_enable zstd)
+		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_install() {
+	local makeargs=(
+		$(usex python install_python '')
+		$(usex static install-static '')
+	)
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+	newbashcomp btrfs-completion btrfs
+	use python && python_optimize
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.17.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.17.ebuild
deleted file mode 100644
index 0936ade75910..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.17.ebuild
+++ /dev/null
@@ -1,117 +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} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 0936ade75910..9051b02693bd 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -95,6 +95,7 @@ src_configure() {
 		$(use_enable convert)
 		$(use_enable elibc_glibc backtrace)
 		$(use_enable python)
+		$(use_enable static-libs static)
 		$(use_enable zstd)
 		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
 	)
@@ -108,7 +109,6 @@ src_compile() {
 src_install() {
 	local makeargs=(
 		$(usex python install_python '')
-		$(usex static-libs '' 'libs_static=')
 		$(usex static install-static '')
 	)
 	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch b/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch
new file mode 100644
index 000000000000..aeb187baaf41
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch
@@ -0,0 +1,64 @@
+From 0a319cad0f002c2dfd44cffc1de0a26cf270560f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 6 Aug 2018 11:26:54 -0400
+Subject: [PATCH] Install uncompressed man pages
+
+Bug: https://bugs.gentoo.org/662920
+---
+ Documentation/Makefile.in | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in
+index 184647c4..c4c843cb 100644
+--- a/Documentation/Makefile.in
++++ b/Documentation/Makefile.in
+@@ -37,9 +37,9 @@ MAN3_TXT += btrfs-ioctl.asciidoc
+ MAN_TXT = $(MAN3_TXT) $(MAN8_TXT) $(MAN5_TXT)
+ MAN_XML = $(patsubst %.asciidoc,%.xml,$(MAN_TXT))
+ MAN_HTML = $(patsubst %.asciidoc,%.html,$(MAN_TXT))
+-GZ_MAN3 = $(patsubst %.asciidoc,%.3.gz,$(MAN3_TXT))
+-GZ_MAN5 = $(patsubst %.asciidoc,%.5.gz,$(MAN5_TXT))
+-GZ_MAN8 = $(patsubst %.asciidoc,%.8.gz,$(MAN8_TXT))
++MAN3 = $(patsubst %.asciidoc,%.3,$(MAN3_TXT))
++MAN5 = $(patsubst %.asciidoc,%.5,$(MAN5_TXT))
++MAN8 = $(patsubst %.asciidoc,%.8,$(MAN8_TXT))
+ 
+ mandir ?= $(prefix)/share/man
+ man3dir = $(mandir)/man3
+@@ -86,9 +86,9 @@ endif
+ 
+ all: man
+ man: man3 man5 man8
+-man3: $(GZ_MAN3)
+-man5: $(GZ_MAN5)
+-man8: $(GZ_MAN8)
++man3: $(MAN3)
++man5: $(MAN5)
++man8: $(MAN8)
+ html: $(MAN_HTML)
+ 
+ install: install-man
+@@ -96,15 +96,15 @@ install: install-man
+ install-man: man
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
+-	$(INSTALL) -m 644 $(GZ_MAN5) $(DESTDIR)$(man5dir)
++	$(INSTALL) -m 644 $(MAN5) $(DESTDIR)$(man5dir)
+ 	# the source file name of btrfs.5 clashes with section 8 page, but we
+ 	# want to keep the code generic
+-	$(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5.gz $(DESTDIR)$(man5dir)/btrfs.5.gz
+-	$(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
+-	$(LN_S) -f btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
++	$(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5 $(DESTDIR)$(man5dir)/btrfs.5
++	$(INSTALL) -m 644 $(MAN8) $(DESTDIR)$(man8dir)
++	$(LN_S) -f btrfs-check.8 $(DESTDIR)$(man8dir)/btrfsck.8
+ 
+ uninstall:
+-	cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8.gz $(GZ_MAN8)
++	cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8 $(MAN8)
+ 	$(RMDIR) -p --ignore-fail-on-non-empty $(DESTDIR)$(man8dir)
+ 
+ clean:
+-- 
+2.18.0
+
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 8ac00c92beea..82b96c298528 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -3,6 +3,8 @@ AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2
 AUX setup-1.7.0.py 788 BLAKE2B dc7a2dbc2187f233f4fae9d85bbec9e2152259a45094f10ab043b36e31d80d40772795cb5f9911b0e9a3aa41d8f1773c0e60aa6da1a530165a26384c65532117 SHA512 823fe8a90a76de9f259a5b69425601b78a0b6c1204cda613e224cc21e4eebc2b22b4be9f53efe843156c45a20a099385bc4dad6d653a26749336023d3ae5de89
 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
 DIST cryptsetup-2.0.3.tar.xz 10125548 BLAKE2B 871df4c248151394f5abc907209b6df636049e5a1ff72161af091d36963ef68adee14e5e1867d779c9419e489aa9bea7562608b239a8fe361b769f0cc14daaf0 SHA512 f5ac54aa9614b234f2d1e84758a98914d283b669f4ab5cbe0ed7cdf25ce77f2d1abdf1e5b5010d803971f0e29120954110ee4fcc538137b04fbdc13b7804385e
+DIST cryptsetup-2.0.4.tar.xz 10444544 BLAKE2B 95c18eefe99c27d05e347440d77e4ff53dcc110822dc706e2284e3203da9069acbd8afedb8d596a0f832bdadea0597b75af58a22af712818a3e0aae2824e51b7 SHA512 74d442c7c7837da719a14aefa8bf0b5dffbb050acd6fbd140c50d43470c828f79fdcf7cd6acf1c149a4e1129a100059df6216b7d8ca04eb0b070cb8d4ca33e61
 EBUILD cryptsetup-1.7.5-r1.ebuild 4041 BLAKE2B 3f8868734f9ed2d1a635762348632b00520b243738c9f907866225e981bd7534d38f746c2eda2292cfaa395f77e431cd4b479ba97294d187c9d7de3b3f6047c5 SHA512 d41b3eb764e68fe72d1e4d2ee725a66030f03cfe7ea7d9046cc0dfaf673062229e9ade2a356b81112e8955cc8536916caae949716aebf3b0d4bfb8ce8f2190c7
 EBUILD cryptsetup-2.0.3-r1.ebuild 4094 BLAKE2B e145fd62d995b06b5326e7d2989d84e0fd265fa7357e561a61edc283c0b02cce3bfcf77b162e36b9477349d4920c788899840261628173b7fc6536c8094de24c SHA512 278cd2e0d788d3aacec7bd64592509c912ccc915bc8e432cbbfd50528143e6dae7736adc6049fc0f0de997fee68c1b96fd63ac9986cfe538d9a82943e04a6784
+EBUILD cryptsetup-2.0.4.ebuild 4075 BLAKE2B ae6d7638bb9b6feb6efa42f434276caf592e97c3c2b299a44b9b05e7239324c1b6814cf4f76759bd5f1b770c7b0cbff72ef98d9005aa59f97443437b0c39e008 SHA512 20de52d01b97851b9a8f10c058573d5bcd85ac4b0f766e5fae64c0fc766a131f75caef564999f8c73ebd9060b461fbc42bf3a3a2a0425fa730e9d0c5cb98d507
 MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.4.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.4.ebuild
new file mode 100644
index 000000000000..a0458bbe4f6d
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.4.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2018 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,3_7} )
+
+inherit autotools python-single-r1 linux-info libtool eapi7-ver
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
+SRC_URI="mirror://kernel/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+KEYWORDS="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86"
+CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
+# we don't support nss since it doesn't allow cryptsetup to be built statically
+# and it's missing ripemd160 support so it can't provide full backward compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality python reencrypt static static-libs +udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	static? ( !gcrypt )" #496612
+
+LIB_DEPEND="
+	dev-libs/json-c:=[static-libs(+)]
+	dev-libs/libgpg-error[static-libs(+)]
+	dev-libs/popt[static-libs(+)]
+	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
+	argon2? ( app-crypt/argon2:=[static-libs(+)] )
+	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+	openssl? (
+		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:=[static-libs(+)] )
+	)
+	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+	sys-fs/lvm2[static-libs(+)]
+	udev? ( virtual/libudev[static-libs(+)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	${LIB_DEPEND//\[static-libs\(+\)\]}
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )"
+
+S="${WORKDIR}/${P/_/-}"
+
+pkg_setup() {
+	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+	check_extra_config
+}
+
+src_prepare() {
+	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use kernel ; then
+		ewarn "Note that kernel backend is very slow for this type of operation"
+		ewarn "and is provided mainly for embedded systems wanting to avoid"
+		ewarn "userspace crypto libraries."
+	fi
+
+	use python && python_setup
+
+	# We disable autotool python integration so we can use eclasses
+	# for proper integration with multiple python versions.
+	local myeconfargs=(
+		--disable-internal-argon2
+		--enable-shared
+		--sbindir=/sbin
+		# for later use
+		# --with-default-luks-format=LUKS2
+		--with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d"
+		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+		$(use_enable argon2 libargon2)
+		$(use_enable nls)
+		$(use_enable pwquality)
+		$(use_enable python)
+		$(use_enable reencrypt cryptsetup-reencrypt)
+		$(use_enable static static-cryptsetup)
+		$(use_enable static-libs static)
+		$(use_enable udev)
+		$(use_enable !urandom dev-random)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if [[ ! -e /dev/mapper/control ]] ; then
+		ewarn "No /dev/mapper/control found -- skipping tests"
+		return 0
+	fi
+
+	local p
+	for p in /dev/mapper /dev/loop* ; do
+		addwrite ${p}
+	done
+
+	default
+}
+
+src_install() {
+	default
+
+	if use static ; then
+		mv "${ED%}"/sbin/cryptsetup{.static,} || die
+		mv "${ED%}"/sbin/veritysetup{.static,} || die
+		use reencrypt && { mv "${ED%}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
+	fi
+	find "${ED}" -name "*.la" -delete || die
+
+	dodoc docs/v*ReleaseNotes
+
+	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
+	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
+}
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 840c1126931b..8a3386d19c58 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -3,5 +3,5 @@ AUX dd_rescue-1.99-musl-r2.patch 4035 BLAKE2B cffc620f429db2042a405174a280e44c27
 DIST dd_rescue-1.46.tar.gz 126790 BLAKE2B 027d509349e77fa020757b826184b4a2206c3f5923c797c294ca8caf210cf6af20afa1d518d826413989612295a4365c480d7aa4293686824ee96394cbbe9851 SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28
 DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
 EBUILD dd-rescue-1.46.ebuild 1935 BLAKE2B 96cb26dbaf1af6e3653593bb3416b27165a078e2211519dd94ac7bdc889cba2c66ac9f04dee253828b56c00a8aaf9de51091aabe706b0bfe6e27de9d44854066 SHA512 57bdaccabd2da99bb329c82f47e52fbd2066f736c742b8de551671fab294297e45a874daa0ddd701234a3e6c216f52ddee55283d70bf1a166d3538f32485e8c7
-EBUILD dd-rescue-1.99.8.ebuild 2386 BLAKE2B 5e54701b73a8197733ee05f807ee76a021455881edb40bdb7c33b5a08064822c265faf58d7d2b106ed603df365051de64f292b45ba71059fbc6149de7f5dc4e7 SHA512 89dc38aa276dafc19324f393a6cf6987998897b35b597e007c16e424af7a1918df8064485e89507c8d95f615520d1211125313d98c5fb97d6c6bbeccecf671ac
+EBUILD dd-rescue-1.99.8.ebuild 2383 BLAKE2B 62cb1d8b4f7f768b619eafdaf85cd35266026b12126ff8004a65b316cadff8842082629d4b3bff9c99ba02bb303043e1abe8fc9a13f8e025fee69178b00736b2 SHA512 e7675ff724abdbcfb5558f02302115329231023f71cca1700ac4d3f2ee97121185a796e0fa71d9750d207f2f87489ea105882de4e713b650f348908a3e70327c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
index 8f5734a435de..a40b043634bb 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
 
 RDEPEND="lzo? ( dev-libs/lzo )
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index d6d3f6227a41..ebb4d875dcdc 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -10,7 +10,7 @@ AUX lvm.rc-2.02.105-r2 2960 BLAKE2B 40cdd0e6c3a717367fe6854524b5f355e952f2640823
 AUX lvm.rc-2.02.116-r4 3771 BLAKE2B adc48b61dcc4c9b0cbd808b79ed2cbccaabc2599f82680ff27dc74a67589fe36f1760693efda29eb0bbffc04624f671b56309c9f77fdc7e911274b342775cc2d SHA512 aa19a17ea3c6626355ac6f82aa383e7a9b253248513d7ef876e381d1a58ab78267e0e39df95a53114675582312693a128cf517051f906aa17a244f8d398f3aed
 AUX lvm.rc-2.02.116-r6 3783 BLAKE2B 5150d5c15db03d65b43fd29a23043c2dbb16805a00f79fbec398980f93f9c490474a03b6b7d0d2748ac9a39619b81ac04f6aaa14e700322b09c3e1372f843cd2 SHA512 f819faf7844c3b946b437aee8eb5dd52bfdbb9b820a2024ad42166895e72e194898b16a34c44c69786539d19e5458c12a333f99db02c26589567bb6aabb23639
 AUX lvm.rc-2.02.166-r2 4146 BLAKE2B 7cb3bef38fd46a1a1ffdce8fc5a58a26387d3e68ef7e5abd3ee565ec4b0ead591b54197d90a8ccad00b9307eb4a243d00be29b1bfd1ec2176dd3c2cf626852fc SHA512 a08891d52d1b7f38d09d15100ae19737ab6b65ae51f1e5d2ca43dd08988fee272972ea02fb3a04240d56812089a0744d215fed87e2ed29d09cfccba0de59d3c7
-AUX lvm.rc-2.02.172 4207 BLAKE2B 9c3e4ca320fda3ae587d908f416f8730c8965f3eea1b79fdd9453c505793870d7ceea0a8f305efaf8579805c773cffac084bc62854eb7a61bceec7f29c3bb183 SHA512 8aff8ed7f854dd326dd78c4862cd0a518deed10e05533d0a17fe47c18db8bf29b26799950f534b52aeabacd3fb70d83f12c523cab0a0f2d669aa0ff9d3fa1832
+AUX lvm.rc-2.02.172 4269 BLAKE2B a53fb5302293f7afb800400a0bb1e4f60ad8c3f7951c0872ecc3940016613faa1d141ab040beb66b3bb0b89ffe0db6be69d9924be071f57263b1c9a54eeaaa85 SHA512 1c2a246959420ab0e05e537a29b3c99c6be4a92c329cfc1c2955f0025333c2a1a48abaf864fde5b552e9c03aa31ca204c3ea49b69112f66f4df5fea7148f1953
 AUX lvm2-2.02.106-pthread-pkgconfig.patch 860 BLAKE2B 73c23ba460787dccc1412a8fdba9cdf60172fecab9a732b154af7e7bc4c927a751fbd1107c86cd997221b963748644885a4f525eae351aa2857c4d7e1498f755 SHA512 ae073936ee15fdeabde4d3948a65f6a435b82e62aa0ddadbad399b69bd5c9bfc181d5e0be1beae9f6e899a6e8b9d7c21add13f7a1606cb5ed4762ed5aa5aa223
 AUX lvm2-2.02.108-example.conf.in.patch 1681 BLAKE2B 3b7f1fcd005687aa3b4469d88a6fea71c6d5745df0b8ec76dbc6e4e6ad11828785f705503a992a25bae9fc77772fca03f023dbf515bc34e498dd718ed97aaa63 SHA512 b4e983892b7ff47e5e7617376197daa62cfd063cf398235dc4a436fd9025ec4b1e263d7418e2c2943d53be494cba4209e9d4230d54a78762b0ca526f92e9746c
 AUX lvm2-2.02.108-static-pkgconfig-libs.patch 3302 BLAKE2B c44b0602e010c7e774d87de808d739987b0bed6e1c963b6a6005b42933edbcaf43dabfbcb26a668c6ba4f0b1e3ddcb2f727f7b57d1c5b8e0c41b201d974a15ac SHA512 246f1029f9346d6bc57c2062c8a223535d0b832fa6bd86947b8b91b094dbc388706a9914f9ca0531666f77e73544612e2819335435b7576b4e91cdb1b0e4f041
@@ -23,6 +23,11 @@ AUX lvm2-2.02.145-mkdev.patch 4111 BLAKE2B 478c987c900c4ccfe3bb7d099b8af580f057b
 AUX lvm2-2.02.166-HPPA-no-O_DIRECT.patch 285 BLAKE2B 0311aab5b4ac843ff36fb7c4dbb8f47538fb621848f8430118dbbbcdfbf64876098ce9732109dca00e9262551b12a0e3293f0edfbb82dadf2d442f448dd695a3 SHA512 e113c31400d9f382b89901be199dfd3dd3888e0b417fb080d381d2aab79ac522dc968fda6aa7fd7668d018fd9109be133252cce01825bf950a79da145ff8b240
 AUX lvm2-2.02.171-static-libm.patch 525 BLAKE2B 5cef02547acdfe24fb26cd96a0bd6eccb0c5cbc5ae79ed4aa0d52ad94391f5ddfede194484f2a9c00add07df7fe69e43f1d122c41c8fe05a91e86f797f4e9759 SHA512 498132b93e482739bd7bf11ee457b837843dee951b66fe268411e7aabcaad373c6c9a0d43083940c85348c506eda2d0d49a3aee205110388e18f9b58a6d6ef1a
 AUX lvm2-2.02.172-static-pkgconfig-libs.patch 3851 BLAKE2B 87789e011380ecb5336373e47266f3e4cd6d617ab68763418c488a8a7d0d5cb14bba5bbf2710d5f9c30a6f9dd947cfb929f98f7f0e54f38a6d338f8f22466e14 SHA512 15e031c22f96d3a12e985129ccfa24e91edbbf30741a8075f089ae22f482f9b0c41f39d3c92ba41dde34a7afb505e0816347d385a9eb5d7692ad63053aabe79d
+AUX lvm2-2.02.176-pthread-pkgconfig.patch 822 BLAKE2B 9c5d89a70c0a7074d689f8f50a1f811b91fe8a64b564e22426bce4574be165765b3640f8dc650e4ae047340a03390fc70faff0cd78ef5251063d28030e1f495f SHA512 d96f579bbdc56b8288fa01e6c416bfcf229c92b659102edd1aa10c9ae1c35eeecb4299bce161218dae423995431e8a12a2a78a80a868b79744f74053ec2f9bd2
+AUX lvm2-2.02.178-asneeded.patch 452 BLAKE2B 6d7013e7a0e1aae933e22b2c30b85cf744f1b34bf865714b64d3ac81431dbad472c637d735e618830966c76a3c82578fff599f51ee600d4b3a79a46e3d5a6abd SHA512 9890ae7cbc10589db730531ffbb8ccfeb15d6c548379ce0dc81a9c8e18b10e2305d1b0556d3e7e5dc23baa1546521c9dd786d446b6db28fe2f1875e32ffc0d45
+AUX lvm2-2.02.178-dynamic-static-ldflags.patch 2279 BLAKE2B 526104c96dbef36568a11898193c5d0a7d69a63df2011e1f1a778a4317248a683470e331ddbf8b07fe8654abca5a96e9a53d0b13715c860f8c1e8b33b8e95384 SHA512 83f253ca629e90380164edc74f3900f6e40fcd0002d357dbcaecf4a75c2a2213c55cce1291a27afd2e07c72838e46fe7438217f8a103c20233ffa2621cf02cb1
+AUX lvm2-2.02.178-example.conf.in.patch 1650 BLAKE2B f5e04bb7524cffb5ee3f6f819541eba0681e8a32f884be4c78537a38848fdbe03d3028b90568e03810df86012cfb497c9050fb949c6c8b1d4460174a6794205b SHA512 fe30018b3f0ebd6f99e63a5d8b423365b8f2c5d5b17b19810ca1bea52f49a5c07e059cfcb1851be752024ba5acad6fbb736f20264b83bdf385f845c3b68d5b5b
+AUX lvm2-2.02.178-static-pkgconfig-libs.patch 3495 BLAKE2B 85869e4f46b001c4a8d43692ae7e3d73731deb9bc6094b4cdb3059058dfb819ecf507f5c5a5b47d4be4db18e6d0765c652f5b0e18ea17ecb55112fc70f7033bd SHA512 9a8b3d2296e4966d7209bdef3cd4c40f65a81ab5c2220d6b8ea06fd35ebad272a09a39b7f4e352eff32ad82babfbbec6c4f108d200193b3f84b225f739e0afc6
 AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 BLAKE2B 5533ceb7a601d58995e7a90b1355508907edb30d14704b397a8c8ba0d66dbcd3d6b02ace1cadef1dfbb1d927449403f76f0f38e5d034344b3232deb512507cb6 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de
 AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 BLAKE2B baf7010b5965f5c2b9a32ec812cb259cb3ceccea0d56e48d75e9f8e872634913f160fcfff0c2c77854ddfeaafb3b48bbca16d569041ab6f45aecb950f8e5bf4a SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c
 AUX lvm2-2.02.67-createinitrd.patch 660 BLAKE2B 23e784e6769bc1f47fa57d690e6bebdf16d784d775a06af1c8eb7c54dd63a12abb0edd8331c8d033d7a0dda058252453a46dd35bd820fd47ba1407e9568b3858 SHA512 17fbba5d34ece5c1c25ef35fa3bbc3d6fcd20b44bd766c049bbc120853a8d60c9544db5790645a7814db5c272fd12d383699a8a9be6f4e9c56a7c0a1bb29ade2
@@ -37,9 +42,8 @@ DIST LVM2.2.02.136.tgz 1891010 BLAKE2B 606900337eec96a5a124518b1cc20712763f0c79b
 DIST LVM2.2.02.139.tgz 1897293 BLAKE2B cad5f37a9190c40147e80edcec6af1717f87c2cce01e6e4cbd8cf8b594d995a08b52070b0d45dd9f1f8b5120c2babaf0ced158e70227dde516fca838369f7664 SHA512 f112207d7447606915026495b931bffc4c0d68d36b9a8792fe4b7abf8b743bc4559da5c79145cb4d457337118e60552f9df511e31f2799001d29d006f7946cc0
 DIST LVM2.2.02.145.tgz 1986370 BLAKE2B 0c9e5efae17f26ff86152cecbf0b11a74e85007b2fa9491f44dec03ac8c11375bacf6685213b4be19037c8fbf70e13549516716ecf8fa262919a44625e6aab34 SHA512 84e28b3efc940837ea9da70fce620744aea0945ba29383b76ad7bcd4b5259b897c714162a8e8b7cfe26ae736a3ad2eca633a3e0df4d6280a32b28bd4cf472d27
 DIST LVM2.2.02.166.tgz 2148324 BLAKE2B a57ad21b1f31a6e78c56e4cf77e0d6fd99262c95a0093fe3eb9d6b0a82b675c0d39c3337af4a4bea87cba0c0a816bc98f7052afda6b850dc4712f5539942b7d5 SHA512 8bebe9b474f791b5edf5366b0bd24861fbbaf8a83afa2a9e2a8e3917e05e4ecbf6877f018be03ffb4e9b4c8832208264165b85182bf79a07661adf35128b4a21
-DIST LVM2.2.02.171.tgz 2333643 BLAKE2B 169155354ba1de7f97a4f9e9156f3f7ba8553a2313883152371637986e8c3355906831368cd2e2c8c30d85045865c24667dc624fdbd36ae6a632a1a678c5cd23 SHA512 801adcc2ae483f81edf6bfba73090b6b8f710370e48764f08a62da71d617157075bea01593c2535ad5ba71dcb5e0cfe83cec9a65180a6e8b9e0d214bdee79883
-DIST LVM2.2.02.172.tgz 2351684 BLAKE2B d303bceab0f30ac726563cbf6491439b0528223c1cb0351aff348b08502912b53b6df449b261ead011c3c40c63603840bfcbc8432f79d047733b7da673ff2b76 SHA512 402612667f279be5f1c682b9037022788e9b76e3157907a0832e8b7847c3aa96e4b44a3bd880657a7e577ab46db0e4f283ac6edbb52502e365617633c802ae40
 DIST LVM2.2.02.173.tgz 2363504 BLAKE2B a516bc9b68b7b7529f4436d8849ca741eb3ca1b5ac2eb2fb2915507935bdd28b5e234e74c1bce827e5761f57b5936510d08107e0dc1c320190f952c706f128d3 SHA512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e
+DIST LVM2.2.02.181.tgz 2375093 BLAKE2B 4e4e7c65511af5902e765254a4316a9f887a6ec5c079333d78f19bff71ed3ed9d0e2e2367b0bb5e619ec6778adc9ddf944156921cec67af4d73aafc08196b73e SHA512 599d992823510e27f3ec3ceaf0d2332402b731afc0d2df88096ab55ed98dba8c3bdc5408d51b9f5b0ffbbb9ac3760ee37b878a0f36ab379449dc076c58e59511
 EBUILD lvm2-2.02.116-r1.ebuild 9247 BLAKE2B fc674ff7f5783ca558e306a6df7559d7191046ff18a9c074d6d2c1bba2e4c717a25fd4e9b67dbb6c5a765bafba97fc4d8db51d8ce2e3d0e23816a2ccadb23dc3 SHA512 d1274a15d39b795fd94e24ab32bb1bfb776b288aedcb45b8c3ac64f0bcee013c51d4a524c91479e7523d7b28afc68f32a911b9b7adcd1bc7844a31329904e547
 EBUILD lvm2-2.02.116-r2.ebuild 9386 BLAKE2B 4f9ca3e3105ea84a6731abe260efcd0c491bf30839f1d6b98d26327047e3afb7d2b83c333774bb3481f9fa1b5d10f1ae64b609599739af21489bb902bb6c5dc1 SHA512 42b3583ca14a706cd13fd4ed79e4f1bf680b6d3312aa8b815be8ffe7b0ccc74107b8df0629ad1a353be354fac6815057ecb9f0dd742be8dabfa9ccc981e30f58
 EBUILD lvm2-2.02.116-r4.ebuild 9572 BLAKE2B 5395ef556bd11d7f6f37720b6c415b33fb29e4bcc2c6035d6c23b18e1db789780f46a9135b423c8709a4d52dfa005d71a094b0f493ba89dcf6c6f84606ef4400 SHA512 763b64def4f7ce4b2d0ed01c7733b643460ff73c3b8f1ff2dfb79c1ec46b822e38c02be7c0d73c8d2ef5f3090526dd608c0a0df916d4bd0d5af0901669a985f7
@@ -56,7 +60,6 @@ EBUILD lvm2-2.02.145-r2.ebuild 9619 BLAKE2B 4461e5fee86d087e94fa8d64bbfe73f746eb
 EBUILD lvm2-2.02.145.ebuild 9633 BLAKE2B 73d08c486afd126faded9b1b0a080843dd941b73d5bdc3e3e95025d4626fc1932abd7e8a639c7173a140981c5f7aac6819ee841c893b86c1d1f2c74ab46429ce SHA512 950229bcccf673055c61b7c84b40db9ac8220a0f5de5cb8e623596944fe521ffefa50240435a03fcaf52cb8b9dde326b68e84e1b74d31396c91655d554be914a
 EBUILD lvm2-2.02.166-r2.ebuild 9835 BLAKE2B 002684c21e6c01a5abef9c5d8af3dd3ec772fd1bd52c4c1652cce32ee144100f74fe33c6a2a6a8bf43b02c465a5c9451928088980010fac36ab1e3cef3191c6f SHA512 19c4124879f5de8b179918d9b3576727a1e35dbf22cd90ce1ce0f17f35e00c540c1bb821702ead6de734093ec03445d130a3707ca9edc9caa02c13dab132909f
 EBUILD lvm2-2.02.166.ebuild 9665 BLAKE2B f6b5984ff34bc28a51426bdf38029623dc5758562b498ac0c324e9efc9ebcaffb9d952a1df328ff882ae463b9018d447c04a934cb71755ed2ae8a55d828417f4 SHA512 bd470eb2b113af3c1f8f3b09386e58db18a95bf113ad9353f68ded0dba0f17ff0ebb9b139c56ea81b2de6bc564f33935038f25f4a8dbc414323a81f26c9b8213
-EBUILD lvm2-2.02.171.ebuild 9929 BLAKE2B 2e9c753178d07723b98e37791e9fed0f10d5c965ff6fbdcbda0ad4a6e6a326cb016fae79a08af6a7af3c894e02d56e4d0c7d377246a5223ae3f3460754f22252 SHA512 adb1e074bd46692f1ea23ebd66adeebaab8cd5bacd119c08d8e4a8adc09a3d520c8f90b0267f8d564d290a8ad2d5a7f68d758e15e47a737f4c35207f3f9082f1
-EBUILD lvm2-2.02.172.ebuild 9926 BLAKE2B 5d6d1e95795def64b1f91d8ad52b091f9971802e54e4526eff16986319125ed49561598bede91f20702ece9c1db07a1cab558702b1d6369050de8168bdaa7cb6 SHA512 e25c41a2fb284ba759788538d975b2476047f64e4ad301665bfdb3c3075ccc32470085b449766e59085ef1690e9522c83b60b900a67f229b468a0c1c010b033b
 EBUILD lvm2-2.02.173.ebuild 9926 BLAKE2B 5d6d1e95795def64b1f91d8ad52b091f9971802e54e4526eff16986319125ed49561598bede91f20702ece9c1db07a1cab558702b1d6369050de8168bdaa7cb6 SHA512 e25c41a2fb284ba759788538d975b2476047f64e4ad301665bfdb3c3075ccc32470085b449766e59085ef1690e9522c83b60b900a67f229b468a0c1c010b033b
+EBUILD lvm2-2.02.181.ebuild 9927 BLAKE2B 4e7c8cc07836d429ec3e7bc598ab2f71d712da47e10b9ec3129cd3c9d7b6d1821d020f52f14270bcd5100fb6e0cd3739d587bfb5c8bfeed9a3fc19bf113bdd90 SHA512 3159f12b97bd23ed02bd173b51bf842e19fc35bad7754e7fb87e39a920a7e3bfa9a8c304b3764b1d0e9c64ca7e3111b88540005903a3d4509d6a794e195ae431
 MISC metadata.xml 1397 BLAKE2B fb780193c777b248648d09cc4c0f287f07b64df79912a4c1c37b5c456f8fc8ea98470c03501619432bddb5df1e3f877178a0c7e630b295a01a3bfc27fa63520e SHA512 1ed97dbef323b6703097c20de99e9003c88663a887bcf87c9489baddfa180aa3d8645e4e60cd3eb3b9505603997ac3ab98a7ee96a813b77b9dc25862dd332d35
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.172 b/sys-fs/lvm2/files/lvm.rc-2.02.172
index 9e22c2801ff1..c3f1f08f399c 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.172
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.172
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 _get_lvm_path() {
@@ -23,6 +23,7 @@ _need_lvmlockd()
 	[ ! -x "${lvm_path}" ] && return 1
 	${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmlockd=1'
 }
+
 depend() {
 	before checkfs fsck
 	after modules device-mapper
@@ -112,34 +113,37 @@ stop() {
 		eerror "Cannot find lvm binary in /sbin or /bin!"
 		return 1
 	fi
-# Stop LVM2
-if [ -x /sbin/vgs ] && \
-   [ -x /sbin/vgchange ] && \
-   [ -x /sbin/lvchange ] && \
-   [ -f /etc/lvmtab -o -d /etc/lvm ] && \
-   [ -d /proc/lvm  -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
-then
-	einfo "Shutting down the Logical Volume Manager"
 
-        VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
+	# Stop LVM2
+	if [ -x /sbin/vgs ] && \
+		[ -x /sbin/vgchange ] && \
+		[ -x /sbin/lvchange ] && \
+		[ -f /etc/lvmtab -o -d /etc/lvm ] && \
+		[ -d /proc/lvm  -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
+	then
+		einfo "Shutting down the Logical Volume Manager"
 
-        if [ "$VGS" ]
-        then
-            ebegin "  Shutting Down LVs & VGs"
-			#still echo stderr for debugging
-			lvm_commands="#!${lvm_path}\n"
-			# Extra PV find pass because some devices might not have been available until very recently
-			lvm_commands="${lvm_commands}lvchange --config '${config}' --sysinit -a ln ${VGS}\n"
-			# Now make the nodes
-			lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ln ${VGS}\n"
-			# Order of this is important, have to work around dash and LVM readline
-			printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
-			eend $? "Failed (possibly some LVs still needed for /usr or root)"
-        fi
+		VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
+
+		if [ "$VGS" ]
+		then
+			local _ending="eend"
+			[ "$RC_RUNLEVEL" = shutdown ] && _ending="ewend"
+			ebegin "  Shutting Down LVs & VGs"
+				#still echo stderr for debugging
+				lvm_commands="#!${lvm_path}\n"
+				# Extra PV find pass because some devices might not have been available until very recently
+				lvm_commands="${lvm_commands}lvchange --config '${config}' --sysinit -a ln ${VGS}\n"
+				# Now make the nodes
+				lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ln ${VGS}\n"
+				# Order of this is important, have to work around dash and LVM readline
+				printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
+			${_ending} $? "Failed (possibly some LVs still needed for /usr or root)"
+		fi
 
-	einfo "Finished shutting down the Logical Volume Manager"
-	return 0
-fi
+		einfo "Finished shutting down the Logical Volume Manager"
+		return 0
+	fi
 }
 
 # vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm2-2.02.176-pthread-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.02.176-pthread-pkgconfig.patch
new file mode 100644
index 000000000000..c0265e81268a
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.176-pthread-pkgconfig.patch
@@ -0,0 +1,29 @@
+--- LVM2.2.02.176/libdm/libdevmapper.pc.in
++++ LVM2.2.02.176/libdm/libdevmapper.pc.in
+@@ -9,4 +9,4 @@
+ Cflags: -I${includedir} 
+ Libs: -L${libdir} -ldevmapper
+ Requires.private: @SELINUX_PC@ @UDEV_PC@
+-Libs.private: -lm @RT_LIBS@
++Libs.private: -lm @RT_LIBS@ @PTHREAD_LIBS@
+--- LVM2.2.02.176/tools/Makefile.in
++++ LVM2.2.02.176/tools/Makefile.in
+@@ -93,6 +93,7 @@
+   INSTALL_LVM_TARGETS += install_tools_static
+   INSTALL_DMSETUP_TARGETS += install_dmsetup_static
+   INSTALL_CMDLIB_TARGETS += install_cmdlib_static
++  STATIC_LIBS += @PTHREAD_LIBS@
+ endif
+ 
+ LVMLIBS = $(LVMINTERNAL_LIBS) -ldevmapper
+@@ -118,6 +119,10 @@
+ 
+ include $(top_builddir)/make.tmpl
+ 
++ifeq ("@STATIC_LINK@", "yes")
++  STATIC_LIBS += @PTHREAD_LIBS@
++endif
++
+ device-mapper: $(TARGETS_DM)
+ 
+ CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS)
diff --git a/sys-fs/lvm2/files/lvm2-2.02.178-asneeded.patch b/sys-fs/lvm2/files/lvm2-2.02.178-asneeded.patch
new file mode 100644
index 000000000000..c831c6d6e60c
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.178-asneeded.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/330255
+
+liblvm2app.so: undefined reference to `floor'
+
+--- LVM2.2.02.178/liblvm/Makefile.in
++++ LVM2.2.02.178/liblvm/Makefile.in
+@@ -43,7 +43,7 @@
+ include $(top_builddir)/make.tmpl
+ 
+ LDFLAGS += -L$(top_builddir)/lib -L$(top_builddir)/daemons/dmeventd
+-LIBS += $(LVMINTERNAL_LIBS) -ldevmapper -laio
++LIBS += $(LVMINTERNAL_LIBS) -ldevmapper -laio -lm
+ 
+ .PHONY: install_dynamic install_static install_include install_pkgconfig
+ 
diff --git a/sys-fs/lvm2/files/lvm2-2.02.178-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.02.178-dynamic-static-ldflags.patch
new file mode 100644
index 000000000000..0a0e73209062
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.178-dynamic-static-ldflags.patch
@@ -0,0 +1,59 @@
+--- LVM2.2.02.178/configure.ac
++++ LVM2.2.02.178/configure.ac
+@@ -33,6 +33,7 @@
+ 		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
+ 		# equivalent to -rdynamic
+ 		ELDFLAGS="-Wl,--export-dynamic"
++		STATIC_LDFLAGS="-Wl,--no-export-dynamic"
+ 		# FIXME Generate list and use --dynamic-list=.dlopen.sym
+ 		CLDWHOLEARCHIVE="-Wl,-whole-archive"
+ 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
+@@ -2042,6 +2043,7 @@
+ AC_SUBST(SYSTEMD_LIBS)
+ AC_SUBST(SNAPSHOTS)
+ AC_SUBST(STATICDIR)
++AC_SUBST(STATIC_LDFLAGS)
+ AC_SUBST(STATIC_LINK)
+ AC_SUBST(TESTSUITE_DATA)
+ AC_SUBST(THIN)
+--- LVM2.2.02.178/daemons/dmeventd/Makefile.in
++++ LVM2.2.02.178/daemons/dmeventd/Makefile.in
+@@ -64,7 +64,7 @@
+ 		-o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS)
+ 
+ dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) dmeventd.o \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) dmeventd.o \
+ 		-o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS) $(STATIC_LIBS)
+ 
+ ifeq ("@PKGCONFIG@", "yes")
+--- LVM2.2.02.178/make.tmpl.in
++++ LVM2.2.02.178/make.tmpl.in
+@@ -64,6 +64,7 @@
+ # FIXME set this only where it's needed, not globally?
+ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
+ LDFLAGS ?= @LDFLAGS@
++STATIC_LDFLAGS += @STATIC_LDFLAGS@
+ CLDFLAGS += @CLDFLAGS@
+ ELDFLAGS += @ELDFLAGS@
+ LDDEPS += @LDDEPS@
+--- LVM2.2.02.178/tools/Makefile.in
++++ LVM2.2.02.178/tools/Makefile.in
+@@ -129,7 +129,7 @@
+ 
+ dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
+ 	@echo "    [CC] $@"
+-	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
++	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \
+ 	      -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS)
+ 
+ all: device-mapper
+@@ -159,7 +159,7 @@
+ 
+ lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
+ 	@echo "    [CC] $@"
+-	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
++	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
+ 	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
+ 
+ liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
diff --git a/sys-fs/lvm2/files/lvm2-2.02.178-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.02.178-example.conf.in.patch
new file mode 100644
index 000000000000..34c710d4392c
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.178-example.conf.in.patch
@@ -0,0 +1,50 @@
+--- LVM2.2.02.178/conf/example.conf.in
++++ LVM2.2.02.178/conf/example.conf.in
+@@ -128,6 +128,9 @@
+ 	# Example
+ 	# Accept every block device:
+ 	# filter = [ "a|.*/|" ]
++	# Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel
++	# noise when you probed while not available.
++	filter = [ "r|/dev/nbd.*|", "a/.*/" ]
+ 	# Reject the cdrom drive:
+ 	# filter = [ "r|/dev/cdrom|" ]
+ 	# Work with just loopback devices, e.g. for testing:
+@@ -704,7 +707,8 @@
+ 	# Configuration option global/fallback_to_lvm1.
+ 	# This setting is no longer used.
+ 	# This configuration option has an automatic default value.
+-	# fallback_to_lvm1 = 0
++	# Gentoo: the LVM tools are a seperate package.
++	fallback_to_lvm1 = 0
+ 
+ 	# Configuration option global/format.
+ 	# This setting is no longer used.
+@@ -1508,7 +1512,7 @@
+ 
+ # Configuration section metadata.
+ # This configuration section has an automatic default value.
+-# metadata {
++metadata {
+ 
+ 	# Configuration option metadata/check_pv_device_sizes.
+ 	# Check device sizes are not smaller than corresponding PV sizes.
+@@ -1553,7 +1557,8 @@
+ 	# 
+ 	# This configuration option is advanced.
+ 	# This configuration option has an automatic default value.
+-	# pvmetadatacopies = 1
++	# Gentoo: enable for data safety, but PV resize is then disabled.
++	# pvmetadatacopies = 2
+ 
+ 	# Configuration option metadata/vgmetadatacopies.
+ 	# Number of copies of metadata to maintain for each VG.
+@@ -1608,7 +1613,7 @@
+ 	# 
+ 	# This configuration option is advanced.
+ 	# This configuration option does not have a default value defined.
+-# }
++}
+ 
+ # Configuration section report.
+ # LVM report command output formatting.
diff --git a/sys-fs/lvm2/files/lvm2-2.02.178-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.178-static-pkgconfig-libs.patch
new file mode 100644
index 000000000000..989b3082576d
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.178-static-pkgconfig-libs.patch
@@ -0,0 +1,102 @@
+--- LVM2.2.02.178/configure.ac
++++ LVM2.2.02.178/configure.ac
+@@ -1238,6 +1238,7 @@
+ 	PKG_CHECK_MODULES(BLKID, blkid >= 2.24,
+ 			  [ BLKID_WIPING=yes
+ 			    BLKID_PC="blkid"
++			    BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC`
+ 			    DEFAULT_USE_BLKID_WIPING=1
+ 			    AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.])
+ 			  ], [if test "$BLKID_WIPING" = maybe; then
+@@ -1286,6 +1287,7 @@
+ if test "$UDEV_SYNC" = yes; then
+ 	pkg_config_init
+ 	PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"])
++	UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev`
+ 	AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
+ 
+ 	AC_CHECK_LIB(udev, udev_device_get_is_initialized, AC_DEFINE([HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED], 1,
+@@ -1564,19 +1566,32 @@
+ if test "$SELINUX" = yes; then
+ 	AC_CHECK_LIB([sepol], [sepol_check_context], [
+ 		AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.])
+-		SELINUX_LIBS="-lsepol"])
++		SEPOL_LIBS="-lsepol"])
++
++	dnl -- init pkgconfig if required
++	if  test x$PKGCONFIG_INIT != x1; then
++		pkg_config_init
++	fi
++	PKG_CHECK_MODULES(SELINUX, libselinux, [
++		SELINUX_PC="libselinux"
++		SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux`
++		SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS"
++		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
++	],[
++		dnl -- old non-pkgconfig method, is buggy with static builds
+ 
+ 	AC_CHECK_LIB([selinux], [is_selinux_enabled], [
+ 		AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
+ 		AC_CHECK_HEADERS([selinux/label.h])
+ 		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
+-		SELINUX_LIBS="-lselinux $SELINUX_LIBS"
++		SELINUX_LIBS="-lselinux $SEPOL_LIBS"
+ 		SELINUX_PC="libselinux"
+ 		HAVE_SELINUX=yes ], [
+ 		AC_MSG_WARN(Disabling selinux)
+ 		SELINUX_LIBS=
+ 		SELINUX_PC=
+ 		HAVE_SELINUX=no ])
++	])
+ fi
+ 
+ ################################################################################
+@@ -1927,6 +1942,7 @@
+ ################################################################################
+ AC_SUBST(APPLIB)
+ AC_SUBST(AWK)
++AC_SUBST(BLKID_STATIC_LIBS)
+ AC_SUBST(BLKID_PC)
+ AC_SUBST(BUILD_CMIRRORD)
+ AC_SUBST(BUILD_DMEVENTD)
+@@ -2037,6 +2053,7 @@
+ AC_SUBST(SALCK_LIBS)
+ AC_SUBST(SBINDIR)
+ AC_SUBST(SELINUX_LIBS)
++AC_SUBST(SELINUX_STATIC_LIBS)
+ AC_SUBST(SELINUX_PC)
+ AC_SUBST(SYSCONFDIR)
+ AC_SUBST(SYSTEMD_LIBS)
+@@ -2053,6 +2070,7 @@
+ AC_SUBST(CACHE_DUMP_CMD)
+ AC_SUBST(CACHE_REPAIR_CMD)
+ AC_SUBST(CACHE_RESTORE_CMD)
++AC_SUBST(UDEV_STATIC_LIBS)
+ AC_SUBST(UDEV_PC)
+ AC_SUBST(UDEV_RULES)
+ AC_SUBST(UDEV_SYNC)
+--- LVM2.2.02.178/make.tmpl.in
++++ LVM2.2.02.178/make.tmpl.in
+@@ -59,7 +59,7 @@
+ 
+ LIBS = @LIBS@
+ # Extra libraries always linked with static binaries
+-STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
++STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS)
+ DEFS += @DEFS@
+ # FIXME set this only where it's needed, not globally?
+ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
+@@ -75,10 +75,13 @@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ READLINE_LIBS = @READLINE_LIBS@
+ SELINUX_LIBS = @SELINUX_LIBS@
++SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@
+ UDEV_CFLAGS = @UDEV_CFLAGS@
+ UDEV_LIBS = @UDEV_LIBS@
++UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
+ BLKID_CFLAGS = @BLKID_CFLAGS@
+ BLKID_LIBS = @BLKID_LIBS@
++BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@
+ SYSTEMD_LIBS = @SYSTEMD_LIBS@
+ VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
+ 
diff --git a/sys-fs/lvm2/lvm2-2.02.171.ebuild b/sys-fs/lvm2/lvm2-2.02.171.ebuild
deleted file mode 100644
index dc1aedc9517b..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.171.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="https://sourceware.org/lvm2/"
-SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
-	ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin )
-	systemd? ( udev )
-	clvm? ( !systemd )"
-
-DEPEND_COMMON="
-	clvm? (
-		cman? ( =sys-cluster/cman-3* )
-		corosync? ( sys-cluster/corosync )
-		openais? ( sys-cluster/openais )
-		=sys-cluster/libdlm-3*
-	)
-
-	readline? ( sys-libs/readline:0= )
-	sanlock? ( sys-cluster/sanlock )
-	systemd? ( >=sys-apps/systemd-205:0= )
-	udev? ( >=virtual/libudev-208:=[static-libs?] )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
-	>=sys-apps/baselayout-2.2
-	!<sys-apps/openrc-0.11
-	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/clvm
-	!!sys-fs/lvm-user
-	>=sys-apps/util-linux-2.16
-	lvm2create_initrd? ( sys-apps/makedev )
-	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-# USE 'static' currently only works with eudev, bug 520450
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig
-	>=sys-devel/binutils-2.20.1-r1
-	sys-devel/autoconf-archive
-	static? (
-		selinux? ( sys-libs/libselinux[static-libs] )
-		udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
-		>=sys-apps/util-linux-2.16[static-libs]
-	)"
-
-S=${WORKDIR}/${PN/lvm/LVM}.${PV}
-
-PATCHES=(
-	# Gentoo specific modification(s):
-	"${FILESDIR}"/${PN}-2.02.129-example.conf.in.patch
-
-	# For upstream -- review and forward:
-	"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	"${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	"${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	"${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
-	"${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
-	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
-	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
-	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-
-	if use udev; then
-		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-		fi
-	fi
-
-	check_extra_config
-
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "1iAR = $(tc-getAR)" \
-		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
-		make.tmpl.in || die #444082
-
-	sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
-
-	if use udev && ! use device-mapper-only; then
-		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
-		elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
-		elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
-		elog "if it was previously disabled."
-	fi
-
-	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
-
-	# Without thin-privision-tools, there is nothing to install for target install_man7:
-	use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; }
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -flto
-	local myconf=()
-	local buildmode
-
-	myconf+=( $(use_enable !device-mapper-only dmeventd) )
-	myconf+=( $(use_enable !device-mapper-only cmdlib) )
-	myconf+=( $(use_enable !device-mapper-only applib) )
-	myconf+=( $(use_enable !device-mapper-only fsadm) )
-	myconf+=( $(use_enable !device-mapper-only lvmetad) )
-	use device-mapper-only && myconf+=( --disable-udev-systemd-background-jobs )
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	if use static; then
-		buildmode="internal"
-		# This only causes the .static versions to become available
-		myconf+=( --enable-static_link )
-	else
-		buildmode="shared"
-	fi
-	dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
-
-	# dmeventd requires mirrors to be internal, and snapshot available
-	# so we cannot disable them
-	myconf+=( --with-mirrors=${dmbuildmode} )
-	myconf+=( --with-snapshots=${dmbuildmode} )
-	if use thin; then
-		myconf+=( --with-thin=internal --with-cache=internal )
-		local texec
-		for texec in check dump repair restore; do
-			myconf+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
-			myconf+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
-		done
-	else
-		myconf+=( --with-thin=none --with-cache=none )
-	fi
-
-	if use lvm1; then
-		myconf+=( --with-lvm1=${buildmode} )
-	else
-		myconf+=( --with-lvm1=none )
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf+=( --disable-o_direct )
-
-	if use clvm; then
-		myconf+=( --with-cluster=${buildmode} )
-		# 4-state! Make sure we get it right, per bug 210879
-		# Valid options are: none, cman, gulm, all
-		#
-		# 2009/02:
-		# gulm is removed now, now dual-state:
-		# cman, none
-		# all still exists, but is not needed
-		#
-		# 2009/07:
-		# TODO: add corosync and re-enable ALL
-		local clvmd=""
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		use corosync && clvmd="${clvmd:+$clvmd,}corosync"
-		use openais && clvmd="${clvmd:+$clvmd,}openais"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf+=( --with-clvmd=${clvmd} )
-		myconf+=( --with-pool=${buildmode} )
-		myconf+=( --enable-lvmlockd-dlm )
-	else
-		myconf+=( --with-clvmd=none --with-cluster=none )
-	fi
-
-	econf \
-		$(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--with-confdir="${EPREFIX}"/etc \
-		--exec-prefix="${EPREFIX}" \
-		--sbindir="${EPREFIX}/sbin" \
-		--with-staticdir="${EPREFIX}"/sbin \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-default-dm-run-dir=/run \
-		--with-default-run-dir=/run/lvm \
-		--with-default-locking-dir=/run/lock/lvm \
-		--with-default-pid-dir=/run \
-		$(use_enable udev udev_rules) \
-		$(use_enable udev udev_sync) \
-		$(use_with udev udevdir "$(get_udevdir)"/rules.d) \
-		$(use_enable sanlock lvmlockd-sanlock) \
-		$(use_enable systemd udev-systemd-background-jobs) \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		${myconf[@]} \
-		CLDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	pushd include >/dev/null
-	emake
-	popd >/dev/null
-
-	if use device-mapper-only ; then
-		emake device-mapper
-	else
-		emake
-		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
-	fi
-}
-
-src_install() {
-	local inst
-	INSTALL_TARGETS="install install_tmpfiles_configuration"
-	# install systemd related files only when requested, bug #522430
-	use systemd && INSTALL_TARGETS="${INSTALL_TARGETS} install_systemd_units install_systemd_generators"
-	use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
-	for inst in ${INSTALL_TARGETS}; do
-		emake DESTDIR="${D}" ${inst}
-	done
-
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
-	if use !device-mapper-only ; then
-		newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
-		newinitd "${FILESDIR}"/lvm.rc-2.02.166-r2 lvm
-		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
-
-		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
-		newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
-	fi
-
-	if use sanlock; then
-		newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
-	fi
-
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
-		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
-	fi
-
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a
-		dolib.a libdaemon/client/libdaemonclient.a #462908
-		#gen_usr_ldscript libdevmapper.so
-		dolib.a daemons/dmeventd/libdevmapper-event.a
-		#gen_usr_ldscript libdevmapper-event.so
-	else
-		rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
-	fi
-
-	if use lvm2create_initrd; then
-		dosbin scripts/lvm2create_initrd/lvm2create_initrd
-		doman scripts/lvm2create_initrd/lvm2create_initrd.8
-		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
-	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-	ewarn "# rc-update add lvm boot"
-	ewarn
-	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
-	ewarn "to enable lvm autoactivation and metadata caching."
-}
-
-src_test() {
-	einfo "Tests are disabled because of device-node mucking, if you want to"
-	einfo "run tests, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.172.ebuild b/sys-fs/lvm2/lvm2-2.02.172.ebuild
deleted file mode 100644
index 64a75336d322..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.172.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="https://sourceware.org/lvm2/"
-SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
-	ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin )
-	systemd? ( udev )
-	clvm? ( !systemd )"
-
-DEPEND_COMMON="
-	clvm? (
-		cman? ( =sys-cluster/cman-3* )
-		corosync? ( sys-cluster/corosync )
-		openais? ( sys-cluster/openais )
-		=sys-cluster/libdlm-3*
-	)
-
-	readline? ( sys-libs/readline:0= )
-	sanlock? ( sys-cluster/sanlock )
-	systemd? ( >=sys-apps/systemd-205:0= )
-	udev? ( >=virtual/libudev-208:=[static-libs?] )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
-	>=sys-apps/baselayout-2.2
-	!<sys-apps/openrc-0.11
-	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/clvm
-	!!sys-fs/lvm-user
-	>=sys-apps/util-linux-2.16
-	lvm2create_initrd? ( sys-apps/makedev )
-	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-# USE 'static' currently only works with eudev, bug 520450
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig
-	>=sys-devel/binutils-2.20.1-r1
-	sys-devel/autoconf-archive
-	static? (
-		selinux? ( sys-libs/libselinux[static-libs] )
-		udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
-		>=sys-apps/util-linux-2.16[static-libs]
-	)"
-
-S=${WORKDIR}/${PN/lvm/LVM}.${PV}
-
-PATCHES=(
-	# Gentoo specific modification(s):
-	"${FILESDIR}"/${PN}-2.02.129-example.conf.in.patch
-
-	# For upstream -- review and forward:
-	"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	"${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	"${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	"${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
-	"${FILESDIR}"/${PN}-2.02.172-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
-	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
-	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
-	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-
-	if use udev; then
-		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-		fi
-	fi
-
-	check_extra_config
-
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "1iAR = $(tc-getAR)" \
-		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
-		make.tmpl.in || die #444082
-
-	sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
-
-	if use udev && ! use device-mapper-only; then
-		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
-		elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
-		elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
-		elog "if it was previously disabled."
-	fi
-
-	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
-
-	# Without thin-privision-tools, there is nothing to install for target install_man7:
-	use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; }
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -flto
-	local myconf=()
-	local buildmode
-
-	myconf+=( $(use_enable !device-mapper-only dmeventd) )
-	myconf+=( $(use_enable !device-mapper-only cmdlib) )
-	myconf+=( $(use_enable !device-mapper-only applib) )
-	myconf+=( $(use_enable !device-mapper-only fsadm) )
-	myconf+=( $(use_enable !device-mapper-only lvmetad) )
-	use device-mapper-only && myconf+=( --disable-udev-systemd-background-jobs )
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	if use static; then
-		buildmode="internal"
-		# This only causes the .static versions to become available
-		myconf+=( --enable-static_link )
-	else
-		buildmode="shared"
-	fi
-	dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
-
-	# dmeventd requires mirrors to be internal, and snapshot available
-	# so we cannot disable them
-	myconf+=( --with-mirrors=${dmbuildmode} )
-	myconf+=( --with-snapshots=${dmbuildmode} )
-	if use thin; then
-		myconf+=( --with-thin=internal --with-cache=internal )
-		local texec
-		for texec in check dump repair restore; do
-			myconf+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
-			myconf+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
-		done
-	else
-		myconf+=( --with-thin=none --with-cache=none )
-	fi
-
-	if use lvm1; then
-		myconf+=( --with-lvm1=${buildmode} )
-	else
-		myconf+=( --with-lvm1=none )
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf+=( --disable-o_direct )
-
-	if use clvm; then
-		myconf+=( --with-cluster=${buildmode} )
-		# 4-state! Make sure we get it right, per bug 210879
-		# Valid options are: none, cman, gulm, all
-		#
-		# 2009/02:
-		# gulm is removed now, now dual-state:
-		# cman, none
-		# all still exists, but is not needed
-		#
-		# 2009/07:
-		# TODO: add corosync and re-enable ALL
-		local clvmd=""
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		use corosync && clvmd="${clvmd:+$clvmd,}corosync"
-		use openais && clvmd="${clvmd:+$clvmd,}openais"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf+=( --with-clvmd=${clvmd} )
-		myconf+=( --with-pool=${buildmode} )
-		myconf+=( --enable-lvmlockd-dlm )
-	else
-		myconf+=( --with-clvmd=none --with-cluster=none )
-	fi
-
-	econf \
-		$(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--with-confdir="${EPREFIX}"/etc \
-		--exec-prefix="${EPREFIX}" \
-		--sbindir="${EPREFIX}/sbin" \
-		--with-staticdir="${EPREFIX}"/sbin \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-default-dm-run-dir=/run \
-		--with-default-run-dir=/run/lvm \
-		--with-default-locking-dir=/run/lock/lvm \
-		--with-default-pid-dir=/run \
-		$(use_enable udev udev_rules) \
-		$(use_enable udev udev_sync) \
-		$(use_with udev udevdir "$(get_udevdir)"/rules.d) \
-		$(use_enable sanlock lvmlockd-sanlock) \
-		$(use_enable systemd udev-systemd-background-jobs) \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		${myconf[@]} \
-		CLDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	pushd include >/dev/null
-	emake
-	popd >/dev/null
-
-	if use device-mapper-only ; then
-		emake device-mapper
-	else
-		emake
-		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
-	fi
-}
-
-src_install() {
-	local inst
-	INSTALL_TARGETS="install install_tmpfiles_configuration"
-	# install systemd related files only when requested, bug #522430
-	use systemd && INSTALL_TARGETS="${INSTALL_TARGETS} install_systemd_units install_systemd_generators"
-	use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
-	for inst in ${INSTALL_TARGETS}; do
-		emake DESTDIR="${D}" ${inst}
-	done
-
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
-	if use !device-mapper-only ; then
-		newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
-		newinitd "${FILESDIR}"/lvm.rc-2.02.172 lvm
-		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
-
-		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
-		newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
-	fi
-
-	if use sanlock; then
-		newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
-	fi
-
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
-		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
-	fi
-
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a
-		dolib.a libdaemon/client/libdaemonclient.a #462908
-		#gen_usr_ldscript libdevmapper.so
-		dolib.a daemons/dmeventd/libdevmapper-event.a
-		#gen_usr_ldscript libdevmapper-event.so
-	else
-		rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
-	fi
-
-	if use lvm2create_initrd; then
-		dosbin scripts/lvm2create_initrd/lvm2create_initrd
-		doman scripts/lvm2create_initrd/lvm2create_initrd.8
-		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
-	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-	ewarn "# rc-update add lvm boot"
-	ewarn
-	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
-	ewarn "to enable lvm autoactivation and metadata caching."
-}
-
-src_test() {
-	einfo "Tests are disabled because of device-node mucking, if you want to"
-	einfo "run tests, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.181.ebuild b/sys-fs/lvm2/lvm2-2.02.181.ebuild
new file mode 100644
index 000000000000..1363c1d32cf3
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.181.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
+HOMEPAGE="https://sourceware.org/lvm2/"
+SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
+	ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin )
+	systemd? ( udev )
+	clvm? ( !systemd )"
+
+DEPEND_COMMON="
+	clvm? (
+		cman? ( =sys-cluster/cman-3* )
+		corosync? ( sys-cluster/corosync )
+		openais? ( sys-cluster/openais )
+		=sys-cluster/libdlm-3*
+	)
+
+	readline? ( sys-libs/readline:0= )
+	sanlock? ( sys-cluster/sanlock )
+	systemd? ( >=sys-apps/systemd-205:0= )
+	udev? ( >=virtual/libudev-208:=[static-libs?] )"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+RDEPEND="${DEPEND_COMMON}
+	>=sys-apps/baselayout-2.2
+	!<sys-apps/openrc-0.11
+	!<sys-fs/cryptsetup-1.1.2
+	!!sys-fs/clvm
+	!!sys-fs/lvm-user
+	>=sys-apps/util-linux-2.16
+	lvm2create_initrd? ( sys-apps/makedev )
+	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
+# USE 'static' currently only works with eudev, bug 520450
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig
+	>=sys-devel/binutils-2.20.1-r1
+	sys-devel/autoconf-archive
+	static? (
+		selinux? ( sys-libs/libselinux[static-libs] )
+		udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
+		>=sys-apps/util-linux-2.16[static-libs]
+	)"
+
+S=${WORKDIR}/${PN/lvm/LVM}.${PV}
+
+PATCHES=(
+	# Gentoo specific modification(s):
+	"${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch
+
+	# For upstream -- review and forward:
+	"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+	"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
+	"${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
+	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
+	"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
+	"${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905
+	"${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid
+	"${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450
+	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
+	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
+	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+
+	if use udev; then
+		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+		fi
+	fi
+
+	check_extra_config
+
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static to the filename!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "1iAR = $(tc-getAR)" \
+		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
+		make.tmpl.in || die #444082
+
+	sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212
+
+	if use udev && ! use device-mapper-only; then
+		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
+		elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
+		elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
+		elog "if it was previously disabled."
+	fi
+
+	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
+
+	# Without thin-privision-tools, there is nothing to install for target install_man7:
+	use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; }
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -flto
+	local myconf=()
+	local buildmode
+
+	myconf+=( $(use_enable !device-mapper-only dmeventd) )
+	myconf+=( $(use_enable !device-mapper-only cmdlib) )
+	myconf+=( $(use_enable !device-mapper-only applib) )
+	myconf+=( $(use_enable !device-mapper-only fsadm) )
+	myconf+=( $(use_enable !device-mapper-only lvmetad) )
+	use device-mapper-only && myconf+=( --disable-udev-systemd-background-jobs )
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	if use static; then
+		buildmode="internal"
+		# This only causes the .static versions to become available
+		myconf+=( --enable-static_link )
+	else
+		buildmode="shared"
+	fi
+	dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
+
+	# dmeventd requires mirrors to be internal, and snapshot available
+	# so we cannot disable them
+	myconf+=( --with-mirrors=${dmbuildmode} )
+	myconf+=( --with-snapshots=${dmbuildmode} )
+	if use thin; then
+		myconf+=( --with-thin=internal --with-cache=internal )
+		local texec
+		for texec in check dump repair restore; do
+			myconf+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
+			myconf+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
+		done
+	else
+		myconf+=( --with-thin=none --with-cache=none )
+	fi
+
+	if use lvm1; then
+		myconf+=( --with-lvm1=${buildmode} )
+	else
+		myconf+=( --with-lvm1=none )
+	fi
+
+	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
+	use hppa && myconf+=( --disable-o_direct )
+
+	if use clvm; then
+		myconf+=( --with-cluster=${buildmode} )
+		# 4-state! Make sure we get it right, per bug 210879
+		# Valid options are: none, cman, gulm, all
+		#
+		# 2009/02:
+		# gulm is removed now, now dual-state:
+		# cman, none
+		# all still exists, but is not needed
+		#
+		# 2009/07:
+		# TODO: add corosync and re-enable ALL
+		local clvmd=""
+		use cman && clvmd="cman"
+		#clvmd="${clvmd/cmangulm/all}"
+		use corosync && clvmd="${clvmd:+$clvmd,}corosync"
+		use openais && clvmd="${clvmd:+$clvmd,}openais"
+		[ -z "${clvmd}" ] && clvmd="none"
+		myconf+=( --with-clvmd=${clvmd} )
+		myconf+=( --with-pool=${buildmode} )
+		myconf+=( --enable-lvmlockd-dlm )
+	else
+		myconf+=( --with-clvmd=none --with-cluster=none )
+	fi
+
+	econf \
+		$(use_enable readline) \
+		$(use_enable selinux) \
+		--enable-pkgconfig \
+		--with-confdir="${EPREFIX}"/etc \
+		--exec-prefix="${EPREFIX}" \
+		--sbindir="${EPREFIX}/sbin" \
+		--with-staticdir="${EPREFIX}"/sbin \
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-default-dm-run-dir=/run \
+		--with-default-run-dir=/run/lvm \
+		--with-default-locking-dir=/run/lock/lvm \
+		--with-default-pid-dir=/run \
+		$(use_enable udev udev_rules) \
+		$(use_enable udev udev_sync) \
+		$(use_with udev udevdir "$(get_udevdir)"/rules.d) \
+		$(use_enable sanlock lvmlockd-sanlock) \
+		$(use_enable systemd udev-systemd-background-jobs) \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		${myconf[@]} \
+		CLDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+	pushd include >/dev/null
+	emake
+	popd >/dev/null
+
+	if use device-mapper-only ; then
+		emake device-mapper
+	else
+		emake
+		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
+	fi
+}
+
+src_install() {
+	local inst
+	INSTALL_TARGETS="install install_tmpfiles_configuration"
+	# install systemd related files only when requested, bug #522430
+	use systemd && INSTALL_TARGETS="${INSTALL_TARGETS} install_systemd_units install_systemd_generators"
+	use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
+	for inst in ${INSTALL_TARGETS}; do
+		emake DESTDIR="${D}" ${inst}
+	done
+
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+
+	if use !device-mapper-only ; then
+		newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
+		newinitd "${FILESDIR}"/lvm.rc-2.02.172 lvm
+		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
+
+		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
+		newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
+	fi
+
+	if use sanlock; then
+		newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
+	fi
+
+	if use clvm; then
+		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
+		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
+	fi
+
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a
+		dolib.a libdaemon/client/libdaemonclient.a #462908
+		#gen_usr_ldscript libdevmapper.so
+		dolib.a daemons/dmeventd/libdevmapper-event.a
+		#gen_usr_ldscript libdevmapper-event.so
+	else
+		rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+	fi
+
+	if use lvm2create_initrd; then
+		dosbin scripts/lvm2create_initrd/lvm2create_initrd
+		doman scripts/lvm2create_initrd/lvm2create_initrd.8
+		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+pkg_postinst() {
+	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
+	ewarn "# rc-update add lvm boot"
+	ewarn
+	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
+	ewarn "to enable lvm autoactivation and metadata caching."
+}
+
+src_test() {
+	einfo "Tests are disabled because of device-node mucking, if you want to"
+	einfo "run tests, compile the package and see ${S}/tests"
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 3b126a177097..89b9f671f4d9 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 7e238a9fad3e..8de4df2529b1 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,5 +1,7 @@
 DIST ck-sources-4.14-blkio-fix.patch 1882 BLAKE2B b85d7d0bcc868284d60c73f26b055cfc061c7535b19ac3aac9ae6df0f086e6b2342fc3ceab878c45b2c021ffc12abf4c8793472b3db85ae32d7d6c3b917530a5 SHA512 aa1f65b505d32af70e0e3c921e477f7e0adea76204ede19ced32514598a1f369bf0897487273b2acb99290ddcd2788707f0711290b767183cecb689f6df5cfa1
+DIST ck-sources-4.14-muqss.patch 282185 BLAKE2B 46af7e98f2abc7b207536fc657b539abf1511a83e0e3499e92744b417c2d50847502fa2775edbea6592550ba760c3f08aba82856133f73afbb3484cf11a155d2 SHA512 97701da9531b81ceade15eaa75de4a362182f5f5b6b66ed8de61e9e8c727853cb9301fa8a9f2debb43bf88abbcbe0fe2d5a54fc51247a0ea34e0cfdec6a85102
 DIST ck-sources-4.9-freezer-fix.patch 684 BLAKE2B 63894db45e5653af1851c7cee2493b6717d37f50d55c3a2b41316075d0f3e0bcb8975ff1c647c764bdf088ceeb4c716657e189d1e5337a69346e6dcefac332b9 SHA512 4241ca604f928263c29a49aca076832c06469db734864ec8c648cbbc30ba63cfb0b21d076ea4a7f3c438868802feb4e369d976e9ef6e091ce7bacf1a69c2c588
+DIST ck-sources-4.9-muqss.patch 303456 BLAKE2B be42cf125910d3978a6da69f5bd6050063b1bfba591c1a196bedf34f25338d57455ff1e8152a1ac11b05db4542058ec0283fe433ebb4c4312709400babccd21c SHA512 1325a18ce2f758ebf0aad95e29c4f2636eb952cf8306f863b1acbf74e982aecfbc82e321064c89fe19ee63938e4930662f40f55cd16284f86743effb79cef3ee
 DIST deblob-4.14 143883 BLAKE2B aaad9858bf626f1495f83187fd2ab91f812504534c7294cfb6818c773229eb780096a2c78a6aa963f3826df3cfdf7a7db5238f71fa8955c21b4acd75660d2b17 SHA512 662a11c03f51d85158175a8bf35fce20f01d94659d36b97a9773304ff9c091b2a9ab72a0445065c20188457fbe174fb43334a79e17b3a9e8553bb6144a971f4c
 DIST deblob-4.16 142787 BLAKE2B 8c43d5487ea8bf78861c582f71206e1d90ad23aad57a0100bea19fb7dd1a3627e4138c3284f31ef292f4c810f6f315718080316e00fb0388cfd997276d170458 SHA512 5f2e0d7cc3adad0ba8f46a2c23041078105778854e87f3a5fb139cdd58151e4cca8690ab99e20026c3a966dc7c414e154c3b395e4e5ab5d744eece3cb9019d02
 DIST deblob-4.17 142269 BLAKE2B 7ac3e9565b1e72c0cba7590aa8ca8eedb3cab1b31cdbcced2a9170dac9b6e4b3979bc319c1b9b342827754b586ed8571057778862e294658c19c78e25d39dc81 SHA512 a0120c94ed132fec3870a836df715a8952aaad54c348938fecd6c755186c69f00b80c9f95fa8b33612d30bcb047fcb21a642a689b255e9ca4abc45e6d97c3e37
@@ -26,6 +28,9 @@ DIST genpatches-4.14-61.extras.tar.xz 17488 BLAKE2B ff11e1b46e4cc9ccd85322800f2d
 DIST genpatches-4.14-64.base.tar.xz 1627076 BLAKE2B 12cdb62b2204dc7eff6e05c81013fa898c37d708af01ad3581b173da82a52e52af946749922033fb46ec9e7ac35d909523fe30c6e82defd3e26717cb48b73a5a SHA512 8c1f384e329cbc34c774d503385cf99d1ba747851a872a8769ec50bfe5a43aa1d0074101228404a02c6930898725d3419dbb4203d0be6bd30e8f29f74505dd4c
 DIST genpatches-4.14-64.experimental.tar.xz 5224 BLAKE2B 2914da5fc4ac05ed3e9c4bc1a864700e7cd701d4bfccc5b741044ad24da3b3c938ec24af000daa6492d8df8dadfd3526c28fd42807bc2e5081454dc2fd02561f SHA512 2706b89bc97c1754ae3ad820e5c005c05d1a4f609236e30089d1421769a2c246ceb8bcd3a06841f0e77bd1dd52c24123df7c363c3e5deffeb94a32429b36f956
 DIST genpatches-4.14-64.extras.tar.xz 17492 BLAKE2B 456c2108f5ae99cb231ba90363e824209a0ae7d63b59ba0a943e75d4a001a62dc93330d38d6c8509479a0a112728590016423b909717b8ad01462313d05d1216 SHA512 d248ec2ab188f1f0cd5f0ba253e76eddafb4687e750343de3cb29539cc64063ba7f3744b61735147e406d0307b2eec9a022ed9f4c179c5b1cace53b59ea05106
+DIST genpatches-4.14-65.base.tar.xz 1677072 BLAKE2B dd0f4496c545b357f67cbb9ead5785bdbd19bc16081a2fbb4a8dafa4d92f201db1add3ea5a69c5185797baa780486420494bc44f8298e7c6916c9860915937ac SHA512 a24c414ec5f13a4805ce1d8acdf261c1d49a5ca5fe4b5c5f16cf64b02816efd10b4008ca13ea5ca203bb214e6dc2ec262e87db9a3e31c94a84d00f5de43c35ee
+DIST genpatches-4.14-65.experimental.tar.xz 5224 BLAKE2B 7435fa53f9278635a316a403a4e3ee03ec585338673b3148ef69190901e52dfc1c8cb19a0600eaebb54b120e65c60bb9b688883af33eb0240cd8623f7fea771c SHA512 c1024431a43cb397a65eec12c206ec57cbcf267364ad8dae4875e6ccfa90b955e468907e440db25bb93610898a7b8f8a99dba5ec542ccd850770963b1b5785bf
+DIST genpatches-4.14-65.extras.tar.xz 17496 BLAKE2B d156cc7b5612ee7d6d5faed0e606a0c8ed49f952cfe77097e37e432b142b8241f3b9fab156ed71f716540bc906f21050c2901b067b3ba1498893068ad45cb9e3 SHA512 8f3c9098a559556d3e256a9b8243cc5886387f23431501093f3c0ce9599a93fb885c5056d28b9189cbcd693b4c7e3601827abd96e548e659b4a7e33bd3403045
 DIST genpatches-4.16-15.base.tar.xz 402268 BLAKE2B 1ce1a4da6e6ed219554adbf9acd0816747298c375a17794831ca9ecacd5bcf8c23c6eb49ab83d04d15b732f5ce6611be98f1d5acf151f3af172cfc6e48dab23d SHA512 2a5d0a8f83597bed7ee6000786d336729d53a2d76b674c14f4f92230cfb4cae6aca688ad70f0aa922e4826eddb0eb5d6d3b8d63ac207c54c52781759dd90c4ce
 DIST genpatches-4.16-15.experimental.tar.xz 5164 BLAKE2B c059c922b3f371ba3fbea51e714ee056d59a7326ddcc122f0c1e94055793d654e8a57faee263fd7b70a088a092e3b1d828befcf406d3d647291ce17782dadcde SHA512 ef3f4590aa9e4801c648b520a49eace811051422c4d849d80dd3d0ada07b71fd955cf520c8f1ce3d1c41d1bcc9f11f0fe05f329ca67f9098e924da3deb65d51b
 DIST genpatches-4.16-15.extras.tar.xz 17500 BLAKE2B f4c4d6408999934c03b2d0543b12fc6b227ac994201f9b31872342c63d930d4280bd1f93625c148eefb126f9269fc1fea1872ac4920ba679938c6aec7d916449 SHA512 a32823c41c47b26110da59d63bd6104d8b38ae9ecac43e87ec03ecef726349475e40fe88354a1680bf816a12f6edd0dbfb1a2b2865be0a0716047b12d2cfbded
@@ -59,6 +64,9 @@ DIST genpatches-4.9-116.extras.tar.xz 17364 BLAKE2B 32b28b0f9afbe1024e37625acf4c
 DIST genpatches-4.9-119.base.tar.xz 2275992 BLAKE2B fabaf4cf9d4162219bcb2bc3adf4166a3c704804a749822db00312907546720942cf474428fe7db5aef41c18a85de4c78beda00ea83d7cebb9ead51b9e593c80 SHA512 31d821b44476045d6d535dd52b99bc56a9c37daf732c9091537531eeac8e0c8e4f32928c907000098ea2a5280eb6314d6a4a1eb4d5ec26f905ea2235b0b1e569
 DIST genpatches-4.9-119.experimental.tar.xz 106416 BLAKE2B aafd01ea5503cd78c70002c150b5bc7312f7a4c5ec9462bc72100e82daaeb84ab298210345f9574a40b7fcbbf6d4091ab09691ae8a2617ece7cdf5da2310c3b2 SHA512 a18c5be590fec6d6e2e24b2adfb96a1aa92eee9fe832313a8696a2b3a1a01b1df933d613d45ecda05f14088cc3831e5f315b4569bd3dfc6dd1d347ee6cffedd5
 DIST genpatches-4.9-119.extras.tar.xz 17352 BLAKE2B f48cb9bf0d315ba20c8649bbb713fa8072f5e41cb962295f31374b8253ad37e7e84220ae381dcf0ae95b9613e3d81bdc02c298c591ed3f692278d0680739ce6c SHA512 a6b7c6e8a6b01bd51b5182c434e06f664a5442e049e66087f18a24d56b5b96389972cc5aeb8c1ac894667462551d9a948d52b3bd147750e969e725c5128af522
+DIST genpatches-4.9-120.base.tar.xz 2301196 BLAKE2B ba535dbc532b3595ad8f97e86531a240492d06f7ad3e1dabaaee59ccbd5c213e1d339400c5915294be9add41b931c2ed7c8250c3231bec27505f9a5c5e3d35af SHA512 32d70d7775d94f864ba59739844c49e0d8953530f17c86fc6e599edbac40f57e297a7004de91b6236b498a6efc4a934e18bfb3ce4e7c41fc1660f36a70eb823f
+DIST genpatches-4.9-120.experimental.tar.xz 106376 BLAKE2B ea17ee67a0d523aa6e2641f3572f98daf7d0c8c096e9265abb207c84d242fb25e9ee77bb88da4c790df52da74a23af03f612e2e572e21616d2731eb5795a55c8 SHA512 9bdb932068d7af65fb685ed317e76c4b0ab80cf7af8564c72cf914c396b258fac2f083db5a6b9f0ad5d4aa39544234912a41eaf0e5796f9167cec8ea7367af02
+DIST genpatches-4.9-120.extras.tar.xz 17360 BLAKE2B 78e4d2954294b7a521d2a8c7a6b16581931e7b420da00dda5e211141da64053a11dd4554dc8f9787922af594edefddd4ff62933c441a1c9d65266ebf801082b8 SHA512 75b6a55dd9350367b4a3177336f82b079560fedd93dfac6d99915771554a831a98674826a90e5791290584dd9d2762ca1939e7df85a44b022fcdbd964ebe4704
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.16.tar.xz 103020152 BLAKE2B c7f7b36280b74b2112a098733680e1e93c4f99571099d471b2dde5f7a746d9b9fab5112fffe3b7978c40f15ecaa33203eeeeea98c2158fab2d5857ece5d74f9f SHA512 ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
 DIST linux-4.17.tar.xz 102165892 BLAKE2B b9e1fe2c063d2761b4d54594b841f6591fd6f5b634a402c07e0fa5518a2b271293d97c5a7a8e3c30c9c4d78df16bf20a4f0befe998c9a9393bb3290d2df1dda3 SHA512 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
@@ -73,6 +81,7 @@ EBUILD ck-sources-4.14.51.ebuild 1890 BLAKE2B 111cb781e1c20ed3b388c931559f6065be
 EBUILD ck-sources-4.14.55.ebuild 1855 BLAKE2B 9806e1cb6bd0d898328788ab8a2736af7701d624e23f3a4eb66f1b6873248d58500275f89bd7013874c07f5f8944df809ca7db1d3a3a410de661941703e9adc0 SHA512 62dbfa716e450f83367699e9a5128ff350ce9a1ee75320e4d31dc5d599681e7ed731c5fe711efce7a1586b72188883f8656be9425386203110251d98f2ad88ad
 EBUILD ck-sources-4.14.56.ebuild 1855 BLAKE2B 7f37c990b81d118b62fe4e35a738a4598f58ebc278032afc4c402d8fef4169ba37c1acf848b22a1d17acdac93c9f836029f58000fb8fa88c1f0679f2f5ea9f37 SHA512 f80e9ba55b9d9fd81b7f85cb968af25815a1a3fc2bd820fafb6b3e26f80d7c90556e06ceafcd2d121c4843e627269bd5b2e0d518c0c8088678d7366782328913
 EBUILD ck-sources-4.14.59.ebuild 1855 BLAKE2B 2f497ba139dc123acee0fc47f497fdc3c0d64e2f67ea762106b5a8ec3c285376e2dc75b07d2942bf3a868e706ff5559c35fa981d94df9c63bd2768639e966eab SHA512 307c9f0b01c094801845a6e3eed6ff55ba2cf56fec6d92735ca0d7afea338945d3ffa621b8624a84db4d26ef6e0bf8359cb9dc16d276851669ad2705a9aaf583
+EBUILD ck-sources-4.14.60.ebuild 1770 BLAKE2B 0a8cd8b85c29583729ffaa626c0e174e234f2887153a7d9bf396505566836a7825e980e8f73e06af347d0a85c620f1c1c98a5fb77cc9b843f95787ffc35f2a8b SHA512 f10f5a2be89e51ba1bcf64fcfd911cfa9d05ab1557eb80b49c9becb43273f5bfd3dad3bd862c5644f8b2378d124f8a9f9c3aaa0fb65aa9eafe87a3446410814f
 EBUILD ck-sources-4.16.14.ebuild 1613 BLAKE2B 5f84b0524878bb19ec8f66c8fdce61f131e4370bf2ea6c23953ea151bc63b6051af1a54432c254ffb6a1243cf3dd99510a00e750eeb1a6529d594b8c8d46fab6 SHA512 5983195dd52b280fc58f08e01202f574b462e7aedd7192122f3ec55cb7f7a11e25d392f3cbda91519d8653a1edbec16648f6a6bd0b0cad026e999e6d6591c5da
 EBUILD ck-sources-4.16.16.ebuild 1613 BLAKE2B 384989f7a3889ed42cbc10c2f7f121bea04529354e5bf756ee791c4a87d5c0b8d3fce2af59c571cdb30cacac8accf48c17d2dbca1895260079db2787225a7861 SHA512 92e3e8f48b4f89c5c76ee5b2f79439d3267e99830c2558f1d94018bb679650713617feab4d70b7c9ba69254a4e598a30fa72800f0a4428660489655f5e074e55
 EBUILD ck-sources-4.16.17.ebuild 1613 BLAKE2B cefa100545689cfba0c5c8c1c90084dc18e243f4e81e2a84239ec5160660f9e690023decad8ab4856cb42cb256ada3df33d750a0167165a64c92a63dd4c1659c SHA512 05a736b59eded5eabda90408b864e3a8aa0d3374e1e925e30592cb30e892cc5b90902c798d2568f474d32131308ae5124ee76e9d103cd9133180571d7c6b3bf0
@@ -84,4 +93,5 @@ EBUILD ck-sources-4.9.109.ebuild 1892 BLAKE2B 0906ae49de55a40b635f1042661c98cd20
 EBUILD ck-sources-4.9.112.ebuild 1892 BLAKE2B c2045c9abb1d045e635389a92dca079af5e4a7ff91ee7a14fb1106c4a8029dace00c5ccee52b2ffdd5c22538537d698030e905042194dbfe2339e717e1b6bb9d SHA512 a6fabe362f38b229fb912295ca0eb43a57358d4eaa46084d562893c2a701c46e4e02323a72f4a9642430899cb73c0a9fb9638ec7645c87f28f2368bafd9c66ca
 EBUILD ck-sources-4.9.113.ebuild 1892 BLAKE2B 2dfdb3ee4167046187d081eab2bbcb9cb960db96d642f69da01f01ce78a559d52f32aa6a41be83813aaad61fd877d684d979dfa0fdac3ddb4e01c719edcf6cc3 SHA512 dbb9a323b07c03ed453fd7ec06ea604fb5a7ecd218b0704f4b2f3a4e45dea7c917592130b3d2461d7728c847f4e92d7a4e61fa36e31f8950d849b801d832e677
 EBUILD ck-sources-4.9.116.ebuild 1892 BLAKE2B a82701bcc9093f26b2409750ff0b7e903ee8d7102b399d13054382c2646c0fc304c2cfdd2674fffe34404b3e445237dc2c8083cab5c6eff14e4d9b5ff91fe5b4 SHA512 5067874fa3490bf8d98a887d20510820581eca2badec95b82a158b1a1eedf88f36d95b2883c440f8bd214e16d9d6d1982b844c1ebaddcf6580e68f35e9b339c9
+EBUILD ck-sources-4.9.117.ebuild 1774 BLAKE2B b77de83627731df33b7a59fce47caa385391d1ce9c2308e4f2133d8fd910728e0d6d56ad6e5478e0d88c553540b995ea6d497710dda6ecdb580395d11f9d59c1 SHA512 2b3b8aac4aec484110717074083ccc47cc1998241e79416c35ec07fa55aaf48215c22fad9af890bb478367bde38096c2b87784c04a68ac648982973cc1fbc6e9
 MISC metadata.xml 921 BLAKE2B a4b785a7d542fd5b1899749a5b83eba87ab3ab3e6dd30cee33f7f762e6b433ce4fb47a119b2162ec088b483f0469ff526093c9775b1e92291c5330c64cf2d10e SHA512 611c76b0b27282067a51869db434ca837f604ef75fe54bba2f18f12c41dbd4a62d5c9e2a53bf5db7ee824bbf4d663db6b5292316bde93aec771356e34751496e
diff --git a/sys-kernel/ck-sources/ck-sources-4.14.60.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.60.ebuild
new file mode 100644
index 000000000000..166b16fd13be
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.14.60.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://kernel.kolivas.org/"
+
+IUSE="experimental"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="65"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Gentoo's genpatches for Linux ${K_BRANCH_ID}, with Con Kolivas' MuQSS process scheduler."
+
+MUQSS_VERSION="162"
+MUQSS_FILE="${K_BRANCH_ID}-sched-MuQSS_${MUQSS_VERSION}.patch"
+MUQSS_BASE_URL="http://ck.kolivas.org/patches/muqss/4.0"
+
+# clearly identify package name in distrdir
+MUQSS_DISTNAME="${PN}-${K_BRANCH_ID}-muqss.patch"
+
+CK_LVER_URL="${MUQSS_BASE_URL}/${K_BRANCH_ID}"
+CK_URI="${CK_LVER_URL}/${MUQSS_FILE} -> ${MUQSS_DISTNAME}"
+
+# Fix for: https://github.com/gentoo/gentoo/pull/6942
+BLKIO_HASH="25849740d77dfc089fdbfb53623e50d38a972aff"
+BLKIO_FILE="${PN}-4.14-blkio-fix.patch"
+BLKIO_URI="https://github.com/ckolivas/linux/commit/${BLKIO_HASH}.patch -> ${BLKIO_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${BLKIO_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${MUQSS_DISTNAME} ${DISTDIR}/${BLKIO_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+pkg_postinst() {
+	elog "CPU optimizations patch (from genpatches) is off by default."
+	elog "Set USE=\"experimental\" if you need this patch / feature."
+	elog "This can be set in /etc/portage/package.use (or make.conf)"
+	elog "make menuconfig as usual to edit .config for this feature."
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.117.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.117.ebuild
new file mode 100644
index 000000000000..9e5dd5bd05cd
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.117.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://kernel.kolivas.org/"
+
+IUSE="experimental"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="120"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Gentoo's genpatches for Linux ${K_BRANCH_ID}, with Con Kolivas' MuQSS process scheduler."
+
+MUQSS_VERSION="150"
+MUQSS_FILE="${K_BRANCH_ID}-sched-MuQSS_${MUQSS_VERSION}.patch"
+MUQSS_BASE_URL="http://ck.kolivas.org/patches/muqss/4.0"
+
+# clearly identify package name in distrdir
+MUQSS_DISTNAME="${PN}-${K_BRANCH_ID}-muqss.patch"
+
+CK_LVER_URL="${MUQSS_BASE_URL}/${K_BRANCH_ID}"
+CK_URI="${CK_LVER_URL}/${MUQSS_FILE} -> ${MUQSS_DISTNAME}"
+
+# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x)
+FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc"
+FRZR_FILE="${PN}-4.9-freezer-fix.patch"
+FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${FRZR_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${MUQSS_DISTNAME} ${DISTDIR}/${FRZR_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+pkg_postinst() {
+	elog "CPU optimizations patch (from genpatches) is off by default."
+	elog "Set USE=\"experimental\" if you need this patch / feature."
+	elog "This can be set in /etc/portage/package.use (or make.conf)"
+	elog "make menuconfig as usual to edit .config for this feature."
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 925226ddf1c9..7572716a03c8 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -22,12 +22,9 @@ DIST genpatches-4.14-64.extras.tar.xz 17492 BLAKE2B 456c2108f5ae99cb231ba90363e8
 DIST genpatches-4.14-65.base.tar.xz 1677072 BLAKE2B dd0f4496c545b357f67cbb9ead5785bdbd19bc16081a2fbb4a8dafa4d92f201db1add3ea5a69c5185797baa780486420494bc44f8298e7c6916c9860915937ac SHA512 a24c414ec5f13a4805ce1d8acdf261c1d49a5ca5fe4b5c5f16cf64b02816efd10b4008ca13ea5ca203bb214e6dc2ec262e87db9a3e31c94a84d00f5de43c35ee
 DIST genpatches-4.14-65.experimental.tar.xz 5224 BLAKE2B 7435fa53f9278635a316a403a4e3ee03ec585338673b3148ef69190901e52dfc1c8cb19a0600eaebb54b120e65c60bb9b688883af33eb0240cd8623f7fea771c SHA512 c1024431a43cb397a65eec12c206ec57cbcf267364ad8dae4875e6ccfa90b955e468907e440db25bb93610898a7b8f8a99dba5ec542ccd850770963b1b5785bf
 DIST genpatches-4.14-65.extras.tar.xz 17496 BLAKE2B d156cc7b5612ee7d6d5faed0e606a0c8ed49f952cfe77097e37e432b142b8241f3b9fab156ed71f716540bc906f21050c2901b067b3ba1498893068ad45cb9e3 SHA512 8f3c9098a559556d3e256a9b8243cc5886387f23431501093f3c0ce9599a93fb885c5056d28b9189cbcd693b4c7e3601827abd96e548e659b4a7e33bd3403045
-DIST genpatches-4.17-1.base.tar.xz 5392 BLAKE2B c0a5d1795ab5ab5dfa064986b53f5f9bdb5ac543795af4a33ce8f3e0e21d0240d7b741caf3971121738963c769f861fbab5744456b350727b29074c6f0f0d090 SHA512 06696fa4ee7a6a5e42a10b83401e25b0c6920ae43ca7f2106dcc208e094c74a82ee769f0d97b5ae04b6a997f7d6bc48a36674477112c74a297d6580b225a6080
-DIST genpatches-4.17-1.experimental.tar.xz 5168 BLAKE2B 679183da1924b81b24e55fad23d57976bd33804f8d2e61bffbb9adf70d2c9d80ea83c2f6db0228baca1adb2ba5c57b8fe528e4e938a45ef9114bbb51a40106c7 SHA512 e7f68bf642616a1604f2d76a2e6310bd3f4147d85c29ddef829d0f59a785fd89f2532d854d32e3f4d132812f84ebb081936d2e5c68941ee5131b3004ed5b411b
-DIST genpatches-4.17-1.extras.tar.xz 17496 BLAKE2B 115e99b501a0119809f2abe84c3bb8a66b2b450f53003441593654c23a4bb653c4b40da1ba31e53f7f4db69c99511b2dd41f53b4adf8bd377714b1ace8abd9e2 SHA512 a01c90e36504f17495c8691ba6fa99870fd03b65299730df57e767e2562a90b6a04da24c50983cb8ea12ac276e6805f3b5fdaa30ad175ae5ee28f147f75dc3ec
-DIST genpatches-4.17-10.base.tar.xz 204764 BLAKE2B 7a8fd9d8b2015750e1d1ed0c987e0beacfec973536d867a853ed7c2b384a8a23144f71ebf871a84a417e568320d79c0006f9f1814144e6b66d8d6eaa1beba5b3 SHA512 7cd9f9b90132e5a5894f3291b83182a5444d6bebb9193712a2a23f3bb0091f332fa400f9b32e8efb4c6caa4a841c7ce79c47741d0c880367a8b8a4e021c763b4
-DIST genpatches-4.17-10.experimental.tar.xz 5228 BLAKE2B 91008e512529e1ef3687d2a0c3c22828d30787a4f465460059a1313710aa4e6f8c4f7af70f26c31d4700c0113c8d654918da82c9a3ee49617adc5e4308ab6336 SHA512 5c5463f09cd2b26c4a5c9d672caceb1ea7b6e9c1f466ae23d0e6a7d8763925c7798f0b82fc05ca115ada11ee4573adbce4e8c6f2c6192e0aa8706548884aeca0
-DIST genpatches-4.17-10.extras.tar.xz 17492 BLAKE2B c83f2606bc6d5a66ea88dcad9f6bfca8a901443c9f3b69f382528d50bfa1d5813ea451e42aea439e257216ec0961fbd636f1776b18a0a1d1e861e792232f4a42 SHA512 1914f1b7d8598f3f59501677a016acbf7b7641371c91b0b0dead2940bf36d5f61bb60d5cec441c07655e9c57b445c8c050a9339d16d5464e9f0247c1c9bb8a3f
+DIST genpatches-4.14-66.base.tar.xz 1681920 BLAKE2B 90daa216c9bc74aae62b773d9492b9d9afd211541307765493ea01cab4c1f87e0268fdc3648efe12c9d2be14e14ba1422d44cda87683c618f0d62e469eb47342 SHA512 2eab17379a326581d74d00ace8beac6d2b84f729d6b5e5784d77cfcdfc80d442f7863e0ee8c855c3bc39c54556dafc790854df3b9ab41761bf86ed9ff4a30c68
+DIST genpatches-4.14-66.experimental.tar.xz 5224 BLAKE2B 7435fa53f9278635a316a403a4e3ee03ec585338673b3148ef69190901e52dfc1c8cb19a0600eaebb54b120e65c60bb9b688883af33eb0240cd8623f7fea771c SHA512 c1024431a43cb397a65eec12c206ec57cbcf267364ad8dae4875e6ccfa90b955e468907e440db25bb93610898a7b8f8a99dba5ec542ccd850770963b1b5785bf
+DIST genpatches-4.14-66.extras.tar.xz 17496 BLAKE2B d156cc7b5612ee7d6d5faed0e606a0c8ed49f952cfe77097e37e432b142b8241f3b9fab156ed71f716540bc906f21050c2901b067b3ba1498893068ad45cb9e3 SHA512 8f3c9098a559556d3e256a9b8243cc5886387f23431501093f3c0ce9599a93fb885c5056d28b9189cbcd693b4c7e3601827abd96e548e659b4a7e33bd3403045
 DIST genpatches-4.17-11.base.tar.xz 222052 BLAKE2B a506875b452a3af992208e3c74c1e731402fd6335a542ce9081b9f0a918a510632da8a3abf7226a0b62632b4d5f98149eab735dbfec0fc21dbd589f239b0a090 SHA512 12744a72256fe387491c56bb29e68ea91989169b7fc6e481e2e980289f7423ba97d3f334879540446a73fb90d18416e00b5638c8518187442baec299a428f22e
 DIST genpatches-4.17-11.experimental.tar.xz 5228 BLAKE2B 91008e512529e1ef3687d2a0c3c22828d30787a4f465460059a1313710aa4e6f8c4f7af70f26c31d4700c0113c8d654918da82c9a3ee49617adc5e4308ab6336 SHA512 5c5463f09cd2b26c4a5c9d672caceb1ea7b6e9c1f466ae23d0e6a7d8763925c7798f0b82fc05ca115ada11ee4573adbce4e8c6f2c6192e0aa8706548884aeca0
 DIST genpatches-4.17-11.extras.tar.xz 17496 BLAKE2B cbd1194aa89a3d9672674298d99451ab6fe64ad164f408c768d8ef7db5f6263f1dda2236b35707679ab7431f5d7fb7fda4c41a31ff75d6ddd51ace3f8658f669 SHA512 680feadf0f5fc8412e2a111d02247ac85c7f7e02c0241306737660654b89629fed407c9fdbe68c1ee0ba94d05d41b8d47da31e50cc7b39e247fcbbd5e313f038
@@ -37,30 +34,9 @@ DIST genpatches-4.17-12.extras.tar.xz 17496 BLAKE2B 4e62accefe05f592f514403a5ee3
 DIST genpatches-4.17-13.base.tar.xz 333620 BLAKE2B e60641c9808d3d0638304ce0a7b215afdd6afff9b8ea6b7069362394daf7302354c616006abb7cdf0d4e375b3f0aceac32076cc80bc9084683cf0fe9e325b003 SHA512 cfcb576a7ba92ea51a9108051d07c050b1a615c6923195893c554846d2b0541e21dd7b9d77735350d5c8d5d47f888b7f3b8f95c5372abc20acee14dcf8d08c33
 DIST genpatches-4.17-13.experimental.tar.xz 5216 BLAKE2B 847fda40afcfa7f99da46ced98b79a3d3fa63a256b651265fbfb465d8acebb4c4c44abefb23925e092aa20de5ba0e18ddd575afe9df141a8e6497b12af35b5db SHA512 04c4f8e1d32c1b9cac01cb34cda7a6be3ded4e34b70ba3c6ff8dcacbccf2722be5d8537f4fc0c9498b6b4ab09fea6cabfb982a988dae035ab4c03b89230acf91
 DIST genpatches-4.17-13.extras.tar.xz 17484 BLAKE2B 2f909c143dee46c9d3e640694137b51295ca53e13fc9f6138c96abf0530afd0e671da93c16a0856803688300259ae16b486f7bb84e612f80ab5cfa41d1db6264 SHA512 62b14250dcadb58140e7f68d64dfd1f72e165fd9c6a98895e64be1a564e4bbdb8b0b5ccef10e1042b629442b64358153f7a0dc9fc5a2745f886c52fd0b91c706
-DIST genpatches-4.17-2.base.tar.xz 11824 BLAKE2B e9daef9db6e614a0eaa6d99563805b30e5ab277c3d0cdb3d3480900c99fd6890de36e90fa2490ed7fe00b8dbf15139f1973439065592c44e02c6e8fcc029d12f SHA512 65cca44521f0bc9e76aa40e9fb8734b9a02602ce09852670fb878c88551214b1b56e012476a930024da1705dca897b1f456e62f39b6a9853f54aa9abfde89f39
-DIST genpatches-4.17-2.experimental.tar.xz 5224 BLAKE2B d4e5cdbe5c0b11c273c757db6a55ed44ea53bbb1ad1772df9b4b75660f8c9f3b97d02d828730eec1a79918f857506e7829a4a8ddf80c4783bfa51cb00eb80f5b SHA512 8fd4c6cf5ea0d5b5c4e83958911d147e84c9e51f71726bb45fe7d356cbd7e40b892e255d3abf9a34b92aebb3d1a14ade2c5e598129ffede3cedbdf62cde47286
-DIST genpatches-4.17-2.extras.tar.xz 17496 BLAKE2B 402ab3be4571457aa71ad0e4785abc5ca4ab3b245d7009bb3c89d730f57b4cf78b6e7b0127907c31e4a21e96f3de367e19a71778d3dcf02ec269345d60a02cd2 SHA512 fc3d536bfa95854ddf788de3bd603a44b4aad3cfd11e464e54b7bcdd328513a048ff3a4e882c4a90fd3d21989aa3e5c0b46f4d0f22d58b93f3bab0f95801694f
-DIST genpatches-4.17-3.base.tar.xz 31556 BLAKE2B b680db7d4df57c290396f081c0099e4cd4d782ea44d8a6622fb6c16944a180789c4e1065419955b4945e0496bb5a3e8ad6a569fd62774982c6b0d1bfbb2b346c SHA512 4d303537680ed4b5a4bb7f2e53508a296796864263335233d2b8004b47b1aed17b7d8956e9f8a66449a4fce80308dc0da81d34d19a8e3cd911d201a026983216
-DIST genpatches-4.17-3.experimental.tar.xz 5224 BLAKE2B 937d0356a553c7ac33b5de50ba4f0c4f37166d89d3faefd2cded856481734626529372731ed0bbcf4ce9431a4d6c9a5e1ac417b3766bc68ebb9b37a264e201f2 SHA512 53c0401e6ab6552fdade77586de298124f6aa133fefb7ac908c5c5f5d275c57baf31aa70de8c0c8caadf99b6a40fbaaed0cf9b6e2102d397322163f9a71dd387
-DIST genpatches-4.17-3.extras.tar.xz 17492 BLAKE2B 9ad1072b3c62c064a72a5406e80eb7d270df3d2b4e2d4fa24c1f4f01d2b651abd06d3ef7d77cbddffff22597e05095f58f1bdf31b36240ec32d3e06aaf01cad7 SHA512 880e0edbbe8897bc638ced47a83dff35fb067596f07e4d6b9bb8b2f0c45bd9a1528cc557ded26ca5fe09fe89414c776f5a852385c2f1657d13c8d26f6fabd20a
-DIST genpatches-4.17-4.base.tar.xz 53932 BLAKE2B b2f31da36c71a4e69d675fc0fdd14b716cc4a6fe1b157ed66f86a51809d2efe82da587a036e61494a3c07b1c13d01516c343cd6b18b57687fa3c4ad47091c0da SHA512 4b265486e5d2111620a4007cc9fafade023e93e94c126bbc94db6f34111f0fd54693c06053b0fdd2ead49cc115c448c2e945c128231230357f7fd7a30ce36fd3
-DIST genpatches-4.17-4.experimental.tar.xz 5216 BLAKE2B ac751059eb363f1327b8cc6a9ad6c993cc56e3a57010f6a7d8b30220a401ec2b607b7eda601b39f1d6480fddb45f7a980ba7ffe7cf808ae382a57cc57a785f39 SHA512 efb2bf34ea83789437388b6becb4c51564c885355dffdfe0f902ded0cd0a9dbc534a891a8eddde76418a651f0da41d8a7402e672688b2cccaae5897ce0bfb744
-DIST genpatches-4.17-4.extras.tar.xz 17488 BLAKE2B 6dbe6859eafa2a61d2139572a28046a1278a965aa6a82518b5658c61f18ece4054175116b5907436bc40bd4c32458752fc381cb29806d9e25550a17f81684eab SHA512 49d7a27075e7e113ef39f2da651e9302b51c66d46c4d2960acc648dcd0eb4b608118584dbcbf169d73cf1ed4e105fbae9125f06dda46d346a63f0f35bf23bb4e
-DIST genpatches-4.17-5.base.tar.xz 112304 BLAKE2B 3f92f0d9298d36cc414d924ac90abffb654f70b95beacb4ebe913f0a2a0fda577af8cfeb6f2e0c5e4a9d5a9942fb1fb16d8aca37dd4f60c1442bbbaec0117b6e SHA512 a928f056ce098e931309fdb6c4004b5426022af3c839ea2d9ea703344cf34291ac688d8c03bc274bfad6cab86020480b8c08d52d2a09744d2fcb0715a8dc9be7
-DIST genpatches-4.17-5.experimental.tar.xz 5224 BLAKE2B 53ea54483b2e3a2f683baaae6ae116a313fb9c960224fc350c0853f90402d9130e2efd7a3c0dbb8504a125cf5a112a613cb8052195b6393dc07af87990d4664e SHA512 62481c468cb73b443bafb6f222ace0a93f1ab7df79323730235903b75fd91ef15ef410f61115c97baaad89f99feb96811890a37e92d1436b51748fdeeb395687
-DIST genpatches-4.17-5.extras.tar.xz 17492 BLAKE2B d627fe1135d0db2bc4be04bd906f16116544eebd72862f842f14dda66172e5fefaeefa70b482689e97e8aba34473f9460f6ed81e366e711af52ebadeb0380632 SHA512 eb52794c163aa5abdd21b8dec218f8232b38694acaa1415f6082c30373b61f2bae39567da3536c0c22b9309d0cd85f7e5d449e58772ecbb0eaa058e4355ecffd
-DIST genpatches-4.17-6.base.tar.xz 127088 BLAKE2B f7dd24fa19f3d9f47246683e6f219441172b8dbda28501406796c37fe053e75dd06b8569b755a600e4b6975fb4ff0048890e05584bc924b108c2698a33566a9a SHA512 436958fdff49c9e71b275220d304c3e2df9d9986acefffacc163e92bcf1008b2dcee793b229dcce1d0db50611a0016a2bdfd049b03278451e36a474e08ee1790
-DIST genpatches-4.17-6.experimental.tar.xz 5216 BLAKE2B 173e88535b054ff1d1710e889f011f86d0c0b8dd3cf39adc8dcbbfbd310665a10c3a7759886d1fb15fb5c76e14cc6fea1b65614fb5be4680d4fea60322d97727 SHA512 d5fef6588a3804d63ec9f160b6837f28c0935f02e55252cc7e92723427720cc635e2493b69a67de38e4ec2def62f90f3de3d6aa17c11ea6e3bcf5f51fd21c134
-DIST genpatches-4.17-6.extras.tar.xz 17484 BLAKE2B f9a8c00f4fe7fa0853bc358af5a525c5b81638b52dae4ea2ea9fd5cd27bb0d8dfbfa1670c73782a1e45a48319b07cc20b8892da2872fc3d56c2b706961e214b4 SHA512 8bb725a9e0c09ce2ce3130e2f76d4d434216d8f9471e314849d585de192e0943d8583eae93197c541ae5b011a8a2d64ec2b76c2a45cb0f47670483b8ad83e0d3
-DIST genpatches-4.17-7.base.tar.xz 145032 BLAKE2B b227c23375bc4b16bcc281b3c8e31776538d1d91a61f0df1a6f49dff41494c87c7f75abc455aa5afaa422f47e7d9900bff4834dd038f4af8ea07f0ac0628b3bb SHA512 95e67406a0400354b74e73273edd3dd6512212e408f7aa2202b5c7e6b03d541af05cdd37de9451673eebb6ec9893695d00a78bcabe4ff8686a51a62e8ae85899
-DIST genpatches-4.17-7.experimental.tar.xz 5216 BLAKE2B ecaf744867f77064c251d4e35fc7737d25d46e66374edf9cb38004111ba3799728e0a02a9157f67ddb5d7577fe211ea3e6e09f8b272fd79ceab5f1097a34403e SHA512 1a6c77c94c2c7ff559e915fa4db238595c21b1faa7f716acecf68b7f31a349a30575f89e31ee2d64e2a4571feba4ff016fb858a5b1d3a3b7661923b1f3581fa4
-DIST genpatches-4.17-7.extras.tar.xz 17480 BLAKE2B ba9706cc7fd251ce586062354be3af5bd1760a3f19c458ecac4da4d094489bc54a50e27c792725c8b8d5b5a9be0de09949fa7c389db226344bcdfd8ffb859455 SHA512 5f384790402cbd7a7ed9f00401f868d10b3f9a55b63f3cbcac37e196da48eced24c2994f1716267f9ce7be7d80fe118a42855b1e1c884acb8d1e3a1ad3ca5a09
-DIST genpatches-4.17-8.base.tar.xz 170084 BLAKE2B dc747c215803b06da66f94956589daed3d0767f7dfb3f4e10d4e1ebae5f714a5fb3e8d6b0b2e69fb349e15c859cf19c821dfa57438bbe0b0c308fa97c973bb8d SHA512 96b088f7e8afbf9a6e1d6dafd49e4cc6b4079e36a16ce7e819c653e4852aaec7e7834806fd520edf84a6a92f9c19934b8c322d743df4de6a8e7a9075a3c18aa1
-DIST genpatches-4.17-8.experimental.tar.xz 5220 BLAKE2B 2003d75504ae365714815a04947ac28aece44da7ec82772871b73fe15556015ffaadff44544cd5bff7379232df88d28dc545d808434a4430046a69a81a7b9ee0 SHA512 b527c3085e6bdf7fb9f6a4c44cf6a2810f1182f43ad533db9b8666e72a47a58b74d760985753cbbfec22337ec630cbb73d8262be0689d3eb78c4daba62bdcaa8
-DIST genpatches-4.17-8.extras.tar.xz 17488 BLAKE2B 8965450e31b593640355e758334bdcb84cf57bcb5313261e734f31ac72a082c97e5f27e723f36383063bfad4842162bf86c8c382bbcd33e4282e15dec8f871b8 SHA512 2452bf5d442ec542a048402a48744e299275e5a42067e0ae007ed0d3934792b5698c05c485361ee890b66cefe2b4f7c4b9f84e9cc24820271f8592fa6b17e852
-DIST genpatches-4.17-9.base.tar.xz 170416 BLAKE2B 4d8316d2b81dc5b08e5517fc36df7c782e88f725e48472adbdb11246a51b26cebbec0ce5a383b9dc244060ec92213883938585b6d1ecd1116a6e674a6dfee0a8 SHA512 55aaec70d1be0a0e56aa0b6ab505a554fd2271e4bf1e21a7db640c89286be945001e773110dd0255760dff9301fc407204cb0f7d0e35841934ee088ef8b873a1
-DIST genpatches-4.17-9.experimental.tar.xz 5220 BLAKE2B 7b133e03a35f7f0ffa58b9a7a2e7465bbb186b4cde1f9d1ce57f0792edded4462ef69b1ce19fac97ac6fe5abf8ac1f14b5cf516eac2649e540bddd107358bafa SHA512 b6dfb48d6140bfa252d06e9b8ca4510e9c77c76ff61e1bce6f26a28e115306ab17525d6838f84bb804056f41c95a73cfc4dd536f7101176635be65ad3bf781bb
-DIST genpatches-4.17-9.extras.tar.xz 17500 BLAKE2B 6d3fe7e54d1acb6072d627d2d7e2de5884d7512b4b02c9d2d7c5d2588d5c2d8147a2c22d62ee3f10dc574ed2ad87b81c1cd5bc3e9b635454f137858830a338fd SHA512 dd64f073f0dc99218b48a90fcbc4997ac3140672fdeb332341ab6d4bccbebfd2060c91e9f0197f9537a313c698deb106bb57a5d8334fd72e37c40767257e3b2c
+DIST genpatches-4.17-14.base.tar.xz 341072 BLAKE2B 3305f67ddd9febe000c20f3f16fd1e1f9dc584059b712d0267371907c1705e76a9987a4f92c460b398b14011c25bfa3a602974af67cbfdf87dd199981efcd81c SHA512 57c3b14086468bb982c96808ddd7ee542291a07d81a3b3f33f70dee6c40527b32e941f791204ea37e3a11b2ac99833fb1104f1deac063042430a1e2c6a96a9f3
+DIST genpatches-4.17-14.experimental.tar.xz 5224 BLAKE2B 7435fa53f9278635a316a403a4e3ee03ec585338673b3148ef69190901e52dfc1c8cb19a0600eaebb54b120e65c60bb9b688883af33eb0240cd8623f7fea771c SHA512 c1024431a43cb397a65eec12c206ec57cbcf267364ad8dae4875e6ccfa90b955e468907e440db25bb93610898a7b8f8a99dba5ec542ccd850770963b1b5785bf
+DIST genpatches-4.17-14.extras.tar.xz 17496 BLAKE2B d156cc7b5612ee7d6d5faed0e606a0c8ed49f952cfe77097e37e432b142b8241f3b9fab156ed71f716540bc906f21050c2901b067b3ba1498893068ad45cb9e3 SHA512 8f3c9098a559556d3e256a9b8243cc5886387f23431501093f3c0ce9599a93fb885c5056d28b9189cbcd693b4c7e3601827abd96e548e659b4a7e33bd3403045
 DIST genpatches-4.4-115.base.tar.xz 1692684 BLAKE2B 8595bbb40d0f0172e5b6f5266d89b3aa67fad3889375c3925a39e01ccccf9dd03e86f934d8d3c0bd93bab58ceee274277aaac4051d09f2edf665c106f2c0e29d SHA512 43dac11a37c6cbef7a4070336bda44beb2d5a9a649188d188e37c4654ce94a71244a7e87652368da5a0f88dc53ad5c8d6194ad614c4033d08295debab0c90eca
 DIST genpatches-4.4-115.experimental.tar.xz 87744 BLAKE2B dc8a9f9ae6e6789e7c072e5c6dfa0e875765d77ffb746060f65cd708124f81f8a269a54ec6bd6f9bd159d0cd5d0d9dabd6ad9489ff5453e01c264b0f34153300 SHA512 e82343f1d4220ecab61503c7cefae9d5d9cd605187f4861eac21f330c39af77e90950badf1896a8fefee57133496f706e2b1905eee1d8c6cf945e77ed3b36094
 DIST genpatches-4.4-115.extras.tar.xz 16456 BLAKE2B 3c854f5619d349eb7b20b8f92787564019769884c28cf8bd3191686e3fc8f5c764ebc3a3c99d3ea7290aab316b8a0a0728a4f679196b80b524943c503fef6705 SHA512 84d76421f1e3d3041ab18a2a6a019b571c1a6f27d2fc880da64ae11398c43e5eab79c538940df82aa02d697983a97145197b127613bb7f4765a26813cc36eacf
@@ -82,6 +58,9 @@ DIST genpatches-4.4-145.extras.tar.xz 16460 BLAKE2B f0df3ec98542d90083e642e153b5
 DIST genpatches-4.4-146.base.tar.xz 2258544 BLAKE2B 124e666bbb8a7afd64ca5b5f2a60eabc1173368e144081c98fcc5ee62f34e3142735f9be625fead106bb5acf93d84ef7cd5a175fb2aca80d0ba99e76e9a0782f SHA512 d587aaa32ea1d31b3ce37a21aa52ed6842879ea72822bae9796f5ef7006d55418690d7b5b8a1f456e0421f32c04f5280ccff4abf65ef99c75444bd6b1ba2aef5
 DIST genpatches-4.4-146.experimental.tar.xz 87764 BLAKE2B 88bf103ba7423a500c4a3b090709455e325268709dc19d084f83ed48ee5ce08a8411dcac5939beaa0792d35f2b850db8a344a83bbedaa753309e50a46e3ff5ea SHA512 ea7343620bc635dba15101fff98a3351058af73a571132bf39ac7c76c5d2e5670bf6ab8ce6a4419a6c29785e84e0a55d30a2898f5852e5be0c254435a265df2a
 DIST genpatches-4.4-146.extras.tar.xz 16468 BLAKE2B f66c91694babd521348be442aa16ec52df8e048ea21ec02778d5fb0c727e77eef70b875b409c5b150350f86b5e419bda4287624d4545ac11b41ffe715f29b503 SHA512 d80b41224ccd9f04bb9353210cf95468fe697f936973609929aab1f5f402a104de6705b3b3d89a4857b2521779c87acb7bb7117838029c1b9c51ad1fe5082ef5
+DIST genpatches-4.4-147.base.tar.xz 2278008 BLAKE2B 782236c025004d15f3efa5555ac82c54b2eab10e06b77b1f28e8a64a66141fc64974ee8b00f31018898b54926fd320428b556b90f95f8a6230576622a4384ba4 SHA512 fc5a4950e07e86cfc36114b3a84296f6405ce108424171e9a2cc884a48ff2a6b7f4f6c8480b765cb72733246f93e100fb7093dbcbfe893c24141aac155992342
+DIST genpatches-4.4-147.experimental.tar.xz 87776 BLAKE2B 271d221b1793b68fa705e3327d7e9a8e3df1bdda685eae366c6a1dbec55fff394a66bc1821f539ee749ca7cdc138e94dbabe6b806d2960576fec98a4c326dc3c SHA512 6710ef2844f0fc942e4e804032df4d5763531dbad06ff1be2c30be71ed4775b663cbf18bd39398b701558e97c45be7a95468540453d3195b3a726f6ecca70b68
+DIST genpatches-4.4-147.extras.tar.xz 16456 BLAKE2B d8077fe3b3ca854e9016782b7a5391e96bf45322c72c058ae207019da028d45457b780a9570918e344a331ddc2d804557987b87c6490b1781d01c7a115fd0b9a SHA512 4dc4607dc2a600459491b53bce34c3130c31792fecbcb6b32832f0c7bbb59f16dd94d73adf71ba4aefcc810554eb1b7a9de839fedbc6a9124dfafd5ec7258aac
 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
@@ -109,6 +88,9 @@ DIST genpatches-4.9-119.extras.tar.xz 17352 BLAKE2B f48cb9bf0d315ba20c8649bbb713
 DIST genpatches-4.9-120.base.tar.xz 2301196 BLAKE2B ba535dbc532b3595ad8f97e86531a240492d06f7ad3e1dabaaee59ccbd5c213e1d339400c5915294be9add41b931c2ed7c8250c3231bec27505f9a5c5e3d35af SHA512 32d70d7775d94f864ba59739844c49e0d8953530f17c86fc6e599edbac40f57e297a7004de91b6236b498a6efc4a934e18bfb3ce4e7c41fc1660f36a70eb823f
 DIST genpatches-4.9-120.experimental.tar.xz 106376 BLAKE2B ea17ee67a0d523aa6e2641f3572f98daf7d0c8c096e9265abb207c84d242fb25e9ee77bb88da4c790df52da74a23af03f612e2e572e21616d2731eb5795a55c8 SHA512 9bdb932068d7af65fb685ed317e76c4b0ab80cf7af8564c72cf914c396b258fac2f083db5a6b9f0ad5d4aa39544234912a41eaf0e5796f9167cec8ea7367af02
 DIST genpatches-4.9-120.extras.tar.xz 17360 BLAKE2B 78e4d2954294b7a521d2a8c7a6b16581931e7b420da00dda5e211141da64053a11dd4554dc8f9787922af594edefddd4ff62933c441a1c9d65266ebf801082b8 SHA512 75b6a55dd9350367b4a3177336f82b079560fedd93dfac6d99915771554a831a98674826a90e5791290584dd9d2762ca1939e7df85a44b022fcdbd964ebe4704
+DIST genpatches-4.9-121.base.tar.xz 2306020 BLAKE2B c4a5ecdcb86411e610539932165c5b137083853876de6326ee92ad972f3c6da8913d2ca42fe19f65357c7075364c9ce4a49353a603e5c7553d3f7b6348018cd7 SHA512 6fd321e8261ff24771d4e543f0b90678689382890ba5f43bc679c6190876ff6b68131e02ae11f7ee162a537ed9e50a2b8975a52859dd763df26af446a2ca8efd
+DIST genpatches-4.9-121.experimental.tar.xz 106388 BLAKE2B 4accb4a19f87c9b0f171c796b079835d5907c8650ab75516a0cf984e27f4779e748a08a47117a65e5c8d209b51ca4d19bbb751278525a6513f1f601b7ed07a53 SHA512 91a73068febf2f660a3123f9afa99c5352eb4fdccad650b19b3d97027f155693b017585f290fb1d0e7ab1d0847018296d5b4a1dcf19ca659d79b1555240b028a
+DIST genpatches-4.9-121.extras.tar.xz 17356 BLAKE2B fb1376b9c54ccf5886f134f0fa40d7739b5195ceca890218703c86b625a7bdc882a8c20f9a563a848bb83518bceff206a341a86534cd242996057d050cf9871f SHA512 ecdcd6d776a6f6a901adf2292846f3e6919de40cbc4d4912d698592e7d3f9e6046d657640ac02117a6c350d7219b4176adb6d5476b1fad43ca47145d8bb278bd
 DIST genpatches-4.9-51.base.tar.xz 1001928 BLAKE2B be8a1a304f634b40dba1daa56922473c25fc57cedca73401bc1a142674832bb797f805f883aecc56a4b17fd63dae6aebe42f7c642739e8c5704f130b6675dfde SHA512 2ab0efa23c556547bd223f066acbebe250346064a3588ee866871e36e3b5b5533ca7a3add6a62b53339acf89dfc8539c42b3877b5a2055ca7e20bc25c5657ca5
 DIST genpatches-4.9-51.experimental.tar.xz 106416 BLAKE2B 483d57d8e19a135130e7084238c304e07ddf04e51dba8aa705566d4be3cf3a3b21a1f8a4ed49a7b2b06bc5b70f820788bc22e42ece8e6eb5d3ea3597eaf31289 SHA512 af7a00b9a3200a50341b9af607fbef362ead2e4f5ca35d58eec505de490c03d6366ab4645e35bbddd6903ac75396413d2902b6a9fc7e2c9d0d1d1254620cfdb3
 DIST genpatches-4.9-51.extras.tar.xz 17356 BLAKE2B 03160cc66db43d543f4bbd3171741cc36ecdd1d3088a143144e8725d1a8452fbb3743dbbd196ba387875cd0eb4fd966821fc9d3b3269a6848d2fda650da5ccbe SHA512 e05c44a5ad1b68afb04647a86efc6f67e03515861e670e39f960c0a02b87fbcb71194efa6773259ee2be5c8362794a5bb6512e876784d5a521d8890865b3ba0e
@@ -131,19 +113,11 @@ EBUILD gentoo-sources-4.14.56.ebuild 742 BLAKE2B 868c210e5cb6d27b85b31ef3b366600
 EBUILD gentoo-sources-4.14.57.ebuild 742 BLAKE2B 30df32b4beaefd675e2ef110ce984915c4e3ae2f6fc8abcd2531cc734b959f4a3e65fcc793f8eb9a6decbb3ade7f7cfc0f9cba83a9d369579c82a454cbe07961 SHA512 ed5758cec76970de49626548fb3299e2a9588dee2e6c0515be00b46f80a8e5f113d66244a6f78824dc6b4c077e41030b7fc6f3c4b8da9a392a89697689e5e103
 EBUILD gentoo-sources-4.14.59.ebuild 742 BLAKE2B 1cf2df9244002d65b605133538af7d98e27c12e02f927de1bcd0f2cf008e097eb8f9bc491377cc2bc4ab30acabfe9b6f364f7c1fd26125351f2f0b9329499c02 SHA512 14b6a2f47534770d520ad7260e8b3e1516ed985aca82171c3f5223624baa427f8cf44cfde51c82be8b345eaa7fdf05a00e7a016c27c2872e0598db94465223fc
 EBUILD gentoo-sources-4.14.60.ebuild 742 BLAKE2B 1a928fc140e4c04acfa76f1dad61a3a641da7e4f60c05d794587935cdc8efe1715ad684cdc20c6fb22aefe11ccea5ded609b583a312aca121556f82669a9a311 SHA512 060d6aade4320ebd5d4471c0a0e2707f19c0042aba53291ddc9151583c5f24d6615474b07a50e7a7dc76180ba6aa8dd481dae76662c855889fda23559f808bfd
-EBUILD gentoo-sources-4.17.0.ebuild 741 BLAKE2B 6cccd19877bc0d5bc677ea794fd4669268c654d01c156b62f24cc1a7cf89c54db8685b78fc2ba941c9b48602847f3b9c9d5c05a358015e1cabead653c0f4476d SHA512 8daf880f336464e106ea015594b1ee8f476e8391dac6f698327b2c48faacaf0f4c864b6b2bbeb2b723d0cd0ea1e88041e3b23010748baaa313962028453c7164
-EBUILD gentoo-sources-4.17.1.ebuild 741 BLAKE2B bdd6a645dca7b8cb96832f43ba52604d095b4074326e482a08a46bebccfcd88dba40dee9de1d01f55e41d32209b20e99cf632bc8bb4189e97efde854275613c1 SHA512 d3101818abccdb94c1ca8a070301a2261027b655b376d3ee4eebf3ce78e88848efd3c4d770857a9657ceaadba2c34b1f220f5d48accd7f2534d37109b69edc4d
+EBUILD gentoo-sources-4.14.61.ebuild 740 BLAKE2B b09124caf5c3785d2f1e3de2e288e3a562342e5c470a1ce7a61982d89da68db8fed39730b0e4376daf29ff7dc62c63278eb5a29880dec7735a04beb1276cc699 SHA512 b6539ebcda7c9a965daec22c40ff807c06c496bf85ad0fe1767159838d0e5aa531f142103e7c172b8b543b89fd189a48e11b0643435925a3a1f5df9624bff7d1
 EBUILD gentoo-sources-4.17.10.ebuild 742 BLAKE2B 236aa15d94c986e007093b39cb21e36851191a907a7003f4cbffcbfa8075a69119926cdde47e8da9e88b31dac43a5e92ecaac1d20bd8534588f662b9b08feecf SHA512 fab04b4e34ccd0cf93560d2a27eefdb8029f6cd6f8c93590b1bd091b085a96faab788b25b764bba9917cc33385b4900fada87594aac17e79ad1d76e6f7ef0ce8
 EBUILD gentoo-sources-4.17.11.ebuild 742 BLAKE2B 9b4b7701175fa852367e1dd0087d34a2b8439cdc800501cc95d5139664172ba3a42c84d7c8ababce19a50c7e025b7107e4d286a1cb17e8402ff61d85910dd605 SHA512 fe6760cad937d2e862172c7e4e0a6a2a03efeea2dea4a141261f357f8759afc80387ed1d13378c40de09e612ae3f88c9fd11c4c900e949dea373ae5da8024770
 EBUILD gentoo-sources-4.17.12.ebuild 742 BLAKE2B 2ec4f3429b0aec8b08bddb0baaed17df4ab7e8a7bd820660e57e37e81c72da9371d7e230f53fadfef4975f05947e328094e698800e84a2fa0da2543a736b7586 SHA512 655e788f917e8e7fc0184394b013beea423c9d441e70782c9b3d4eb29eeda9e378bacd60be596457f0a1cd5cd4556dff6380310f5a6ee7a87fd6ba566a252004
-EBUILD gentoo-sources-4.17.2.ebuild 741 BLAKE2B 2eb00d59aa519bd1ce81391f509a492a74fb5026947883f638c5f0eae7f7b78e86310997497db063f18398f3f7c7543c1913f6d5552c986443ec75724895d13f SHA512 a369ec39bdb9c4f320fc140f92109aac23067610d99250c298d033248be9b324f07f07dbbcbac52e9be01666bfc111c121346813b267ace82f6fa8690940124e
-EBUILD gentoo-sources-4.17.3.ebuild 741 BLAKE2B 64ad4fafa2243d25c4798c2020c8a16ce32c4212812023073b55a977021e150b52bb2fcd13133831233be438760178c71c03423643b3729e11814ad55aa71c95 SHA512 2a26da6cc8938e404fde1ae53aba5531521d87cdfb1ccda14cb64584df2595e9293d303ebcb09c384c2134b4a5e0e6176c0d5d77de6a55f463113e4b94a06d70
-EBUILD gentoo-sources-4.17.4.ebuild 741 BLAKE2B f1e5fa6acf69df9a5e78740ee57f94033bc417bc64b6af21df7016d4f20b10b5498c49eedfe042bb2a5c020d30baeab532d3296c5284cd8de1e95bd342b80c60 SHA512 2491e573773f078689ec07fd1c836b55032fca2773f5ec8195a4c3fd2e23c8356bfbf0a51976621c074491881352c3fc4ce35723f2ae2c1c55773b5dd799b463
-EBUILD gentoo-sources-4.17.5.ebuild 741 BLAKE2B e0a48fdf626979d01025952d1004c9c8b59cb5891d7bc966ad1f4dc38f636da59b4237f9d1ca078bb4e787d06e61a83886425a558495f0aa1b43285a7cbccb95 SHA512 19bb33b52273b61e22a9cbe31cf5cfc09a671fae876131fd37bd0c28d2bf75403aa80f81b6b52cfdbe37de383dc4d10d76029a17f37c10255006001305d7b767
-EBUILD gentoo-sources-4.17.6.ebuild 741 BLAKE2B df58106245c600e0bf9dd35a7eb2f4d25469e29769d81e314e552dd32b95e592acbb90af0413ae1559939a302d289005043ff729ca43c2fff520b133ac38a2d5 SHA512 4e94b88e040b686d34e8083e6cf9ae23a4d1b5bdddd456150b1b8f85203b645de42182c3043339600bb24c9ebe4b5e4893ce633f13fdbfaab9815809169a8f64
-EBUILD gentoo-sources-4.17.7.ebuild 741 BLAKE2B 3d0593031462ff30611e20d66f3b9b5b4da8b8763754f0af7fca209c8b9d7659e910ed401e44006c78469c2f5f19c01767c29a5497b8d32fe8894a5493707463 SHA512 f024a492df3732d1c5253bf32ede8119f0f3c89da099875c14c9511b676b40b934918134ed85f098236505080a781eb0d096158e799bc905e6659208b96649d7
-EBUILD gentoo-sources-4.17.8.ebuild 741 BLAKE2B c600b8af8fb7af879c95edeb1f4c1d7412991bd42450e8659c13f60fd8ccd19a41da0cef5ffaf97e62faac994928d03a778adf104a3a368b530b00bbf5e49d22 SHA512 913997637d2bef7ea097e0a060674c1932bde149d6f32baa32f355420dab9fbe4e91af7c1d8e41992bca36b0b53eefea3a08c1a1c2b10300e0893544f844098c
-EBUILD gentoo-sources-4.17.9.ebuild 742 BLAKE2B 52d67137214e025479975cb32b5edc26ae208bc0a4ac216bba9ceaa8f4d1062ece103131950c1a8eb0a3bf387fbfe5efa9f47ec75b1d4d1c936530ea305c9447 SHA512 7f2148b0a0b88b7350f069a7b8bea5381bbf56ce25c36b459a82a31c28d20964a19204c17325efd5ff877defcd7c6bf7288947852e118b4762fbb866ecb750c7
+EBUILD gentoo-sources-4.17.13.ebuild 742 BLAKE2B 249891fb6e7d7633c87a96c8342c99d30eb047ae4dbd61e23086d50c500f311a1392a779a52c308fafd61b1acf613e583f54b12f864535e876b384fdfb17075b SHA512 3b377898580986d04c8689b2f7c02f34a86ff6e55039157b1d3ff90bfb34f99b95e59d8410b94aacf0182e2dbb6d4446e0a8db8eca61c137228dbec7f2a2f39a
 EBUILD gentoo-sources-4.4.111-r1.ebuild 738 BLAKE2B 2052014422e63b1e20f01d48f63a8eff2ae594e15ff9c873cc9d062db10c238c61084ff3c4e61bd3576af1b2744776a137972f6766e2752283b05835e40f50a8 SHA512 589b508bafdfa91c3b1f9faf390dc56795cfd5d43e8e55cde64b75ff7595f13e614d06f59a83ae1a30c2be816cabca08cdd5578c19bb459e8beab6cbc2945a07
 EBUILD gentoo-sources-4.4.128.ebuild 739 BLAKE2B addd997d6cd91e4b777dcdb847bd5c3444b4c995025a8fd1202597082bfe87ba9e46817d5db2902737d7f73ab733db4b14c6688108da061fb229f234b5c19358 SHA512 8ec27f6b753c3d839a7741da8aab3e0fe4b3095a1535ca018605b31fb9dca8ebcbcf2fee47c2da99be42e8036fce6733e0b7bfda5c2d7a5d20a50b94b42ebcc7
 EBUILD gentoo-sources-4.4.140.ebuild 743 BLAKE2B fc51ae791456368ecb5d6288c231609d8cdb05a87279ea1348d0f3de103098d0bc4bfc56e79e5b60f3faf99b5a28db082c07ba518dfbf3b930d5d7ccc29b3e31 SHA512 63896a27ad76ca4dd228021764ff540e4ab00391be283671ab7771040276ec786192c26311d25bd6e96703ae183532a530c2054c77ef1fe7e54639bf72308483
@@ -151,6 +125,7 @@ EBUILD gentoo-sources-4.4.141.ebuild 743 BLAKE2B 4627bb65cc6e6a38a60ba6b203c4011
 EBUILD gentoo-sources-4.4.142.ebuild 743 BLAKE2B b082d3f03a27df17bf6f72dfb7d03681fb7bcd0024393da6c94047232c3e943700bed7920803eeb7137023d9176a493a81d65377e05ea4636f5aa6fba81c27dd SHA512 6a378169dd06635f86594098887b6d4e93089e683b52669203358b94abe38c52da0c4cf4b211530817b0b9f0f2b87ff927c850f58c9130494b58065816d18f18
 EBUILD gentoo-sources-4.4.143.ebuild 743 BLAKE2B 7da410aa2a75881d63f9f9a9bb355fea76669cb9d70006fc2ec7df13226a90f55d44bf023019abb8a2ce13edabf100095ee49b6300fccdef22e791d91bab0458 SHA512 0e8d694f541f6d363e3a6288605a1d3c26093993b89fb023f8499df18e4a196c2928c54cf4bfa0ea001e03e5347aac2734d4c9457cc5deac5375827cb88504aa
 EBUILD gentoo-sources-4.4.145.ebuild 743 BLAKE2B 7d110a829935290f7f0e9ee05ef4f7686346bf99697e6833bb667c823b2aed647bc42baa34b08ec83e7d1d2a788ef2c95dd1e810a5a39aae7a8b02b1140b4d09 SHA512 bc2bfb6c77b4526a0b9e3191576fa28216915aa8324b096a8e82dbc4a2d8463f36342d581ce3d7bfe796f5554527980199c41e06ee2a70b19aa3558f389824fe
+EBUILD gentoo-sources-4.4.146.ebuild 741 BLAKE2B b48cf3eacf7264149837999b66fd099263922b07fe5d691bae27f49e1be10aab00d415b5466e5b4709d35a1c16c2bd62c2872530fcc9b845223c94b7a9789da0 SHA512 5c9f96ea1c59a41222101fcf70da1d4d4cb52da66e8fd7faa5f80bcc248731e816729dce4bf4e7261702d408dbfa03dbc0faa602220051d5c1674b1762744940
 EBUILD gentoo-sources-4.4.87-r1.ebuild 734 BLAKE2B 1f1cb7f7355792bcb664b74c7476e9f8d0e90ca648b819ad44e0a4339210867658584a206beb21842633b7537b2b7f58d43b391d4c4f98fd700280a72662423b SHA512 3a59950c522313a2f9722ae6d4801cd03ddb9430b58f17ab9e8a500fb9a083dc59369de7ad59de1064412f82bdc21396c7280a6af6fcb0a4524ac93f758d85ff
 EBUILD gentoo-sources-4.9.110.ebuild 743 BLAKE2B b97cdb80532d857229893737c3897de72b7d480826c5b2e5ac8d0f71879d15ebdf38d2bf99c0eba90f69200bd9087482a423fe0220600df1ac87f4b06b2fee74 SHA512 d8f68277462fb19f98da7a5185d4617c72a531727ed014bf08c7b2bb36252561f2eef85fa94024d10c6d0c151fd74414ac0d68da80406ba25a018fa501b566a2
 EBUILD gentoo-sources-4.9.111.ebuild 743 BLAKE2B 056a55dfb35a0ba7ecf78908c7cdee90e23756f9df93c803772908fc845368062d5117c0d0f98dc569db812721161e10084f311c7d6dd5c8387b78992d50b8f1 SHA512 a6b238120c4e158711bc9b2d8164c00396ae956344787c152d235dab88ac647f4215f700840c3a31c7693763318248ae93be6058773b2e16cbc620b600c8a976
@@ -160,6 +135,7 @@ EBUILD gentoo-sources-4.9.114.ebuild 743 BLAKE2B 6c31cc1269e4a32bc808657758e7e8f
 EBUILD gentoo-sources-4.9.115.ebuild 743 BLAKE2B 3b697dafc5bd68da36cc0d37a16841caba0d52f83408ba9c90a7ba9d1a0f3e8ecfe47878e50d0671b9c180173c72385014d7af5ce91f304c022bc1eba68cb302 SHA512 0cbda791621186a4a9ff6b594741a843895d792e825230e18677c129f53d5e7d1292a398b173041bd97feba88c5a64a2f87f288a888688c3398a724ddb3b156f
 EBUILD gentoo-sources-4.9.116.ebuild 743 BLAKE2B 1903d410d78de981bc8b5cd8e99c60e1b4dacb8a44cb41c526f6b1489fa42fbeba17ac3f4ddc7d6354b9db0b0b16b9a8a93a7111f4e5cb5e83ffba726b09a0e5 SHA512 81c3d5c44d243af979a7da84c36df3d1a6634e4e025c307db85948f45ee13e69ef97ca727ffbe9041a7e14c681c21236a336a089d24956ae106b649dd55b68c0
 EBUILD gentoo-sources-4.9.117.ebuild 743 BLAKE2B 4716cc340fd1ffd3e584dbce1eec57d1a5c827edd14cc78a56c42772d563c3e2fdcd9bf8512f76a07280dad6bda4a7bff220153ff4753cab7998839306da09b1 SHA512 ef0eef93ca23453252a0fbf519e6fc7fee637cf650e272eafba7646a1d67ae4eff28ecdd5c0ef1bbebc0f2ae9b86d48288777c0d53868ed39e8874f32bb7665b
+EBUILD gentoo-sources-4.9.118.ebuild 741 BLAKE2B 58dbe5f53edf250b8e69f26c6702488426aaea4831afda19920718649b6c42a8aa92fa2e4488c35787fa666f2e3f7c7957b3d8c739f7522098a3053a5fd10dc0 SHA512 897c910425493a7c89d79ef24231903dcc40a774fd28472d1f3c35033a6d68cea5cceb14ce113ad852002c737ace73d1f45c4178f34e7e2d0286416b7fcf4da2
 EBUILD gentoo-sources-4.9.49-r1.ebuild 734 BLAKE2B 169d43bf5276e6d398a72a22b968f571d6122d6b88f61e757f27ccc3d732b171bcdffc27d502c440818e93da732495c258844f047f2f64672fca5b595d15b906 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e
 EBUILD gentoo-sources-4.9.72.ebuild 738 BLAKE2B 1c88296bca01b95ece33afc5dbc5fe7ebc29ec545fdbff53dae3113b028392c41fc5557e949c4c07503fdc88b5c5f925b79316e48bc8ba8978a316554a2aa191 SHA512 d1c3b5fbcb59ac3ab703b8dd62a8f4f213dbc14526be00a34c3bb480dc4eb068297d02ab0fff33bd0d6fcf8973e862df74ca31e774cbdb0a437edcf892c233e9
 EBUILD gentoo-sources-4.9.95.ebuild 737 BLAKE2B 78f196e9dbf5c3d24f32edc2bea8bb23a525a2427d4196dce20b3f1608138ffa431103c8f586c9523880f1ffc5b5e2a31b9109b04a0a7016db2cf834ea19d065 SHA512 ab82a5279bec8af76c9d33e77ced819ae40ab93f9ca660f70feb5d62bcc35ebf71cbc10c9b8dd520f4ecf08acd06448d9ffd61a5515021e9cbeaba2498b6cbc0
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.61.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.61.ebuild
new file mode 100644
index 000000000000..e565a676196d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.61.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="66"
+
+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.17.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.17.0.ebuild
deleted file mode 100644
index a5f75de7ba4b..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.17.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="1"
-
-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.17.1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.17.1.ebuild
deleted file mode 100644
index 0cdac282a79e..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.17.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="2"
-
-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.17.13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.17.13.ebuild
new file mode 100644
index 000000000000..ca18009c454f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.17.13.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="14"
+
+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.17.2.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.17.2.ebuild
deleted file mode 100644
index 6d1f06c79d94..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.17.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="3"
-
-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.17.3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.17.3.ebuild
deleted file mode 100644
index 3237baaa381d..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.17.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="4"
-
-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.17.4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.17.4.ebuild
deleted file mode 100644
index fa93adf7230c..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.17.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="5"
-
-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.17.5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.17.5.ebuild
deleted file mode 100644
index 84cfe321515a..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.17.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="6"
-
-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.17.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.17.6.ebuild
deleted file mode 100644
index 8a49ade7edb4..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.17.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="7"
-
-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.17.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.17.7.ebuild
deleted file mode 100644
index e4760a2f9e90..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.17.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="8"
-
-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.17.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.17.8.ebuild
deleted file mode 100644
index c73638f7769a..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.17.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="9"
-
-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.17.9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.17.9.ebuild
deleted file mode 100644
index 868d54970f08..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.17.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="10"
-
-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.146.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.146.ebuild
new file mode 100644
index 000000000000..f2fcb83826ac
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.146.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="147"
+
+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.118.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.118.ebuild
new file mode 100644
index 000000000000..7a2b8f72da72
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.118.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="121"
+
+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 59cb8ccc8e4f..8e54de5e1330 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -6,6 +6,7 @@ DIST patch-4.18-rc4.patch 53258687 BLAKE2B 3abd80176b7de14be61a8fd6826f9eaab970c
 DIST patch-4.18-rc5.patch 53496453 BLAKE2B d8211e175f4d6d0f62b3458bd19731c408999c9d00510bee99323232cc59822da9d7eddbfeaacb441066a2e8f3b543106608d67b11896952f8c87c9a6c4b1a2e SHA512 9c7dc21dad12ad7cd005ce12128d25ab36d7cb6e5dd074bcc3d26b89437ae778727e52b8535240c084512c270dc5d9a66ac87babdaa9f5f030a94c2329fc9437
 DIST patch-4.18-rc6.patch 53787283 BLAKE2B 01fa18fe3cf1afdf1da52145e41c23422ba408f220c889835e01e524e03f30e2b8c61c7395c267f6893bc8f5e8888b254e28ae7f6bc099c25cab1d435c76048f SHA512 6abb369738ab4176fa0b6f25d68b8351a196c400a00045cd5afc7035e74fec5cb9e48b1506707c568a3aad441278cb10a6b345e9ca212f440e48bd5cf319816c
 DIST patch-4.18-rc7.patch 53978258 BLAKE2B f13b1b91f08d528657c4e7b7685f84bddc4aec24085c1667b943dbabc3fd59b3c438a96b29ec90cf450fa3d4bae21917f980e3770fc376bcde5ad0112b330f7e SHA512 c982f79d57f3b331de92754f423852913ecb3f8a29284b030780a8e291056b6257ab73b95edb502aa143de1982106d747c69095250c1746429dd477949f7fdd2
+DIST patch-4.18-rc8.patch 54117635 BLAKE2B 10439a54667a3b81a4635ae7ad1fffbd5862030f095ee382296c46ade02794c31f3b434721296e6d65901b3165d59e41cc286896b49b660680953721dad93f78 SHA512 afe4fa142d2d780a99a9bf7c9c8191262ce66df6947adb63c6fd9ee1e9c84f4211ae3da2872ce6d71059800f6cce5375344d0db2930664091be9b8cdc838200e
 EBUILD git-sources-4.18_rc1.ebuild 1179 BLAKE2B 56d626a7ba8ae474be3595f25012e3bd74c51b56775b2fd9267049eb688958dd173a84ee6fabc3df7bb0ef965a19f857bade0029d3e1a83948829e0282caf2e5 SHA512 9f5a1b91752ec426c7b37bf60e3d7cc8b2e8cc8cc77173fd4edb0b46985ea42e244bcd97fb3924d6f635232335894b14193492ce29e11c1f0b39ca934cb50ca0
 EBUILD git-sources-4.18_rc2.ebuild 1179 BLAKE2B 56d626a7ba8ae474be3595f25012e3bd74c51b56775b2fd9267049eb688958dd173a84ee6fabc3df7bb0ef965a19f857bade0029d3e1a83948829e0282caf2e5 SHA512 9f5a1b91752ec426c7b37bf60e3d7cc8b2e8cc8cc77173fd4edb0b46985ea42e244bcd97fb3924d6f635232335894b14193492ce29e11c1f0b39ca934cb50ca0
 EBUILD git-sources-4.18_rc3.ebuild 1179 BLAKE2B 56d626a7ba8ae474be3595f25012e3bd74c51b56775b2fd9267049eb688958dd173a84ee6fabc3df7bb0ef965a19f857bade0029d3e1a83948829e0282caf2e5 SHA512 9f5a1b91752ec426c7b37bf60e3d7cc8b2e8cc8cc77173fd4edb0b46985ea42e244bcd97fb3924d6f635232335894b14193492ce29e11c1f0b39ca934cb50ca0
@@ -13,4 +14,5 @@ EBUILD git-sources-4.18_rc4.ebuild 1179 BLAKE2B 56d626a7ba8ae474be3595f25012e3bd
 EBUILD git-sources-4.18_rc5.ebuild 1179 BLAKE2B dc18094110b5d16f0e7d273eb3f900e37e4b27c3b3bb78dc85a8bd899d0dd131731a113651a3ea8c5435a87a797db07ac6a3792d04717caea66570eb7c6b76cc SHA512 4e078e7c4b66e51fd3624ca7a84564cc535c0a9b390eb13c82ad3254e7076d8699d52951486c3d6def5e1af5de13a64cae40905895bed2499c389c1c14338313
 EBUILD git-sources-4.18_rc6.ebuild 1179 BLAKE2B dc18094110b5d16f0e7d273eb3f900e37e4b27c3b3bb78dc85a8bd899d0dd131731a113651a3ea8c5435a87a797db07ac6a3792d04717caea66570eb7c6b76cc SHA512 4e078e7c4b66e51fd3624ca7a84564cc535c0a9b390eb13c82ad3254e7076d8699d52951486c3d6def5e1af5de13a64cae40905895bed2499c389c1c14338313
 EBUILD git-sources-4.18_rc7.ebuild 1179 BLAKE2B dc18094110b5d16f0e7d273eb3f900e37e4b27c3b3bb78dc85a8bd899d0dd131731a113651a3ea8c5435a87a797db07ac6a3792d04717caea66570eb7c6b76cc SHA512 4e078e7c4b66e51fd3624ca7a84564cc535c0a9b390eb13c82ad3254e7076d8699d52951486c3d6def5e1af5de13a64cae40905895bed2499c389c1c14338313
+EBUILD git-sources-4.18_rc8.ebuild 1179 BLAKE2B dc18094110b5d16f0e7d273eb3f900e37e4b27c3b3bb78dc85a8bd899d0dd131731a113651a3ea8c5435a87a797db07ac6a3792d04717caea66570eb7c6b76cc SHA512 4e078e7c4b66e51fd3624ca7a84564cc535c0a9b390eb13c82ad3254e7076d8699d52951486c3d6def5e1af5de13a64cae40905895bed2499c389c1c14338313
 MISC metadata.xml 596 BLAKE2B 967f959eca5873ccd58ab34aeabf965ec03e9ff41850fa4eb1c49f908ed7ad090ad2f5d7904f350c84cd47d99109e977835a2b216bb8605001b4098cdbdebda5 SHA512 c3476f5b64efc298e0df021b00dc4978a34ea48e5839a9cfee583291a4b5fe7ccc35db89a335db81e9c2cded36663691e6324dcabc90d0b287213d0fccddb227
diff --git a/sys-kernel/git-sources/git-sources-4.18_rc8.ebuild b/sys-kernel/git-sources/git-sources-4.18_rc8.ebuild
new file mode 100644
index 000000000000..d7f883a43cc3
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.18_rc8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="4.17"
+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/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 872cb551ab84..454250f3c7ac 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -18,32 +18,43 @@ DIST patch-3.18.109-rt102.patch.xz 175080 BLAKE2B c9d5914c5a9e8cb4ce5d8a90d732f0
 DIST patch-3.18.109.xz 1543076 BLAKE2B 92c0226ce5a701d3c814008c6686351694d724ad3fc4df20b492c4e408f47011d8e6a1c73617556d1dca5223f7b5d96f553fbd2f63e825aacc793796e7dd4036 SHA512 053ad85e88910ae4830061c5c33b6d82d02b459b83a3084cf4b136f90153ee2ddce6555ebb84ee7d11fe8c2b412eb4a59eaf1970a753bc9835851ff276f2b966
 DIST patch-3.18.113-rt103.patch.xz 174972 BLAKE2B b0ec6aa7d6093caa6e2c9cb6ca8e10b2ac61ec5687442219856df5c52a784d849c19db793b8bd67665237da8a1a54e68179ead6feed74768d99dd19b89990e24 SHA512 38a58067c8957bfb1ff7c353e0dfacbb9aeb3b3c5477e4dce4ec8d705624667cf76bd333a83a2fc50d75c528c237719399ab8e9af1e96b188c0343f0bb5b971f
 DIST patch-3.18.113.xz 1585572 BLAKE2B fb9fec8f364df103b73e7804f6d6deeb2605ff51fb4a4c82613010b300e2d52259af24c93e47c55b86f0aeff248e309314f06bff3814a438a062d1ff509e2863 SHA512 006830bc456a63bd64e0fc0a090ce60dc9e001c6b9a3bb845d9f635976004be1b0969078bd408b8bb0a339adf67cac958a23fddde2c2a86430033a9138c41abf
+DIST patch-3.18.117-rt104.patch.xz 174976 BLAKE2B c7a066ebd4b3450d26c1825ae8c2f2afc784c9941838a071387dead23dba12d1e75b879a15967adbfe279b379bc49053c5ccd0a5a14e134103403bf4b551f358 SHA512 a6df3bf5ae5c5471847ec8e88d9040270ce56d1d8050cf9b49e7aa988d219ca9b8fc0c0e5dbd5f02188f9b752338ef17b2f0e58175d269f1e80cd104a592dbad
+DIST patch-3.18.117.xz 1614868 BLAKE2B ff86219c3547c60d603313fb6628d718dae24e2d114cec6544aed301dabb3c79e2e91dfd25e5e71e9aede7a6c29d3653cb3bdb135dafb1911180dc671d6559c2 SHA512 537efe3d940d65b045cafa95b25dad23849c63cfd751d8f936cf3d6eff4c10667ac236db55df0079ea8e17c6c256ec9fe11f4e8295e088fc4bcacc654f9551cc
 DIST patch-4.14.40-rt30.patch.xz 230352 BLAKE2B b788d4034b4398c2c499d5010c6e20bc455d35925f66acaeb02f4bf11efa43ddb793bcb92590008cfc0aaafa385148efd124ca2881247381bc85f0461375dcc3 SHA512 acd6e26bae67d7961abf9d3cac0a2ddf124b83b5087bfe533446a135dff42bc59bd415b88dfb56500239a0e726bd6b7f894a89f74e6cd1a6370c5e944dfae0d5
 DIST patch-4.14.40.xz 1103932 BLAKE2B a06e9f1208a0396e3bf28ddad9fefb7bcd669271731fc3a3745e61eb62f4186138c00b03a5f7afb7a0c236a278d164043f07f01ee6faf0aca29ca1cd11e02d52 SHA512 4961a454836b8583cf3b0a743f08951c7084745039593f2cfb2630f836f33c471b7456d162556359255e6952e3652e9bb30e2b363985467787d4d0d73ad24738
 DIST patch-4.14.52-rt34.patch.xz 230384 BLAKE2B e31f747aa6c252627e5cb57a4f1978d115edf2ad724bc93e4772c58e47a15695d2bdbc60fb9d7433c40f6fc08d55a5703228ee4208643b5eeec182d430654a42 SHA512 78a85512412c5caf0a4d83b8b6dcb78087635f1c35abbc2675860d67ecebdd31b0d6c986ae61af76c776b66889bf626223e5ff0774ae524df2495ce7cb72ae33
 DIST patch-4.14.52.xz 1373656 BLAKE2B 387b9d34af20df773f4cea44f3b9ed28aa5c84411ec4754af1248dc120470fcc1b10537505952a0d32f3d5681d5eca96b4868975651c6b3288f0f80d6c6731cd SHA512 720b310700337d7c8b77b78592aae6c8d9bd08cb4da0437110ddcdf4e9e8146367293a2f2d94325787b5f201a09847badb50657082426212b610f6993eefc536
-DIST patch-4.16.12-rt5.patch.xz 227940 BLAKE2B f7b6eef1a729f29cccc0587d235aea921623fdd5e1ab0f9e738651719fac66ab49084a416334886e128385a50132572ff04ababc827cdf1521df6841b32f4210 SHA512 5b981b5758933c61526d50a47e0f454fdf6ee91d45c191dd97339972ea27f3bb27ebfa23460cf8dbbfb593e013f40ba53e3f164053ef28e4fa0aadcf4c21da03
-DIST patch-4.16.12.xz 301028 BLAKE2B 8700a03dda8a741311d0b09e7a6aa96476978dad03451582a9fe772dc4abe410a9f542edc65742bb7a214b3a6a9e5e2aba0e9113b42a48864763c11c60669b7d SHA512 7bd2b4fa54b69df5558a4a151936fb1787f2faa0f4e73c03db04ef84ac088f764425faf5d6b5a023d4863e190775dcbb251eba1efc3b10eb133330bb6b210b72
+DIST patch-4.14.59-rt37.patch.xz 230040 BLAKE2B c2973c4ff401667f1933db9d89b050df239c9ec4e02d020dd88735719d0ab90643ccfedcbbab8e2839ff427e06548b6ff1d8bc6e24d73667640c0c70d07405e4 SHA512 1bad47fef519e39230a556f82a0243705976a157ea8867ad19f13ccb83d995b17bcb34de3fa992d137ecfb142a60b641f38fef52ce5221029b1489070870dda4
+DIST patch-4.14.59.xz 1514024 BLAKE2B ad0e2873d5e7572a864ad7b6a7decfdc991b575dd68040a5134be7bbdd48a41fadf7ddb1e4dd61d600501a73db77adb8d33371b20174d2b1da75c4cc562ebd5e SHA512 a3797c2802fb36e0e9d4e7817b5554657a1943d6087ef1b43394eebbfb3da16f81fb3e4fec9482685e98b01f178988e8dc32c92fdcb6832cbfee79773894446d
 DIST patch-4.16.15-rt7.patch.xz 226680 BLAKE2B 702333605c62ddb4ca71afad3807784842dc8cdf75682f15672e9be535fc89cfe9035a9f1056d39ed7b99ad0cd30d4e8c573cf27e9eed74886da9b2c69c1b23e SHA512 72e3418d30a1818921647543c150c634a492395aee86f581606be6ae91e9bb2e712c5fc1154f584b40639a0e84c8c40c0113db1bfedb664e308153caa89305cb
 DIST patch-4.16.15.xz 400912 BLAKE2B 6250e736f10d71228aeef4db42c626684e8a323ce411d08e2dab3663fec400150b9285a08af9ed13fcea9e9cdb6442cdd68fcf389d2e836ebfc1c5a7a8791500 SHA512 496a8a85758b4bae9b3082c45d7e9c8a87bd10a8a2ffbb086f96b83e0ed2e3449ebe8bdd50d138219a55c96a93dd87c9d4802dc0962112e8e78115de77d3c363
 DIST patch-4.16.18-rt10.patch.xz 229556 BLAKE2B 3d83bb93e5b1305fba8d37ddbcb187b07f0f222203d5383e9d3b7e6020f055c9f19217c0b5b4d89566b2fa4d94900170620f21f8cfd903357914e519ed443574 SHA512 8e66fa88a9f7d59fd467b10389ae5a049489cb5d6fcb2489dac875c55b06285187ccd81387d3de5d16618ffc4cbed66ab72c4c39c7e0f5822f67c48f542fb8b8
+DIST patch-4.16.18-rt12.patch.xz 230644 BLAKE2B d3e777b47c6b33ceab5d7829a54ff76c08682958b7e2798b7dae177281514f89e98833883d8757adfc687f88c23ef55ea3c0392da398ac92454bb5e3f870a609 SHA512 d15089470ea9317aac8be600f09bd76566a65a1f48b3efe22a0ad1269444cd9fa15723dd190fe5e2a30c2464a9cc3b53200d7a7d462b3adac00e70ecfae593ba
 DIST patch-4.16.18-rt9.patch.xz 226696 BLAKE2B 5084fa7d266b14ce2050a311cebfd9279e26c950f65b2931e646adbc9414be15b3f298f8eabaa892e49d50b4b890424bac583ad0a7cc2824b75b5dc8543bfff3 SHA512 ba4a38055bd86e1284efbb2cd08645a8b687bf96fa0e64fc42345e2f98c5f58ddf62683f7943dd525ece39b1026a8751930eb02e75cc98314c6a8e91536ef822
 DIST patch-4.16.18.xz 506924 BLAKE2B dc41b7247e58808e1827fda7b4236ccac1ef8150f4c200161f4a9cd91912a7cb8b72337dfd403c3b1d7bee3d2626b5d53e3c3d595d80418da57bc3f9b58fdbce SHA512 9e1cf90b874c757393680026cb74500ca9fa22c0047ac820f4e5f43062125f8cf469f1e8e93a084b9ecc28a177e55c8b733c2fe620e46694a338f1b2ff4180f8
 DIST patch-4.4.137-rt154.patch.xz 196172 BLAKE2B 2eb6b97ee9c9f59a0d9ca0bc622f4163ae117de2d230b9a4b26c9e8f0fa9fb78f604d2fb44b804106fc900fafe101fa1b0fc02567e172dcb414d58c8c3b60b39 SHA512 6c378e5502a69f7fc10d9a97ecc0981cae2ac4275c8858cc087691142ae55016a6388c0d4bacf575f368756930a63a77b0a19bf8234a5f9e4d38068d85d72a57
 DIST patch-4.4.137.xz 1966024 BLAKE2B 802b4711b07ab799be48b74c51eedb7fa5ee5d327e29a972c92fc300d3b7180848fdeb4c95f28d25d16a56605335a2c44c644eb66dbf6517bbdaaf3a77cd4f77 SHA512 ddab3061b1406d3fb8975e3ef4ead22a97388309232bc30df48d24a0724302dc6b92293a0bdc10ec37964af0d86fc66118fdaeac22a8853bfdc85ab6d66a0ee8
 DIST patch-4.4.138-rt155.patch.xz 196252 BLAKE2B 963697e179660b30ccd1e166be93a0e7bb7a08cea7422a906af11b6d4859cb3b97158c64ba57ae35569e95f7358d839f401439f92cb094ca5da79429d6f85cae SHA512 30dafe87c77080396385de6c2ea0a02294a61b7c853034ea35158f7bfe8a640eb6006d5eddec8ce1b1d7bc57560dc995f2bd6bd0020b94c5b5eac57fb3f06b7e
 DIST patch-4.4.138.xz 1975088 BLAKE2B a95590d1576f078c3c2811b676ef6d88768d8dd1f55d35dcd6859a9d778e0c6a9c0298d9d3c38f6ca69db041103572f63645353e0b9528721169870e9f458bd6 SHA512 fb4cf2b1eaefa1cf1b34f7ef238fc6536e8f00c12c80629535e4e026b502471b66b3f3d005e06ff1f09facb89cc7dfdc5475b812f3a80181a4382f5d190457d8
+DIST patch-4.4.145-rt162.patch.xz 196244 BLAKE2B 9174782551b44f83b0c7e39a56e7b2f96dcb287fb4556a53f3e0de7b004d6916e3e5bffa781da5967fe4b5c1bcc657c3ba8aa0bb6dd6ad1d98878abf7fc43d5b SHA512 6a06eed7c041de86eb82aec87f7f0d4b6c78d4ff0615ca56c3e1234ce298a93785e25803319e1b4c68393b7e7d5cd816e28564e6b6d3060a97bb7afa637b8438
+DIST patch-4.4.145.xz 2051344 BLAKE2B 349ffe3aefb003a84ad9a1747c80fe56b0d7c15bc7dba23aa01447085333e30893a81005019632f3acfe169404a3603b1daaaaf770ef26926b98ea1edb6660e2 SHA512 622f8bb87d600d0cb7f3155112c27b9725e3da449f2b0e491f28b567629ff0611e8d182276a62424f51a2beb2e4809385f6ddee735431edab553c52ed40291d4
+DIST patch-4.9.115-rt93.patch.xz 173136 BLAKE2B 5ed7aec677fdcb97f1d56ea3e6984828bc0581e9f39cc9f231445ff3be0561f9a691e6e3e6f17929d3a4aee031fa64f1cb114d4d3cf54d7294073cd85e94ec58 SHA512 a86dff8c348b3260a75f83c2a287eddb1df36c013b3d3dce91e3fcad624c851003ac4754b177805a99f8237676cf2da3de4a0657777902bdbfc40c5cecf2b18a
+DIST patch-4.9.115.xz 2080804 BLAKE2B 6c2d1b957b55ea6a28b82fa7bafb7bac56b5345297de2e5a53e54ff817b27fb7371a36e5424fd58479359edc3e4a4e8dd41f1dd8b8d612ce10d4bbc615c2c432 SHA512 ad0ed227bf915ab2a7093237c3a482909497b1a00cc5262c79e720a50b008b4942904658fe2e8f764df0ac6e855a632de0bbd4d5788e63c4dbfa3e8f2f8fcf97
 DIST patch-4.9.98-rt76.patch.xz 173232 BLAKE2B 77f8e3a17bdcf126b9854d54f6a15fee483e422ffc60e7f656ca6298bbbcedc7c9a1d907ec151e1305bb1c8673644473de4410088892007bd1c8c80c3b1b4d53 SHA512 1adcb149f5991300aebdb88595bd93d941325cca5880e9f0e195c2771468ee018cbca5af21401b78064695785e6bc16252767d7399df4002b5add03cedce9988
 DIST patch-4.9.98.xz 1811528 BLAKE2B f6244076779eeef08399128daf07d4a9ceb42065bff4f89b5f40ef3dd9dbdcf36daa5cb064ad13635c91e73b3d9bbdb57dd64dc4d5adf07042b1f96c7e8733f4 SHA512 e1aa814fac33ae6dbfbf2e0cda40a1bebbf420d33c6448de718726f94d2ba0c9538b18c3251fb46202d90da6aa56add466d4328696faa1a05c50478aa3f99a5e
 EBUILD rt-sources-3.18.109_p102.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
 EBUILD rt-sources-3.18.113_p103.ebuild 1490 BLAKE2B cbced23c3d21d46097b3e36694867ae87b0e1325b9632cf65f2c1da3adf2cbecf46f3f957e5cee2751eec7ffe2752491d514de90c5ed24a37864e2c8f3dcb85f SHA512 27616ae3b89249b1f96034bc72dcb01f76fd12c3563f41a1314d0d949cc2b05548e0582ca20607623dca4eefad71a451d3c9eca345de3f87ff4d9b0a36c71390
+EBUILD rt-sources-3.18.117_p104.ebuild 1490 BLAKE2B cbced23c3d21d46097b3e36694867ae87b0e1325b9632cf65f2c1da3adf2cbecf46f3f957e5cee2751eec7ffe2752491d514de90c5ed24a37864e2c8f3dcb85f SHA512 27616ae3b89249b1f96034bc72dcb01f76fd12c3563f41a1314d0d949cc2b05548e0582ca20607623dca4eefad71a451d3c9eca345de3f87ff4d9b0a36c71390
 EBUILD rt-sources-4.14.40_p30.ebuild 1445 BLAKE2B 32d78dc667c02cb733badf0b909f7a439d3bbd265091e1f3a04ea371ed1f42f6893e5eb99f44a7efac3fbb571a41ee69eec84e4396cd8d52e7c41ce16c48a406 SHA512 6a19444c2b39f767a892da8d5ab489a9431b1771d8fd603d39cdcb9bcbc899fbfa62a2641ec2caf301f2cc259049041dc0612d2676056501307100ad28b3ad5e
 EBUILD rt-sources-4.14.52_p34.ebuild 1423 BLAKE2B 27526bbd4639ec9ea40b2642d6663831bb0515aaaaf4b498d90db260fd2ac0413bb16955d8b9dc4f02d4802d2c696b4625f28c1d36abbc2ca33c0d79d92b2e5b SHA512 d4976cc287b4ebcd5f4aa9fb57a2e3d92a37bc47d191d36b2bcb2c745d8c343bcbf3c0a7315ac3c3c5d9d5bce6c48efe50f89b69ba4768eb15289b9f1d62946e
-EBUILD rt-sources-4.16.12_p5.ebuild 1445 BLAKE2B 32d78dc667c02cb733badf0b909f7a439d3bbd265091e1f3a04ea371ed1f42f6893e5eb99f44a7efac3fbb571a41ee69eec84e4396cd8d52e7c41ce16c48a406 SHA512 6a19444c2b39f767a892da8d5ab489a9431b1771d8fd603d39cdcb9bcbc899fbfa62a2641ec2caf301f2cc259049041dc0612d2676056501307100ad28b3ad5e
+EBUILD rt-sources-4.14.59_p37.ebuild 1423 BLAKE2B 27526bbd4639ec9ea40b2642d6663831bb0515aaaaf4b498d90db260fd2ac0413bb16955d8b9dc4f02d4802d2c696b4625f28c1d36abbc2ca33c0d79d92b2e5b SHA512 d4976cc287b4ebcd5f4aa9fb57a2e3d92a37bc47d191d36b2bcb2c745d8c343bcbf3c0a7315ac3c3c5d9d5bce6c48efe50f89b69ba4768eb15289b9f1d62946e
 EBUILD rt-sources-4.16.15_p7.ebuild 1423 BLAKE2B 27526bbd4639ec9ea40b2642d6663831bb0515aaaaf4b498d90db260fd2ac0413bb16955d8b9dc4f02d4802d2c696b4625f28c1d36abbc2ca33c0d79d92b2e5b SHA512 d4976cc287b4ebcd5f4aa9fb57a2e3d92a37bc47d191d36b2bcb2c745d8c343bcbf3c0a7315ac3c3c5d9d5bce6c48efe50f89b69ba4768eb15289b9f1d62946e
 EBUILD rt-sources-4.16.18_p10.ebuild 1423 BLAKE2B 27526bbd4639ec9ea40b2642d6663831bb0515aaaaf4b498d90db260fd2ac0413bb16955d8b9dc4f02d4802d2c696b4625f28c1d36abbc2ca33c0d79d92b2e5b SHA512 d4976cc287b4ebcd5f4aa9fb57a2e3d92a37bc47d191d36b2bcb2c745d8c343bcbf3c0a7315ac3c3c5d9d5bce6c48efe50f89b69ba4768eb15289b9f1d62946e
+EBUILD rt-sources-4.16.18_p12.ebuild 1423 BLAKE2B 27526bbd4639ec9ea40b2642d6663831bb0515aaaaf4b498d90db260fd2ac0413bb16955d8b9dc4f02d4802d2c696b4625f28c1d36abbc2ca33c0d79d92b2e5b SHA512 d4976cc287b4ebcd5f4aa9fb57a2e3d92a37bc47d191d36b2bcb2c745d8c343bcbf3c0a7315ac3c3c5d9d5bce6c48efe50f89b69ba4768eb15289b9f1d62946e
 EBUILD rt-sources-4.16.18_p9.ebuild 1423 BLAKE2B 27526bbd4639ec9ea40b2642d6663831bb0515aaaaf4b498d90db260fd2ac0413bb16955d8b9dc4f02d4802d2c696b4625f28c1d36abbc2ca33c0d79d92b2e5b SHA512 d4976cc287b4ebcd5f4aa9fb57a2e3d92a37bc47d191d36b2bcb2c745d8c343bcbf3c0a7315ac3c3c5d9d5bce6c48efe50f89b69ba4768eb15289b9f1d62946e
 EBUILD rt-sources-4.4.137_p154.ebuild 1490 BLAKE2B cbced23c3d21d46097b3e36694867ae87b0e1325b9632cf65f2c1da3adf2cbecf46f3f957e5cee2751eec7ffe2752491d514de90c5ed24a37864e2c8f3dcb85f SHA512 27616ae3b89249b1f96034bc72dcb01f76fd12c3563f41a1314d0d949cc2b05548e0582ca20607623dca4eefad71a451d3c9eca345de3f87ff4d9b0a36c71390
 EBUILD rt-sources-4.4.138_p155.ebuild 1490 BLAKE2B cbced23c3d21d46097b3e36694867ae87b0e1325b9632cf65f2c1da3adf2cbecf46f3f957e5cee2751eec7ffe2752491d514de90c5ed24a37864e2c8f3dcb85f SHA512 27616ae3b89249b1f96034bc72dcb01f76fd12c3563f41a1314d0d949cc2b05548e0582ca20607623dca4eefad71a451d3c9eca345de3f87ff4d9b0a36c71390
+EBUILD rt-sources-4.4.145_p162.ebuild 1490 BLAKE2B cbced23c3d21d46097b3e36694867ae87b0e1325b9632cf65f2c1da3adf2cbecf46f3f957e5cee2751eec7ffe2752491d514de90c5ed24a37864e2c8f3dcb85f SHA512 27616ae3b89249b1f96034bc72dcb01f76fd12c3563f41a1314d0d949cc2b05548e0582ca20607623dca4eefad71a451d3c9eca345de3f87ff4d9b0a36c71390
+EBUILD rt-sources-4.9.115_p93.ebuild 1490 BLAKE2B cbced23c3d21d46097b3e36694867ae87b0e1325b9632cf65f2c1da3adf2cbecf46f3f957e5cee2751eec7ffe2752491d514de90c5ed24a37864e2c8f3dcb85f SHA512 27616ae3b89249b1f96034bc72dcb01f76fd12c3563f41a1314d0d949cc2b05548e0582ca20607623dca4eefad71a451d3c9eca345de3f87ff4d9b0a36c71390
 EBUILD rt-sources-4.9.98_p76.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
 MISC metadata.xml 656 BLAKE2B 3bd604678b07a267b32917a36104fae8ac19abfed08ad8400368dd1d165f628712ba924653b6a03062f065a1d93660c5bd95addd463633f799a525cdcc5134a6 SHA512 7645322de766780bef064c3b6313009bf7ce4e4e28c247ce7707d0950bb7bbb792091254a4af1fc9ab3d24923fd69ebea0f9d253115527ef6b48cffecbcdfb67
diff --git a/sys-kernel/rt-sources/rt-sources-3.18.117_p104.ebuild b/sys-kernel/rt-sources/rt-sources-3.18.117_p104.ebuild
new file mode 100644
index 000000000000..6ec80f749bb1
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-3.18.117_p104.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit eapi7-ver
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+PATCHES=(
+	"${FILESDIR}"/rt-sources-posix-printf.patch # 627068
+)
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.14.59_p37.ebuild b/sys-kernel/rt-sources/rt-sources-4.14.59_p37.ebuild
new file mode 100644
index 000000000000..d65a86c4c306
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.14.59_p37.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit eapi7-ver
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.16.12_p5.ebuild b/sys-kernel/rt-sources/rt-sources-4.16.12_p5.ebuild
deleted file mode 100644
index ad4f19f2289a..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.16.12_p5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64"
-
-HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
-
-inherit versionator
-
-CKV="$(get_version_component_range 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
-		-i "${S}/kernel/Kconfig.preempt"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.16.18_p12.ebuild b/sys-kernel/rt-sources/rt-sources-4.16.18_p12.ebuild
new file mode 100644
index 000000000000..d65a86c4c306
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.16.18_p12.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit eapi7-ver
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.4.145_p162.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.145_p162.ebuild
new file mode 100644
index 000000000000..6ec80f749bb1
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.4.145_p162.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit eapi7-ver
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+PATCHES=(
+	"${FILESDIR}"/rt-sources-posix-printf.patch # 627068
+)
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.9.115_p93.ebuild b/sys-kernel/rt-sources/rt-sources-4.9.115_p93.ebuild
new file mode 100644
index 000000000000..6ec80f749bb1
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.9.115_p93.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit eapi7-ver
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+PATCHES=(
+	"${FILESDIR}"/rt-sources-posix-printf.patch # 627068
+)
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 870c55eaf81d..8b9721f12f06 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -8,15 +8,15 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
 DIST patch-3.16.57.xz 2026584 BLAKE2B 275c631a26fd7832f5845f2bb74ec053b2e289e72b4a7578cf36427f8939f6267d99395857cd40b26e61a56fa2ea8d913298889bf0b629f48f8fc951ab62b398 SHA512 ceb84c52cee592f2bf19d47522a01e66c98edea1c5b532b667fb92c8919ebe905c9340bb68bf38205518e5f41e7ab4059f37e40d334c05f4c1f9f0f28f1caafa
 DIST patch-3.2.102.xz 1964152 BLAKE2B 92a9ddef295250db735f7212af956e47385818b1863b27f7852afc6c0a36b3cc1d1099fd3fa37f3de9a8668f4aa7250fbae467451eae67fa4371078dd0de2009 SHA512 15e17a1eb39cb73d0efb606d78a44c811fe83b24004ac45504b32531af1db29f1d333382fd5270c8ccc56d714cedb124a07f5e31b1eda93f45715154a721df4a
 DIST patch-4.1.52.xz 753264 BLAKE2B 57e0d116ead0a994bffbe019f229c607c71201452d6a8bb57c9855b637b011471bcf383d51fd8f2222e725498210d3ddaba7a3a3f6af491effc909a15f902275 SHA512 0d18cb892b62edb42e48038125b74edcf13093cefe30616403f0e75d44974d57e569ad28a8c98d9d80b3fbc360f092b7c045778e17e28bbb9748528ed87df43c
-DIST patch-4.14.59.xz 1514024 BLAKE2B ad0e2873d5e7572a864ad7b6a7decfdc991b575dd68040a5134be7bbdd48a41fadf7ddb1e4dd61d600501a73db77adb8d33371b20174d2b1da75c4cc562ebd5e SHA512 a3797c2802fb36e0e9d4e7817b5554657a1943d6087ef1b43394eebbfb3da16f81fb3e4fec9482685e98b01f178988e8dc32c92fdcb6832cbfee79773894446d
-DIST patch-4.17.11.xz 238408 BLAKE2B b50b99b1d6b03ce320e15ad0fb4c1a57b7ac9108051363c9a52fb8a5c7ed86654eaff87b574ef14fa15e4fdfa939fbd63696d928ea39f711d516bccdb9a4b139 SHA512 6cab8f1aecceb0491dca25afa088f9601178c8dfec51551afd34e219600bba54f65f929d9a10948cdb5595e339e096473127b55b1142e6dbe9a818149bec307d
-DIST patch-4.4.145.xz 2051344 BLAKE2B 349ffe3aefb003a84ad9a1747c80fe56b0d7c15bc7dba23aa01447085333e30893a81005019632f3acfe169404a3603b1daaaaf770ef26926b98ea1edb6660e2 SHA512 622f8bb87d600d0cb7f3155112c27b9725e3da449f2b0e491f28b567629ff0611e8d182276a62424f51a2beb2e4809385f6ddee735431edab553c52ed40291d4
-DIST patch-4.9.116.xz 2086476 BLAKE2B f545e763236f32e8e6650e49667c2164e43d08fc5b113e197ad55486026b403fed659b5a9a91b4f651a79d73201bf55681de5b79395b64ac3e71e686bca1e0ba SHA512 5c0aecd17ec15a140701e7fa0d6ac16cd79247068fb08861a5757f36cc1cef665a5b49ccb946557806406a6a68eebbd54e18f93a9c8ecc147ec357dbe09dd236
+DIST patch-4.14.61.xz 1563008 BLAKE2B b4edb962f1c4eab956d5ff2ce3f78679a7d503ec15e218fd56bfd838f08c3e490472319fd52006c9cf56c8ff7eb2fe1bd980362ba70a576c34c915a22bcd9346 SHA512 ef649ffed6c45ccd1b163649cc4cf1a281220cdd3227f4336fcf715e282b312a2068e5d69188ec28185e4a67d4a688c88eaf6030c4ec1460b7d601772f3527da
+DIST patch-4.17.13.xz 329540 BLAKE2B 1ef58a7ef36a38469f80aabf0a1235f2f94b2c6c2861bf320a2df324bc2822021e5f741355eb28e7605899740ced4e60372b8e599c04bdaf27e377544d9834bd SHA512 8f77239c6c0393aa6e854f98d0ef0832e0a3e936251805ca1fcde2b5d24e0b086582f68e3f494a4a287b404573c26a867170958d53f3c1bf4c46c4c5697188b2
+DIST patch-4.4.146.xz 2068320 BLAKE2B ba739fab960d59ee73e40ad10a8b826437bfa791ddc969a656287f9edab5c4f06d5ac96058402d13470fa13abc8bd900f498467ded71769d9202615c470a3f32 SHA512 d05a7b3fe1110bd03f12532c7a336a885909db7bf7824d942fe20a917604c34306fb1a3fd5220beca5f2ece85a1b52d34e9d51e52ca739598aa360017a9840d4
+DIST patch-4.9.118.xz 2112140 BLAKE2B 6d30719b1f65e4e5cda7bdedc992142313189510c02485b47f8758b9eb8ca3d9face8046dd8d464e278f0e061ed936a76f6687399bec6e89a5cabfc01af0b300 SHA512 9406ddce00942705935068fb38387adce8bdc428523062178465179b447c046428df00dcdb50f9e7a9b541ec06bb26e9bbf607bb4cd21db90a6e2fbbe7fa66c6
 EBUILD vanilla-sources-3.16.57.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 EBUILD vanilla-sources-3.2.102.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 EBUILD vanilla-sources-4.1.52.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.14.59.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.17.11.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.4.145.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.9.116.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.14.61.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.17.13.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.4.146.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.9.118.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.59.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.61.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.59.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.61.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.17.11.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.17.13.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.17.11.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.17.13.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.145.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.146.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.145.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.146.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.116.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.118.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.116.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.118.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 75919df23223..af67300d81cb 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index d93008946c91..ec3ee4ab799d 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -9,16 +9,13 @@ DIST binutils-2.29.1.tar.bz2 29123355 BLAKE2B 83de518a27bae0f13c57b1979493dd7f7c
 DIST binutils-2.30-patches-2.tar.xz 490272 BLAKE2B a28a5b5bb8faa33fec269f2c69d6ed0e4e7d5a9169861aa4b3c45511794e1e749c216862a8258c2029f1b40c511dcb2a0aeaecda57e75d52418f10d6f345718f SHA512 1686d5b58ee968f2000647acab2bee4c263d1c85fd43fed8c820fccfc0d7024a01211e7853cd5ce452fa90da500bc17309edf6dbc901c7fd6fc7b3e3d6f42581
 DIST binutils-2.30-patches-3.tar.xz 548804 BLAKE2B 428a1750233ae3f019e20cb5ed1d8e6fe6455181e8f5961dbfe7b66493d1c42050f889e45c02c1fc1a84d545c9e61f81ad6ffd5afc0b1099a702ccc7637c3abe SHA512 c91e902d1d9fc2e9782df04c93173c3207c771f1c063e2ff12c9336593c954ea3f1b2474a8fc045927d72fe18f7401874059599d100c4a1fd152081f05913d03
 DIST binutils-2.30.tar.xz 20286700 BLAKE2B 2dd5436a15a601011a1950e6082ec00082f5916fb82ce95ceab424fd8dc19f6daa7ac32a149f222ccdcc603354165cc206fde070eaa44fe2cc5e57486efc7868 SHA512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839
-DIST binutils-2.31-patches-1.tar.xz 16692 BLAKE2B ee9c7b344b12073c881eaf6fa80e8cb3187add720a26b60e7ef7db9dc3eb8e6e2b83cd0afb3115c4846aa914f8957554bd010f67af34dc5ad81e676639cf361e SHA512 4004d52327babd00f946b199f71e9eca840e66c65a287730af80b5a69138fe5f946f33c13400e028088238314c644f00b858049f8923948d2e6144dc779c24c0
 DIST binutils-2.31.1-patches-1.tar.xz 10644 BLAKE2B 3c2e09713593fc01d78d45ee4e4ac92020d5de781325c8ea98a5193a36a2a0a814f1b6730ae718ad92f92c5876e8e47d0eee7c42d2fce281cc0b37fadb85c42b SHA512 d701e6e2c9d22ca5c7ac4bf08d9206a6648b299b7b04a053aaabc34fa94d7c5fd074a08e3f3af66365069918d9000986c646430bf2adf94213cbf0d55d6e6c51
 DIST binutils-2.31.1.tar.xz 20467996 BLAKE2B 6b914df1fbb7cf54f2159f71b2c2b09f3f6a569b7a3cb4cf9790d0a3733a7548bc0ea32334a178ed3b56e8b97656ae99c7abaf212601beeaeae9a0884c0f6051 SHA512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30
-DIST binutils-2.31.tar.xz 20445772 BLAKE2B 02d9ef7f8ea0d24682716b6890916d507762b4672a3148192afbbc1d6323b3f3970eb630ec9af5e18c60ba1d4579d49d847e571bcd8b1236c24b04c9e3815481 SHA512 3448a71c42d790569c1159c1042aa520b2d8ac8af7506fb1f2a4199dfb13b39f1c2271a5cb3a643d10c7d8a388a73f190e90503d4793a016da7893473aa1c635
 EBUILD binutils-libs-2.25.1-r2.ebuild 2725 BLAKE2B a4fe58fe79272a65c7703b3be801bd8ef197119cbb06b964a107b80eb7c3f38a65e2bb5de69a12b1eb939e04334c7767898d9adf6b853f622dfbb843fc3b7039 SHA512 8c610d03d282e72507e055fac6a3edb9b0fea10dda1934099a7b9b6577d90ce808c803ffc3e6b7378071bfa6d3fd8e1d6919031448d0d12bf86bd37dcbe4e53e
 EBUILD binutils-libs-2.27.ebuild 2847 BLAKE2B 3d02dfccc46d3398646d338e01f096de36a74fdf6d224a8ae221120fe8105cc674ed09840b01d84994ff11c4f73c88b39737b3ff484d32dbfb1183f20eb3a1a4 SHA512 629aeca9ec392f957fbbe7f2a3d5564016d096b7cbe63ef9337351e599722bced4c3eb190d8dd0f091eb3ff816e839b03f7a7662f22f9e22b36ef3e8e5bb93ae
 EBUILD binutils-libs-2.28.1.ebuild 2872 BLAKE2B f0ef199dfc0025b06dbdab74f76f0a1775ca47030bd26cf2cf4ce4f6b7f3c5325d1629b3713aa40a1f85b9b0151555cf0a978c0390bef48846b3b1eb0c89b05d SHA512 b00d0080957824bf447035172b4941fecfd358f2cbbdeb82a578e11e0a8b4c712091344b904d8f74840164032d210834b30ed8a90ac3dddb47dc9632d66f8a9b
 EBUILD binutils-libs-2.29.1-r1.ebuild 2921 BLAKE2B f38060716462c9c51bc84b98348b82952b6bb47cd33136d7eaaca822ba6e40504fad2b0c778a4a02989ca9e20f812d928d718295376141dd02e519e541a605a3 SHA512 8fc849244e3cdb9b1a35e9bed1f2e57e8bba210e6ab9aa7408904b5a04cc532dfff52a9840e866df5985f6b1d05c96ce7549c7514389a8dae9a4d5d798d48c8e
 EBUILD binutils-libs-2.30-r2.ebuild 3200 BLAKE2B 124abad02ef385d313034760d84c58a93ac7eb0eafab6692867a07474b5d95dd21caf1bd01c4b2c58958b8e6f992a15ec7b05fd65ccf5f24da15f6a4e271e4f6 SHA512 0ff4afe328164c8280f4a8deb18028b8a0022100ff8eb627770da8da4f8772e6f6469deb5ef9cae95cb89a513eb4ac69a81a6dac0a185b1bad70af5a77280479
 EBUILD binutils-libs-2.30-r3.ebuild 3211 BLAKE2B 7715a2ba111df9c62f3b00998ecb7d2b6d9aa42273195488fd121ea3f0d52554a7dd1a98e138d5b9870becfe9038ba57da8254c84720f5768af60822113386b8 SHA512 f08ecc65cb4ec222ae651ecb9fce48ebe2503ffb18204fb3183f18e802485721937e41f9140b54d56068bfa69468261d32aacaeffe595feb8788bcc837795c39
-EBUILD binutils-libs-2.31.1.ebuild 2979 BLAKE2B 397044b7c91ed0be4b1f94bb8629397506894bca6bd7e199edfe8a4e4d73933fc39c05c630590cf0ede7584c6cd33c737ba1ef7e61d46e05c82166e37e666280 SHA512 1b37a875d8f0237a0d4065282618104b8a9dddccdd8f6f6997934147b85ed452f473480e5c91c7b87bf96d10c15991d5877c7e3b613020a56c943e25f27aca4f
-EBUILD binutils-libs-2.31.ebuild 2979 BLAKE2B 397044b7c91ed0be4b1f94bb8629397506894bca6bd7e199edfe8a4e4d73933fc39c05c630590cf0ede7584c6cd33c737ba1ef7e61d46e05c82166e37e666280 SHA512 1b37a875d8f0237a0d4065282618104b8a9dddccdd8f6f6997934147b85ed452f473480e5c91c7b87bf96d10c15991d5877c7e3b613020a56c943e25f27aca4f
+EBUILD binutils-libs-2.31.1.ebuild 3096 BLAKE2B 4f78b6eae723baeeff4da9d4bbc7c130b444a3629639d2a5e7226b5d4c3cb4a89308464e6d9565f161767c24020a674f60ea3791e631792e7e2f600a19c18104 SHA512 373ceca15f0b73fcab25092baae2295d3e9e216d839719809a3e5d43633f1f0163cd36a2c6beeac122bf0831df2c73508596490a4ed274885089f63c997fb4b7
 MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
diff --git a/sys-libs/binutils-libs/binutils-libs-2.31.1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.31.1.ebuild
index 777a60ae37ee..415d289b8642 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.31.1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.31.1.ebuild
@@ -21,6 +21,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 # The shared lib SONAMEs use the ${PV} in them.
 SLOT="0/${PV}"
 IUSE="64-bit-bfd multitarget nls static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
diff --git a/sys-libs/binutils-libs/binutils-libs-2.31.ebuild b/sys-libs/binutils-libs/binutils-libs-2.31.ebuild
deleted file mode 100644
index 777a60ae37ee..000000000000
--- a/sys-libs/binutils-libs/binutils-libs-2.31.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCH_VER=1
-
-inherit eutils toolchain-funcs multilib-minimal
-
-MY_PN="binutils"
-MY_P="${MY_PN}-${PV}"
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-dilfridge}
-
-DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
-HOMEPAGE="https://sourceware.org/binutils/"
-SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
-	mirror://gentoo/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-# The shared lib SONAMEs use the ${PV} in them.
-SLOT="0/${PV}"
-IUSE="64-bit-bfd multitarget nls static-libs"
-
-COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	>=sys-apps/texinfo-4.7
-	nls? ( sys-devel/gettext )"
-# Need a newer binutils-config that'll reset include/lib symlinks for us.
-RDEPEND="${COMMON_DEPEND}
-	>=sys-devel/binutils-config-5
-	nls? ( !<sys-devel/gdb-7.10-r1[nls] )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/bfd.h
-)
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-	default
-}
-
-pkgversion() {
-	printf "Gentoo ${PVR}"
-	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="https://bugs.gentoo.org/"
-		--with-pkgversion="$(pkgversion)"
-		$(use_enable static-libs static)
-		# The binutils eclass enables this flag for all bi-arch builds,
-		# but other tools often don't care about that support.  Put it
-		# beyond a flag if people really want it, but otherwise leave
-		# it disabled as it can slow things down on 32bit arches. #438522
-		$(use_enable 64-bit-bfd)
-		# This only disables building in the zlib subdir.
-		# For binutils itself, it'll use the system version. #591516
-		--without-zlib
-		--with-system-zlib
-		# We only care about the libs, so disable programs. #528088
-		--disable-{binutils,etc,ld,gas,gold,gprof}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-	)
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	use nls \
-		&& myconf+=( --without-included-gettext ) \
-		|| myconf+=( --disable-nls )
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	# Provide libiberty.h directly.
-	dosym libiberty/libiberty.h /usr/include/libiberty.h
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index a0b1cfa71a92..b47f0209281a 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,5 +1,6 @@
 AUX gdbm-1.13-fix-a-typo-in-gdbm.h.patch 657 BLAKE2B af19808507b00d941a51756bbc2a48686aad60c0a19626d4b3f549b948254629857eb7ce9a692d790fdf42877de2d6072455b1825347cf9d557e45239088c989 SHA512 bb31f6043184f02f9b0735d8827d09de77367bac489296805a963c01963a70c60dea8efb4a4a00c254019bf438f0c54159b3097c276185367f0064fe119544a1
 AUX gdbm-1.13-fix-build-with-enable-gdbm-export.patch 1568 BLAKE2B 65a841191f362ca94d0b7d1b9df042b5f6b75aaf560aceaa702c8a11e9fa9430deb106aac6a50b211b07c66f9457732ca164352a62fc244fd4e3f2862c69265c SHA512 8bd5308a95abb7df3dd8edc63eba5c8830a6f4aa47066ac644cf5ec19767bcd97618834c598fbc1603093a8e1516b4ef325afe2a68b001d5353d2e4247d562a2
+AUX gdbm-1.17-fix-gdbmsync.patch 411 BLAKE2B a7ef5283748c3aa9913c99ecf29d88acf322ce4f2fa9b4d10f41c2a59c8b39a475649ae196b96f11b76e02e27dfa3227adb1cb3e6b23777f8e413ec50c8621fe SHA512 f76d9fcf5f818fc9cd2a179e28d9b46954e305318f825cc9c50389ebadf6c244af78b67daf7b329b4f7ae0b4a09eb6e633903ad49bafb0300742af4790c1701d
 DIST gdbm-1.13.tar.gz 891987 BLAKE2B f73cb89aeed140a584c5a8bce9c2324cc39a7647ee288364af66fbe1c1cd8662e53f7cb82a208e795a6d27adc048018153671d964ecad518407eb888283e17c5 SHA512 fdb777f5b415b0578ea46b4a6fc70151a04a3568e2f2c8c0219ccad8c0d34abb773d80d5d7a06462ad1a3d6c1f3b5b7ab25f9de4f43ccf05c58db05f9a2906ad
 DIST gdbm-1.14.1.tar.gz 894412 BLAKE2B e519af45d670ec4285ece01edc17770dcb0d77f12edcf2d3d4cb9580c6d2bb6d6dddb57d4f33490e11dc9df7cd08fd44ab7737b62271c5cfdc9485b90d0d4888 SHA512 a15d7acb0ebf459f4f7d262e5a05393a9a7c8e9ae906d12ccb3b38715de15a41c9254e7814555e2f9af306ef63b2dc68b5f9f6c7b75dd0db77e07a58831ff603
 DIST gdbm-1.16.tar.gz 936526 BLAKE2B 4d0eff485f6ef8cf534688ed3acb2d6e1a40140159e89227dec56cb0c7ff795701feb7e8cfa0df98f2636c6a257bbe43cdb63318ac58cd0437ef73356b8fb5fe SHA512 97f4f37fd95cee4dd5c9c3f42ea3aecaa28016e90fe0e168a9d8c38e92602221f946c273bb249d508200249701c6403d0f9351460485dfae34a3bf625de59d2c
@@ -8,5 +9,5 @@ DIST gdbm-1.8.3.tar.gz 228695 BLAKE2B 21b5833facb97fe937020d80b038c7b09e55eea6bd
 EBUILD gdbm-1.13-r2.ebuild 1880 BLAKE2B 93488b07da9e466dfd1ba72283a73285ad99400af89edd57e3f1af0f17a797cadbe819dd7eae9bee06cbbc85f7381460c1caa7d8a3c3e2ce194c492fea8092f4 SHA512 4ff430d01e7f803c4783cb143da5b988533331fe40887870142aa11501ec1a1d12bda68021ca888dfd19019ee8b85f1275da9c290faf4ba5156c26ebff767af6
 EBUILD gdbm-1.14.1.ebuild 1802 BLAKE2B a9872ffcb3aa6c7b0656095b30a4ea5e71fe6c7967244b59c84a0e59a739976ed08b89318a22e35548d00904bb7c51aacaaffe7f0f21c9ff059252d37a08ca38 SHA512 b0d3430a85a19106aea0e6a57c7334ca99e008bdb3f83e5413cfb19e9c9ab75d3cd54714bfdb2e172ed4edcc74f5c732ad4c9ca6e37fa806c76f25ceb6f8c244
 EBUILD gdbm-1.16.ebuild 1342 BLAKE2B cf3f17073ba5838915b99bb8938511423a3e4df7a5cc659a06fb1afa61b90ab7027f465dac823cfa0e83d7ca70aae5d59d4724e1fb1b5185bfee037e33c935e5 SHA512 616a8e23631fbdf41fcd5320d18a09adb159b4872bc0f0331dfc1f78a337d415e0e4209e6704ecbfabd9a8382779b2f2963a9b5fe90e32e3585b9e71c672b4a8
-EBUILD gdbm-1.17.ebuild 1342 BLAKE2B cf3f17073ba5838915b99bb8938511423a3e4df7a5cc659a06fb1afa61b90ab7027f465dac823cfa0e83d7ca70aae5d59d4724e1fb1b5185bfee037e33c935e5 SHA512 616a8e23631fbdf41fcd5320d18a09adb159b4872bc0f0331dfc1f78a337d415e0e4209e6704ecbfabd9a8382779b2f2963a9b5fe90e32e3585b9e71c672b4a8
+EBUILD gdbm-1.17.ebuild 1398 BLAKE2B b935e30584d2f61c07eef4912baa2a79b46cc894e74ddaa22fdc53215f4f97e3e06d012cf1f55520f10cd58ea4669631a6543baf895ef4ae1c0316e1e450b11f SHA512 846b96ac99bc40ae9a27d902ceb0c0b08b9c6ab406636de89d4ddf600a6a54bc7a52fe28c60bc0648b3c2c55dec79354cdb0587062fe900a490edfd5591be664
 MISC metadata.xml 471 BLAKE2B d73a0a1493a17d9990451e721b5bccddbdc3cfb59af544b1cdd927e31c65795888b13c7e42274a454d7dd8762ba92c5ab94dae5af7389a67688e6b06840ebad5 SHA512 05f989aa1f1d2ca29d4084741af8465c3daa0713881130aeb8ba8ac65f89a8874d668a0ea32184ec404e19777aa1df9e8d2526fe2ce9a22cae8c08c608501d41
diff --git a/sys-libs/gdbm/files/gdbm-1.17-fix-gdbmsync.patch b/sys-libs/gdbm/files/gdbm-1.17-fix-gdbmsync.patch
new file mode 100644
index 000000000000..434aed59952b
--- /dev/null
+++ b/sys-libs/gdbm/files/gdbm-1.17-fix-gdbmsync.patch
@@ -0,0 +1,11 @@
+--- /src/gdbmsync.c.orig	2018-08-05 14:37:18.000116786 +0200
++++ /src/gdbmsync.c		2018-08-05 14:37:39.666117321 +0200
+@@ -28,7 +28,7 @@
+ gdbm_sync (GDBM_FILE dbf)
+ {
+   /* Return immediately if the database needs recovery */	
+-  GDBM_ASSERT_CONSISTENCY (dbf, );
++  GDBM_ASSERT_CONSISTENCY (dbf, GDBM_NEED_RECOVERY);
+ 
+   /* Initialize the gdbm_errno variable. */
+   gdbm_set_errno (dbf, GDBM_NO_ERROR, FALSE);}
diff --git a/sys-libs/gdbm/gdbm-1.17.ebuild b/sys-libs/gdbm/gdbm-1.17.ebuild
index fa77f1fe956a..db39c5da570d 100644
--- a/sys-libs/gdbm/gdbm-1.17.ebuild
+++ b/sys-libs/gdbm/gdbm-1.17.ebuild
@@ -19,6 +19,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/gdbm-1.17-fix-gdbmsync.patch )
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 60b6f38ba574..956464026f08 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -33,6 +33,7 @@ DIST glibc-2.25.tar.xz 13873900 BLAKE2B 73ef792fff059f6ad154c9af2155ea15b7869ec1
 DIST glibc-2.26-patches-7.tar.bz2 413976 BLAKE2B 18263201cf33abf911eb7b802ed539b217391156f897a8db50f65a69627d8f8cceded78414168986ee98eba038364a6b2f3599b23f95e7b0ad2643481c399718 SHA512 0c812a343fcc68c10d92117cb2a0cf1c255470e81f0a7a04d6db2fe35445e410ef37f15162f145c2eb772b08ab55af246f5b52f5e57c2e91038181f6f027abc3
 DIST glibc-2.26.tar.xz 14682748 BLAKE2B c1c9dbec110dd4e25b2f463a96d8afc43b8e3ebfe3c958107032beaa879710252be3bc4122bb62166408725d43785f233544df6159d29cce0fc5b2c08f45adbe SHA512 6ed368523bc55f00976f96c5177f114e3f714b27273d7bffc252812c8b98fb81970403c1f5b5f0a61da678811532fb446530745492d2b49bfefc0d5bd71ce8c0
 DIST glibc-2.27-patches-2.tar.bz2 129983 BLAKE2B fad8d14f5330bc301804913f92f48051583f122cc83ab44813dc13498f59e97b38d1b276353eed9df3fde427b669cf9168632bbed8d006a3d4995c1df79575a4 SHA512 b05e34dbb45aaadfdcc079888ef2b2f70b181ba31edf2e2bbd18fa666375f5c6c48993830a305de0706b4a562db6403b6287bcab4789c1c37bc535216ee9f4cd
+DIST glibc-2.27-patches-3.tar.bz2 166511 BLAKE2B 1dc54bef6e82112935c7411f7a5cd07c1edb24c3edaa1e0243b846b3832a40af1ba3a7b77aef04c54a173388156b464ea442fa8310a02e6f44e2ed5b78994286 SHA512 12496e9b0c60630dbec4c2febdd6d20df1f3d7a2c243cc55b595202b27f682b9208e16cd8c387687c0cc9e18b36c3caeef8d1b1148eb3ee8081431997270db5e
 DIST glibc-2.27.tar.xz 15395316 BLAKE2B ea206d304c8c9aa86d69db981a14bea008602cea06a6c151c4971a8df059949ffe5632b42a67ab0ffcd7c4d7ce1ec02ac48815dac4dade1c4dd41eaee8a6ed33 SHA512 7c5581154487d38d173ce1feb944e60207139cca148bccf066eaae322c0c2d219423bdcfa15c7f9be1b5e45dfc43c641cc5d80d3c3c65837d08a83cdb4e2a147
 DIST glibc-2.28-patches-1.tar.bz2 15028 BLAKE2B 4b2bcb4123a2a6d5df9c5bdf6bda29a4b7633159917d3e385bfe00d6685b71a3e42e8739a791a4ae5d88280a82227531cc6cd42536e5bd6b795f391cbcc62783 SHA512 6b9451df7a0e83e93b06ae97c564653ac17c8e0d9c78f8a0ed42750bd6e3e58938491acb018681341eb57898811dc6020fa42287e408dfd6e8189cb362e393f1
 DIST glibc-2.28.tar.xz 16484344 BLAKE2B 9aa8cbd5a145c2a6fde3a60b3d0a14b12b46ed79333ad1ca3e73464adcfe700277a17a9e7fd0ca36e355a0c5b0b27decfa091da320ba802741ad75cc955bbcc8 SHA512 521f820953ff07c69ece4c2186f59fc061a7f9747932cd70ef2995c2b2deee76eeb6de700d85071cdca5949179aa8ccee75eda7feca1394121ec7b821ad0a3f3
@@ -48,6 +49,7 @@ EBUILD glibc-2.25-r11.ebuild 4975 BLAKE2B cef32f5d160644845e7cf45a9dd4c8cef1dcff
 EBUILD glibc-2.26-r7.ebuild 25619 BLAKE2B 46b2940a19af94728e94544243f12f0ae6eb2c4d7c0b82b9406ef0d4bfe3bd948f60ad605e01a092f6837f29b6ada840f8c70d0fb5adff4ba649ec2b49c52ee0 SHA512 7b6c0c2f844d782267de387e74ea74410b10ceccb6253c3906a7ca93b0fa69e85aff51ae6657a5933c771ab87516db1547c93648963ea7489008776d74265e73
 EBUILD glibc-2.27-r4.ebuild 41434 BLAKE2B ad24af35925a429c5680824554f9b388fec11f574ec6be63a327aaca485a3d80c2656d29c25c6562634580ef1f22022fb748c794d8e1b7482cef404f4f7d1e4d SHA512 58b98614032c0a7c383a833dffdb93862b30c1e19dff8d0d62c4363c5f4d18ce7edc5b481ad5ee58d12511b682c962ed8db4e411a68d069dbf340f9a23f1a268
 EBUILD glibc-2.27-r5.ebuild 41539 BLAKE2B 9f08c13a154043e34049c08d6ad003df056bb15f6079759b15589b1461f2cc7dcba1909e69e7ae705bde2e6b2d535f968770207ea9c5a96637aafaa4b55aa956 SHA512 90229d4a8b0ab9d9d72079ee51403654c3264a42caef67f710d46a80f806522a504f83427d4bcbb21666a70fd45a41d79079d6f3cc4233a1dfbcfa6e7b637c28
+EBUILD glibc-2.27-r6.ebuild 41539 BLAKE2B 336165f2198d1572acdddb3c4c855c4e510938289fb62438e312320f4d3e793b9f70583cf3901f0f370f7c38756dddeb6a7349d0def99272b7f3ad2d630c43ac SHA512 38f361e8a17dd72612899dc8e69f2784b760e6a49d0b006343919d62403facb28385e6715003924248fc40f4fb448d7fb36ac14887aa7ff9e9726dec8a423a3b
 EBUILD glibc-2.28.ebuild 41861 BLAKE2B f747cf7117f8a629e8353fee9a5ca2ddc8a128e2722381fdbf27849ff6be676b147596d0cbea52c78edc0e4a369d0eb4cda0a4c33d8eb99b4a1ee51aef68bfda SHA512 80015c199dbb2086daf7801184ce3501838fd97265378ed732fce96ff7dda95524ababdc738d392411d35bc174522a25dd62571676cd4c09435769bb855ea990
 EBUILD glibc-9999.ebuild 41861 BLAKE2B fae057c79abc53eb68b73394cb03404a8c6e33d07f3c60df52ee089322503bafa196bea96736966fe5eef8b224ee018ed26ecf0da188371a635bb676da429506 SHA512 7bd763ec64e227da5f6e8960e4d004c894bd744a0136b2f7fd3ce7b0f6cff48a9e8302a98ad5bb6cb7a86db2d2038b9c3c3a5069a11e3f7d09842c1420c53d93
 MISC metadata.xml 1255 BLAKE2B f76cdfb02dfaf8b51cff3e074d41df76b34d5ae84bd5f8e9c05fba2a0d83f85751d74e1d84a3ead510ee905782d8e2b0134c276aea85a684fb42ccfef57e366b SHA512 da070159b83cfb5af39c9cd8cc44f6c4135c9b3f71c899829faf4ebe511c9cd60e121cd01a9268264f4a680b0467847f84d1887614366ff5a937b4dbb6d38ad3
diff --git a/sys-libs/glibc/glibc-2.27-r6.ebuild b/sys-libs/glibc/glibc-2.27-r6.ebuild
new file mode 100644
index 000000000000..4f328fea7cb0
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.27-r6.ebuild
@@ -0,0 +1,1418 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix eutils versionator toolchain-funcs flag-o-matic gnuconfig \
+	multilib systemd multiprocessing
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+RESTRICT="strip" # Strip ourself #46186
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+fi
+
+RELEASE_VER=${PV}
+
+GCC_BOOTSTRAP_VER=20180511
+
+# Gentoo patchset
+PATCH_VER=3
+
+SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2"
+SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+
+IUSE="audit caps compile-locales doc gd hardened headers-only +multiarch multilib nscd profile selinux suid systemtap vanilla"
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS.
+COMMON_DEPEND="
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-util/systemtap )
+"
+DEPEND="${COMMON_DEPEND}
+	>=app-misc/pax-utils-0.1.10
+	sys-devel/bison
+	!<sys-apps/sandbox-1.6
+	!<sys-apps/portage-2.1.2
+	!<sys-devel/bison-2.7
+	doc? ( sys-apps/texinfo )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/gentoo-functions
+	!sys-kernel/ps3-sources
+	!sys-libs/nss-db
+"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	DEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.24
+		>=${CATEGORY}/gcc-4.9
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	DEPEND+="
+		>=sys-devel/binutils-2.24
+		>=sys-devel/gcc-4.9
+		virtual/os-headers
+	"
+	RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+#
+# Small helper functions
+#
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="${EPREFIX}$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	nonfatal emake -s glibc-test
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# Note: This test only matters when the x86 ABI is enabled, so we could
+			# optimize a bit and elide it.
+			# TODO: See cross-compile issues listed above for x86.
+			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				# Normally the target is x86_64-xxx, so turn that into the -march that
+				# gcc actually accepts. #528708
+				[[ ${t} == "x86_64" ]] && t="x86-64"
+				filter-flags '-march=*'
+				# ugly, ugly, ugly.  ugly.
+				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404"
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			# If the CHOST is the basic one (e.g. not sparcv9-xxx already),
+			# try to pick a better one so glibc can use cpu-specific .S files.
+			# We key off the CFLAGS to get a good value.  Also need to handle
+			# version skew.
+			# We can't force users to set their CHOST to their exact machine
+			# as many of these are not recognized by config.sub/gcc and such :(.
+			# Note: If the mcpu values don't scale, we might try probing CPP defines.
+			# Note: Should we factor in -Wa,-AvXXX flags too ?  Or -mvis/etc... ?
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if version_is_at_least 2.8 ; then
+						cpu="sparc64v2"
+					elif version_is_at_least 2.4 ; then
+						cpu="sparc64v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				niagara)
+					if version_is_at_least 2.4 ; then
+						cpu="sparc64v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparc64b"
+					;;
+				*)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					[[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if version_is_at_least 2.8 ; then
+						cpu="sparcv9v2"
+					elif version_is_at_least 2.4 ; then
+						cpu="sparcv9v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				niagara)
+					if version_is_at_least 2.4 ; then
+						cpu="sparcv9v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparcv9b"
+					;;
+				v9|ultrasparc)
+					cpu="sparcv9"
+					;;
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Over-zealous CFLAGS can often cause problems.  What may work for one
+	# person may not work for another.  To avoid a large influx of bugs
+	# relating to failed builds, we strip most CFLAGS out to ensure as few
+	# problems as possible.
+	strip-flags
+	strip-unsupported-flags
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# Lock glibc at -O2; we want to be conservative here.
+	# -fno-strict-aliasing is to work around #155906.
+	filter-flags '-O?'
+	append-flags -O2 -fno-strict-aliasing
+
+	filter-flags '-fstack-protector*'
+
+	# Starting with gcc-6 (and fully upstreamed pie patches) we control
+	# default enabled/disabled pie via use flags. So nothing to do
+	# here then. #618160
+	if [[ $(gcc-major-version) -lt 6 ]]; then
+		if use hardened && tc-enables-pie ; then
+			# Force PIC macro definition for all compilations since they're all
+			# either -fPIC or -fPIE with the default-PIE compiler.
+			append-cppflags -DPIC
+		else
+			# Don't build -fPIE without the default-PIE compiler and the
+			# hardened-pie patch
+			filter-flags -fPIE
+		fi
+	fi
+}
+
+want_tls() {
+	# Archs that can use TLS (Thread Local Storage)
+	case $(tc-arch) in
+		x86)
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
+			return 1
+		;;
+	esac
+	return 0
+}
+
+want__thread() {
+	want_tls || return 1
+
+	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
+	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
+
+	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
+
+	# only test gcc -- can't test linking yet
+	tc-has-tls -c ${CTARGET}
+	WANT__THREAD=$?
+
+	return ${WANT__THREAD}
+}
+
+use_multiarch() {
+	# Allow user to disable runtime arch detection in multilib.
+	use multiarch || return 1
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	version_is_at_least ${nver} ${bver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if use headers-only ; then
+		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
+		# At this bootstrap stage we have only binutils for
+		# target but not compiler yet.
+		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+		return 0
+	fi
+	local VAR=CFLAGS_${ABI}
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other.
+	: ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})}
+	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+	echo "${b}"
+}
+
+check_devpts() {
+	# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
+
+	# If merely building the binary package, then there's nothing to verify.
+	[[ ${MERGE_TYPE} == "buildonly" ]] && return
+
+	# Only sanity check when installing the native glibc.
+	[[ ${ROOT} != "/" ]] && return
+
+	# If they're opting in to the old suid code, then no need to check.
+	use suid && return
+
+	if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
+		eerror "In order to use glibc with USE=-suid, you must make sure that"
+		eerror "you have devpts mounted at /dev/pts with the gid=5 option."
+		eerror "Openrc should do this for you, so you should check /etc/fstab"
+		eerror "and make sure you do not have any invalid settings there."
+		die "mount & fix your /dev/pts settings"
+	fi
+}
+
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "${EPREFIX}/$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Make sure devpts is mounted correctly for use w/out setuid pt_chown
+	check_devpts
+
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ ${ROOT} == "/" ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	# Users have had a chance to phase themselves, time to give em the boot
+	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
+		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
+		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
+		die "Lazy upgrader detected"
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	use hardened && ! tc-enables-pie && \
+		ewarn "PIE hardening not applied, as your compiler doesn't default to PIE"
+
+	# Check for sanity of /etc/nsswitch.conf
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then
+		local entry
+		for entry in passwd group shadow; do
+			if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then
+				eerror "Your ${EROOT}/etc/nsswitch.conf is out of date."
+				eerror "Please make sure you have 'files' entries for"
+				eerror "'passwd:', 'group:' and 'shadow:' databases."
+				eerror "For more details see:"
+				eerror "  https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26"
+				die "nsswitch.conf has no 'files' provider in '${entry}'."
+			fi
+		done
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers ; then
+		local run_kv build_kv want_kv
+
+		run_kv=$(g_get_running_KV)
+		build_kv=$(g_int_to_KV $(get_kheader_version))
+		want_kv=${MIN_KERN_VER}
+
+		ebegin "Checking gcc for __thread support"
+		if ! eend $(want__thread ; echo $?) ; then
+			echo
+			eerror "Could not find a gcc that supports the __thread directive!"
+			eerror "Please update your binutils/gcc and try again."
+			die "No __thread support in gcc!"
+		fi
+
+		if ! is_crosscompile && ! tc-is-cross-compiler ; then
+			# Building fails on an non-supporting kernel
+			ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+			if ! eend_KV ${run_kv} ${want_kv} ; then
+				echo
+				eerror "You need a kernel of at least ${want_kv}!"
+				die "Kernel version too low!"
+			fi
+		fi
+
+		ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+		if ! eend_KV ${build_kv} ${want_kv} ; then
+			echo
+			eerror "You need linux-headers of at least ${want_kv}!"
+			die "linux-headers version too low!"
+		fi
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	# All the checks...
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+}
+
+# src_unpack
+
+src_unpack() {
+	# Consistency is not guaranteed between pkg_ and src_ ...
+	sanity_prechecks
+
+	use multilib && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+	setup_env
+
+	if [[ -n ${EGIT_REPO_URI} ]] ; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+	fi
+
+	cd "${S}" || die
+	touch locale/C-translit.h || die #185476 #218003
+
+	cd "${WORKDIR}" || die
+	unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
+}
+
+src_prepare() {
+	if ! use vanilla ; then
+		elog "Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER}"
+		eapply "${WORKDIR}"/patches
+		einfo "Done."
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}"
+	find . -name configure -exec touch {} +
+
+	eprefixify extra/locale/locale-gen
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}"
+}
+
+glibc_do_configure() {
+	# Glibc does not work with gold (for various reasons) #269274.
+	tc-ld-disable-gold
+
+	# CXX isnt handled by the multilib system, so if we dont unset here
+	# we accumulate crap across abis
+	unset CXX
+
+	einfo "Configuring glibc for nptl"
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+
+	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+	# To build .S (assembly) files with the same ABI-specific flags
+	# upstream currently recommends adding CFLAGS to CC/CXX:
+	#    https://sourceware.org/PR23273
+	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+	# and breaks multiarch support. See 659030#c3 for an example.
+
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="$(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS) ${CFLAGS}"
+	einfo " $(printf '%15s' 'Manual CXX:')   ${CXX}"
+
+	echo
+
+	local myconf=()
+
+	case ${CTARGET} in
+		powerpc-*)
+			# Currently gcc on powerpc32 generates invalid code for
+			# __builtin_return_address(0) calls. Normally programs
+			# don't do that but malloc hooks in glibc do:
+			# https://gcc.gnu.org/PR81996
+			# https://bugs.gentoo.org/629054
+			myconf+=( --enable-stack-protector=no )
+			;;
+		*)
+			myconf+=( --enable-stack-protector=all )
+			;;
+	esac
+	myconf+=( --enable-stackguard-randomization )
+
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(alt_build_headers)
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_multiarch || echo --disable-multi-arch)
+		$(use_enable systemtap)
+		$(use_enable nscd)
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="${EPREFIX}/sbin"
+	export libc_cv_slibdir="${EPREFIX}/$(get_libdir)"
+
+	# We take care of patching our binutils to use both hash styles,
+	# and many people like to force gnu hash style only, so disable
+	# this overriding check.  #347761
+	export libc_cv_hashstyle=no
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# ia64 static cross-compilers are a pita in so much that they
+	# can't produce static ELFs (as the libgcc.a is broken).  so
+	# disable building of the programs for those targets if it
+	# doesn't work.
+	# XXX: We could turn this into a compiler test, but ia64 is
+	# the only one that matters, so this should be fine for now.
+	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
+		sed -i '1i+link-static = touch $@' config.make
+	fi
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then
+		echo 'main(){}' > "${T}"/test.c
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_compiler_powerpc64le_binary128_ok=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_target_power8_ok=yes
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	local headers_only_arch_CPPFLAGS=()
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	case ${CTARGET} in
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
+	local myconf=()
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(alt_build_headers)
+		--prefix="${EPREFIX}/usr"
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	local headers_only_CC=$(tc-getBUILD_CC)
+	local headers_only_CFLAGS="-O1 -pipe"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+	local headers_only_LDFLAGS=""
+	set -- "${S}"/configure "${myconf[@]}"
+	echo \
+		"CC=${headers_only_CC}" \
+		"CFLAGS=${headers_only_CFLAGS}" \
+		"CPPFLAGS=${headers_only_CPPFLAGS}" \
+		"LDFLAGS=${headers_only_LDFLAGS}" \
+		"$@"
+	CC=${headers_only_CC} \
+	CFLAGS=${headers_only_CFLAGS} \
+	CPPFLAGS=${headers_only_CPPFLAGS} \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+do_src_compile() {
+	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+	emake check
+}
+
+do_src_test() {
+	local ret=0
+
+	glibc_src_test
+	: $(( ret |= $? ))
+
+	return ${ret}
+}
+
+src_test() {
+	if just_headers ; then
+		return
+	fi
+
+	# Give tests more time to complete.
+	export TIMEOUTFACTOR=5
+
+	foreach_abi do_src_test || die "tests failed"
+}
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local locale_list="${root}/etc/locale.gen"
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root}/usr/share/i18n/SUPPORTED"
+	fi
+
+	locale-gen --jobs $(makeopts_jobs) --config "${locale_list}" \
+		--destdir "${root}"
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}$(alt_prefix)" install || die
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	if [[ -e ${ED}$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		ppc64   /lib64/ld64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		keepdir $(alt_prefix)/lib
+		keepdir $(alt_prefix)/usr/lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+	cd "${WORKDIR}"/extra/locale
+	dosbin locale-gen
+	doman *.[0-8]
+	insinto /etc
+	doins locale.gen
+
+	# Make sure all the ABI's can find the locales and so we only
+	# have to generate one set
+	local a
+	keepdir /usr/$(get_libdir)/locale
+	for a in $(get_install_abis) ; do
+		if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
+			dosym ../$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
+		fi
+	done
+
+	cd "${S}"
+
+	# Install misc network config files
+	insinto /etc
+	doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf
+	doins "${WORKDIR}"/extra/etc/*.conf
+
+	if use nscd ; then
+		doinitd "$(prefixify_ro "${WORKDIR}"/extra/etc/nscd)"
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		systemd_dounit nscd/nscd.service
+		systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf
+	else
+		# Do this since extra/etc/*.conf above might have nscd.conf.
+		rm -f "${ED}"/etc/nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen "${ED}"
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_strip() {
+	# gdb is lame and requires some debugging information to remain in
+	# libpthread, so we need to strip it by hand.  libthread_db makes no
+	# sense stripped as it is only used when debugging.
+	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
+	env \
+		-uRESTRICT \
+		CHOST=${CTARGET} \
+		STRIP_MASK="/*/{,tls/}${pthread}*" \
+		prepallstrip
+	# if user has stripping enabled and does not have split debug turned on,
+	# then leave the debugging sections in libpthread.
+	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
+		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
+	fi
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+	src_strip
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		./ld-*.so --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ ${ROOT} != "/" ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
+	fi
+
+	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
+		# Reload init ... if in a chroot or a diff init package, ignore
+		# errors from this step #253697
+		/sbin/telinit U 2>/dev/null
+
+		use compile-locales || run_locale_gen "${EROOT}"
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+}
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 5c9e0ae871ef..91ac34ab009b 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpi_call/Manifest b/sys-power/acpi_call/Manifest
index 32591c3a88bf..f809b132c95e 100644
--- a/sys-power/acpi_call/Manifest
+++ b/sys-power/acpi_call/Manifest
@@ -1,9 +1,13 @@
 AUX acpi_call-1.1.0-linux-3.17.patch 607 BLAKE2B 1b253abd5a3a8124637313ddf44eba179011f96def5a2127b3fd4da0270ccd2c4d55947b8de3c1760b60d7c40797ffc66337b8041ac6bc685d861347c94179c3 SHA512 dec605256d0eab24542e550abec19ba64bc49c58ab84f23593f1cd835cd0db8e2da89fa7020881501ef7a4f4a00dc04c116f77fc70e0c1036554055272ed2137
 AUX acpi_call-1.1.0-linux-4.12.patch 315 BLAKE2B 49c7e3145e367169ac028dbc854659b3f7826eb494e15f54c2432f7d33f7796168145fdeade2051cd450504efd3ca50c6dd6deaee21291e8b97355a9406c299d SHA512 ce8d7c04508eb396c8633376cf21dcbfb9b7ec6110143666300ab66e1d30563b4e687d07a86dfe92566dd8be47ac43f295e7244317bdc12449b6426048edac4f
 AUX acpi_call-1.1.0-linux-4.14.patch 317 BLAKE2B f1d5067511174466d551e9747f7160c12eff6e6a83473c98b51baf80206c2b8e5045ab2c2085451794b8ccc1fe6820c7bfa38de9c280cdb248971f965d64bab8 SHA512 3c823712a59b0bf739fe06cc5dffe6b895ff869dd78457615452a13ef810976a27b7a9ef5bf61189135b8d278e2df340199f36e8016d6e90b040317d468b9b39
+AUX acpi_call-3.17-linux-4.12.patch 256 BLAKE2B ed94570d4e815c92ec5228ef5d6caefe55649902105cf071c4c1c83fa8b2240b9ace2c25c6a66528a50be0998aaf17b16e83a254b87de4b77365497a3f1a2b5d SHA512 49c12db4eefa721599096947faadc48e328f5d3a37eba5ee6f833124e228632e2cc0a871d7ee8427c1e798a1adf67df75674061c2cc6c05ffca1a3b02cffd742
+AUX acpi_call-3.17-linux-4.14.patch 341 BLAKE2B 8402c22a3f016f8b2b00805f6ce1db3b3a6005e4ce83ee43764ef248eaa5b49ba368b9dcb11ca923dd84f1bede7a1c39d64f72a09f882e53d2f3e59c1fa9e1a3 SHA512 d49ab94daf00cad83226060d8b884ba00f1d970fc1f3872ef5f47ef3ff657dc6f4d7d6656b76f8a685f6b865fb1b4d338f96f16cada5672f0e9560d6c0565dab
 DIST acpi_call-1.1.0.tar.gz 10470 BLAKE2B 000c5e6f1eb968bdea3d8dfb6d6bf7b18daffe8baa75ff32e8c6c4b98cafe0a72a67a65a17994a1c8efa16f528bdfbf2b27686a146730c319a5195dfa9ec0d51 SHA512 d5cf13c15f9057e3a27aaacfee6dcdb17b6a79194bdc8fd57b8140c07a532e2e58151bea881aa158c1183ac3bbe89f83fcfc2279ffd9e945a72331b6ddbf2c70
+DIST acpi_call-3.17.tar.gz 10470 BLAKE2B e1a4912f4b92532aa8496e668541975b7e563dfd7613d41f33503d5eecad786b84ba98b205f27c4a4fbd3b37b034a467cf7c9a73f2995539d2117f50751df682 SHA512 39f8f924995ba4e5490e93f03c33db083ced224699b1028102294b2cc99edebd1eea04d33b50beed9dea86939c124682ef8d013c990d5611471b104be3200cb1
 EBUILD acpi_call-1.1.0-r1.ebuild 779 BLAKE2B 7af9e860674878e18d42a2883049b1e9d04c4d627e4a80301a8a22e835fa7b56c10d129a4d5a11722d5a6dcfc931e916bc288f80380af12d9d10309d067d9e03 SHA512 164f8346a983c6b7c525dbc8206d5e0a51f4f3316b4efcd55cca2c884000967e4ea63280e182ca6512b8e69698e6af71f709ad4e3c64d5d7199dbd4b8bdc2245
 EBUILD acpi_call-1.1.0-r2.ebuild 834 BLAKE2B 191fcc7f9a1719a7af02a28891d37c3b4eadb976366e1be691f88e5bc6561a24f1a1f0390cf8fd88191a15e18a19e7356ad57e910b74f99285c9d9483e8858c1 SHA512 033a66d24857d3d833e5ce1f12b643fb781b212b851dce77fbe04e4b321b270ea8d0acbaa3ffdfb50fbbab589b4985ae13a2cdbebee86204f6c76cb5bc944b36
 EBUILD acpi_call-1.1.0.ebuild 710 BLAKE2B 2e1dff96cc5d66ad222f3420fc2407b66f0c4835e012338a053a4c3146197a7bb7352dbf19959f3b990648934706915f1ec0172125d344075a71a6ffafa02249 SHA512 bf3759f82e75bf3f7bdd3d5f208d5f57ebde4a6f1991b1945a6373185ec47c3723fd7edba0f0fa6f18d9e32cd0182996397e3a39dfc3c5387afca32c2f24e206
-EBUILD acpi_call-9999.ebuild 710 BLAKE2B 2e1dff96cc5d66ad222f3420fc2407b66f0c4835e012338a053a4c3146197a7bb7352dbf19959f3b990648934706915f1ec0172125d344075a71a6ffafa02249 SHA512 bf3759f82e75bf3f7bdd3d5f208d5f57ebde4a6f1991b1945a6373185ec47c3723fd7edba0f0fa6f18d9e32cd0182996397e3a39dfc3c5387afca32c2f24e206
-MISC metadata.xml 303 BLAKE2B 730454694f40b9d855afcb26f131e7c2ce833b431b405403ee2aa497347e0706ecaa015aa8dce81ff571ac6edf9331b10a7d0f66d1c4669414b50312985fca58 SHA512 ac96ee0d022c1b7f7e0e2d3823469ab00da1caa680607e634620382f0da3a114ddde2955f1ba173ffb074ccaa90030ee41022273a1f37678ec9ab62f9588b114
+EBUILD acpi_call-3.17.ebuild 750 BLAKE2B dc60fa86a87e64f5ec96a2f81b2495cfc2089add443bd84c27f474bd94c778b77dfdcaa288e5422e28cdf469723e31faf161ca6e2de5a1a81b823a5e4204139d SHA512 2f6b9f80721eda05e8c37673998385a589a3928ff849c9ff09d5668f31db462fe69b13adc216369ecbf3692fb18bb6ed7a0cb81bd43432ee80388e8373c1e272
+EBUILD acpi_call-9999.ebuild 663 BLAKE2B 1df1ee9b55b2bb366d1a483119912920a95c1a0129a594c6f099d689d6208010c5cccf5f40cad24a1a891324fd1893636b1bfb0ae51ebe1d35a105bbf1d99ef8 SHA512 373e465f8eef1c2a06edadd50596d6df26ce0991fa809fc39b31e37a0b4b798a6c604d8096049b4826d126f6c5128e85cbd22667136f18bc4f2d09dbcb73acbf
+MISC metadata.xml 304 BLAKE2B e9ebd649d5b044096dfa71d43332fb12c6577abdff31ae880ab30f7d5bf83e244afa2a57d9ca135b5378dae1c45f7b8422c08caf24e5c0a604f76c3fe1774e01 SHA512 024d05a8863a152a45a50bc42018182781d46b83c0b83dc24f844909432f7a90c2e041a6aca6b57932a773082749639500e6a8a9823fcb64b54705cb753801ce
diff --git a/sys-power/acpi_call/acpi_call-3.17.ebuild b/sys-power/acpi_call/acpi_call-3.17.ebuild
new file mode 100644
index 000000000000..b0d6197ccffa
--- /dev/null
+++ b/sys-power/acpi_call/acpi_call-3.17.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod
+
+HOMEPAGE="https://github.com/teleshoes/acpi_call"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="${HOMEPAGE}.git"
+	KEYWORDS=""
+else
+	inherit vcs-snapshot
+	SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A kernel module that enables you to call ACPI methods"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+CONFIG_CHECK="ACPI"
+MODULE_NAMES="acpi_call(misc:${S})"
+BUILD_TARGETS="default"
+
+PATCHES=(
+	"${FILESDIR}/${P}-linux-4.12.patch"
+	"${FILESDIR}/${P}-linux-4.14.patch"
+)
+
+src_compile(){
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
+	linux-mod_src_compile
+}
diff --git a/sys-power/acpi_call/acpi_call-9999.ebuild b/sys-power/acpi_call/acpi_call-9999.ebuild
index a2501dc4df20..5fe21ce3e3bc 100644
--- a/sys-power/acpi_call/acpi_call-9999.ebuild
+++ b/sys-power/acpi_call/acpi_call-9999.ebuild
@@ -1,22 +1,22 @@
-# 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 linux-info linux-mod
 
+HOMEPAGE="https://github.com/teleshoes/acpi_call"
 if [ "${PV}" = "9999" ]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/mkottman/acpi_call.git"
+	inherit git-r3
+	EGIT_REPO_URI="${HOMEPAGE}.git"
 	KEYWORDS=""
 else
 	inherit vcs-snapshot
-	SRC_URI="https://github.com/mkottman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="A kernel module that enables you to call ACPI methods"
-HOMEPAGE="https://github.com/mkottman/acpi_call"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-power/acpi_call/files/acpi_call-3.17-linux-4.12.patch b/sys-power/acpi_call/files/acpi_call-3.17-linux-4.12.patch
new file mode 100644
index 000000000000..ac64ba5efaf3
--- /dev/null
+++ b/sys-power/acpi_call/files/acpi_call-3.17-linux-4.12.patch
@@ -0,0 +1,12 @@
+diff --git a/acpi_call.c b/acpi_call.c
+index 35bfe12..c059511 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -7,6 +7,7 @@
+ #include <linux/proc_fs.h>
+ #include <linux/slab.h>
+ #include <asm/uaccess.h>
++#include <linux/uaccess.h>
+ 
+ MODULE_LICENSE("GPL");
+ 
diff --git a/sys-power/acpi_call/files/acpi_call-3.17-linux-4.14.patch b/sys-power/acpi_call/files/acpi_call-3.17-linux-4.14.patch
new file mode 100644
index 000000000000..ddea4fafc695
--- /dev/null
+++ b/sys-power/acpi_call/files/acpi_call-3.17-linux-4.14.patch
@@ -0,0 +1,14 @@
+diff --git a/acpi_call.c b/acpi_call.c
+index c059511..b622bf7 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -6,7 +6,9 @@
+ #include <linux/version.h>
+ #include <linux/proc_fs.h>
+ #include <linux/slab.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ #include <asm/uaccess.h>
++#endif
+ #include <linux/uaccess.h>
+ 
+ MODULE_LICENSE("GPL");
diff --git a/sys-power/acpi_call/metadata.xml b/sys-power/acpi_call/metadata.xml
index 3e6c789e7835..64e830cdff96 100644
--- a/sys-power/acpi_call/metadata.xml
+++ b/sys-power/acpi_call/metadata.xml
@@ -5,6 +5,6 @@
 		<email>maksbotan@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">mkottman/acpi_call</remote-id>
+		<remote-id type="github">teleshoes/acpi_call</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-power/powerstat/Manifest b/sys-power/powerstat/Manifest
index 9c96d003a3b1..f2680d2d94ca 100644
--- a/sys-power/powerstat/Manifest
+++ b/sys-power/powerstat/Manifest
@@ -1,7 +1,9 @@
 AUX powerstat-0.02.17-makefile.patch 432 BLAKE2B d917331055d4c33df53e926ad7aa0fb8aec2d45d5d1f80f7dee4ac67ba351f8d5602304ac9d750c182b84ead33cea9a92cecc36bad1f1b1b1ae076461866c05f SHA512 f9da9311295b420bf1101a1a19aaa23617368319b7d825667195d66965ad292b111a2c8779d4a0183e9c1693892d848b686a53a1eb377e61b87f91eb597d71c8
 DIST powerstat-0.02.15.tar.gz 58529 BLAKE2B f5429392fbb6f3b42b2bef5ff3218adb8b421bae055a302b00ee26aaaf219eca561a39238150786de94f6b74110ce7df1318e784a80c1caa903a2d7758dc5625 SHA512 15fdcee2ffecf7ceb6895a9fcd74ce30708c40cdb35e5e15de2b3c0d39b63b3500862a7117b08ce0f388372aace849aa5f8343d97c2315ec19e499cb5d76e204
 DIST powerstat-0.02.17.tar.gz 58854 BLAKE2B c8459c410de2311fa409e80b2395958c9080e7b9991a9c39818fa60ad420039415b70dc891fdd293f0952f3228a9766cb237d6c98b85b7feb78c717958e83b82 SHA512 fa6ee1da5f75b0415f3e495dfd8db0ea416493c1ddb7d0a079c8136220c609207001c66dfedf624c8675b9ba12a25698e59154ae62b2647403a2447522f68f11
+DIST powerstat-0.02.18.tar.gz 59205 BLAKE2B 80230b0571b0920d68ed0148220d0b50c84dece6a24c11d866a885c63da336d5a632119a667a3348dcc8b6f62ed98a5785ad91120a3ee9d98ddd0dbb5952aaea SHA512 2634ae760d2cd68f71d315033d53bcda843b977bfe34190f792a5937a29dc4b6d220b91bd3b538be75394c8ba9b5a8d883e3d99ea8b840abf4106880da7a1404
 EBUILD powerstat-0.02.15.ebuild 459 BLAKE2B a915f5373b04953c575ff321c2334f458bf51ce7e4842891e86d9293338f399ab0ed16ceeb89a889685c2060af2d8fe4538149aebeb3e9fcce1ec6ce2b643419 SHA512 e2b655308006e62b610566396c2bec028790ec1f3bb25a99eb088e33cdf3c28c73a7bae8785eaef6f76f1fb331761badad6f8d780e8aa60e76660592d3e4ec2b
 EBUILD powerstat-0.02.17.ebuild 544 BLAKE2B 2e254b84fb5fc7b931ae2dc2529442994c9f74d79aa25026d8e7e3873d12fb38edff0b109ec6a64f38aa6fae5dc7b613fbd0c9104e5317e1810e58b326bf59d1 SHA512 a4e3eb59a3542457e6c42ee1eb3ed8a34b5d270e3ec7346d555a2769f9b6f344724ff7857825a68651ca85473dde1ecf86aad9d7041cc4c577636a156a880057
+EBUILD powerstat-0.02.18.ebuild 553 BLAKE2B 17bf6c3d17e60e5bf12dbc0b6803aedbeb1bbc30b154ae39dbe70c3f73b622494d409f56977cb9fd1fad8e9b0e9e46ca90ef7f736b1e0dbb34e48baa3bb066de SHA512 4496f0de0283beeffab6c6fbfb1a8ecccd5cf09e22bed6e5f1e4dba049cb22cc5efa28f7a7322e7bd5164e7e22a18f6c49c2664cfadeda946dff68b1e5bdbc27
 EBUILD powerstat-9999.ebuild 534 BLAKE2B 64f7af80b27ce9233766d6772def12720f29d0c6bef7d531e7b99e0520ddc9203c70fd38704e23ce7fac35ce3bb2bf7ff852c9b0608c03aeab7de8c98ec0d700 SHA512 bd722e97c60b9e1c15c3587b1952c311c74cf95b063dfae0a6d2bf6bc59ce4bbb0b0695c9d03d7b255f5de9d631efd4f70c467c3969eeed0155e950bcf3f5f6a
 MISC metadata.xml 858 BLAKE2B 75ca9db98e72e80d14d2f17970fe65183bca67ff52fa19e61101de1cad8bd8c5119b9cfe3286a67282c5cbdcdfe821b627dbffee7a04ceae0a158f2fb3f50462 SHA512 59311c93c878c4dd09141428ccfb72fa030b72538978ddd2b44c505c0e083a5a0dfe017c865dfaff27fdd3edf3abb9a78fd938e2e0d32ff92fa121ad27a84f1f
diff --git a/sys-power/powerstat/powerstat-0.02.18.ebuild b/sys-power/powerstat/powerstat-0.02.18.ebuild
new file mode 100644
index 000000000000..e521ed728d56
--- /dev/null
+++ b/sys-power/powerstat/powerstat-0.02.18.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Laptop power measuring tool"
+HOMEPAGE="https://launchpad.net/ubuntu/+source/powerstat https://github.com/ColinIanKing/powerstat"
+SRC_URI="https://github.com/ColinIanKing/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Don't compress manpages
+PATCHES=( "${FILESDIR}"/"${PN}"-0.02.17-makefile.patch )
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 94932c7698fa..c81e874e27d1 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index be4262b83066..1a0055a75be1 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -10,8 +10,8 @@ DIST audit-2.6.4.tar.gz 1078677 BLAKE2B 056d9f269926d9b0d74f7187f833f1e94d4e03a5
 DIST audit-2.7.1.tar.gz 1099083 BLAKE2B 10f72ac3273ce9e23e1fb8ad8d57dcae772ba1f861f519867399d95e14f4809897637969de45566d62a73a35e5674260155773daf8de00481fcbd1b9c3138f96 SHA512 37964d81deee8608fde5f90d5d096727d3eb009e084be34749adcb0662e607e35c49c80bd83ce38b17161f11363b691721c8a8aa5dea832d320c53ab0ebb7483
 DIST audit-2.8.2.tar.gz 1121970 BLAKE2B bbec694ed1177a8590d035c2d6d197e49343fc370b101589e58736042c3b12cabb68fe796422f3133feb79068ab7d5931efa5414d22edead10c8871fefcd2549 SHA512 888ebf5e8e9d285b82d87377fc8836886d7a8b089c1be4091420a77a0250c9baf09aebb7a6330ff5043fb35f51eb6baf8d4491e26da7ad0811f0087e395b5012
 DIST audit-2.8.3.tar.gz 1107583 BLAKE2B 21c2b8543a31c0ca4319af40b844f4400615108a59195a95ea79499ff2923d7dbbc840716d60dfba311bfc451983cd4cd0f7cb27c2444825df2c0dfb50f9614f SHA512 aa939b81a66111f4e466208d7a38414bd186d00ccd374b420439764905b4707bbfcdc2331a6179a080fca981d19171696ecabd26674205b2f9339c44954db933
-EBUILD audit-2.6.4.ebuild 6194 BLAKE2B 5e159665e671092224196d91478246d2f9f56092dac4be65d86d6094bc535c276d90f2635be17214bc9fbae94aa9d4e58d1b538766eda940260c00ce9be66591 SHA512 5769b0f13bd033b5b465ca36d707c4324338fb2ce43948a2d656ebdb76d5004030e5a10057aa8d9f532d13484fdc1819f5633ce52a12c20dd301d0b4b7eaffe5
-EBUILD audit-2.7.1.ebuild 6191 BLAKE2B ede0d8d8caf3842995b5f818fec46009929d099743a0309efcb7db8ce9e5ecb8d2676f8ad2683ba63bbaf6a3ee41adc0a41748e58715bd489b0d29e9b78ee156 SHA512 520c61a4edb2d05937aebb0e602cd417398a556a0fa0dabaa57080232a24301379b16c0e6a4d00ad8f5c2acc3a624ef59061569fc1862b8891b537cbcb9a5291
-EBUILD audit-2.8.2.ebuild 6205 BLAKE2B 82d223206cf3e14c58ce4bbdec2df18e5ad874eb440b4208a7c7463305ec2ec8039783e6436dff0623478db3dcb0d7909b4f077a819bee494d086f162d455e34 SHA512 ee1194da6ee59e8efb3d625853dfd98b0b4e034282aa72cd5f38860be7023c0e8d795c6898313551fca0b8477912a3d7608d821d74f66851136786620abdd630
-EBUILD audit-2.8.3.ebuild 6205 BLAKE2B 82d223206cf3e14c58ce4bbdec2df18e5ad874eb440b4208a7c7463305ec2ec8039783e6436dff0623478db3dcb0d7909b4f077a819bee494d086f162d455e34 SHA512 ee1194da6ee59e8efb3d625853dfd98b0b4e034282aa72cd5f38860be7023c0e8d795c6898313551fca0b8477912a3d7608d821d74f66851136786620abdd630
+EBUILD audit-2.6.4.ebuild 6205 BLAKE2B 486150d4806a8d6839e1a660fccd9556b95db3bcd1715ee797aabc059500cb63a2f38ba6cb9be28229a813403126e4f22e22e011033974663259bab693450216 SHA512 be5b2dc7eb3ffe5d68c1478635fc423337f2047018c4e528d0ee4cd4dfa4e2ecaae8754f7df408adb698b871c7de6e84dab58ed2c36f2d13c455105203ad5b18
+EBUILD audit-2.7.1.ebuild 6202 BLAKE2B bc171497850fa83d1c8e96d3c30913bc4b28078501aa1557577f9c8b3468ffe57d38360611acc0bc6857aa6cab5de07019d58e4edbaac345f75dbab8f39e3d8c SHA512 5058294f8da151fcf2ab11cde998161331b81c117a6ab540168634d6e15ecb88ec8fe639113b183790b430f239034d28f58d542935a5d235e2f7b4097e450d19
+EBUILD audit-2.8.2.ebuild 6216 BLAKE2B ad2391a4eb0802a63b1831646a1da196820605c9a6cf16c595bf1daabcd8b10161c09e23097f48b37378cfd3b18973fa264da92fdfb3df9942e99b736202156a SHA512 17f9261ca660386c6a24cf978dba360b3e911d5515c7ccb6174ad736b67ae33583185f1a758e57c692820d81886b7871a8283b809a959ff231e2700757f0de95
+EBUILD audit-2.8.3.ebuild 6216 BLAKE2B ad2391a4eb0802a63b1831646a1da196820605c9a6cf16c595bf1daabcd8b10161c09e23097f48b37378cfd3b18973fa264da92fdfb3df9942e99b736202156a SHA512 17f9261ca660386c6a24cf978dba360b3e911d5515c7ccb6174ad736b67ae33583185f1a758e57c692820d81886b7871a8283b809a959ff231e2700757f0de95
 MISC metadata.xml 364 BLAKE2B d056ff5b5d3a6fd968f926ceaa85eaaf9b6c54f069dfe3e3d6eb8f784dd1eb4353b3c1236a4eb7691cd48893b7b10a10647a86bd2355b33f2b682c435510422c SHA512 3e5dcff1ff9cfa5c209ab052de5f2ac44ef2bef1d991e8daab6603b72cef81cae6106a34f5181196e083596183a454cb47436d7560084cd51779ae8eb9901202
diff --git a/sys-process/audit/audit-2.6.4.ebuild b/sys-process/audit/audit-2.6.4.ebuild
index 999fbf25c03c..4d02229546e9 100644
--- a/sys-process/audit/audit-2.6.4.ebuild
+++ b/sys-process/audit/audit-2.6.4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Userspace utilities for storing and processing auditing records"
 HOMEPAGE="https://people.redhat.com/sgrubb/audit/"
 SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="gssapi ldap python static-libs"
diff --git a/sys-process/audit/audit-2.7.1.ebuild b/sys-process/audit/audit-2.7.1.ebuild
index 8f76eada8300..9ece8528d55a 100644
--- a/sys-process/audit/audit-2.7.1.ebuild
+++ b/sys-process/audit/audit-2.7.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Userspace utilities for storing and processing auditing records"
 HOMEPAGE="https://people.redhat.com/sgrubb/audit/"
 SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="gssapi ldap python static-libs"
diff --git a/sys-process/audit/audit-2.8.2.ebuild b/sys-process/audit/audit-2.8.2.ebuild
index c03f103ef2f8..44ef93b51bdc 100644
--- a/sys-process/audit/audit-2.8.2.ebuild
+++ b/sys-process/audit/audit-2.8.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Userspace utilities for storing and processing auditing records"
 HOMEPAGE="https://people.redhat.com/sgrubb/audit/"
 SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="gssapi ldap python static-libs"
diff --git a/sys-process/audit/audit-2.8.3.ebuild b/sys-process/audit/audit-2.8.3.ebuild
index c03f103ef2f8..44ef93b51bdc 100644
--- a/sys-process/audit/audit-2.8.3.ebuild
+++ b/sys-process/audit/audit-2.8.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Userspace utilities for storing and processing auditing records"
 HOMEPAGE="https://people.redhat.com/sgrubb/audit/"
 SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="gssapi ldap python static-libs"
diff --git a/sys-process/minit/Manifest b/sys-process/minit/Manifest
index 324f4efaa5fc..2033a970e5c8 100644
--- a/sys-process/minit/Manifest
+++ b/sys-process/minit/Manifest
@@ -1,4 +1,4 @@
 AUX minit-0.10-fixes.diff 1916 BLAKE2B 4c277a5f25838533074515edf5b11244ad94350ebb5dce0bfef66ba7c022f5d68e54e568da851c610c2da832cfec6b0a1d53d990b5e9725b4b7b5bcdfbcfdea6 SHA512 dca96b6a5c6dba7d72f0df32a2d615aee7ffd9f640a20fa67b4fcd9a0f56e991033196e91090fd78c2ba1c38d013a4ca4b0a74e7ddc39f488354a8aafb281b00
 DIST minit-0.10.tar.bz2 26119 BLAKE2B 3520cb53192df3da87f2cd40247623a1c1c77cd728890aa7ee24804729429d955abe430e9f90e6786a5c4f8dc733aae8ea17f7488ef0650bb4ece356c2033713 SHA512 9c617ca9f3638a430ae8347ec4b3dc36c5b23c703f11c4d445c9abebb2e7cb2460424f5ed71112bb21e862818a45338926bc4de3d0ed8b2e99f7d296ca37479c
 EBUILD minit-0.10-r1.ebuild 934 BLAKE2B 74adeb15a44dacca463e7f4c8436e5eadaa61325a23c30b96f180c517386c11e1f5a810cb6d1fb292513b214571781d017f65ce6c531edfabddbd55e42367ff8 SHA512 4dd5afc99b797057101d108949de43a7002fea17b0a653212273b970d362d26d4fd1309d26a3040950184e27c0e038db4e4827b12c3b0b289a00e7c742661ccf
-MISC metadata.xml 1237 BLAKE2B 2da4c9ab4f1627e17f1f580ed4402fe1524605ba15e30028bcbf2dc82faaccf0837518adc0ca08f21b0a7c732e4ed4937d719f61408e676e82b178e65d6b8356 SHA512 c219e5b11f7fa3dd1eaed9570722ec050c93f4b372ac35f11b031a96a8ea3740a64f885e87fe6547e9a4f66f899b4ccbbfa6c0787ca6ff835925c94b9eb3326b
+MISC metadata.xml 1030 BLAKE2B 18bf659470d9400e2468f8e4f8390cd1d27ca6468ef44a9cd90900fe1582f32b400a81ae40719cf5d189f27a34a1621f68b70ff70053869f6cf76d06583b82ec SHA512 65814f971016515f44c618294f0d1f020326e573acd5577229d585aad41b055703d4b56fd666cb43dfd2e5c8afb5051fe353883e188b0b1704f20385b8ea7bfb
diff --git a/sys-process/minit/metadata.xml b/sys-process/minit/metadata.xml
index 257fae54f708..ae1e2f5e09cd 100644
--- a/sys-process/minit/metadata.xml
+++ b/sys-process/minit/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>aw-gentoo@instandbesetzt.net</email>
-		<name>Andreas Wiese</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		minit - a small yet feature-complete init
 
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index b72dd06dbe27..22f1977f9896 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/cargo/Manifest b/virtual/cargo/Manifest
index 2f2328f32c55..fa6880f4876d 100644
--- a/virtual/cargo/Manifest
+++ b/virtual/cargo/Manifest
@@ -1,2 +1,3 @@
 EBUILD cargo-1.27.1.ebuild 355 BLAKE2B 59652dc58344b9f387fb0947ee0cfeb5fde367d1b204de0da374997e549a068d0dd57e2ac294c820cd07268c01d73edf80b6e067edd1ff65baf286c69aafe11a SHA512 c1b7badec7baca2b55597ca2c30bff7173060147eecfa81c5e5e9338cb9163ee8da790bf57175d8d2f4a204fe1bb1321335dab9ad2f5cf6b8dd5eca919f2e4ca
+EBUILD cargo-1.28.0.ebuild 411 BLAKE2B 899395d81f0be64fa30bbcc216bcd9da6ff36830e89f2e57ed4132bf861bcefba4edc2e047e8b99ad38694bcf154c5fa03482c433aec6e40a30a850e24b0edb7 SHA512 330ecbb23d04521f0e066f70a61af5cae1529f43a57406de21abca3e3325a1696bc52fcab00bd94246c6ac400ee979b2ae216d7f20218ba4812d898eccd8f2e4
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/cargo/cargo-1.28.0.ebuild b/virtual/cargo/cargo-1.28.0.ebuild
new file mode 100644
index 000000000000..e05ec4b31305
--- /dev/null
+++ b/virtual/cargo/cargo-1.28.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Package manager for Rust"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+CARGO_DEPEND_VERSION="0.$(($(ver_cut 2) + 1)).0"
+
+RDEPEND="|| (
+			=dev-lang/rust-${PV}*[cargo]
+			=dev-lang/rust-bin-${PV}*[cargo]
+			=dev-util/cargo-${CARGO_DEPEND_VERSION}*
+		)"
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 91628371a8f6..1f10241dbec6 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,4 +1,5 @@
 EBUILD rust-1.25.0.ebuild 315 BLAKE2B 9b8dc0635a5f3616c6aae90b9d9deebfda2e410f5bdf14560305d5e8f732e40e4f19dca8fb9ddd024403aba02269ea572f9534a66a79b01a63cdd8ae73711e7a SHA512 e1788d6d3877f1b04ce08ad35668673e3e52f2d1243fe167e1fb38c7dbb816f1c70cb778d839a96aea2130bc672e8026bf6f0f8608bb0ca328c14fce4157d96a
 EBUILD rust-1.26.2.ebuild 317 BLAKE2B b724b229130ca619bdcd4777df139b4dbb26ddf5678d5a385cefd3f9fdac0fc8bd7781bd9e83bc9e53f54d2f5e825ff0e3b453d60742008967cdbe747f092370 SHA512 b3a5d397453562e72a9ba6ed097b6e4470f80c8e2abcf9399ae6b712ac6a6a5c0e0d8568b68383797b9ff224d6f45bf9fa07482ebe8a0a1df34a2be1593941ec
 EBUILD rust-1.27.1.ebuild 316 BLAKE2B 42011cc292fb034308820d2daf342120b736834151bd05ccb12378551862a8fc5dba286401872c8af6a71741018cd5f709d0e7401cb92dcb295d36f23d91d28b SHA512 1083147da3fa25ba69f561eae232f1a60e8bb967205bb483dde126e3e3e69f83cbe02a8179d46849d3ef70aada88cb8d8ed1af4aa0ff1eacc558b141a28deb4e
+EBUILD rust-1.28.0.ebuild 316 BLAKE2B 42011cc292fb034308820d2daf342120b736834151bd05ccb12378551862a8fc5dba286401872c8af6a71741018cd5f709d0e7401cb92dcb295d36f23d91d28b SHA512 1083147da3fa25ba69f561eae232f1a60e8bb967205bb483dde126e3e3e69f83cbe02a8179d46849d3ef70aada88cb8d8ed1af4aa0ff1eacc558b141a28deb4e
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/rust/rust-1.28.0.ebuild b/virtual/rust/rust-1.28.0.ebuild
new file mode 100644
index 000000000000..fa78c78a3e78
--- /dev/null
+++ b/virtual/rust/rust-1.28.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for Rust language compiler"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND=""
+RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 548b24c85955..6b98d75358f4 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index 25da82bd435f..260c34936d83 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -2,6 +2,6 @@ AUX cgitrc 2632 BLAKE2B d806a93ed671a3dc8369067cd5af512f4d2653d8959d99dded2460f7
 AUX postinstall-en.txt 1844 BLAKE2B ce765acde48fb3b1c95b8b773f20dd196507b7b6b908806f2b1dece5c9b4dbf5ca93a61331b5f69efa9dc9a9728761d432c6e54a3d767868046c4b9cbbf210fc SHA512 40848a103f12cebe1572b51640abf8bb8c7cab58b6bcb95493498af61ee743abb987b59b6e5d6d9ff4eec5ba7d21cf2e5173ddbf4c51cd4210fdfa430da3aadc
 DIST cgit-1.2.1.tar.xz 89648 BLAKE2B c1dc2fe9af58cc00bef9e11c5f784c5696d108671456be61c46e971659df3274874e751b26d6e124c2b3e7b407bbad2878ec5d74f26a0469146bfc66a479501c SHA512 c7380df9afbc3735ef9e4f196f4f5bbd26cf52e473fa6f435e7d0c00dc295cc8de6bee6bfb1857144025c8591d41a6a74efb1af551e8610848d90ac40fcfab36
 DIST git-2.18.0.tar.xz 5102264 BLAKE2B 94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce SHA512 db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46
-EBUILD cgit-1.2.1.ebuild 2249 BLAKE2B ec42f974494f204b8c9b33c4b0134ec558b384d55f8968fb6ca9a3cd1f88bfcf0879c828f49d245510554618c7bc9b097df11bc5675bf0710b8f7f54cb4fbd49 SHA512 566caa7d80eec4454f84185fb70924bb284389693d017fba77717311c8883e73072c44b17077f2d92606279862d601b6056b499ab84163013160cfe4f2aade24
+EBUILD cgit-1.2.1.ebuild 2246 BLAKE2B 15f71733038821b269b91df3b1cfe81153a8b2fd0327ff7e68696230bddf215f5589632f2bcf0ad7b91f71767112f4fe938f87880d7b3e95a3bfb6e6124c5682 SHA512 034407bc5b0575e92af162f9e036b87043b347176c38f33e1dfaaf9683f4edad68d790848ee3004e44ed0677ce175a6dcb92ffbcd31a781b80afb7d17da3e560
 EBUILD cgit-9999.ebuild 2162 BLAKE2B 803fc4168ed39bca73ee63e33c9946ad272e440e79b24cc370899203e24b2ec255915d7a06fa9cc6b810ea66754cd06e42dfb3d6fa5516672f2db07eaa76cfe5 SHA512 2e4a26d903bab34cb4c9106f9d3d8b0957a66fa15dad668b4a764e030df3960b6f94f925e69cc339cae0396b77b1a34edbe5dd154404b70b408fc9ba2d9e3c5b
 MISC metadata.xml 785 BLAKE2B 77499510fb3060d6e2317f9b83f3bdc1580bade8eb81d27febcdfbf1171fbb0266670a55b8f5cfd99cd748a10ee772946ff0178b0c1f2ba71aaee7af0c5ea4da SHA512 dd9913901422f70df64638a4e8244da670ac9708ea8a0027b2e6aab5b960e27c117f2c486e6ebede40f8c5f475eec054a2896c08166f38113e1ee3ab97694d90
diff --git a/www-apps/cgit/cgit-1.2.1.ebuild b/www-apps/cgit/cgit-1.2.1.ebuild
index cc4e2a139545..82174c822957 100644
--- a/www-apps/cgit/cgit-1.2.1.ebuild
+++ b/www-apps/cgit/cgit-1.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="doc +highlight +lua +jit"
 
 RDEPEND="
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 9e83a6408d91..c8c8805a028d 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -4,5 +4,7 @@ AUX gitea.initd-r1 688 BLAKE2B eb2341dee53f3fd92c49137855615d9ae7ca77efc396e2d2e
 AUX gitea.logrotated 87 BLAKE2B 373830ddd6eed0ce2f0f7b1dab14e4a253e5a56a73f477cfadbc6deec373846d4df2d697735391581771699d5a6513acb0e14a446873de01eba10d19e3a6bd88 SHA512 798f3fc33026f19dd31ffa78b9b1ed313d7b82b19c047f509e896c1798b2925a1bb7c4998d98a6b47e728979bf7132fb1c2a80eb7fda096a763d6791631cb6d4
 AUX gitea.service 472 BLAKE2B 4c728e2987d0c0a86e65d4b9c1a59f6193ff8a3f9b066991a06f495ad1c5586b3497c71fca1cce5b65f167af09343e7bf3215ee5e8fdefa539e384198d2d88d6 SHA512 6666fe3b4cdbb78a58db4a6bf47a15e6be9ab30b666c6eb77a9e8a002d8c0abd510fc75ef463a11ee6892ab12c98943774616072cb64fd9f2fa42ff8f676aa95
 DIST gitea-1.4.1.tar.gz 14978598 BLAKE2B 8fde79291b745750e79c944e7fcf938d2476ddaa386c1277f54bf315831eeb749507e270ca0a8a8351dd8fa60656bb98eb7c478a5c99f2ac20d350b6054339d5 SHA512 3b812bd61215230035ec9241e953f239981d04580d931f379aa550e11d2f7facd56bf70ac9e2d866224d341570a238bcc5c2fa71fd1432cfb95b8c8b703784e6
+DIST gitea-1.4.3.tar.gz 14985783 BLAKE2B d2f141a036406c92e7900ce073066ff5024f308c24a2705eb5da229c48a1b6c772d3148222aafd5c0d6608830670badb2a102149f58a134cc32b5175e1ae306e SHA512 24498b418b9ddb14da5568a206e1fa0831c5789e0b64207f413c3b86e2a855052f7af80d3cb80549eaae6944e22af271c00f6308c66487c3be0dccf55a17976a
 EBUILD gitea-1.4.1.ebuild 1892 BLAKE2B 09a05d287962d04ac368be5a9a20f65d1310231a55e90e10fb3dc9d2da79aaf94a16bf24a1f4d6be7cc27be4130a7e2edcf91fc05cad6c20077a98c09123e3b7 SHA512 aa22f9c026cb5741679c1fa8783ac9aceb1ff413d96e4a422e7f21ae5fd4ab12872b330fd58b790a9cfcf121a519a73a44016270a6919b1cd076a6ca70693998
+EBUILD gitea-1.4.3.ebuild 1892 BLAKE2B 09a05d287962d04ac368be5a9a20f65d1310231a55e90e10fb3dc9d2da79aaf94a16bf24a1f4d6be7cc27be4130a7e2edcf91fc05cad6c20077a98c09123e3b7 SHA512 aa22f9c026cb5741679c1fa8783ac9aceb1ff413d96e4a422e7f21ae5fd4ab12872b330fd58b790a9cfcf121a519a73a44016270a6919b1cd076a6ca70693998
 MISC metadata.xml 324 BLAKE2B 66e4bf11fea6a0b4a0ca353849e1a4aaf32c0a1680c36f1e74fe155705806a822c277487f551e82ad0a3740b4faf9f1f8b2b2ce24781774da6c9f21a3f094f57 SHA512 7b0e56ffe4652157a5126ae7cb7cc6b557ec8367dac02c28f69243181147855dc0e96fe09dd7ff507052a7f5382445deb98090175e06d030fe635990812820ee
diff --git a/www-apps/gitea/gitea-1.4.3.ebuild b/www-apps/gitea/gitea-1.4.3.ebuild
new file mode 100644
index 000000000000..41abc1c912b1
--- /dev/null
+++ b/www-apps/gitea/gitea-1.4.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user systemd golang-build golang-vcs-snapshot
+
+EGO_PN="code.gitea.io/gitea"
+KEYWORDS="~amd64 ~arm"
+
+DESCRIPTION="A painless self-hosted Git service, written in Go"
+HOMEPAGE="https://github.com/go-gitea/gitea"
+SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata"
+RDEPEND="dev-vcs/git"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitea git
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/\"main.Version.*$/\"main.Version=${PV}\"/"\
+		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN}/Makefile || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} generate
+	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="-fno-PIC" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin gitea
+	insinto /var/lib/gitea/conf
+	newins custom/conf/app.ini.sample app.ini.example
+	popd || die
+	newinitd "${FILESDIR}"/gitea.initd-r1 gitea
+	newconfd "${FILESDIR}"/gitea.confd gitea
+	keepdir /var/log/gitea /var/lib/gitea/data
+	fowners -R git:git /var/log/gitea /var/lib/gitea/
+	systemd_dounit "${FILESDIR}/gitea.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}/var/lib/gitea/conf/app.ini" ]]; then
+		elog "No app.ini found, copying initial config over"
+		cp "${FILESDIR}"/app.ini "${EROOT}"/var/lib/gitea/conf/ || die
+		chown git:git /var/lib/gitea/conf/app.ini
+	else
+		elog "app.ini found, please check example file for possible changes"
+		ewarn "Please note that environment variables have been changed:"
+		ewarn "GITEA_WORK_DIR is set to /var/lib/gitea (previous value: unset)"
+		ewarn "GITEA_CUSTOM is set to '\$GITEA_WORK_DIR/custom' (previous: /var/lib/gitea)"
+	fi
+}
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index f6d0b2970a57..38d34e492c21 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -5,6 +5,7 @@ DIST github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.
 DIST github.com-alecthomas-assert-405dbfeb8e38effee6e723317226e93fff912d06.tar.gz 71099 BLAKE2B 2894bc0568c3d114aff71724dade89c604d9f0528cbe8f5c644c4a850941f146eec9a862886cb3241b75212c6f2272efc50a6923166eeb571be26c8aded40e0d SHA512 182f141d83bb9b1d7d94cf3b1beb2e7c4074f9be3bd0250e3423fe64e6182f34b54b36e517397aa88440e42fe116973ed435bde6b8343df299db6ebb32591331
 DIST github.com-alecthomas-chroma-1b755a90bd109f170385cb3964f0abdfd3451145.tar.gz 301047 BLAKE2B 8d14d121cdeb160d3ed10d6b60a8d97897b0344c7c42e5a6546ef1996d32bc163ff650f0d74b9085635ac179fe14a672dff87fb4b3ae43093fd06ba660fc4faf SHA512 67f0d6f741fa07e9d6c3fdc92d0235ed70927b6fa85a346c8b7ecbf9b709e2b7810aaa8f625f5d528bb20d9f7118b4af1cb52fc7f4a5d3e7d1dbf05c0430d7ef
 DIST github.com-alecthomas-chroma-85c342e3e3d715ad780edd0ba8728161e99cce24.tar.gz 298009 BLAKE2B e2c8e9e72c06d389c43f4040d652b8de27e9480d3dec27f1b76cee14e657aa10196cf42f42bb4a19d2982198e8a566598104fa14328f06bb12916f382e8bff26 SHA512 38d5c391aa9ec4b8c24bd18ec7bb9bd1dab9eb968689ca91635b9964e62d1c0b74c6d102071e48e461440e3f30f201a63bc3a8eaa9e200521c77d35ef4d8c655
+DIST github.com-alecthomas-chroma-e4dff9a08cad984e9cf8eaa39fb80f2beae10484.tar.gz 316451 BLAKE2B 8025aba0ccd83bbfdce3eeaf9031f00db9555f851729605a625d5ed698b8edf2d24e9efdfd54ed2bfeee1f560fb5f9e9772e4ded5d2164ad4c1254df8f27a3fd SHA512 74da7b6b28b3e838ab8f0fb72ca66de54d0e8f28086a1e6a3509c6bf9435344a8f2e8437597e1d5d56c5ebf424f9ca0cf4dce82f3e77b0ad4fb85888e4ee0487
 DIST github.com-alecthomas-colour-60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz 3483 BLAKE2B e4ecc9503cc8c6053adb66f87ddaf1e9fb66fa18060c07a0e26c1fd8fa1b143d48345ea73c399571f787b8104a7522672a945d885f5e24dcf0718a995d6567f0 SHA512 e428ba9fdc2fcf097ec9892241cbca65631924dfe66a08ec4131e7cfba24125145600f03b753b7bc4452b06f0c7380560d9165ebeb7dddb30d35db512c825796
 DIST github.com-alecthomas-repr-f49988b46e025398b9f834f7c726afe001ec481f.tar.gz 4609 BLAKE2B 4407439779e981b39d1926437aa67a8922bad0eeed8858b0888c53ee819c8551367e8f74d6d04854ce57dc45a477060461ebb79b30be6b8f6880dbc94f5d53c2 SHA512 f07fda8ecd0c653dfd0024eee9e33851572ee21a6aaa196d453825bc28bb92b3c80c0dc0aad38ec4e2158e7f22d7aa1166e4ea7aead713fa834c686cb98dc02d
 DIST github.com-bep-debounce-844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz 3494 BLAKE2B 3f8103b07b4d37c060d48739c6a6cfc9b585ea3fcf1b87aa9bfee44245b8f4067763567864903b488070a3ae43a30b7ed95dcaa12517d119af0c4bc6cf73303b SHA512 2636d6ef6cdb5334da0e6ca560e64e2e1880ed749b7abdbc6ac6f2eff125c7c40e4eda549273d68097789234dc7e4bba3cd5d07ea5147e9d28ee390c2fd0216d
@@ -71,9 +72,11 @@ DIST hugo-0.42.1.tar.gz 16529961 BLAKE2B b9b16de707a1d9a17a42147451ce365453a927b
 DIST hugo-0.44.tar.gz 17634657 BLAKE2B 6f21af5003b6a082df3cc3a64a6013c78f7c9fc5f81d56c1925d8ee3092f3381129599e008c1c9ca752cb6b40f405a6893664bee508cf55c700f59e5a9461ce5 SHA512 0cfd399a18e21c0596095c8e6817cf953b142624a1661e0e95944fccd74ca8e93072694e6a340300fbc93a739e744276893f42fafa44983beb5f6e5b60437cfe
 DIST hugo-0.45.1.tar.gz 17987572 BLAKE2B 4227fd2e2c01b649d39d569ed24af67768de591ff98fd3cc0e0853f6ff374e05dffbbee4fafe66f1990767984cedc9e9b7a6b57d88e923ef1fa1d82ac0437891 SHA512 277c97f3ca66eed1ce705741194da44e9e96f35e58cad377846e22dda4afdce355caeecc29ed9386425c3a6c62c0c439cd91a03452e7641f494ec360dc0b168e
 DIST hugo-0.45.tar.gz 17989581 BLAKE2B 8813eefd07c0858458abb12f9fc91f22bb183ecdafe9eea86cb80f191c000b21a72dd1f22f6a47e0dc4c3046a74922b6cbbb8dfc5883b40244da2d503dbed97b SHA512 1f6d0139b2606dfe6c86d581390f76fa7989b70dd2cbc69c9ffef0fed8a7bef367af207cd2c5d9ad3558b97abc85381fd65025eb29b85dc59bb522f45be84ec0
+DIST hugo-0.46.tar.gz 17855569 BLAKE2B 6e33f963f0e8c1f90b1416857ad552145dcc2a165f9f0e7732546625afb190988756916dc181f0e0de5c214f75fb8a20d6fb982eb1e33926684e0639c5cf0f02 SHA512 b197a44b13df607cb6761d77a3f5ea3a40ec279151075ce0ec0db38797c7aef7d26689699d5a3aaa9e35405d388989d3a5da15227b06652ebed01aa5d6fa916c
 EBUILD hugo-0.40.3.ebuild 4846 BLAKE2B f25a8a07bc090313babb726945ca729a608878a7edd2524e156ef26f4ac75d17d95c36be641f9e0f64d55f4408760bd5f250ba84a54c30fb61b4e107c69cc316 SHA512 b2ddff47f6ce6e0267e0942600463680f4404c65ec26f137a55a71b22fd435a3651b17f0ee889d9a05ca9448bb257ba14d4d83793ede95efe6ddc61c4de9acd0
 EBUILD hugo-0.42.1.ebuild 4846 BLAKE2B 4dcb40c1e84fc3206d3f8e386f1008fca5a271943162090d9bd801a909218a7e5ab10f1e209f0f6ffa2eb1f76c2495870f0c97a57aad946f488283210a78faee SHA512 9f063518751ab20af19ddfcaeb9fa496cec186f92ceef973e21d2d84273cc9d9a66d1b47b99ce542cebe62784e11393b77ed420af0922d1910c386ef7eaf8da8
 EBUILD hugo-0.44.ebuild 5683 BLAKE2B 8701d40f1afe753f44eddb09d7aba880842ab05065758772618ce7e0aaab914de40900b361d3d237ace960eafe75e758412fa65ec438c39fb4b67408cd15bda4 SHA512 83516f57af0f5c64e6268f8a321f48f0a4f1cbe7553ba63d24da8a7e0185d5abc0d492d8e7aa0d5cf4d494610600fafb58f5b208562004b5b5734c6c94d969e3
 EBUILD hugo-0.45.1.ebuild 5684 BLAKE2B eed2d5f3d069e4511a31119df191216dcefaefe0a646780a664a4bb5030973988d295241a489bd1cb3fea8e35ebf556bf56337470ee891deb48c90d5a4817a61 SHA512 9b7ded36fb0f40a4cd7edf3264f9b72a42c1e5cbbe232fec297abd39ee68e54f8ded68602e3ec10bd954c8efda09204828d2cc588f3cc97ba867d389f6c07be6
 EBUILD hugo-0.45.ebuild 5684 BLAKE2B d36f40703e38a82d5e190a5abc2f7c23a207e9d649c766a7c809c3c84a49085e04152e9cccb1a6efaefa58f396f7efd7afe509890944870dbb678c06bfc3e5f4 SHA512 d0495030323010154513d265eb8941ed956f282c96abcf72df084b0fe0c6e5097dd6ed12a3dc34f4024518d07c7e431c1762a485ff5cc483b882712139698659
+EBUILD hugo-0.46.ebuild 5684 BLAKE2B ca0fb858d24cd936fdba63bdd541bdd203e6304ab8bff5dae9863c690bacb8e71076f267f313b655d124a4be0795e09e7f2060a3024fe6f172a3af7610beccf1 SHA512 4e7ade7a40d7253dfe564251a095f648aad8b7388bd573a4008418362f82d0106be0f352ad25b7ec693857a1ebe45f7dfd4ac89fa06a3d8b55443104fc6fab94
 MISC metadata.xml 312 BLAKE2B 461bb90ec180d1a09d780aee57523196d50b176b6bdd6645c75b878a72ecbe76f7e7a323d6c0ec300762e57be5ac4342c6f67a11f73088f55fb2b1bde17b5b25 SHA512 c7ab34fd5a378c5b82484b7637ab0fb598a64f61649d9b68726bc7cb9d5d51b7bd1f199f3f298d49dc7bbadfae9c3d692f45e878daa3e22ebfe4601b0d0f0c9f
diff --git a/www-apps/hugo/hugo-0.46.ebuild b/www-apps/hugo/hugo-0.46.ebuild
new file mode 100644
index 000000000000..e8cd6a0e9e1b
--- /dev/null
+++ b/www-apps/hugo/hugo-0.46.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_VENDOR=(
+	"github.com/BurntSushi/locker a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a"
+	"github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895"
+	"github.com/PuerkitoBio/purell 0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"
+	"github.com/PuerkitoBio/urlesc de5bf2ad457846296e2031421a34e2568e304e35"
+	"github.com/alecthomas/assert 405dbfeb8e38effee6e723317226e93fff912d06"
+	"github.com/alecthomas/chroma e4dff9a08cad984e9cf8eaa39fb80f2beae10484"
+	"github.com/alecthomas/colour 60882d9e27213e8552dcff6328914fe4c2b44bc9"
+	"github.com/alecthomas/repr f49988b46e025398b9f834f7c726afe001ec481f"
+	"github.com/bep/debounce 844797fa1dd9ba969d71b62797ff19d1e49d4eac"
+	"github.com/bep/gitmap 012701e8669671499fc43e9792335a1dcbfe2afb"
+	"github.com/bep/go-tocss 2abb118dc8688b6c7df44e12f4152c2bded9b19c"
+	"github.com/chaseadamsio/goorgeous dcf1ef873b8987bf12596fe6951c48347986eb2f"
+	"github.com/cpuguy83/go-md2man a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa"
+	"github.com/danwakefield/fnmatch cbb64ac3d964b81592e64f957ad53df015803288"
+	"github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76"
+	"github.com/disintegration/imaging dd50a3ee9985ccd313a2f03c398fcaedc96dc707"
+	"github.com/dlclark/regexp2 487489b64fb796de2e55f4e8a4ad1e145f80e957"
+	"github.com/eknkc/amber cdade1c073850f4ffc70a829e31235ea6892853b"
+	"github.com/fortytw2/leaktest a5ef70473c97b71626b9abeda80ee92ba2a7de9e"
+	"github.com/fsnotify/fsnotify 629574ca2a5df945712d3079857300b5e4da0236"
+	"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+	"github.com/gorilla/websocket ea4d1f681babbce9545c9c5f3d5194a789c89f5b"
+	"github.com/hashicorp/go-immutable-radix 7f3cd4390caab3250a57f30efdb2a65dd7649ecf"
+	"github.com/hashicorp/golang-lru 0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
+	"github.com/hashicorp/hcl ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
+	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+	"github.com/jdkato/prose 20d3663d4bc9dd10d75abcde9d92e04b4861c674"
+	"github.com/kyokomi/emoji 7e06b236c489543f53868841f188a294e3383eab"
+	"github.com/magefile/mage 2f974307b636f59c13b88704cf350a4772fef271"
+	"github.com/magiconair/properties c3beff4c2358b44d0493c7dda585e7db7ff28ae6"
+	"github.com/markbates/inflect a12c3aec81a6a938bf584a4bac567afed9256586"
+	"github.com/mattn/go-isatty 0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
+	"github.com/mattn/go-runewidth 9e777a8366cce605130a531d2cd6363d07ad7317"
+	"github.com/miekg/mmark fd2f6c1403b37925bd7fe13af05853b8ae58ee5f"
+	"github.com/mitchellh/hashstructure 2bca23e0e452137f789efbc8610126fd8b94f73b"
+	"github.com/mitchellh/mapstructure 00c29f56e2386353d58c599509e8dc3801b0d716"
+	"github.com/muesli/smartcrop f6ebaa786a12a0fdb2d7c6dee72808e68c296464"
+	"github.com/nicksnyder/go-i18n 0dc1626d56435e9d605a29875701721c54bc9bbd"
+	"github.com/olekukonko/tablewriter b8a9be070da40449e501c3c4730a889e42d87a9e"
+	"github.com/pelletier/go-toml acdc4509485b587f5e675510c4f2c63e90ff68a8"
+	"github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2"
+	"github.com/russross/blackfriday 11635eb403ff09dbc3a6b5a007ab5ab09151c229"
+	"github.com/sanity-io/litter ae543b7ba8fd6af63e4976198f146e1348ae53c1"
+	"github.com/sergi/go-diff 1744e2970ca51c86172c8190fadad617561ed6e7"
+	"github.com/shurcooL/sanitized_anchor_name 86672fcb3f950f35f2e675df2240550f2a50762f"
+	"github.com/spf13/afero 787d034dfe70e44075ccc060d346146ef53270ad"
+	"github.com/spf13/cast 8965335b8c7107321228e3e3702cab9832751bac"
+	"github.com/spf13/cobra a1f051bc3eba734da4772d60e2d677f47cf93ef4"
+	"github.com/spf13/fsync 12a01e648f05a938100a26858d2d59a120307a18"
+	"github.com/spf13/jwalterweatherman 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
+	"github.com/spf13/nitro 24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"
+	"github.com/spf13/pflag e57e3eeb33f795204c1ca35f56c44f83227c6e66"
+	"github.com/spf13/viper b5e8006cbee93ec955a89ab31e0e3ce3204f3736"
+	"github.com/stretchr/testify 12b6f73e6084dad08a7c6e575284b177ecafbc71"
+	"github.com/tdewolff/minify 8d72a4127ae33b755e95bffede9b92e396267ce2"
+	"github.com/tdewolff/parse d739d6fccb0971177e06352fea02d3552625efb1"
+	"github.com/wellington/go-libsass 615eaa47ef794d037c1906a0eb7bf85375a5decf"
+	"github.com/yosssi/ace ea038f4770b6746c3f8f84f14fa60d9fe1205b56"
+	"golang.org/x/image f315e440302883054d0c2bd85486878cb4f8572c github.com/golang/image"
+	"golang.org/x/net 61147c48b25b599e5b561d2e9c4f3e1ef489ca41 github.com/golang/net"
+	"golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca github.com/golang/sync"
+	"golang.org/x/sys 3b87a42e500a6dc65dae1a55d0b641295971163e github.com/golang/sys"
+	"golang.org/x/text 2cb43934f0eece38629746959acc633cba083fe4 github.com/golang/text"
+	"gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml" )
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+EGO_PN="github.com/gohugoio/hugo"
+GIT_COMMIT="f14d773841c32ad48f2d2fa22e1e378d477e5c9e"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A Fast and Flexible Static Site Generator built with love in Go"
+HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+sass"
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go install -v -ldflags "-X ${EGO_PN}/hugolib.CommitHash=${GIT_COMMIT}" $(usex sass "-tags extended" "") || die
+	popd || die
+	bin/hugo gen man || die
+	bin/hugo gen autocomplete --completionfile hugo || die
+}
+
+src_install() {
+	dobin bin/*
+	dobashcomp hugo || die
+	doman man/*
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index a64364d8c402..9a48978780c9 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -4,8 +4,11 @@ AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386f
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
 DIST kibana-5.6.10-linux-x86_64.tar.gz 52586941 BLAKE2B cb4e1716c640c80be980541e5496a96fc6baa04152e11f754b46dc71a9995809038b8a82c3404d9d86d1bd0381e9fc55fca44c66f046cb41e005c760aa077092 SHA512 c56c600c79bf2f5d2991d6c1442db300c78dd4135bf8dec5b9f500d609e2f041d09649195cfdae2f6d30cf8de2c2c865ac607283f865c4aa8ec1d400af84c270
 DIST kibana-6.2.4-linux-x86_64.tar.gz 85348919 BLAKE2B ce062a5a7d96c0266143f1091f7dbe5ade6236068a73f6fedbe253957f7ddf2d00b441d985f72e9936aa3bfa7ecd9e7b7672b301b726a7d78c3e2b71d52c3b24 SHA512 125c2002e1a3b197f9f0d6200f2979f2e5974a902bfec2baa4b34a0c8d55babccafdb87b8a7b69c61ca4c02b8ae97e69b9b2743f7d445f0e53e31c69288296d5
+DIST kibana-6.3.2-linux-x86_64.tar.gz 205331616 BLAKE2B 17273e641a9f146943cc4aebbce1114706dcf5d4c5f4d865a79d5b576a845c40268ea4389c358d555ca278c0bed4a68baef661472f80f7957dd013f0ce2e9835 SHA512 35eb97ca2f8d0bd80dc7dcdc5bc03f8ab21d1280d11d892f12eda5a173a951dfe88718d45c94ff0a748bb324e44f243cda0ba314c6dcd249cd960928f7c7b7ea
 DIST kibana-oss-6.3.1-linux-x86_64.tar.gz 89617065 BLAKE2B bdadf0ddecb060d64ed07f4f3f62934b4ae686f00d1dafbe8030acf95431b13049f53ffe7a6f8eb695d9cb1dc45151110f430c1953e1c0e1edd3656819ee0cb8 SHA512 6be02af23878dae1d48b81e8a46704f35a0bc136dd0952d997ba1f00d080868960fc3fc86d37e1e1fad5acb74dc2345e09ccc7d27862575d5783708d058c6831
+DIST kibana-oss-6.3.2-linux-x86_64.tar.gz 89561513 BLAKE2B 37031653e171d683a18f25c957545b6b143c2f0d8c07da6c02ea61c8296657d190540f4ffee2c6a62a9146800971041d7e4e30767892ba2bbff0486aef31cda5 SHA512 87236fa1a45a5c5e0ecdc033f864e9a1f74cb148e350b83c6c024b37eb71e3c16236fe52525898532f286f816cb6d03de23cba3d97e0cc0c4d622cdd18c7defb
 EBUILD kibana-bin-5.6.10.ebuild 1612 BLAKE2B fba7f593b8a2bbed90cf316f4c7f118fb65204efb9be4ebd81480f0ddc0333648a6478bb4fe0d2c1bda61e7ed355f084647d55c62685852daab3c0182b1f7476 SHA512 eb15aae68dec70c34af29140039ec0e16ccc8721817df07ff191eb18ea81bd1d4872b37ade34b74ca5470847b158d90d81c4e0b123073c5bee89854ad41f3c76
 EBUILD kibana-bin-6.2.4.ebuild 1745 BLAKE2B d95296e03ddf57600d331095322c847d7bed1d078da13ba77ecfaf4d45ee6e3a6b148beb086eceaa998ee7f0b7bd0628b093d8eb5a819e470868a31fb0c75df8 SHA512 aad7d437c13a237f86a743f90f71cb8bfedf705eba09f53271c888cd191364e4c51f682b854a5515f9cc10623631f37b11d05cd8e85bd55384c02d1d9321d718
 EBUILD kibana-bin-6.3.1.ebuild 1756 BLAKE2B 270ab6f83343ac29f3cf73d58f4366e8d0ca47db163eea15c50609ff4b572a0b80e243d3e66c53f34c4f640158f841b8c2c53a5ac84c2e164a8b31418ecc0be9 SHA512 32c3779f96f42220a720ffd4d3107be8304f6cc80145b473d3cdd64fb6b9fd5eabf9ed73a5f440af963361db08efca21defb5a6056b4812480e695efd64f3fc3
-MISC metadata.xml 462 BLAKE2B e46d1fa695c441eebcf417e41d8a28d04309768c8e91c97c3e5c6f7a165a284f229708c9d3b6860cfc5ee7b541cc77dae288a7df17468b30f7b2fda258b84359 SHA512 99681a4b9c1674467a8f4828246c0fc0a96d145c5c62cf751b8dbcc060a41b9327f58e5a53323454fa360bf4a5d576b3f01e7664cb0091f20c21b88d6a18b0a9
+EBUILD kibana-bin-6.3.2.ebuild 1892 BLAKE2B 29ed1dfb8f3b986e6b0d1cc2d2e5c1d87e903108963acd4ebac21f44252f8daa1c76165fe6bb49dfb1e079d47c8378d7285b9650170db4c2a03da01d371a79cd SHA512 8b269eab38464251f02d9e25882543d520efb2eadde3b0164977f808dfb5d70b943f995c573f00210e3367462cda985b034a0a6bf5d54bd0c48a5b5d8d126071
+MISC metadata.xml 538 BLAKE2B 649a05badea8d1116854565d09820a8ce623c733d9d0d1cbded145fdc0dfcac2478273d99f686119adab16126149ad4da8f6feb0c7be9499f5721f31a259ec34 SHA512 f0e65883a644eeb57f2d11d0871631142665e74bf8820431ac8333a1cf3e40a0b517b5cca747adba173c7eab20b70311b7bd8de6c4fb5cee4982e044189e5256
diff --git a/www-apps/kibana-bin/kibana-bin-6.3.2.ebuild b/www-apps/kibana-bin/kibana-bin-6.3.2.ebuild
new file mode 100644
index 000000000000..e6790f0a74fb
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-6.3.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver systemd user
+
+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="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-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 x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+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 -r node || die
+
+	# remove empty unused directory
+	rmdir data || die
+}
+
+src_install() {
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -r 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}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+
+	insinto /opt/${MY_PN}
+	doins -r .
+
+	chmod +x "${ED%/}"/opt/${MY_PN}/bin/* || die
+
+	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+	keepdir /var/log/${MY_PN}
+}
+
+pkg_postinst() {
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 8. Some plugins may fail with other versions of Node.js (Bug #656008)."
+	elog
+	elog "To set a customized Elasticsearch instance:"
+	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
+	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/kibana-bin/metadata.xml b/www-apps/kibana-bin/metadata.xml
index 235a4590e78e..8a7e9b80fe5a 100644
--- a/www-apps/kibana-bin/metadata.xml
+++ b/www-apps/kibana-bin/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hydrapolic@gmail.com</email>
-    <name>Tomáš Mózes</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">elastic/kibana</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomáš Mózes</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">elastic/kibana</remote-id>
+	</upstream>
+	<use>
+		<flag name="x-pack">Enable additional features (may need a license)</flag>
+	</use>
 </pkgmetadata>
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 0c33396ad067..a2dc436635dd 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 14dd0b7013b1..520e0294b130 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,12 +1,7 @@
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
-AUX chromium-compiler-r0.patch 5681 BLAKE2B d56abb6f816cfb530e583b5e59c7719f766ed0ce198f1caf3043cde38115fabb8f776f57946abf57f7430259ac0bb7c7c44602198d9a5e1f3ac942c4f1da366f SHA512 01a799b1ae1dd4042fffb0307207089c99d568289e20677ff7436767da9ee16cc6491f759d0b7447b59b53d44cbd235053078aa7dfdfcbc66eb9cd2d73ab8857
 AUX chromium-compiler-r2.patch 5649 BLAKE2B 211945cbb207e956517470210d97b2dbbf6c496f71cacda7f2fa288e5ba631a791a0e60214e982d4f91c4db723dd5c4aaa2e9f51423d2e63fce8b334687170f8 SHA512 563017b56d410080ae3bee8053cb65f0308d841b96222cb6ea7e444cfd066dbd8c6161489240c778de63794ada76c90189fd794001d4fe50ab875251c0b7f41f
-AUX chromium-compiler-r3.patch 6170 BLAKE2B 51bb86d462a4da19adab669217529e09a227a53f7eb6c9adf2b98bc5426181fef869e23a8ffa240952c2d3dd5b0bde957909a946e0db51eb3dcb300a562b098c SHA512 a64743d003bfe90750d446b12be1a64f458ac35185d4cba222e98632bc097550a880cdf2d3f25474c932d7af02208a30be32fc3b05b7865394bfc109af5a55a3
 AUX chromium-compiler-r4.patch 5640 BLAKE2B 2fe93975237f112bb280bd5b51f48e0e8454d11a91b81ce2ae0520fb59ff2c00498319e202e34f4c2abb1330ba2c7dbe9dd1a75bfd578453da533531b7dfaf8e SHA512 34e32d9e46a5981b021cffee3440582ef312e78ec1bf287c6d0f14f5ff7921a5b229238394259b8df5aa081360dd76aa6d7db095ed4e1841479d8fe55cde9fe8
 AUX chromium-cors-string-r0.patch 1819 BLAKE2B 80f68395eebbc8425dd5d17c46364bc8d3f8cb657c4e4ffe94a221a22f006f15eb6aad68160e0da767a23276ebd6a4efb6fe2d468501c48571b32bf8c17486c9 SHA512 06314e759c7073d19bb18f41713e43ca34e608ebec4d269cecb7d592e84fe7f10e839e1c3824c574e938746b26a6f2f9d6361f7d21b5698b917c7b3e0fe87b94
-AUX chromium-disable_xml_catalogs.patch 738 BLAKE2B c756c9c6c97da3cb1ec771a25b91ecec2d4792b4d925bd5135cf36910e73dd19a2e8187101c474b756d52042a2f42b93248e0e7b2a8bb46eba4669f64d42dc3a SHA512 c2cef0ccb124d1417ee9cf02be2114c193b3f42887bbddee40dfde8531a35ee3c1891db58fb8b398a6dcc881740244166b63b520221c548d1f29accd7702014d
-AUX chromium-ffmpeg-clang.patch 840 BLAKE2B cd0af6414462be4ee0cbb46e0c43b705f6883ed42a536747a5ab5a9a6c52727c521aca92bce61b55cf68be6dbac665a41846fd8907335e1dd34b452f973b624e SHA512 e02bc169ef60af8f48b67ed36a7f0e1232fcfc2c59fd48de5cc6c0a267fe29eccd7971a2692ce07c34cf07d5bf416389e10442bf2658822b3fbd27dd623ea91a
-AUX chromium-ffmpeg-ebp-r0.patch 596 BLAKE2B a858b782aba848b99964c7f0c5175b8992dae9b053d3314dbd1f7a349054bbf647f2d3a64073049ab1af02b29f4948dbfe668bbfe266aac9cacf2230a491424d SHA512 03bf99d6900516ad30f9f1afeb5d0ffe6978eda0b63d8ddabac2732df0eb8db237805b9ae688b3541a9d4ee66500c05acd309f67117f08f97d0da4b7476ac63d
 AUX chromium-ffmpeg-ebp-r1.patch 553 BLAKE2B 2f9799b38436f37ed7f7de06d6f7692bcadcacc0269169cc75e48f52ad6eb1c5af54891249eecf1bd5e10efad3888dc650326b53878ad1d9360d6304b12d51ed SHA512 27d929756707b964465c2cc1b586b118ffd67b3fec84e1c6606c2d4141a6717741cbc1ebf5b4c3b40f9476220610a1ada6e80b342506c4f9d2ccbe7e067191ba
 AUX chromium-ffmpeg-r1.patch 528 BLAKE2B c6cbbbb13093b10d0d8e95bd382dbc7f9afb6634802f6560a7b5886482c912cb493aed4c231b4c781b89de6dcf4200b17ba9315e337a3f73e8fdca12dceb80fb SHA512 1dc7dd844e8e0aec379ace3a163200735bbab0644f9d02fa0736f91a4156e9cede5b66eb6a015f8679ecd26dab2345b82ed181591bb78a1e88d3cc0174237ea0
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
@@ -19,9 +14,11 @@ AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b01
 AUX chromium-widevine-r2.patch 1488 BLAKE2B fc4dc6ce40b2d2a152a0bbc5958d8050d9a7f4176cd0121d81ae1a9e76d361c064f54e034fb9213fc802e0a4b1b8d661788dbe9089daf8b197414724a057d4e4 SHA512 6fe8eb7b0e6c88e00d1b3dadf433b886c71cbf9b3dd4e712845a636a689cad6bc58fa8b20b412a1f7a8a1b649bccc8c961e762fa5f4d4ae092355e70db0a9cfe
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-68.0.3440.75.tar.xz 630277224 BLAKE2B 87c152c14333007223f611acb56360b553c5a4a97026f9cf4ca37d90aa501aabe5e294c3bacbd537c7602fc5dcb010a493c8d64b2881681ddfaad66cd58a3c56 SHA512 99ab36c9a9c224469f3a34f0193b0b4662b626ac29d23711716117cc6fa437717c2c3357f8a95adf9085b94a262c8b4c46727f88bf50bb231bb85af956afbedb
-DIST chromium-69.0.3493.3.tar.xz 622878800 BLAKE2B 46aabdf4032471db8c6b461ebce6cfbc4fe99be55b959134c950bbba63d2c303673f48bb10004698f79abd4e22aa8b8c390ff6a12210020cf6bd8cf6cf8d8060 SHA512 96393f8939fccc8514094f9215496883f416669e61feb45b706610f67ff90672a88f9154fb06e59dec9d363c5e9a072bf1f2ba562dd533345a493664dabcb19e
 DIST chromium-69.0.3497.12.tar.xz 618608916 BLAKE2B 08090979f0e78e4e0cfc5b638bfd4a3b94479f824d279dd3fe269ac8ce3d6820f5d56dabef76763f9e5d6ab335a84f9173db600c2c7060db66ed8462d6a57c24 SHA512 0eae307df50efb872271e395541e5434ab0cfbd4d1db66fec4ac0578ca228f391deb4e70ffa3af2adf26618b22961978d06692b39d20037a1da41512258e3c55
+DIST chromium-69.0.3497.23.tar.xz 618726780 BLAKE2B d1f6284044e33200291ca736be3c5d63f3225f303028f54aeafc43bcf33d0f4b46101e893cf0c0d01b2ec2d8b5ab45948c3092a59cec91ad3ab15a8bf494dca8 SHA512 e3423e45fd3811da9338c1e687004ba538b4c80eee7d1825084d242b72d10d78874926e0f5ac249a09382348b098b3a19646ef142d769c8ec147049144b6a73e
+DIST chromium-70.0.3510.0.tar.xz 620983276 BLAKE2B e2bb05e3e8aefa23ebda5559515d41e41a7c383acf5c4150adfa22ba107096f51603ff5d6bbbd20e9f2e8d549cf832b3a7e194d584c44c289835d9a54e8563bc SHA512 2954737aa229fe8572ef9cf2cc998f5be6bec1745c027fda56278ff9525e9a24eddc6ff48c2f2e07d3eb0607aaf35a5371f3568d218250f95a152a5148b29149
 EBUILD chromium-68.0.3440.75.ebuild 20531 BLAKE2B c619601ec5d1959e2b885d39f1802b1db71974cb4a4077642dc7a6e92193833d6f006e5088993dd85d439b718d080b68f42dd2fa890e303d886c34ffe7f132af SHA512 91b2a75aac963b7910d43c09d21a0b4b4b9997a87fca7af713b1422774c331a46d810b40d647062a66b6914c2a9f6885df3d9baf963b3ed13f7b3e475a9b4168
-EBUILD chromium-69.0.3493.3.ebuild 20236 BLAKE2B ce27ddcb28c8a783fa23f0f51f5ecb9f74e8ba1255e920c52ed467f5aa83ff6238fc02610c488d2e5eba9d364d55cfdf469e974cd37dc82421a54c776acff5ee SHA512 0724a7af2d40b29d37e83c75c59840992814a6cde9142803bb379a4c2c7a3d1d791855fa6b3d736c76163a6bf91e25733679b26df2c9d1af5b8bc52b44b7cd2a
 EBUILD chromium-69.0.3497.12.ebuild 20236 BLAKE2B ce27ddcb28c8a783fa23f0f51f5ecb9f74e8ba1255e920c52ed467f5aa83ff6238fc02610c488d2e5eba9d364d55cfdf469e974cd37dc82421a54c776acff5ee SHA512 0724a7af2d40b29d37e83c75c59840992814a6cde9142803bb379a4c2c7a3d1d791855fa6b3d736c76163a6bf91e25733679b26df2c9d1af5b8bc52b44b7cd2a
+EBUILD chromium-69.0.3497.23.ebuild 20236 BLAKE2B ce27ddcb28c8a783fa23f0f51f5ecb9f74e8ba1255e920c52ed467f5aa83ff6238fc02610c488d2e5eba9d364d55cfdf469e974cd37dc82421a54c776acff5ee SHA512 0724a7af2d40b29d37e83c75c59840992814a6cde9142803bb379a4c2c7a3d1d791855fa6b3d736c76163a6bf91e25733679b26df2c9d1af5b8bc52b44b7cd2a
+EBUILD chromium-70.0.3510.0.ebuild 20511 BLAKE2B 1d41334fadb5284258588bbc67547064967e5e73de207c284b47253ba5b32e158aa07e9dc0c3e997c004c7e45a903c307766e069dbb03924a14c0f62dbe8e2bb SHA512 17f52ae1b3044940220dced3f38e8c3b9907d721b92c248a1948649ef52a9950787d0231272c9a5801d5fc3deac41a6e6ceeecffe5c09e3f9334f4d0dd2bacdd
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-69.0.3493.3.ebuild b/www-client/chromium/chromium-69.0.3497.23.ebuild
index dcee9bd0f1c5..dcee9bd0f1c5 100644
--- a/www-client/chromium/chromium-69.0.3493.3.ebuild
+++ b/www-client/chromium/chromium-69.0.3497.23.ebuild
diff --git a/www-client/chromium/chromium-70.0.3510.0.ebuild b/www-client/chromium/chromium-70.0.3510.0.ebuild
new file mode 100644
index 000000000000..af3cb811d001
--- /dev/null
+++ b/www-client/chromium/chromium-70.0.3510.0.ebuild
@@ -0,0 +1,676 @@
+# 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 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 ~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.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-4:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12-r0
+		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-plugins/chrome-binary-plugins-57
+	dev-util/gn
+	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[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	>=sys-devel/clang-5
+	virtual/pkgconfig
+	dev-vcs/git
+"
+
+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/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-compiler-r4.patch"
+	"${FILESDIR}/chromium-widevine-r2.patch"
+	"${FILESDIR}/chromium-webrtc-r0.patch"
+	"${FILESDIR}/chromium-memcpy-r0.patch"
+	"${FILESDIR}/chromium-math.h-r0.patch"
+	"${FILESDIR}/chromium-stdint.patch"
+	"${FILESDIR}/chromium-ffmpeg-ebp-r1.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
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/http2
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/spdy
+		third_party/WebKit
+		third_party/abseil-cpp
+		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/angle/third_party/glslang
+		third_party/angle/third_party/spirv-headers
+		third_party/angle/third_party/spirv-tools
+		third_party/angle/third_party/vulkan-headers
+		third_party/angle/third_party/vulkan-loader
+		third_party/angle/third_party/vulkan-tools
+		third_party/angle/third_party/vulkan-validation-layers
+		third_party/apple_apsl
+		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/beautifulsoup4
+		third_party/catapult/third_party/html5lib-python
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		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/crashpad
+		third_party/crashpad/crashpad/third_party/zlib
+		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/libaom
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		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/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/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/perfetto
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/sfntly
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/skcms
+		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/unrar
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/vulkan-validation-layers
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/fft4g
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		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
+		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
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	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"
+
+	# 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 -- 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).
+	# 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
+		fontconfig
+		freetype
+		# 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_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"
+
+	# 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
+
+	# 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
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; 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
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+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
+
+	# 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
+
+	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/files/chromium-compiler-r0.patch b/www-client/chromium/files/chromium-compiler-r0.patch
deleted file mode 100644
index 3c528e5e71aa..000000000000
--- a/www-client/chromium/files/chromium-compiler-r0.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 71924291b586feaa7045fe0ad7874116e3d1de80 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 25 Apr 2018 13:22:49 -0400
-Subject: [PATCH] Disable various compiler configs
-
----
- build/config/compiler/BUILD.gn | 61 ++++++++++------------------------
- 1 file changed, 18 insertions(+), 43 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 461e62da2d50..964d41e9c971 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -222,8 +222,6 @@ config("compiler") {
- 
-   configs += [
-     # See the definitions below.
--    ":clang_revision",
--    ":compiler_cpu_abi",
-     ":compiler_codegen",
-   ]
- 
-@@ -464,18 +462,6 @@ config("compiler") {
-     cflags += [ "-fcolor-diagnostics" ]
-   }
- 
--  # TODO(hans): Remove this once Clang generates better optimized debug info by
--  # default. https://crbug.com/765793
--  if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
--      target_os != "chromeos") {
--    cflags += [
--      "-Xclang",
--      "-mllvm",
--      "-Xclang",
--      "-instcombine-lower-dbg-declare=0",
--    ]
--  }
--
-   # Print absolute paths in diagnostics. There is no precedent for doing this
-   # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
-   # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
-@@ -1387,10 +1373,6 @@ config("default_warnings") {
- 
-         # TODO(hans): https://crbug.com/766891
-         "-Wno-null-pointer-arithmetic",
--
--        # Ignore warnings about MSVC optimization pragmas.
--        # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
--        "-Wno-ignored-pragma-optimize",
-       ]
-       if (llvm_force_head_revision) {
-         cflags += [
-@@ -1440,22 +1422,6 @@ config("chromium_code") {
-       "__STDC_FORMAT_MACROS",
-     ]
- 
--    if (!is_debug && !using_sanitizer &&
--        (!is_linux || !is_clang || is_official_build) &&
--        current_cpu != "s390x" && current_cpu != "s390" &&
--        current_cpu != "ppc64" && current_cpu != "ppc64" &&
--        current_cpu != "mips" && current_cpu != "mips64") {
--      # _FORTIFY_SOURCE isn't really supported by Clang now, see
--      # http://llvm.org/bugs/show_bug.cgi?id=16821.
--      # It seems to work fine with Ubuntu 12 headers though, so use it in
--      # official builds.
--      #
--      # Non-chromium code is not guaranteed to compile cleanly with
--      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
--      # disabled, so only do that for Release build.
--      defines += [ "_FORTIFY_SOURCE=2" ]
--    }
--
-     if (is_mac || is_ios) {
-       cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
-       cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -1786,7 +1752,8 @@ config("default_stack_frames") {
- }
- 
- # Default "optimization on" config.
--config("optimize") {
-+config("optimize") { }
-+config("xoptimize") {
-   if (is_win) {
-     # TODO(thakis): Remove is_clang here, https://crbug.com/598772
-     if (is_official_build && full_wpo_on_official && !is_clang) {
-@@ -1820,7 +1787,8 @@ config("optimize") {
- }
- 
- # Same config as 'optimize' but without the WPO flag.
--config("optimize_no_wpo") {
-+config("optimize_no_wpo") { }
-+config("xoptimize_no_wpo") {
-   if (is_win) {
-     # Favor size over speed, /O1 must be before the common flags. The GYP
-     # build also specifies /Os and /GF but these are implied by /O1.
-@@ -1843,7 +1811,8 @@ config("optimize_no_wpo") {
- }
- 
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
-   if (is_win) {
-     cflags = [
-       "/Od",  # Disable optimization.
-@@ -1867,7 +1836,8 @@ config("no_optimize") {
- # Turns up the optimization level. On Windows, this implies whole program
- # optimization and link-time code generation which is very expensive and should
- # be used sparingly.
--config("optimize_max") {
-+config("optimize_max") { }
-+config("xoptimize_max") {
-   if (is_nacl && is_nacl_irt) {
-     # The NaCl IRT is a special case and always wants its own config.
-     # Various components do:
-@@ -1914,7 +1884,8 @@ config("optimize_max") {
- #
- # TODO(crbug.com/621335) - rework how all of these configs are related
- # so that we don't need this disclaimer.
--config("optimize_speed") {
-+config("optimize_speed") { }
-+config("xoptimize_speed") {
-   if (is_nacl && is_nacl_irt) {
-     # The NaCl IRT is a special case and always wants its own config.
-     # Various components do:
-@@ -1952,7 +1923,8 @@ config("optimize_speed") {
-   }
- }
- 
--config("optimize_fuzzing") {
-+config("optimize_fuzzing") { }
-+config("xoptimize_fuzzing") {
-   cflags = [ "-O1" ] + common_optimize_on_cflags
-   ldflags = common_optimize_on_ldflags
-   visibility = [ ":default_optimization" ]
-@@ -2034,7 +2006,8 @@ config("afdo") {
- #   configs += [ "//build/config/compiler:symbols" ]
- 
- # Full symbols.
--config("symbols") {
-+config("symbols") { }
-+config("xsymbols") {
-   if (is_win) {
-     if (use_goma || is_clang) {
-       # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2126,7 +2099,8 @@ config("symbols") {
- # Minimal symbols.
- # This config guarantees to hold symbol for stack trace which are shown to user
- # when crash happens in unittests running on buildbot.
--config("minimal_symbols") {
-+config("minimal_symbols") { }
-+config("xminimal_symbols") {
-   if (is_win) {
-     # Linker symbols for backtraces only.
-     cflags = []
-@@ -2157,7 +2131,8 @@ config("minimal_symbols") {
- }
- 
- # No symbols.
--config("no_symbols") {
-+config("no_symbols") { }
-+config("xno_symbols") {
-   if (!is_win) {
-     cflags = [ "-g0" ]
-     asmflags = cflags
--- 
-2.17.0
-
diff --git a/www-client/chromium/files/chromium-compiler-r3.patch b/www-client/chromium/files/chromium-compiler-r3.patch
deleted file mode 100644
index ca41add408ee..000000000000
--- a/www-client/chromium/files/chromium-compiler-r3.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From cba2fccce163bc549db529c5d6783478de908325 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 25 Apr 2018 13:22:49 -0400
-Subject: [PATCH] Disable various compiler configs
-
----
- build/config/compiler/BUILD.gn | 68 +++++++++-------------------------
- 1 file changed, 18 insertions(+), 50 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 2d82ed5b4e23..23632b156900 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -225,8 +225,6 @@ config("compiler") {
- 
-   configs += [
-     # See the definitions below.
--    ":clang_revision",
--    ":compiler_cpu_abi",
-     ":compiler_codegen",
-   ]
- 
-@@ -488,18 +486,6 @@ config("compiler") {
-     }
-   }
- 
--  if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
--      target_os != "chromeos") {
--    cflags += [
--      # TODO(hans): Remove this once Clang generates better optimized debug info
--      # by default. https://crbug.com/765793
--      "-Xclang",
--      "-mllvm",
--      "-Xclang",
--      "-instcombine-lower-dbg-declare=0",
--    ]
--  }
--
-   # Print absolute paths in diagnostics. There is no precedent for doing this
-   # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
-   # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
-@@ -672,13 +658,6 @@ config("compiler") {
-     ldflags += [ "-Wl,--no-rosegment" ]
-   }
- 
--  # This flag enforces that member pointer base types are complete. It helps
--  # prevent us from running into problems in the Microsoft C++ ABI (see
--  # https://crbug.com/847724).
--  if (is_clang && !is_nacl && target_os != "chromeos" && !use_xcode_clang) {
--    cflags += [ "-fcomplete-member-pointers" ]
--  }
--
-   # Pass the same C/C++ flags to the objective C/C++ compiler.
-   cflags_objc += cflags_c
-   cflags_objcc += cflags_cc
-@@ -1467,10 +1446,6 @@ config("default_warnings") {
-         cflags += [
-           # TODO(thakis): https://crbug.com/753973
-           "-Wno-enum-compare-switch",
--
--          # Ignore warnings about MSVC optimization pragmas.
--          # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
--          "-Wno-ignored-pragma-optimize",
-         ]
-       }
-     }
-@@ -1512,22 +1487,6 @@ config("chromium_code") {
-       "__STDC_FORMAT_MACROS",
-     ]
- 
--    if (!is_debug && !using_sanitizer &&
--        (!is_linux || !is_clang || is_official_build) &&
--        current_cpu != "s390x" && current_cpu != "s390" &&
--        current_cpu != "ppc64" && current_cpu != "ppc64" &&
--        current_cpu != "mips" && current_cpu != "mips64") {
--      # _FORTIFY_SOURCE isn't really supported by Clang now, see
--      # http://llvm.org/bugs/show_bug.cgi?id=16821.
--      # It seems to work fine with Ubuntu 12 headers though, so use it in
--      # official builds.
--      #
--      # Non-chromium code is not guaranteed to compile cleanly with
--      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
--      # disabled, so only do that for Release build.
--      defines += [ "_FORTIFY_SOURCE=2" ]
--    }
--
-     if (is_mac || is_ios) {
-       cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
-       cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -1857,7 +1816,8 @@ config("default_stack_frames") {
- }
- 
- # Default "optimization on" config.
--config("optimize") {
-+config("optimize") { }
-+config("xoptimize") {
-   if (is_win) {
-     # TODO(thakis): Remove is_clang here, https://crbug.com/598772
-     if (is_official_build && full_wpo_on_official && !is_clang) {
-@@ -1891,7 +1851,8 @@ config("optimize") {
- }
- 
- # Same config as 'optimize' but without the WPO flag.
--config("optimize_no_wpo") {
-+config("optimize_no_wpo") { }
-+config("xoptimize_no_wpo") {
-   if (is_win) {
-     # Favor size over speed, /O1 must be before the common flags. The GYP
-     # build also specifies /Os and /GF but these are implied by /O1.
-@@ -1914,7 +1875,8 @@ config("optimize_no_wpo") {
- }
- 
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
-   if (is_win) {
-     cflags = [
-       "/Od",  # Disable optimization.
-@@ -1938,7 +1900,8 @@ config("no_optimize") {
- # Turns up the optimization level. On Windows, this implies whole program
- # optimization and link-time code generation which is very expensive and should
- # be used sparingly.
--config("optimize_max") {
-+config("optimize_max") { }
-+config("xoptimize_max") {
-   if (is_nacl && is_nacl_irt) {
-     # The NaCl IRT is a special case and always wants its own config.
-     # Various components do:
-@@ -1985,7 +1948,8 @@ config("optimize_max") {
- #
- # TODO(crbug.com/621335) - rework how all of these configs are related
- # so that we don't need this disclaimer.
--config("optimize_speed") {
-+config("optimize_speed") { }
-+config("xoptimize_speed") {
-   if (is_nacl && is_nacl_irt) {
-     # The NaCl IRT is a special case and always wants its own config.
-     # Various components do:
-@@ -2023,7 +1987,8 @@ config("optimize_speed") {
-   }
- }
- 
--config("optimize_fuzzing") {
-+config("optimize_fuzzing") { }
-+config("xoptimize_fuzzing") {
-   cflags = [ "-O1" ] + common_optimize_on_cflags
-   ldflags = common_optimize_on_ldflags
-   visibility = [ ":default_optimization" ]
-@@ -2109,7 +2074,8 @@ config("afdo") {
- #   configs += [ "//build/config/compiler:symbols" ]
- 
- # Full symbols.
--config("symbols") {
-+config("symbols") { }
-+config("xsymbols") {
-   if (is_win) {
-     if (use_goma || is_clang) {
-       # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2207,7 +2173,8 @@ config("symbols") {
- # Minimal symbols.
- # This config guarantees to hold symbol for stack trace which are shown to user
- # when crash happens in unittests running on buildbot.
--config("minimal_symbols") {
-+config("minimal_symbols") { }
-+config("xminimal_symbols") {
-   if (is_win) {
-     # Linker symbols for backtraces only.
-     cflags = []
-@@ -2238,7 +2205,8 @@ config("minimal_symbols") {
- }
- 
- # No symbols.
--config("no_symbols") {
-+config("no_symbols") { }
-+config("xno_symbols") {
-   if (!is_win) {
-     cflags = [ "-g0" ]
-     asmflags = cflags
--- 
-2.18.0.rc2
-
diff --git a/www-client/chromium/files/chromium-disable_xml_catalogs.patch b/www-client/chromium/files/chromium-disable_xml_catalogs.patch
deleted file mode 100644
index 9f57ed2261c7..000000000000
--- a/www-client/chromium/files/chromium-disable_xml_catalogs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
-+++ b/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
-@@ -28,6 +28,10 @@
- 
- #include <libxml/parser.h>
- #include <libxml/parserInternals.h>
-+#include <libxml/xmlversion.h>
-+#if defined(LIBXML_CATALOG_ENABLED)
-+#include <libxml/catalog.h>
-+#endif
- #include <libxslt/xslt.h>
- 
- #include <memory>
-@@ -648,6 +652,9 @@ static void InitializeLibXMLIfNecessary() {
-   if (did_init)
-     return;
- 
-+#if defined(LIBXML_CATALOG_ENABLED)
-+  xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE);
-+#endif
-   xmlInitParser();
-   xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc);
-   xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);
diff --git a/www-client/chromium/files/chromium-ffmpeg-clang.patch b/www-client/chromium/files/chromium-ffmpeg-clang.patch
deleted file mode 100644
index 6c5ac71323b4..000000000000
--- a/www-client/chromium/files/chromium-ffmpeg-clang.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
-+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
-@@ -639,18 +639,8 @@
-   if 'win' not in target_os:
-     configure_flags['Common'].extend([
-         '--enable-pic',
--        '--cc=clang',
--        '--cxx=clang++',
--        '--ld=clang',
-     ])
- 
--    # Clang Linux will use the first 'ld' it finds on the path, which will
--    # typically be the system one, so explicitly configure use of Clang's
--    # ld.lld, to ensure that things like cross-compilation and LTO work.
--    # This does not work for arm64, ia32 and is always used on mac.
--    if target_arch not in ['arm64', 'ia32', 'mipsel'] and target_os != 'mac':
--      configure_flags['Common'].append('--extra-ldflags=-fuse-ld=lld')
--
-   # Should be run on Mac.
-   if target_os == 'mac':
-     if host_os != 'mac':
diff --git a/www-client/chromium/files/chromium-ffmpeg-ebp-r0.patch b/www-client/chromium/files/chromium-ffmpeg-ebp-r0.patch
deleted file mode 100644
index cca5b84d7024..000000000000
--- a/www-client/chromium/files/chromium-ffmpeg-ebp-r0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.chromium.org/p/chromium/issues/detail?id=796379
-https://bugs.gentoo.org/656902
-
---- a/third_party/ffmpeg/BUILD.gn
-+++ b/third_party/ffmpeg/BUILD.gn
-@@ -247,11 +247,7 @@
-     # On POSIX x86, sanitizers will fail to compiler the H264 CABAC code due to
-     # insufficient registers unless we disable EBP usage. crbug.com/786760
-     if (target_cpu == "x86") {
--      if (using_sanitizer) {
--        defines += [ "HAVE_EBP_AVAILABLE=0" ]
--      } else {
--        defines += [ "HAVE_EBP_AVAILABLE=1" ]
--      }
-+      defines += [ "HAVE_EBP_AVAILABLE=0" ]
-     }
- 
-     if (!is_clang) {
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 57f6ff52e12c..c0df21d0ab6c 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,5 +1,7 @@
 AUX epiphany-3.14.0-unittest-2.patch 1725 BLAKE2B 1464841241c618137db834933094968d7769c513ecd8934f73e6522744175efb5d41e05be11ed629cf3072135de39a2c6f05c083d48ea219bc29952ac000487e SHA512 5ec81de76fb8bb1574e954d5bdffd81114c022d558573f049c415f037855b65c03e727fd3fa2ce557c12f3a17921dc655c60ef4e1ad06f3bc9a6a42e58ddde70
 AUX epiphany-3.16.0-unittest-1.patch 972 BLAKE2B bf27a8b68a9526ed3b481bae00c614dc57db57c2b6909a6e0d1936c86a395cf577cba8db8bc272a3485527118e69b0f8109ad1427f957b5b2eeff4437c954c5a SHA512 ec59eb312e7826306af76fc587fb9435c6ac2da96cd574df381829bda2e2f987a47afef9bdff0e8dc162fe63f43d1a744edc84b84ae387edd1279d77ebdfdc86
 DIST epiphany-3.24.5.tar.xz 3216736 BLAKE2B 8a4dd668606521d1b0144afc9ace8607f52eac457f0059e6087216323ec1132dbe1c755e40dfe9993bf685e5444db1268ada1cdf55edc04c51058fdd256c6047 SHA512 a8f203d182b8c87878a3272f8b4f642b0cf4128476e0727208135cfdffeb293425cf662c58820f0d3aed2e1b20fe6dc4cf5cbb8277a398c6f533a0bea34f40f2
+DIST epiphany-3.26.7.tar.xz 4429308 BLAKE2B cdd8cf084631891e97585307c90bd67f45e71deb6564f54711deb8dfd39c09007732efeb22ad5be45c1b0af6af7be30cf13a9d90aa1e9506a2e997f6f3f8d854 SHA512 686c8825d476a4c6675dadd7a68bf72727714bc6fe01b4dbf67d39b2dc7e3f21d4f630417865800664a716d6316df8a97fde5201ec72c90f448fd6f0af4b49a0
 EBUILD epiphany-3.24.5.ebuild 1949 BLAKE2B f17b4603d8f1dbfc26cde3be0c333fa50d3147b61255d1d1618180d5578330a388ed866439e4506c83fb2b06dbc37cf767cd4e25cf2b2a971c222ab0613afecb SHA512 49dabbd617bf90f4af2dbb45d08d6c9a0854555a58a933872b15dca299e7bce9e9084fe07a51571be96d3310651475b0e95e4babf4cf0f7456aea0313fa42f3a
+EBUILD epiphany-3.26.7.ebuild 1841 BLAKE2B 74962e17d4ad5c7d962f1ab47bef5161fbc7c3616205520c6d088de51b7b33f3bcb4a1ddeeb74c6a475de72e529be9a87cc67ed16fa855f6caf36170c8fd9627 SHA512 889bbd1442da2425711c85259a73a8cb34e0a76c65f319838eabb2f31514736a03a16bf5e112fc6a8d3956f17bce645b41386c1dc279cb89f8840daf25e561a6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/www-client/epiphany/epiphany-3.26.7.ebuild b/www-client/epiphany/epiphany-3.26.7.ebuild
new file mode 100644
index 000000000000..fba9d58cc806
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.26.7.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson xdg virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.52.0:2
+	>=x11-libs/gtk+-3.22.13:3
+	>=dev-libs/nettle-3.2:=
+	>=net-libs/webkit-gtk-2.17.4:4=
+	>=x11-libs/cairo-1.2
+	>=app-crypt/gcr-3.5.5:=[gtk]
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	dev-libs/icu:=
+	>=app-text/iso-codes-0.35
+	>=dev-libs/json-glib-1.2.4
+	>=x11-libs/libnotify-0.5.1
+	>=app-crypt/libsecret-0.14
+	>=net-libs/libsoup-2.48:2.4
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-libs/libxslt-1.1.7
+	dev-db/sqlite:3
+	dev-libs/gmp:0=
+	>=gnome-base/gsettings-desktop-schemas-0.0.1
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+# paxctl needed for bug #407085
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/gdbus-codegen
+	sys-apps/paxctl
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751591
+	# ephy-file-helpers tests are currently disabled due to https://gitlab.gnome.org/GNOME/epiphany/issues/419
+	# So this patch is currently without effect. Retest with PORTAGE_TMPDIR=/var/tmp once re-enabled upstream.
+	#"${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Ddeveloper_mode=false
+		-Ddistributor_name=Gentoo
+		-Dhttps_everywhere=false # removed in 3.28
+		$(meson_use test unit_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 7fca305ab685..6eeeb2d2d1ff 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_68.0.3440.75-1_amd64.deb 55365092 BLAKE2B 242882a9d4bdaf2821b84979573c6b07fe6647774c09ee8971e5c3467bae1a3f426c2a24f09d2b65fdd575c6ded0859e92c2db005df66bf89d723f420ae405bc SHA512 3eecb8c013bb76e80a40fd7fed47ff70c3eff7cc055b22e1b6ee219c0d5e9308e0b47b315560df9e1fcdcf79ca924f9b80ed9df841e8da2a7b52ec8623bae549
-EBUILD google-chrome-beta-68.0.3440.75.ebuild 2715 BLAKE2B e390e4af632a26200d63279a35ef5edba71eb9316f508837edd92dd5dd1b1208b325555f3fab6130b39a29e8c5667e748388791e49ec1cce1ab1a5e13cda8b97 SHA512 31b8b89c65dd7c0a5efcf8ae7775970c4513d6d2b6200e07493bfca8428618dc8beb46f455393614ba9f51c5cabd3513dba67a1957558fabdcfd05f58f42ab8a
+DIST google-chrome-beta_69.0.3497.23-1_amd64.deb 56361772 BLAKE2B bdd8581f97e45dbb959d49b00d1beeb0302b5f74a31284af621151a0155be679e299d7d7b0e940519f7b90f49d17e0f9f4de3d3edbe2dd94ae9f7037e63c65e6 SHA512 c9769099551d135a0204331ec0d747043d0e63b27d02844883fd4a516e834a88365a02b947e400b856e8fc81608130ec46068c4c82ce0af8427c757f2cd733dd
+EBUILD google-chrome-beta-69.0.3497.23.ebuild 2715 BLAKE2B e390e4af632a26200d63279a35ef5edba71eb9316f508837edd92dd5dd1b1208b325555f3fab6130b39a29e8c5667e748388791e49ec1cce1ab1a5e13cda8b97 SHA512 31b8b89c65dd7c0a5efcf8ae7775970c4513d6d2b6200e07493bfca8428618dc8beb46f455393614ba9f51c5cabd3513dba67a1957558fabdcfd05f58f42ab8a
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.75.ebuild b/www-client/google-chrome-beta/google-chrome-beta-69.0.3497.23.ebuild
index 3a57de6d8e18..3a57de6d8e18 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.75.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-69.0.3497.23.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 167ce73fe654..59a79ec7bbf2 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_69.0.3497.23-1_amd64.deb 56345622 BLAKE2B fab0ffab47b2201310b87bf885b85f87a83b2c5bea03d1bf7d70b334105afe549b62afdbc45b64093b2626bd962a2f2f90bc362e2be089b13424dd52c85a5ac9 SHA512 3908824161e2200c39d20668443ba910b7cb04ed3979f8c8c41ae4ecdc9b59d175a61cb39321aba660de3fffb473c316b6cda5235715765f76560b4850da7b49
-EBUILD google-chrome-unstable-69.0.3497.23.ebuild 2694 BLAKE2B 2bc43982ec155ed3e7b416348d7a58227b2d326f2bab4349d6cdfa216e88c4bd78529301e97ad16a36dd9226d71ab0b748ba262f3e80cbef26fbbd8525c3c286 SHA512 25c03f363aa887f119c763528698b5b370196897ba3344cca4334ef0f232f29a57137fb21fef3e9d5fd696988eefb853a3b0dcbfdd023a57773d940bde4c547a
+DIST google-chrome-unstable_70.0.3510.0-1_amd64.deb 56663720 BLAKE2B 57ed294f222a4f8b3d6c76832b0c3741aa3870a661979d934e04c4458de3da57df39f611a72146576796171b75b8b2536aeea9761f0831ad59bf892fc2d1c3ba SHA512 5ac10d46c0adb1d5cfa2caf8bbbc8bcac3ab0bc6798bbcbb8cd023cab128177bb2b417c7da0bcbc37451498edd1f213f70dad07bb47eeece62eb61ac94deff5e
+EBUILD google-chrome-unstable-70.0.3510.0.ebuild 2694 BLAKE2B 2bc43982ec155ed3e7b416348d7a58227b2d326f2bab4349d6cdfa216e88c4bd78529301e97ad16a36dd9226d71ab0b748ba262f3e80cbef26fbbd8525c3c286 SHA512 25c03f363aa887f119c763528698b5b370196897ba3344cca4334ef0f232f29a57137fb21fef3e9d5fd696988eefb853a3b0dcbfdd023a57773d940bde4c547a
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-69.0.3497.23.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-70.0.3510.0.ebuild
index 550065b04c3e..550065b04c3e 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-69.0.3497.23.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-70.0.3510.0.ebuild
diff --git a/www-client/jd/Manifest b/www-client/jd/Manifest
index cfb70f80762c..704fe79b77e4 100644
--- a/www-client/jd/Manifest
+++ b/www-client/jd/Manifest
@@ -1,3 +1,6 @@
+AUX jd-gcc-5.patch 531 BLAKE2B cd4ddb54f204eb6c09b77b76013bd91071a13b37bf365d61be7e41239d577453dd6733bf769ac4ceaff4ea7978d800106922b3ef58d46da98eb1bc9e71b31bec SHA512 851c7ff7faa83cf4e443b6ecee31790d97882bdb5ec461fb925c1bc350492d8b2a150a111778798931c8ca7f327890df11d256e0a75062c54839e8bbd285c4c6
 DIST jd-2.8.5-120826.tgz 784657 BLAKE2B 07e3ef150ddbc58cdd5d4e7bddfeb5f4cb5dd9b0c6bfc9fda4309768e34b7f4534549dad919c18ed8c5918d519e672ea4d3728d8bc87280096764d87a74151cb SHA512 0c4aa0845aca71f1172a565d7b9e4a7099fa27c221b452c623b818144b958c8b042e5ab00582eee07bc8d44186a172c9abb750550ae3293851e03382e527e11b
-EBUILD jd-2.8.5_p120826.ebuild 1318 BLAKE2B 080ab48fab13fdbac7fbf7539828559fd8c8b14d5541e13b115102fda7be335604a659d2df0335c7fb320ed9b6be09b5070f34915e700f19f64b4942df8ec888 SHA512 d5f91ea64ad531e0931db349722c0a5a9f5710e438103e714d37d977b459a88c805b9ceb8bb31e22eb7bda7bcf07c6357aece94a44ea2a94b770722a46808d2b
-MISC metadata.xml 315 BLAKE2B cd3f447e3abc191fcbfa1fef5a48b628972e663374da0ca3908cb48a9ad7c36f2773cfa98d35ec208775bc6b32f1073f40e39b11e3f792e13ea772180a16fb10 SHA512 087cd02ed5f0102424d975d865f4039a567d970e7272da23c8455c00d592f1d2d368ea4843b4570e52a8f892bb2234dfb8b259aa51495794d73e925b1f58419f
+DIST jd-2.8.9-150226.tgz 770110 BLAKE2B 096469fdc343dab64485897c5a402a48093ab1cc49e30973ab2f969fd60c389b1987c90246cf897125ab0d1787960574b35b811feacbc68e8079a00366c74602 SHA512 39bb4f0242426a5eff40e2a8c4bfc703491d260d4764be3745581b77a39d6db553521f2e09ea36c15d0318847a6fea8f48e079504f1f575fb600cb196c94df70
+EBUILD jd-2.8.5_p120826.ebuild 1221 BLAKE2B abd38a288f11e9a9cd1abc1515148258a96ccad9a52209dcfc42c77c45131f655584bae500c34ec27dc04ee37c1561760e0d6de2db3a7e3980f7e0cee10477fb SHA512 04b8b510412344fff172326a16d4bdf18b1e5890628cb4ea37ce7cf1f02814bba7072d83125edc060c72b7ec555fa7baeb03bf9f18c4b2bc57a9731d80d903af
+EBUILD jd-2.8.9_p150226.ebuild 1192 BLAKE2B 28475f34242dbd8cf00fcb44b8c91c29f7ac48e681ca58bddd190db778ce7ab221ea22672bac5af87d4dc5fd646ae5ba3a4ffbad9e51d7e1966f7bb044efd712 SHA512 fc6368265bbac771685df6195c0a0cef5f1950284df3d7479d67517678e9220981400e6d08ea0ab316fb3a45f3807d129a312c3b4db03cca54f4c10e4b20d2e6
+MISC metadata.xml 419 BLAKE2B cf2a3244f7358e218a9fcbf2fe6265fee1f0ebc983230a8b6777ea8fbaf86555ece54455e464aba5abee3b4fa6ea832eb246c268d7e101d4ca7bb550d11783f5 SHA512 c558d2d6312e3076ee584db16f8192297782ef8cee53dfb7078ba9787d67d777080f2ea8cff26e091240eee712c372cb3a9b364c9f346bd8bbcc138314b921a7
diff --git a/www-client/jd/files/jd-gcc-5.patch b/www-client/jd/files/jd-gcc-5.patch
new file mode 100644
index 000000000000..4e6a74f4d79d
--- /dev/null
+++ b/www-client/jd/files/jd-gcc-5.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/600802
+
+Author: nanikata@gmail.com
+
+--- a/src/article/drawareabase.h
++++ b/src/article/drawareabase.h
+@@ -330,7 +330,7 @@
+ 
+         // リアライズしたか
+         // Gtk::Widget::is_realized() はうまく動作しない
+-        const bool is_drawarea_realized(){ return m_window; }
++        const bool is_drawarea_realized(){ return static_cast<bool>(m_window); }
+ 
+         // 文字色のID( colorid.h にある ID を指定)
+         const int get_colorid_text() const{ return m_colorid_text; }
diff --git a/www-client/jd/jd-2.8.5_p120826.ebuild b/www-client/jd/jd-2.8.5_p120826.ebuild
index dcc8ee7aced2..80bbabb0121e 100644
--- a/www-client/jd/jd-2.8.5_p120826.ebuild
+++ b/www-client/jd/jd-2.8.5_p120826.ebuild
@@ -1,59 +1,59 @@
-# 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 autotools autotools-utils flag-o-matic
+EAPI="6"
+
+inherit eutils autotools flag-o-matic
 
 MY_P="${P/_p/-}"
-MY_P="${MY_P/_/-}"
 
 DESCRIPTION="gtk2 based 2ch browser written in C++"
 HOMEPAGE="http://jd4linux.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/jd4linux/56721/${MY_P}.tgz"
+SRC_URI="mirror://sourceforge.jp/${PN}4linux/56721/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa gnome gnutls migemo"
+IUSE="alsa gnutls migemo oniguruma"
 
 RDEPEND="dev-cpp/gtkmm:2.4
 	dev-libs/glib:2
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
 	x11-misc/xdg-utils
 	alsa? ( >=media-libs/alsa-lib-1 )
-	gnome? ( >=gnome-base/libgnomeui-2 )
-	!gnome? (
-		x11-libs/libSM
-		x11-libs/libICE
-	)
-	gnutls? ( >=net-libs/gnutls-1.2 )
-	!gnutls? ( >=dev-libs/openssl-0.9 )
-	migemo? ( app-text/cmigemo )"
-
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl:0 )
+	migemo? ( app-text/cmigemo )
+	oniguruma? ( dev-libs/oniguruma )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-
 S="${WORKDIR}/${MY_P}"
 
-AUTOTOOLS_AUTORECONF=1
+PATCHES=( "${FILESDIR}"/${PN}-gcc-5.patch )
 
-src_configure() {
+src_prepare() {
+	default
 	append-cxxflags -std=c++11
-	# use gnomeui sm instead of Xorg SM/ICE
-	local myeconfargs=(
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with alsa) \
+		$(use_with !gnutls openssl) \
+		$(use_with migemo) \
+		$(use_with migemo migemodict "${EREPFIX}"/usr/share/migemo/migemo-dict) \
+		$(use_with oniguruma) \
+		--with-sessionlib=xsmp \
 		--with-xdgopen
-		$(use_with gnome sessionlib gnomeui)
-		$(use_with !gnome sessionlib xsmp)
-		$(use_with alsa)
-		$(use_with !gnutls openssl)
-		$(use_with migemo)
-		$(use_with migemo migemodict /usr/share/migemo/migemo-dict)
-	)
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 	doicon ${PN}.png
 	domenu ${PN}.desktop
-	#dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/www-client/jd/jd-2.8.9_p150226.ebuild b/www-client/jd/jd-2.8.9_p150226.ebuild
new file mode 100644
index 000000000000..c1e8d8e99e2c
--- /dev/null
+++ b/www-client/jd/jd-2.8.9_p150226.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils autotools flag-o-matic
+
+MY_P="${P/_p/-}"
+
+DESCRIPTION="gtk2 based 2ch browser written in C++"
+HOMEPAGE="http://jd4linux.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}4linux/62877/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa gnutls migemo oniguruma"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	dev-libs/glib:2
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-misc/xdg-utils
+	alsa? ( >=media-libs/alsa-lib-1 )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl:0 )
+	migemo? ( app-text/cmigemo )
+	oniguruma? ( dev-libs/oniguruma )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-gcc-5.patch )
+
+src_prepare() {
+	default
+	append-cxxflags -std=c++11
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with alsa) \
+		$(use_with !gnutls openssl) \
+		$(use_with migemo) \
+		$(use_with migemo migemodict "${EREPFIX}"/usr/share/migemo/migemo-dict) \
+		$(use_with oniguruma) \
+		--with-sessionlib=xsmp \
+		--with-xdgopen
+}
+
+src_install() {
+	default
+	doicon ${PN}.png
+	domenu ${PN}.desktop
+}
diff --git a/www-client/jd/metadata.xml b/www-client/jd/metadata.xml
index f69cb4cf43a6..79b2e260a246 100644
--- a/www-client/jd/metadata.xml
+++ b/www-client/jd/metadata.xml
@@ -5,6 +5,9 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
+	<use>
+		<flag name="oniguruma">Use <pkg>dev-libs/oniguruma</pkg> for regular expression</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge-jp">jd4linux</remote-id>
 	</upstream>
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 45e977112571..32d01b94767a 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,5 @@
-DIST opera-beta_55.0.2994.20_amd64.deb 56266674 BLAKE2B a8198ecf4c9086f8e50f027256a380e3a97760cc47a8a54c3975cdff08374330fba35e77f03a9b0293cf1932cc98201f876974b59421bfb1c3c4a682d8ff1742 SHA512 607942e2cfa31c98c503077d827c74122e7ac8540500f89f72e1aff613c1b21abc260defb6ef6bcf31437e13fe98dd2b97537a4f81040d80f9d2c519f3c40e41
 DIST opera-beta_55.0.2994.23_amd64.deb 56588490 BLAKE2B 4ddf932d0ad9cba59a9e221f880d31b3346868cc163974d63ee200dc402d4cb13f0228def39b8f469f09c82eb98e7bce5608f7395126c1721143e52db83132b4 SHA512 c0125bb6087998941f7edcdf97b399c3fd965e70491f5de3c1191a826c2687607dc87af4784d942263749e9b361ef976351c16ab925206354030922045734ba3
-EBUILD opera-beta-55.0.2994.20.ebuild 2321 BLAKE2B b09bfa2cc73d206f4d9ebb72efcaa7e9cfbdf4fc351bc97c8ca993d13f54dfcc96c0119ddb2503b5b041489ce57bff76faa1b300263fc3ff14094a580f847d31 SHA512 31332154b99d40920a9898923af02d8009f0fedddd324fdf2628e60239509a2d58e2a8484d0090cc5a458947e4f5e7e02e465caac866c134b08798958d7daf60
+DIST opera-beta_55.0.2994.29_amd64.deb 55842144 BLAKE2B cde94452c7986e2c913605865eb85928dc250105347db2af81e4891bdc9dfae38006861ac8bcf88df7a4dcf1ed6714b335d978ecf0e32a1ddde9d77a2130b3c2 SHA512 8808fec284cad8944000609b286636a929c84d92ca16b41c9398e22811c861ed1b219b0e4bac8dc7b8cecb1202d82588cf7194663f597270f146d3cdffbb0a67
 EBUILD opera-beta-55.0.2994.23.ebuild 2321 BLAKE2B b09bfa2cc73d206f4d9ebb72efcaa7e9cfbdf4fc351bc97c8ca993d13f54dfcc96c0119ddb2503b5b041489ce57bff76faa1b300263fc3ff14094a580f847d31 SHA512 31332154b99d40920a9898923af02d8009f0fedddd324fdf2628e60239509a2d58e2a8484d0090cc5a458947e4f5e7e02e465caac866c134b08798958d7daf60
+EBUILD opera-beta-55.0.2994.29.ebuild 2321 BLAKE2B b09bfa2cc73d206f4d9ebb72efcaa7e9cfbdf4fc351bc97c8ca993d13f54dfcc96c0119ddb2503b5b041489ce57bff76faa1b300263fc3ff14094a580f847d31 SHA512 31332154b99d40920a9898923af02d8009f0fedddd324fdf2628e60239509a2d58e2a8484d0090cc5a458947e4f5e7e02e465caac866c134b08798958d7daf60
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-55.0.2994.20.ebuild b/www-client/opera-beta/opera-beta-55.0.2994.29.ebuild
index 135872778f99..135872778f99 100644
--- a/www-client/opera-beta/opera-beta-55.0.2994.20.ebuild
+++ b/www-client/opera-beta/opera-beta-55.0.2994.29.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index cf44ae1fdf6d..a0a9caaf656f 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_56.0.3023.0_amd64.deb 59238156 BLAKE2B b76684508134413bad2df613f5cbed3f0c166f7cc89335026c8817d3f1c8d81acde14682b2dd2417395a478bdabd8c680994fd9cdcae143e9aab1537b8ef81cd SHA512 e680cee4804707556e72d0d3ba476651bcdaf15c3264b87fe0fcfcbaab896b650f6ef940c2805f4f2611350fab2cbcfdeaaf3abcf0a02ea0150bca46cc19292a
 DIST opera-developer_56.0.3026.0_amd64.deb 59316648 BLAKE2B be1cb1abc97b32f9e323b49378d6d626b58aedcb5c529e77cabfebe65cd0e6dfaba0f26a7e90c2910a7468a3958a70cb538aa1ec886c5a60fa8ae77ce9c4b1c1 SHA512 dbc1ddfcc3f6914ab157ba56db60398a73d16e42b5c7a2d6452b0707acdade74060a1832dd2eda28c38c0363340b5185fd50cc01bcc0e7a199d4c154c3fe9817
-EBUILD opera-developer-56.0.3023.0.ebuild 2321 BLAKE2B 56e8594faefd33b0303eeaa1c40b8874d038679f0296782dd593974fb5d58bbe22364d4a70bac166ae4587ace78c60aa0ae5ccfb79b5c2b2b8d2e285bfbe7cf1 SHA512 602f6281bac8432618c22f051541c513517d6a4f805b07a1c53a1c597089e53131ecf9cd8bf177af212941b45733e4eebc1ddb91a8d074ef5bf4418067cdbd5f
+DIST opera-developer_56.0.3037.0_amd64.deb 55910568 BLAKE2B cdec28a3437084a1fdabdf39ad23db2ca913558c2e73fcb744c22873683b628543312fbf4eb68d5d82fedb4444e88b6016c23f6f4a4f47273e62b9af5f65baa6 SHA512 6a47a2a89d9b54c35df14eb99226685517b27b3adfea482280eb4eb77e1560f7c91a3409f964ed1f708ec680ada14fe6255da6228e83c677bd175144526eb3cf
 EBUILD opera-developer-56.0.3026.0.ebuild 2321 BLAKE2B 56e8594faefd33b0303eeaa1c40b8874d038679f0296782dd593974fb5d58bbe22364d4a70bac166ae4587ace78c60aa0ae5ccfb79b5c2b2b8d2e285bfbe7cf1 SHA512 602f6281bac8432618c22f051541c513517d6a4f805b07a1c53a1c597089e53131ecf9cd8bf177af212941b45733e4eebc1ddb91a8d074ef5bf4418067cdbd5f
+EBUILD opera-developer-56.0.3037.0.ebuild 2321 BLAKE2B 56e8594faefd33b0303eeaa1c40b8874d038679f0296782dd593974fb5d58bbe22364d4a70bac166ae4587ace78c60aa0ae5ccfb79b5c2b2b8d2e285bfbe7cf1 SHA512 602f6281bac8432618c22f051541c513517d6a4f805b07a1c53a1c597089e53131ecf9cd8bf177af212941b45733e4eebc1ddb91a8d074ef5bf4418067cdbd5f
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-56.0.3023.0.ebuild b/www-client/opera-developer/opera-developer-56.0.3037.0.ebuild
index 7f81451646eb..7f81451646eb 100644
--- a/www-client/opera-developer/opera-developer-56.0.3023.0.ebuild
+++ b/www-client/opera-developer/opera-developer-56.0.3037.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index a58250aac23b..fb48f704ad4f 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,9 +2,9 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 BLAKE2B 2c4cd52a07999c5beabe
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 BLAKE2B 35fef5a5d1784941ce11ff3fed440d9c8f83ce5f9a0a8aad3f68deb470a7d82accfe7c9c93be225b458c0fc8e738ca7841d3d14abcaa201801321f3280f2b58f SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 BLAKE2B 7f9ef54f44bc143c13173bce92543351c39288058455baf3fde19f9f8766c9acd72971216c8c340fd89e918f18e89320eb8d13c4be9ec71635e2073c94c90067 SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c692d445fc8949f554c3bbe2bf3c9f222885891458cab7af1a29096cd3caf6936e83068841dda4bff5b8a17eb55a86bebe39ce2b270183 SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b
-DIST opera-stable_54.0.2952.60_amd64.deb 55845302 BLAKE2B b7b8ea124dc50da1b9bac33aa9aca9e672a54ddbffd5257d31984951af5d8f9587f86699a6969c9594e7f8e6e6a11b4e26e92dc6203d9f8fec1ba6eae0db7597 SHA512 e650f202fed6bf962bc3f94aad3eadcf5cfb9a82a6588263d4cf4bec5e4ce3a798aab0be1692c385579964031785fb4875528be803aa8dd93ca8eaecc22812e6
 DIST opera-stable_54.0.2952.64_amd64.deb 55735848 BLAKE2B a2530afdf8c6aa6d0d2d456eea1f222fe58e6048c015d8a28977aac8cfd967d62c88dc727abb3d2e2bdb10962e55fa9de22d8066b9d1de03113162c47d3d7199 SHA512 410f6fae8bfc35373e22e73465af87544e0051c4fd04df560601fb57ae313b2db849d862387a8769c65bdc22b02e9ba81600ff44ae65f612e838b9bfcfa9a40c
+DIST opera-stable_54.0.2952.71_amd64.deb 55731158 BLAKE2B 81df63cee2199b7ace01f30b86fbdbffb6adbefacb0828b3b1744993be96227a25991f367541396b7535cc4d69b2de727649853fc6be0dfd78e54c518a5e3c82 SHA512 4f9881071063ff290534c5f13f5fd783129d3430ed64ebb8e48622fcd22291343c62784a2f4ba6eabbf36049270b7383162597ca7ff48aac78078981b351e439
 EBUILD opera-12.16_p1860-r1.ebuild 6118 BLAKE2B 72e7be2d8786ef62b3a7b9fe93019e0df26b60d37826789c0e1ff691571a84d9f964c18517cb2acee0c4a6ba98c86ba00a032cb309197b83101ab8edf4a17dda SHA512 109edf5cd49938f57a59ce704efa46abfa93e1f72edabc57cffd8ca72e15193b3d35280b458ceb569a7163e7f7ec25cf84aaf602114855fad849f3c6c2125937
-EBUILD opera-54.0.2952.60.ebuild 2244 BLAKE2B 29a9abb8eef54f8a45263e1fa5fa114de5c5e5c04a792ac829c64fd1dfe2fbeac65eb8ef2a1118a69ee7c461edbbdcf4af34543fe25e2d7c67e12ff619f602ff SHA512 98a4dc3cf7b5b0023a11837b8eaeed8f540351473634b5f61d9054dda004fbb4b38d26710b8ffa22fa6dd3dfd36a36a330754f0ceca17dee8d304b183a99a1a5
 EBUILD opera-54.0.2952.64.ebuild 2244 BLAKE2B 29a9abb8eef54f8a45263e1fa5fa114de5c5e5c04a792ac829c64fd1dfe2fbeac65eb8ef2a1118a69ee7c461edbbdcf4af34543fe25e2d7c67e12ff619f602ff SHA512 98a4dc3cf7b5b0023a11837b8eaeed8f540351473634b5f61d9054dda004fbb4b38d26710b8ffa22fa6dd3dfd36a36a330754f0ceca17dee8d304b183a99a1a5
+EBUILD opera-54.0.2952.71.ebuild 2244 BLAKE2B 29a9abb8eef54f8a45263e1fa5fa114de5c5e5c04a792ac829c64fd1dfe2fbeac65eb8ef2a1118a69ee7c461edbbdcf4af34543fe25e2d7c67e12ff619f602ff SHA512 98a4dc3cf7b5b0023a11837b8eaeed8f540351473634b5f61d9054dda004fbb4b38d26710b8ffa22fa6dd3dfd36a36a330754f0ceca17dee8d304b183a99a1a5
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-54.0.2952.60.ebuild b/www-client/opera/opera-54.0.2952.71.ebuild
index 23b9ad88ecc4..23b9ad88ecc4 100644
--- a/www-client/opera/opera-54.0.2952.60.ebuild
+++ b/www-client/opera/opera-54.0.2952.71.ebuild
diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest
index a9bb7659eb97..9050ab970526 100644
--- a/www-client/otter/Manifest
+++ b/www-client/otter/Manifest
@@ -1,6 +1,6 @@
 DIST otter-0.9.99.1.tar.gz 4815838 BLAKE2B 466193891c13d1ac1837dbf4d845fe26fe1c2456afc20b31e75d5ae1d8579d0b80a87a5ac0cd8ae778a23db997dfcf438169634776da97d65a49e13d44a240d4 SHA512 333759ee0f846ce503d7a96ba7ce69fb7bfc4c08e8872b80f6230966d5d8f4c3d85b98b8e636500cc4e100f5c2d400ac7f622fbeb15ec1100614fe53fe73f88d
-DIST otter-0.9.99.tar.gz 4758228 BLAKE2B 503f94bb341e4a1701b8935cb14d7b972f0a212a1c626743a2758e95d864be534737d320daf142738a983a95512c1985aa035afdd33ac62ac2947a68403c49dd SHA512 7178dc9e7b7ecb9a1e9e4910616366f7e4186be592795cd6f9674238b1f94855cec2fa4065651491265f9d713ca8149aca225feff85fff62938580a050ca1afc
+DIST otter-0.9.99.2.tar.gz 4857916 BLAKE2B c6009c29c8740e9159dd874eb76db1245c3eae64f1f795a1dda0a6bb0f99f9d82595efa76ea1fdea0043e1131464718520d08b82d503c0ac07162f8631a499bf SHA512 5d30e826a011847be8f2df53efa3d389be350d139ed39abbd21fa7de2555769b5098a6f7849794463866be793365b3c91c527cfd3b17e06f32f61ec526756139
 EBUILD otter-0.9.99.1.ebuild 1817 BLAKE2B fec0434247425fcfbaa89abfb3b669269acc294dde57f1f84c95445b023b78b48a30e074f927ff5ba15ff1d1ca3da864bb2c71bad2c5856f5a9da2a8b7ca29fb SHA512 d5dd664dc246ee0e15f92214961eb641fa4274da6032870cc8b879c6de0c42cb4dad6423e4486d57b3c8121bf56c4e173875583158aea700cbbe6a38af2b10c2
-EBUILD otter-0.9.99.ebuild 1817 BLAKE2B fec0434247425fcfbaa89abfb3b669269acc294dde57f1f84c95445b023b78b48a30e074f927ff5ba15ff1d1ca3da864bb2c71bad2c5856f5a9da2a8b7ca29fb SHA512 d5dd664dc246ee0e15f92214961eb641fa4274da6032870cc8b879c6de0c42cb4dad6423e4486d57b3c8121bf56c4e173875583158aea700cbbe6a38af2b10c2
+EBUILD otter-0.9.99.2.ebuild 1817 BLAKE2B fec0434247425fcfbaa89abfb3b669269acc294dde57f1f84c95445b023b78b48a30e074f927ff5ba15ff1d1ca3da864bb2c71bad2c5856f5a9da2a8b7ca29fb SHA512 d5dd664dc246ee0e15f92214961eb641fa4274da6032870cc8b879c6de0c42cb4dad6423e4486d57b3c8121bf56c4e173875583158aea700cbbe6a38af2b10c2
 EBUILD otter-9999.ebuild 1454 BLAKE2B 44a2b89a5ab1b01a9d16440d25b4de7889e02fac35a5c4e5bb755a3323b8c68baaa27d8518905246bcb6741cec19e81713130dd3b516f23500bf6c3d6dc8e2d5 SHA512 ae93d8bae4b15c1cb99d304d28ce9547bd068bbcc29924091523af470293bce0f077a06042785a76b66a89a431f297af52c5b35eba987de2e7ac769066b983b4
 MISC metadata.xml 466 BLAKE2B 95a6b3f8c4a297c6a57f514173a99b2e6a6dda37cd90c0b9a3bb9069a272daad73dc7b9c3a054741331e813b625e14f1a395263409255ad12692f049f557d5ff SHA512 3c07f030c4ae6777cca5e122f32a6b2f5844a2dc5bba27a6ea17b36ae56ef43174deefe0460128a6e31d709857e5b915d340b8e6e50049e43c87bfcf58f95f22
diff --git a/www-client/otter/otter-0.9.99.ebuild b/www-client/otter/otter-0.9.99.2.ebuild
index a354d54d965f..a354d54d965f 100644
--- a/www-client/otter/otter-0.9.99.ebuild
+++ b/www-client/otter/otter-0.9.99.2.ebuild
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 6bb7ac04c964..3d4e7b30e2aa 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,14 +1,9 @@
-AUX vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch 603 BLAKE2B a4b048e605d70544de30e69245b50615162aa8b983bb254b3979ee6060d93a1e04de16d4e8b2b0426a7faea471a89644be3d6896206de35affb2158941c0f542 SHA512 60aedeeb8e8443c3177f19b4aa745415138ad9f3fa4f3696ad00d2b93889e145f401c59298454e62462f0a8afa619ff2d07bb481ff5895735b89c3701d270be9
-DIST vivaldi-snapshot-1.16.1226.3_p1-amd64.deb 54931368 BLAKE2B fecdbf62cf301a051f0798545847aba381f803b69165c470f6057247b626b31c0194f1bdf88f7bfeda57cbcc7d2b14d21efbf9e60cd177f37d9cd65d7edd6f36 SHA512 88a5c72cc2b0558d9819eb17525f00d3a049b01ebd80734ddbcc0b5928f188b3b6f081b7ed1e1a403cf2a071b009d5b26ea5af2b72b26b45eb42e644f5a47236
-DIST vivaldi-snapshot-1.16.1226.3_p1-armhf.deb 48799752 BLAKE2B 4bf6ddf1ff1869c1a4614615046de27367dce9bf6c02208701740e12a3e6ef0c821ec486129feee8b2886c6a7f744d57115e5e8c2077e5540c71b70faadef4cd SHA512 d53eeba114f0502c0e045fc3a5d5531654f36bafeb34666ecea3798c4ceda8966f7079fb80c55617789c16ee273529f9ff6b872c56d63b430997bd2901cae6af
-DIST vivaldi-snapshot-1.16.1226.3_p1-i386.deb 54406672 BLAKE2B 42e979c5b16d3f4d7ba3cf22c63b84b8991d14a13b3f1d8950cc1e504800cbb4a25a560b515201ebc4292a6aef6254008150926dbab5bb806ab70bfc84da0b7a SHA512 b7f50f377ede4a3a9ccb90dece883f5ca289f875b4397c0aa9151c60ab80378eed4dc198a0aa4d3960bfb766061510277f8b53f3a72c29532940b3878d04d887
-DIST vivaldi-snapshot-1.16.1230.3_p1-amd64.deb 54948576 BLAKE2B e32ed93d6e5692f4e2dd21e7fb93edfe67408e346e3ab264f7dbc0f536245d32d06573edc396efb9c7eff5e7eb02ceb1965321c104e6be556998102aba6c65bc SHA512 6e60ddc456525012a02648cff70aa1908635da79b0711cea6b9a296d983969f2fe2e22f0dc78ee29d362403a4cb5dacacc8e3d3f302e4fc5170cd508639fd348
-DIST vivaldi-snapshot-1.16.1230.3_p1-armhf.deb 48827914 BLAKE2B 53166df94706501b96c185cc97681cec6a1a227ceb74f5974a6e63b5f70148195fde0ddfda978c7694f480460d915ad7f8f5c3b68217835847a7b2d109362923 SHA512 a1483e209a82886b24fe067218b27f72667aa40f92382db560008d5198a018df43ec076c17f2059e03c2a41402f8f862799537385660007dff30b29e899cc127
-DIST vivaldi-snapshot-1.16.1230.3_p1-i386.deb 54437300 BLAKE2B 0465cfed1663a1595d9361ed9677019edfe10ef9b3e3c39ddf450c86ad9f23aa56307a95c048fc67dfee9d0e440e2519498b8913bde306f4eff159a429b1276c SHA512 3c24a26f8797ec844bbbf385ea61390000ee27c4cd9dce09958ac4e21143b65fad0bfaca56b35caba4f22401cf0e3279471e034520deb4ec1b424a7f18bacf3e
 DIST vivaldi-snapshot-1.16.1246.7_p1-amd64.deb 54951038 BLAKE2B 2e74799186965efc3ccd5eea6051c4eca4df287de3820ae88f72d0bb11eb50e31d768fea6c4d2dbc7d1fb3d4d2d5eaeb8f491d068c3be80e327134e56d69aa8d SHA512 2c3a7f2e7f1a3d458f245f89764486fd7dc00b77ec23cee51fda2a3aabfa8e51a27ce6152060858d441da6296a1970705f20f46d676e20531e3bc58556d96cf6
 DIST vivaldi-snapshot-1.16.1246.7_p1-armhf.deb 48813648 BLAKE2B 5ace5fa65e255a5acec7fe8b9c8299f385af06f9d0d2e1a92580bc1b16801b123c052044c7473def7e2e87e89a51db08070e8a39ba79f981a1ea7ed0b2c9a478 SHA512 eb41b1abe8a4b50c71f881f96e308c922cee0acdbe4a5933d9f0d873104b6003a4c7ac58257acaafff6c5d67580c36764c06c3860b35a2d995c65e04c99c5d20
 DIST vivaldi-snapshot-1.16.1246.7_p1-i386.deb 54434310 BLAKE2B 19940c56ab8644d63e18f5d0003d98fe126fbefe138801b3fa376d22745f98a1a9acef4bb7b182beb081abf55f9161187f0b85ac225297d904bd5648e41bfb56 SHA512 ae1f98efa4ccf2051b7770ddb8f22e7ee869705294ab8a83c129ee99e26090dc654d3a2890c9aa3ec4b945e0e5329b910e8696e32a6cbdcf2b8551811612bee6
-EBUILD vivaldi-snapshot-1.16.1226.3_p1-r1.ebuild 2509 BLAKE2B e2bf04ea6626b6f1b1ad34e1825a12eec0f6fc2ee785faf9c62ad3076e3b911f73a23f5850264afab28023475f4d1d27954bd2510b7268ba895f948fa83069f8 SHA512 0488ae172c9096e9bd4ed7b862964a50735f74db4e77039e1efe2f712540fb3807fa45090ab6bb7f245db1f43fe15a90b78a39ba7453e28f7455f45be5e2127d
-EBUILD vivaldi-snapshot-1.16.1230.3_p1.ebuild 2509 BLAKE2B e2bf04ea6626b6f1b1ad34e1825a12eec0f6fc2ee785faf9c62ad3076e3b911f73a23f5850264afab28023475f4d1d27954bd2510b7268ba895f948fa83069f8 SHA512 0488ae172c9096e9bd4ed7b862964a50735f74db4e77039e1efe2f712540fb3807fa45090ab6bb7f245db1f43fe15a90b78a39ba7453e28f7455f45be5e2127d
+DIST vivaldi-snapshot-1.16.1259.3_p1-amd64.deb 54952974 BLAKE2B 660b7ef27e994c77223f082d63377420093e68c24285c15e3cb9188489218a66264d6a996f4f848d16a80e22e6cb8b32023d5ef91b16beb370ab9145b9f944b0 SHA512 dd5fbdc9cc757e5fa89fbd44171c1992e839d17a5581d970484fd6531b3ba4a8ebca3f7af85bbaa15400c7831f71831d70baf0c65b6d513d5433a0fa35d7d2a3
+DIST vivaldi-snapshot-1.16.1259.3_p1-armhf.deb 48849488 BLAKE2B 4663e7fa65e5c2c05ceef0b03e201647eaf7778bf95bfc2b9166df117a23f71c3f5bfca457a34a52694cba428d1a4557f2784ef9c957159d80e531fae0748497 SHA512 67c9fc8adc2913ae5baeb25fb730aa2da06133987aa3adee48e194b6be9fa46a44854edbcafc521c5ba4fa96c379b5fd435113e893e84ca1cbad5a5c0f2cb0f9
+DIST vivaldi-snapshot-1.16.1259.3_p1-i386.deb 54436966 BLAKE2B 8e35f0ff901004fc755018431e80c336ecc76c381f6e36382227277a0348e35bcd2f405e98d03ea479daef1b46e536de3172e9407a16960f760f9a0dc9a57344 SHA512 a4871246d476edf53f28cb8167d641403ec826030dceb3a9e6d904b4b32aa6cc8c78f0528feef4314be618b442484d8061dc34eae94830103967c11562211052
 EBUILD vivaldi-snapshot-1.16.1246.7_p1.ebuild 2509 BLAKE2B e2bf04ea6626b6f1b1ad34e1825a12eec0f6fc2ee785faf9c62ad3076e3b911f73a23f5850264afab28023475f4d1d27954bd2510b7268ba895f948fa83069f8 SHA512 0488ae172c9096e9bd4ed7b862964a50735f74db4e77039e1efe2f712540fb3807fa45090ab6bb7f245db1f43fe15a90b78a39ba7453e28f7455f45be5e2127d
+EBUILD vivaldi-snapshot-1.16.1259.3_p1.ebuild 2509 BLAKE2B e2bf04ea6626b6f1b1ad34e1825a12eec0f6fc2ee785faf9c62ad3076e3b911f73a23f5850264afab28023475f4d1d27954bd2510b7268ba895f948fa83069f8 SHA512 0488ae172c9096e9bd4ed7b862964a50735f74db4e77039e1efe2f712540fb3807fa45090ab6bb7f245db1f43fe15a90b78a39ba7453e28f7455f45be5e2127d
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
deleted file mode 100644
index bd64493c404a..000000000000
--- a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/opt/vivaldi-snapshot/vivaldi-snapshot
-+++ b/opt/vivaldi-snapshot/vivaldi-snapshot
-@@ -54,6 +54,7 @@
- # Check for libs in preferred order.
- # Where possible, use other files/directories to confirm it's the correct variant.
- VIVALDI_FFMPEG_FOUND=NO
-+checkffmpeg '/usr/lib64/chromium/libffmpeg.so'
- checkffmpeg '/usr/lib/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra'
- checkffmpeg "/usr/lib/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra'
- checkffmpeg '/usr/lib64/chromium-ffmpeg-extra/libffmpeg.so' '/usr/share/doc/packages/chromium-ffmpeg-extra'
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1230.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1230.3_p1.ebuild
deleted file mode 100644
index e897c38d5d11..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1230.3_p1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	am ar bg bn ca cs da de el en-GB en-US 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 chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
-
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	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/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${PN} \
-		${VIVALDI_HOME}/libwidevinecdm.so \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	epatch_user
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-}
-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
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1226.3_p1-r1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1259.3_p1.ebuild
index e897c38d5d11..e897c38d5d11 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1226.3_p1-r1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1259.3_p1.ebuild
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 010e738be4a2..ebb492de43ed 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/litmus/Manifest b/www-misc/litmus/Manifest
index 0206eae6aa4e..d88c9d7327a7 100644
--- a/www-misc/litmus/Manifest
+++ b/www-misc/litmus/Manifest
@@ -1,4 +1,4 @@
 AUX 0.13-autotools-neon-version.patch 344 BLAKE2B ece27a25656cb54a5eac255994fdd757c98840a39c4c215c44bb1b548eb3b5583b04d0bbe2feecec5a05fc0283f8f5ce6903894ed3bb94e57e20e6df825e36ab SHA512 ffc549b2c676a124bbb5a4d9df5ffe3178ac7186dafbad0cbae85b6092b6e204c9ac15e054084efd5eb5bf74620cedeaa88924c02c1f0861e9c258bae7ff9012
 DIST litmus-0.13.tar.gz 467532 BLAKE2B 509951d2751e32917f920fd37720dab215b1b81e6450ee96c5adaad22efd06ce781b80cb6acb363dda9e62ed9e08c2bab1869d24a4fd70f5f7bc337f3e112af4 SHA512 a1c04a17cbe4a17b5e0ed768017296256c9f234ae3f238f838f55064855b254246ba1d2e41b07145e1a9587698145b36b67e31488cfce817a9b5b119ee505b1e
-EBUILD litmus-0.13.ebuild 1591 BLAKE2B 0fcf0f44478cee91b4250ef6f6922bb3a14920e07a32c66d283b53a15201d45de5d29b839d5f62db8f2d4a99a0bd1d5d47179fe7ac5ced2689051b2697b0dd9c SHA512 35aa843ced2559537307d46c2f9fc701a1330a18b59354613b00a9fe16ea0ad6ee1da72526d20d5b0be733aafc407b26f82c885868982bedda0f351c5df25348
+EBUILD litmus-0.13.ebuild 1581 BLAKE2B 095b887d7de2924e30705b9931bbf74c5809f02f302ceaab7bf7b808ea1754d3250ce4947c651d9336c0cda4aba71550a18eb4dbe0672a001185d087d9b6c997 SHA512 00a5813b6c2c476b705c654081577e286ed54fe983f33a6a478db8b216c0893e5671e443c273481d0fbb3bb1ddc3a074a59d332072205489202b5a8d29bbeeba
 MISC metadata.xml 750 BLAKE2B 99476220901ddc365659ec57e10985b27782e98a234df51fcac2682c10eb5a8b0723987d7a224df44d68c3a21d487f3ac206f9d34d4958767f01cae48a1d9fa8 SHA512 d6973143e28fd6462a846248c48d82f88ae11d93286e4d4499cf6aa9d186e816057b4d93f3a2b1e4104e2baab5b590ab1321ac8e971d1d4f556d3e221cdba7bb
diff --git a/www-misc/litmus/litmus-0.13.ebuild b/www-misc/litmus/litmus-0.13.ebuild
index 979cadc02fce..4b14ebaafda9 100644
--- a/www-misc/litmus/litmus-0.13.ebuild
+++ b/www-misc/litmus/litmus-0.13.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"
@@ -10,8 +10,8 @@ inherit autotools eutils
 RESTRICT="test"
 
 DESCRIPTION="WebDAV server protocol compliance test suite"
-HOMEPAGE="http://www.webdav.org/neon/litmus"
-SRC_URI="http://www.webdav.org/neon/${PN}/${P}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 5508fb8c20da..884dd2655fe4 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 16c3aecba333..fadcad9c08b2 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_68.0.3440.75-1_amd64.deb 55365092 BLAKE2B 242882a9d4bdaf2821b84979573c6b07fe6647774c09ee8971e5c3467bae1a3f426c2a24f09d2b65fdd575c6ded0859e92c2db005df66bf89d723f420ae405bc SHA512 3eecb8c013bb76e80a40fd7fed47ff70c3eff7cc055b22e1b6ee219c0d5e9308e0b47b315560df9e1fcdcf79ca924f9b80ed9df841e8da2a7b52ec8623bae549
+DIST google-chrome-beta_69.0.3497.23-1_amd64.deb 56361772 BLAKE2B bdd8581f97e45dbb959d49b00d1beeb0302b5f74a31284af621151a0155be679e299d7d7b0e940519f7b90f49d17e0f9f4de3d3edbe2dd94ae9f7037e63c65e6 SHA512 c9769099551d135a0204331ec0d747043d0e63b27d02844883fd4a516e834a88365a02b947e400b856e8fc81608130ec46068c4c82ce0af8427c757f2cd733dd
 DIST google-chrome-stable_68.0.3440.84-1_amd64.deb 54076744 BLAKE2B 294e48ae5458d813dda1d9270ec31384842aae0879cedb76521529f7d7b37fa8a8ceee5ef32e0cff99709ff8b50de048e1077f6c4a36e0e368c224f2f5e9cbda SHA512 cae6469df0147171eec0c56dc14051661be79d41348828aca5e08619b5ee9143f85aefa9db5045482a8b9ffbbe0af81473598239cf856d8f33cdd3df5e76d994
-DIST google-chrome-unstable_69.0.3497.23-1_amd64.deb 56345622 BLAKE2B fab0ffab47b2201310b87bf885b85f87a83b2c5bea03d1bf7d70b334105afe549b62afdbc45b64093b2626bd962a2f2f90bc362e2be089b13424dd52c85a5ac9 SHA512 3908824161e2200c39d20668443ba910b7cb04ed3979f8c8c41ae4ecdc9b59d175a61cb39321aba660de3fffb473c316b6cda5235715765f76560b4850da7b49
-EBUILD chrome-binary-plugins-68.0.3440.75_beta.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
+DIST google-chrome-unstable_70.0.3510.0-1_amd64.deb 56663720 BLAKE2B 57ed294f222a4f8b3d6c76832b0c3741aa3870a661979d934e04c4458de3da57df39f611a72146576796171b75b8b2536aeea9761f0831ad59bf892fc2d1c3ba SHA512 5ac10d46c0adb1d5cfa2caf8bbbc8bcac3ab0bc6798bbcbb8cd023cab128177bb2b417c7da0bcbc37451498edd1f213f70dad07bb47eeece62eb61ac94deff5e
 EBUILD chrome-binary-plugins-68.0.3440.84.ebuild 1362 BLAKE2B c75ab3b0c0744543f6c0bb7716b1ff5eb0a7163fd91ac1e1b378588d1ebfc0ba57cae2ce8024315eac3d6a0b3a5ead6ae69a026e6c5e82724904f1fc524858f9 SHA512 c21c2bdf6845456d3f9cb47a5225f9962cf7897194c7f2c670010c5eec3fe33f88051c6a4000ebaac14313c1b630c0590fa8fb2b5b255f23fc75232f53cc6609
-EBUILD chrome-binary-plugins-69.0.3497.23_alpha.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
+EBUILD chrome-binary-plugins-69.0.3497.23_beta.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
+EBUILD chrome-binary-plugins-70.0.3510.0_alpha.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.75_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3497.23_beta.ebuild
index 08f94544e0a3..08f94544e0a3 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.75_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3497.23_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3497.23_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3510.0_alpha.ebuild
index 08f94544e0a3..08f94544e0a3 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3497.23_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3510.0_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 5f4dda57c1ed..34d5f23f4b92 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index c071e92b6048..abf9604ac3a8 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -15,5 +15,5 @@ DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682
 EBUILD apache-2.2.34.ebuild 2976 BLAKE2B 8816d1f547ba7e8de670ef0f45cde40748fc5d611e1060f0c76a8b35ce9771a493f89f2277afcd90ac36fc6f4f684be1e19913d2d3a2ecd78e63e9f4f0d97470 SHA512 32b49f813a80f28b50a2170878d3b204c51db243bbd117b60b8aff63627b42d2cb76e87282ad9053ac1513f0faf8489a60edc7dec0c8087f12650a74d3a533b7
 EBUILD apache-2.4.27-r1.ebuild 7737 BLAKE2B 6e459c6d091a5d91d1179cde68fa1b34bb4faf04d3c66b8b0a759311e6b03102485fc4758a65437c5c9bd12f63e3afdd50730c196f3e5785c3c6aa25fb2cf2c5 SHA512 bd2df8d64f22fd28af9e2225492de2d3dc2d8172220f14f495841fec587aeb39c02d4d7021d4f96430f9821922baa84a78a7b8470f56d5c5305bd124d763afd2
 EBUILD apache-2.4.33-r1.ebuild 8285 BLAKE2B 380d88d720559b28dc0d3b999e1ac233fb8da49f07bb2bd91f8f4214b1012da6428b44d9324b42c1ee0c52280bd2171e0a04b9eda3b57ad1f913a3a1f016811f SHA512 9ede39ce930d909ed942dfa22462f3c50e4b83eb1a23646a2f702dc4081233ac6944ad135f813d0a94563267e29730ba73ca6a29a834a8f269379f559f49683d
-EBUILD apache-2.4.34-r1.ebuild 8162 BLAKE2B 1cd1ca3041c0babb4cebf4f7dbdcadae27be95b4eb94c7d08795ba40d39fa4e37cf41c84cc7c9105439d6dfcdd8d841ac1370c560bef554df3f9d20f07fecf9b SHA512 71f8cd66955b8f2305144647cf2ddd4f2722adf3805a3b394082e95fd3ebd13c8eec4aa388b4d4a7f385598e0a0aac52f0fe11e4cc4c453d8749f26c6e617833
+EBUILD apache-2.4.34-r1.ebuild 8159 BLAKE2B a324cd88acfe2fd77e82df141c53393f6dacc5cfc58c40d812ba535e9c58c12f6ba597419f2d894dab19a86f918247105f5906c8a05d057b06b8021d7c61564c SHA512 28301b8827f37b5c503a1f9f8a64385d673e6280d148741a88c89b6393e66e583d682d0a8912d6159fa276cde46bca65eeeee91c87a18c5370eb83ea732cfdfb
 MISC metadata.xml 3852 BLAKE2B 66dc78cb1191b40322dde247b302d5987c10348a0d3b639b3479563b7584df67806e3774d46bf967b5115209b05bdd6e29c1a199b5ff250fd3e140d299e36a8c SHA512 7c3f98caa25850b8321ce7809da866a712f0b7c787b5cfad29ed9a3129bf0c685e57f16b239566bd4c377fde724f20bf49d83881fa805168efde28484d1ddf7f
diff --git a/www-servers/apache/apache-2.4.34-r1.ebuild b/www-servers/apache/apache-2.4.34-r1.ebuild
index cf545f229ee8..1c761c00b987 100644
--- a/www-servers/apache/apache-2.4.34-r1.ebuild
+++ b/www-servers/apache/apache-2.4.34-r1.ebuild
@@ -130,7 +130,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 # Enable http2 by default (bug #563452)
 # FIXME: Move to apache-2.eclass once this has reached stable.
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 76301958bb62..b1977b5e9f22 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index cae116b3872b..77baa6c59493 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -37,6 +37,7 @@ DIST NVIDIA-FreeBSD-x86_64-390.67.tar.gz 63611003 BLAKE2B 093d61fa03a64e6c61920c
 DIST NVIDIA-FreeBSD-x86_64-390.77.tar.gz 63638514 BLAKE2B 8a63f1c93cb24400ce099ffe76d2453e6980674554378a2e135e32a976212f75c335e104e52ad5039216b06286bc350e49a8fd1c61b987e1be3f3cf3bdd08f38 SHA512 f2bb8f9b5afe6ddaaa6395835592763d6f36814b37d8234f7372a0039324bcd88fa4e7f1ff5da7205bcdaac0f0d96ac8d72fe66db15e2adeee06a86fcb4d3199
 DIST NVIDIA-FreeBSD-x86_64-396.24.tar.gz 60839222 BLAKE2B 4baa266d945525a8f43d69e14df1b045d5a2e7212eb3a92208f8efb454642e657ea3cf00a9e625ef5efa9f54c8a9e2f87ef4847696368de13b88a0721364d9af SHA512 28c456cfc9f779bed84d671e104f2ea68940053aed2dc7964390e84ec553a9062be6b5108a78f123c129c25548a7b3027060da67417c64f857b23c95ae9f908b
 DIST NVIDIA-FreeBSD-x86_64-396.45.tar.gz 60850050 BLAKE2B 1bc8e761fbe38637ee17f996ec74f63c4e9da7cea6d38029fe2fcad5cd85da73e10773e019e2744d522aefecee2d6a8d3852db6ad5b9e1e746bc36ccdb4b7c9c SHA512 76955be8e86645376856bdbda7339601b88067e6b4d39b768ec86586eced7e77a437eb990bcf0fa77b3671968b00df91b53be53e1cdcd45d3e0c6a96ab5f1d77
+DIST NVIDIA-FreeBSD-x86_64-396.51.tar.gz 60903199 BLAKE2B adaf32bce51a11a15f71dfb3fb66a203237a6e153437cd4c95bd5d9d7d694b9b959d7e599d9481e3201eff243655e2d3e39cbea72bf40d9c40448d4b55cf22ed SHA512 903af39b5d8681d80f0016db4fe7a4b84cc2c1325c295be6c44b95aa98006d395f46b9d26ca5f08aea8998ca62f1c51eb4b1c0c2b3d082943d35c4bb437a57ef
 DIST NVIDIA-Linux-armv7l-gnueabihf-375.82.run 26650801 BLAKE2B 31446667065c56b48f6a3e737afe29a4517459d3462138136bffe383bc6fe514d6e80b49c391c27edc96b8abc3da3dd4d6ee3f3dca17f3c9a0f1cdf0e72cf099 SHA512 28554f1c24fe63c9257c0de3e84e4e739a45bf1c20ec7a53bc2c1b69b4e2355675061491ef5b03f3ae489cf623e553cfa68442f5536f137837327036d1c53d63
 DIST NVIDIA-Linux-armv7l-gnueabihf-378.13.run 26514235 BLAKE2B 2b3c540704496a290be7ae3f1ff378487c75af2298c12488da8b3a1814446e5df02a1ed99afd8ee7fc459d950aab472155359eae0bf56ac83389711d70638152 SHA512 253786a821df85fa926ae842114321b3c70502f887ea7c2b6790dfe3836039ee5d390e6722ca8785904ec6487e465916923d3042dc6191b3b4522c3161b80cb0
 DIST NVIDIA-Linux-armv7l-gnueabihf-381.22.run 26815484 BLAKE2B e5f0241b07d1e54edea2025dd30061d1018c68cc2c7136c507eb894bbad5be3d0724494e2b9f33d1f8f60da4904999bbb964e6f2e78d045d7cd86bcd46b7f6d0 SHA512 934cda37c7aed26243b5b661122e1c060de5b4df890aaf2295b6650dddea37cb4f0e3f0bebddb00b5d687b66ab5e028a203195c4d4ad3379593babda42febe77
@@ -64,6 +65,7 @@ DIST NVIDIA-Linux-x86_64-390.67.run 82272406 BLAKE2B b0aafce048e6cf62fde5d86a282
 DIST NVIDIA-Linux-x86_64-390.77.run 82722543 BLAKE2B 46bc7b365b4a8bd2d9444ccccec0ef427a1bbf19546db21c01d765332e8ff12fd297991166895815c96bb8d1a6153df5178578ebfaffbf7875396a8bb5578ad8 SHA512 6273ab0dee2fb70a5675166d4a49059f2cb46528408e292ac334b6210eb54be7caa56479274404ab773a4e9ba4c5a9a2e0568cb5ca7f15dea448a59ec2e72cde
 DIST NVIDIA-Linux-x86_64-396.24.run 86545234 BLAKE2B be297b4585275362608cb5119c9f7f77bcf7895bd1320603cb5f8034ee5f1dfa6d0150e58d4a11dd4656b50476d6cb6a372c18db54d33fdd685250ceb0793d3f SHA512 dfe837804d01e903cdf980353add0227362771cd252e4a7d8aff99fc489e5535edfda51ed1a20b9d60e23f1a9e7312f23309c59c67ff0a09a9b9214e52f09077
 DIST NVIDIA-Linux-x86_64-396.45.run 87016131 BLAKE2B 988392f69fc4f1f60acd03bee50245d836976728c81bbd21e5542b13e0bd93589a2bf8482d544e868f294e32de65b62c13512e465ec25afaae1ae405ae4beb3c SHA512 243253ebc83e4bc5116223ecaa29e55786a611484d9a0fba302f9f87961576bbd7f367422635725173662f013e27ef88a09f7282c9fe9912f9fe4665bdf06822
+DIST NVIDIA-Linux-x86_64-396.51.run 86541408 BLAKE2B 2cc41d2f6fe73a49c322828a9001383d8a23890a6d1d18593b649e18b77d2424fe588fdfbfd71fce6819a4620c4ba21d8e8ce7f2a8aa8411961099d40cf54edd SHA512 961c1a5b27a0f6cb54e387133a8d4038ddda0df39e70e84a637d8d64eaeb4ec937e37d6a737179d72750785614d20ade5e99f0668e3d53fef2cfa70241de4fe3
 DIST nvidia-settings-304.137.tar.bz2 1481361 BLAKE2B cf52a55a34eeb03a685a683487af6a198ba467dd8ba9983cc75624a37a226373cd931d98e8448b7b8ed430c54be2118c7b240ed2a9100b19bec5e832e2f6cdad SHA512 676d1f70c9a78ee234f5f1a283412430a386fa604de211afba02806a45906c5e246a002989b724d74752178d28c92a268de1c98d4c87876797d991253f16b0cc
 DIST nvidia-settings-340.107.tar.bz2 1549413 BLAKE2B 127442ee2c35ceec47ab4f103bdd2d0278c621fcb9be47051111f6f8728ef5699bdc95fe33a3812a807c38c4868b04c2176e2ed218a422171d2a88ac0c00de96 SHA512 593e7e83aa350a3a7beaaa32aca8660d7e203f6f2e460a6e6eabcdc092087f9917ee4e6d141e37ad4e3b0a1b9908c085e4a71d2f579e481a03bbd1c6f75ca776
 DIST nvidia-settings-375.82.tar.gz 2114647 BLAKE2B 26413fde8397e748fae362984039286c53a7fe104228452f3188b5e77b084ff4bf00131e77359ff5e92dfc325680c1f662950175cf806403d2a524ba86158f51 SHA512 7a374be56c8be52767d73a048029d9e55dc2abcf2f6a97eb4931544c927c85a1103a206be9e8d1ffcef36fec2caf2416f33699ad4d51e7dca17e4e844c37a595
@@ -75,6 +77,7 @@ DIST nvidia-settings-390.67.tar.bz2 1109133 BLAKE2B 3ac68f374d439c900ddbaa5eda9e
 DIST nvidia-settings-390.77.tar.bz2 1109358 BLAKE2B ee59fff5a679301b0e1f24fce3a13ee4e216d48afd73473a1ec3729067e85308d3df3b8ce1d4394b5a7836e40298c6623a0652ee3f23fbdd1a00ebdc82136f22 SHA512 130c8b9382984df597040475b29a8b61cad6eb76ef241214ab327f08a4c335176f3bda49a0c1a565a1bd8d64ab70cf1c00b7d316f343b7387dd03be7c9684f21
 DIST nvidia-settings-396.24.tar.bz2 1115673 BLAKE2B 5b0bd156505e99a5b788fc61458c902cc1760d999b18c8c6309986d8c315eabc65cb2fea9ef6a823acbe57c4a11bf67938575afffb36fea91320416fe40a7507 SHA512 841470a324bb09683fcd863474f987a525a38213432be3bf4288a48671c674692f44642d260f3d2d0710e485e323153f867d0bda4cfa9b11d0e3c61a36370353
 DIST nvidia-settings-396.45.tar.bz2 1116216 BLAKE2B 85769b7e3152bf2ff029083d5e1cf695751fa713b9db858d77f344f19266b545e8f70a07dcb3b017dd6ab901e25df6acd15a1e584bc65efec1a3d24cdd56cfca SHA512 2ec1c1e2ba79a95c1199724c476b8433ea34b7c88acfabf9b49484073d8b0251a7f466bfe71f501772915ea77fdc34b4bc539fc62e8844a06c28af7570fe0bee
+DIST nvidia-settings-396.51.tar.bz2 1116520 BLAKE2B e7362bf71d0c7e595a17e398aacfe53ad845e1d29db6792e0d4e7769663c9eba1267c95c8a629473f7419d05ab48c02ff198bebee11db8a3d9de1ed4444c4124 SHA512 139fde3ab704562db5d7247b0ccd578260baf2650de24d6844a02439d6847681181681fb6bf84fc962434597259887b735b1cb2e596ab5112924d70ba4c6fc6f
 EBUILD nvidia-drivers-304.137.ebuild 13647 BLAKE2B ff0bc9bc9d98a5f38ebd791c696291d6c88d0e10ab68509c73ae7b9e1f8b3188027627dd02b99329b551c77819a4bf2d77625762d6ff2bbe25c3bbe14afdd0e5 SHA512 617d92a8eca878b7a69b7bedead069b672d827c48e7531da49d985a913d4295039d8f5d9e2566c9ee9192cc5191bd3c70400310ea682b71c479df6082692e70c
 EBUILD nvidia-drivers-340.107.ebuild 14648 BLAKE2B 3456f822cf41e497637b880898189ee040b2113779fb28ba2a04193180ac3769e00d61e80e697f779f50dd55b055a95dfc480f8e2f6fe5d78a30219ddda5c30e SHA512 d3df565fdb9425fe568eb16c9dc7ca50ff832a54629012a92a5d8c3e60f358f4a286f371b14cc6365dc8465bc78e1a1bdf5cbd4ca9ce26497ad4cacd695cfcd8
 EBUILD nvidia-drivers-375.82.ebuild 15848 BLAKE2B f89ad536d15a0df282744c7c26c995dc1d94b8af60e2a7fe3d40a06134526b8eba96c06ae999ae55efca4a21655893a4e53498d0f729f1b35affe891b81438cb SHA512 4778befb48304ed07f9e47174eaf0e519dcdc261906151246e54f3fb8383c5fb5c45b45e42165d69523057007ab44a9c7b400a907ddd167dfdd29dc422995f93
@@ -85,5 +88,6 @@ EBUILD nvidia-drivers-387.34.ebuild 16295 BLAKE2B 0e6e77ed5654425bf03e358d5d8c53
 EBUILD nvidia-drivers-390.67.ebuild 16291 BLAKE2B 7a3748763d42bc2f51b7410b89a0309ec865d5d61b73ce74d51e2c05201ec6072e1494b1e1be4fcc7124e61416a5bfab2639c860b1b55a49101746544d29fda3 SHA512 a1e483782e37a18cc3476c4027fc549a5f02e325a2ae8d263e0670915ddc793c9986ff46b05f9dc0900135d034d8316165b3ed7f143b38f6f460a13ba403e553
 EBUILD nvidia-drivers-390.77.ebuild 16293 BLAKE2B 5263b9481915c21b9df6c4477697e541dd10f5103fd98d2c66f45166dc9e8bbe425490f483396d3bb3bb5bfa9dabb202116d649f782a9c902d728dfa8d940b2f SHA512 b03219ab61b1b39f7d3c9ca00cd3442b15511c6bc93a82053f89560cdafb540492c0b91d081aab19d4e04960b6df3aaba819607e51a44698faad29a14bfe1e30
 EBUILD nvidia-drivers-396.24-r1.ebuild 15944 BLAKE2B 08a71847cda1985aaf86817cd865e4943de4ce25609a1db42861c07cc063456afec1abdd8e46c3fdba49c05bc57fd4b66a46f9a2e4e42e029355becad028fd87 SHA512 e9717a8d09b68f9fa9f44fba55e612cde824c4eb64287fd95fd3ccf47797e56fe137f6a93907249dc5f060af9607c52b9e125a0fdf9b859f53e11b154eb0e471
-EBUILD nvidia-drivers-396.45.ebuild 15945 BLAKE2B 01bcf2d8b1e4423fb89412075bbda270a018fad08166c4c4351bc57fa225107142c9dd007f22407cb224e0261f430a79787d06dd21d8f04075cfdcfef8dd8e20 SHA512 c742ec64ce005a4f7e9937ce2e6eb959920aa4ee6dfcda7b140423619990c954959fc6e6ae39417cb8f7e72f085fe06abeaf9585718b289fc003dd822e3280ce
+EBUILD nvidia-drivers-396.45.ebuild 15944 BLAKE2B 08a71847cda1985aaf86817cd865e4943de4ce25609a1db42861c07cc063456afec1abdd8e46c3fdba49c05bc57fd4b66a46f9a2e4e42e029355becad028fd87 SHA512 e9717a8d09b68f9fa9f44fba55e612cde824c4eb64287fd95fd3ccf47797e56fe137f6a93907249dc5f060af9607c52b9e125a0fdf9b859f53e11b154eb0e471
+EBUILD nvidia-drivers-396.51.ebuild 15945 BLAKE2B 01bcf2d8b1e4423fb89412075bbda270a018fad08166c4c4351bc57fa225107142c9dd007f22407cb224e0261f430a79787d06dd21d8f04075cfdcfef8dd8e20 SHA512 c742ec64ce005a4f7e9937ce2e6eb959920aa4ee6dfcda7b140423619990c954959fc6e6ae39417cb8f7e72f085fe06abeaf9585718b289fc003dd822e3280ce
 MISC metadata.xml 1275 BLAKE2B df5cb10ac396802437bf6efb3e80226124c11d6167bef2b64c3e525c17fb27213b13d7413ef909469440804a373b6e5c7088c53e0a6b44897860b7276ac3de6b SHA512 464ba5638a5d82a6e6bcbfe11b52759846f9f81e3f223cc313e0059b923427f21dab95b84595d6bffad4441fec96fe5f01044be572b72add8196a812f5682edb
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-396.45.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-396.45.ebuild
index 49a63be02100..2c010974326d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-396.45.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-396.45.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~amd64-fbsd"
+KEYWORDS="-* amd64 ~amd64-fbsd"
 RESTRICT="bindist mirror"
 EMULTILIB_PKG="true"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-396.51.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-396.51.ebuild
new file mode 100644
index 000000000000..49a63be02100
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-396.51.ebuild
@@ -0,0 +1,581 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	tools? (
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	)
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+KEYWORDS="-* ~amd64 ~amd64-fbsd"
+RESTRICT="bindist mirror"
+EMULTILIB_PKG="true"
+
+IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )
+"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+		app-misc/pax-utils
+	)
+"
+DEPEND="
+	${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+	tools? ( sys-apps/dbus )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? ( !media-video/nvidia-settings )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		<x11-base/xorg-server-1.20.99:=
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+QA_PREBUILT="opt/* usr/lib*"
+S=${WORKDIR}/
+
+nvidia_drivers_versions_check() {
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 18; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.18"
+		ewarn "<sys-kernel/vanilla-sources-4.18"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+		ewarn ""
+	fi
+
+	# Since Nvidia ships many different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_pretend() {
+	nvidia_drivers_versions_check
+}
+
+pkg_setup() {
+	nvidia_drivers_versions_check
+
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver && use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	if use kernel_linux && kernel_is lt 2 6 9; then
+		eerror "You must build this against 2.6.9 or higher kernels."
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		eapply "${FILESDIR}"/${PN}-375.20-pax.patch
+	fi
+
+	local man_file
+	for man_file in "${NV_MAN}"/*1.gz; do
+		gunzip $man_file || die
+	done
+
+	if use tools; then
+		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+		sed -i \
+			-e "s:@PV@:${PV}:g" \
+			"${WORKDIR}"/nvidia-settings-linker.patch || die
+		eapply "${WORKDIR}"/nvidia-settings-linker.patch
+	fi
+
+	default
+
+	if ! [ -f nvidia_icd.json ]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die
+		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use driver && use kernel_linux; then
+		MAKEOPTS=-j1 linux-mod_src_compile
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			AR="$(tc-getAR)" \
+			CC="$(tc-getCC)" \
+			DO_STRIP= \
+			LD="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			RANLIB="$(tc-getRANLIB)" \
+			build-xnvctrl
+
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			CC="$(tc-getCC)" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LD="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ "${nv_DEST}" ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
+			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
+		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
+}
+
+src_install() {
+	if use driver && use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		doins "${FILESDIR}"/nvidia-rmmod.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins ${NV_X11}/10_nvidia_wayland.json
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}"/nvidia-smi.1
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+	fi
+
+	docinto html
+	dodoc -r ${NV_DOC}/html/*
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+
+		insinto /etc/vulkan/icd.d
+		doins nvidia_icd.json
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1
+		doman nvidia-modprobe.1
+		doman nvidia-persistenced.1
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/ \
+			DESTDIR="${D}" \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="${D}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			PREFIX=/usr \
+			DO_STRIP= \
+			install
+
+		if use static-libs; then
+			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || \
+			doicon ${NV_OBJ}/nvidia-settings.png
+
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${NV_OBJ}"
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${NV_OBJ}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
+			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
+			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv2.so.2.1.0 ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLX.so.0 ${GL_ROOT}"
+			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLdispatch.so.0 ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libOpenGL.so.0 ${GL_ROOT}"
+			"libcuda.so.${NV_SOVER}"
+			"libnvcuvid.so.${NV_SOVER}"
+			"libnvidia-compiler.so.${NV_SOVER}"
+			"libnvidia-eglcore.so.${NV_SOVER}"
+			"libnvidia-encode.so.${NV_SOVER}"
+			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
+			"libnvidia-fbc.so.${NV_SOVER}"
+			"libnvidia-glcore.so.${NV_SOVER}"
+			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-glvkspirv.so.${NV_SOVER}"
+			"libnvidia-ifr.so.${NV_SOVER}"
+			"libnvidia-opencl.so.${NV_SOVER}"
+			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+			"libvdpau_nvidia.so.${NV_SOVER}"
+		)
+
+		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.0.3"
+			)
+		fi
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-wfb.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so.${NV_SOVER}"
+				"tls/libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${NV_LIB}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver && use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use driver && use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use driver && use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 0d457cdce349..0835be96b477 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index ac2149ecb2b8..ea6ed912bfcc 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -18,6 +18,6 @@ DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce
 EBUILD wxGTK-2.8.12.1-r2.ebuild 4675 BLAKE2B b73898dba9c7e77e560e7ba9ab960dc2608d20db1c2debcf70f4101fea9a05b832c4912e102f2cf8e29d03090fc3b25bcaf2ff6f73b19504d3197564fdfabc69 SHA512 8580b8f943fbbec1b1df60f58880c83064533afd8a4b4f5156b02aa4042e85cb1bbf17939ac08aebdd2488082d7e0f5d16e4cbe0c70282e57e4696e4e9b5fec6
 EBUILD wxGTK-3.0.3-r300.ebuild 5056 BLAKE2B 187c4e043e912beee9a58c9796866493fe83b85e5c814b30029bf5e4d92a3c561d814cd41e635028d97b9e9d8b7dbdb9b19694023caed063976b9ec1b919d5fe SHA512 aa1ba5f27f7593e0a3f57010509169173ab6521f66890400d2f654f636cbc154723cc2fea403c02bdfca516ef7ec5cf83e71be74ef5cdc543b2676d01ec3d65e
 EBUILD wxGTK-3.0.3.ebuild 3982 BLAKE2B 5b49474a6ab03648d801c2cc1e1df298bb52b2cc61c2e957368f1d2bb06f910d20b533ab1cf80dcf9fdf124b9c37b56b9233b775e3fc07803173d440e3a28e29 SHA512 4c63f058ba1c7eded7978a9adac5637d3d4b40de6cdb92eb079eb697a3792581a32641f4d8e6062181d1c2e763e2528416691f5b4fe8d88d7bd41092eeda0509
-EBUILD wxGTK-3.0.4-r300.ebuild 5206 BLAKE2B 3b049e8a49215ffe10e9d21638e3c90380af5c3c61c318620ce6ef6b873fadb2a18f8aa84e46349b954630510a5bff7dc1519f482fad2dd62cf415fc12dd1924 SHA512 e6634cc3ea88b04a9fb18bc0c106c766a09b832a689d29be58c8a1b7e795bc3d9536c4912f913f6870ebecb82e822b4dd3c1411aa224bec4a002d57f7c7a68fd
-EBUILD wxGTK-3.0.4.ebuild 3989 BLAKE2B f996515e9f676beb27f94a2d2f54e20c75fccfb65b0ae14973e80ce267d9e13360c1c45ee24a391340042dc9dafc51f5741ab5c5a37d1d662129134f03adcd13 SHA512 87d1cbf0b65e2eb5ba60261cbf36faf68183d112d683b480063d0806ce348f42f553887151f53a756e64d94b8cd153d62d85963cf299a294b531ae51ccd63a53
+EBUILD wxGTK-3.0.4-r300.ebuild 5205 BLAKE2B f0470fc04f824c5840873d68b0dcda93dbbf19cac3c246d2af0c88bc1c3f07e0ca476b0e0c84ad96331da4270aabf7e826eaf1f741fbb93dabef0f23aa4ddf24 SHA512 f264fd330c9a2b8c1b6065107501ee4b175a67bd8e69d26725ce48583cae83cb417a72b7cbc07ce050f2422ee325247d12bd177e825433610ee0dd6a6ee389cb
+EBUILD wxGTK-3.0.4.ebuild 3988 BLAKE2B 2d876e967e1962a0183b2bb0f4e267e53d51420f2c483803cd3840930d5060ba0943ab785e1bbf0632c0a5b353dc7b2ab69461d96a5f8307932e50bb17899464 SHA512 61d674309f469337f2727bfa083167a1d337a2a8a932b060ecae2631fd3eddd4cfdbbb1e7694603db58d38044e7a08d2ed5973915a1656776c67fad0b32ecbc2
 MISC metadata.xml 856 BLAKE2B 9f03dc05155eba5aee9ca7233d96dc7d0929df2a016dce4131b3b639358eea8ebbecfb5e7f59e7382f5467259885c14bcdc3df416a678f213cd58cd3096b4252 SHA512 f5308ab2b8d9d1964c23b175b30c6e728b16522a09a9cf907789a72296b4703f1da9a7b4d116d14cfffb8b38513d4c2830a70acb98b2df62a5dc67ed4e069abb
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
index 277a21d40717..37fc6ed3a0cb 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
 
 WXSUBVERSION=${PV}.0-gtk3			# 3.0.3.0-gtk3
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
index b0263676cd98..7fa67636631a 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 3de01e1e59dd..72476eb26024 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest
index 9509609b39a9..7c8dce740d3c 100644
--- a/x11-misc/kdocker/Manifest
+++ b/x11-misc/kdocker/Manifest
@@ -1,5 +1,7 @@
 DIST KDocker-5.1.tar.gz 173340 BLAKE2B a15b833fba2a2d1e3f1b55ad4d115cb09f55a57981076332fc86b1e607bac470705b8bc909d15ddd912b43d301e8c217b1fd175947879f053b250d8684556424 SHA512 df5880e1c19a436ef6b8ee92426f989b77f4dfd11f3a6a2357f425419ea61cd69f51250a10e92962a893611f0a14504f698ccef09322d62d20f5d49a506c4a12
+DIST KDocker-5.2.tar.gz 173508 BLAKE2B e44a924a085c2d237c113028f40a98cfa8a8a5398525aea4e38fadabd23a10cc91648a55f800afd2ad398b744ad450d9c7bc26dd5bae994603f6ea4b322b5804 SHA512 1a98bf7b6360f4ce042b3e5330798076d42bd463c16e41b259706811f11516a34acfb0ace59f2c10c07aa6b2ff8fc57b1b1fa3ccdd33d452e220ec46446e8b64
 DIST kdocker-5.0.tar.gz 152222 BLAKE2B b4e60a28f497476503f2a40aee4a776ece3a052adce4d29cb75095d9056ba0d6e4993838d6f771fad08532a3fb6d4022a07684f47cbd72289d34bce7196347aa SHA512 7c7702000621204d7e4acab295d43d05f71982af91524bc237878bdc9aa8851dc01a718bbe32412f46c718a1e358de8e710489a4beba9ef5b39359fe43662ba3
 EBUILD kdocker-5.0-r1.ebuild 964 BLAKE2B 34d68d6a6ce1518555e1312026e10aa8e92835c0e6600ad3d3a70b369650df76a568711e3a33727d1700db7dc9efaa7976ed0c7ad0a9633b3f497ba54c546044 SHA512 81d41b24645b5afab09d08f983fe29733ddaa8859df52e357d78258659cbe2e585f5fb3e47cb30cadb1138e3c1d6a5de3d7abbd046ecaf25134bda295eca2634
 EBUILD kdocker-5.1.ebuild 1085 BLAKE2B af70e64fad198e5689fb2a3ee7c0be8a72afe716cd783ea1254ecd6745f62dafae1c2822818d5012b1602c817b5cfc7bf8b8fb8c5e65c07abd4ae378ef429340 SHA512 d3c4319dadfa7353c3ccf8244868aea2e2db2246f981214e7fb725c9b12a9b51499902a02032d675af629b5e858460838b7c6c5025053d38020f20fc9c2fb8e1
+EBUILD kdocker-5.2.ebuild 1085 BLAKE2B ff54c8cf21bc4630b291121ba7f4775b80dd50c419b3296fb8c7c3f11c59470b30b45ff955aa852eb457366145dfcf4f7d0f2ebf84530eb79cca9125f5760494 SHA512 b768dcd72dea6333b4408823e9b57dc6f92d413f52f5122a29cb8fc5c7811abc754363fed72cd5f3d36830a7864a7ae4c9cddcc6e688af0a826b5167ce22e43b
 MISC metadata.xml 513 BLAKE2B 74790e6c3a0503c7092152bc6b74850ef0c2ae5fedc71a1ac887775054b5965a8c13aace575792488ee443552d17a5f2f5732d92255600a00082911857c9541f SHA512 51f230ff4133f037ad1d92a18224004d27d0382efe842cd9c3d012f4589c611f9788d333c5bdd33936964aabcce4d96d790a4045b6a3cbbd37fd11597a3a5ea0
diff --git a/x11-misc/kdocker/kdocker-5.2.ebuild b/x11-misc/kdocker/kdocker-5.2.ebuild
new file mode 100644
index 000000000000..43c6d71eef65
--- /dev/null
+++ b/x11-misc/kdocker/kdocker-5.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 gnome2-utils qmake-utils
+
+MY_P=KDocker-${PV}
+DESCRIPTION="Helper to dock any application into the system tray"
+HOMEPAGE="https://github.com/user-none/KDocker"
+SRC_URI="https://github.com/user-none/KDocker/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXpm
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS BUGS ChangeLog CREDITS README.md TODO )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	sed -i -e "/completion.path/s%/etc/bash_completion.d%$(get_bashcompdir)%" \
+		kdocker.pro || die "sed failed"
+}
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/nitrogen/Manifest b/x11-misc/nitrogen/Manifest
index ee7dddb9a767..3bafac9f4264 100644
--- a/x11-misc/nitrogen/Manifest
+++ b/x11-misc/nitrogen/Manifest
@@ -1,3 +1,3 @@
 DIST nitrogen-1.6.1.tar.gz 314332 BLAKE2B 4e2ce39a770434e35250cc2ff2bff792f3943eef489a0dc9b897b47fb98c3791cf633974ded2481b6e29ceb00f26964115254cc047041e77954563e82c7cd44b SHA512 125bb62162da95c3aab8c146f93113162c171512ffd3e8e6011fff22f1a1b841d1ffc9b4df4fd1b0b62a3731c68cd30c8448dbc836e9861216f50068d8b08c9c
-EBUILD nitrogen-1.6.1.ebuild 925 BLAKE2B fd49794f48f03265a8f304af08d87151b370838b591591f653d8fdd01bfacf8d88a6ea4269c23e868695cba4444b6e13514fddf1914c5b87cfe1621b64a4cf58 SHA512 cf87618030b411868e8cda395bc540d0dcf7a0f74b413e0ead50693336d3198a9460574eff287e33b741ca33091147c8e990a3c5bd9e0877c275639f96173e4f
+EBUILD nitrogen-1.6.1.ebuild 930 BLAKE2B 79555c78a52cb219eb57879ea93c6bd42bf6ac3aa73c7b91e1c8170d0d7245bfbcf469ea0a482f0bf855a392a9378258800109d669d123a60e4f9add088b2e04 SHA512 8c27a5ff194a32869eff972bf3754add2f0b65d2b3b3c1aa07d960f0e55f1c6a1ca7207e03b574b3640b10605f60ee4dbce2980417d6f8446b64d270d31974dc
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
index 90955390f26a..aee77e158ce4 100644
--- a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
+++ b/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://projects.l3ib.org/${PN}/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls xinerama"
 
 RDEPEND="
diff --git a/x11-misc/parcellite/Manifest b/x11-misc/parcellite/Manifest
index 0b2307a3277a..5661e79a55cc 100644
--- a/x11-misc/parcellite/Manifest
+++ b/x11-misc/parcellite/Manifest
@@ -1,3 +1,3 @@
 DIST parcellite-1.2.1.tar.gz 763956 BLAKE2B 487029ed2d0492a1b8fe5e8093ab5b1d488db22798b18dab130da339353d6bf6e5525cd4d5fbdf68526946156d646dd2ce1095d07167785d3aa23d81a163b094 SHA512 14b513e760e205666e00893dffb75ef3d42994aaeca3238b5adbed4af7495a7ed67cfabdcb163024fb9b0a7e832599bb31c54201217ac3fca88e0a4a22deb53d
-EBUILD parcellite-1.2.1.ebuild 912 BLAKE2B f28ef108ca219e74571b3a55dada22efcb796e79236cd44a7b39434697c945d595a1fdbdae132b1fab8e9c4e9419d5fd9f44539938b47df5271e04694499877d SHA512 ed522a80574afec519adb65b5a472459bc720ec0a99912002855268bbe48742127b6c7b80b839e8652ab603044262f2516137670e0771ff2428e97ce997daca6
+EBUILD parcellite-1.2.1.ebuild 917 BLAKE2B 0ad8e9f22bcb9b756dea536d4ef7f01e8f83315d8371319195793bed70f4600f5e247923bb7159cfa7fb89aa4eb9d22b7e316fa213fb5432b7dd5e6afe32f524 SHA512 758ab9d185efa59da38cbab49e3429d9d7c6f0adf3c45caf5b5f86f0f3385accc0c9e61fc93a414ca3761b68454f70af5eb29f8e32743b52aa984b2901ff0f80
 MISC metadata.xml 356 BLAKE2B ec9d32ba673b4c7e352e0e555f1a8959ad52dda9cf2d8ee57a02ed59b5c010b08cbd3d8582dfaff3f5dca9891e3b50f0b32a843f143d680796bd171b44a0d894 SHA512 fa6f71f1385257ab9df7e9236275f2f9fbe4c66828c9671a60ae40dae0d9c600113102f02de254c5c31ad99975e9738a2af50480822b9c3f9a7cb2be269a3385
diff --git a/x11-misc/parcellite/parcellite-1.2.1.ebuild b/x11-misc/parcellite/parcellite-1.2.1.ebuild
index e70e339d09f9..b89ab441c540 100644
--- a/x11-misc/parcellite/parcellite-1.2.1.ebuild
+++ b/x11-misc/parcellite/parcellite-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/glib-2.14
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index caae71f6e0f5..ac91cd5604df 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,8 +1,10 @@
 DIST i3ipcpp-0.7.1.tar.gz 191417 BLAKE2B 62b76a0921c78f374309d26856c01d1467b8bd181ce922fd47daec406afda9d76eea9a1f473b4899e22f99e2ef36fc70f72db1bb17eb1f3e71a8431c2634b915 SHA512 ef9f591bb4436916ad038bcb0c15ea3415d1978ff264fb276108ddac89c98515c464fbf252429f6a76589cb78e1434adba2efefb5a844dadad0e261f3806fb72
 DIST polybar-3.1.0.tar.gz 418298 BLAKE2B 1c7394a17ff1ec5b0dec519b7aa58e63cfcec0f104d4302051f6e12753b7074c3d85072a3d78e7ce135c53d4ddd4a6f68ea61ffb7b2ad04997bbf0c836115046 SHA512 6d8759d9f750c2abfa79fe735615b0ed3d1827e3a88561317712c6f02cb32a0a77726f97cb419f3a040ae9085a34a23cb1aad0aacf3f14e56c542977b89036b2
 DIST polybar-3.2.0.tar.gz 242314 BLAKE2B 1bdecba237f6d400479305caa2e571b5de708b07251c77f999fdc16af4c89a54ff722956c24b0b188aa76b5418cdf159eb21004091d87d2b93e2d43ba8a888c8 SHA512 14516e37bc39736eddb53aaffd38bbfa8443fa6744bd3bd374359b9d55c085c89f59ecaa80f31815f4828398d378d2772bbd79fac36a639a208814a0bf230930
+DIST polybar-3.2.1.tar.gz 242327 BLAKE2B eb7bfe6e6d58fb4389016b8e5c73feea3984ce3ccefdb1acf202c6d2873a634e4d096658b850e8534c5c8c56e42ac66b3b8e80dabf5625491e5f56523b043ddf SHA512 e93c33738029b2e56a5dda75cbf3ee804c0d89c406444da6991ea8a5dd00e5544ef51d20f3d67ec293fc55ab7095e8e3057aaf8d1c08af61cf0531297e55a18d
 DIST xpp-1.4.0.tar.gz 84095 BLAKE2B 2af4221953abe7f40473c55cd50c608b54ebc85a62be65af987ed5e6c5eaf56fbd92531788becf39ba5ad52099ac78f36e9b2a2515b473f4d86ed5fda3fa5065 SHA512 d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
 EBUILD polybar-3.1.0.ebuild 1694 BLAKE2B 140bcf98cc7dd8b0928c313d93335117e3196fe7da14808ab2a9416cffcfa802b100ff66ebcbada4e5ae9a2754641c2622b002e459ab100ed4be89b838693892 SHA512 1f60c5389d5e217bc6409fdd0a91bd7b0563606134a5528d8121325e88bb9967374cd4cd42d40a493eac6d93c35bcf1e6095357a93239d7622a2c93d6e32f670
 EBUILD polybar-3.2.0.ebuild 1788 BLAKE2B c44044b3a7e3db34d10c9e018e52f192920f8a42fa6ea93e27c3cd0109143d8331c5f28e74958ed90fd569c632aa88257132c61625b0f5fb30cdfdb09f91b460 SHA512 db2abec6f14c08ed7beeff4fe90b2d832b5f249b64e5b0e4897316de597675bf06e4704ae8aa8635ec40fb3eca0e9be81c38889e82ddb7e98b73d99a69529980
+EBUILD polybar-3.2.1.ebuild 1788 BLAKE2B c44044b3a7e3db34d10c9e018e52f192920f8a42fa6ea93e27c3cd0109143d8331c5f28e74958ed90fd569c632aa88257132c61625b0f5fb30cdfdb09f91b460 SHA512 db2abec6f14c08ed7beeff4fe90b2d832b5f249b64e5b0e4897316de597675bf06e4704ae8aa8635ec40fb3eca0e9be81c38889e82ddb7e98b73d99a69529980
 EBUILD polybar-9999.ebuild 1187 BLAKE2B b42e5685622509643cd9b8c73c2d119eb0adfc5904c52ddce1b66cb0ae4735e05e46a8e18e98f62ee6f47080c57869704b11fc2af7e593292d9736ee4d533551 SHA512 e548c3f17e6ee4c2f5190d5706d83ca567eb3c2f5c2a8bdda6e9984e6d2ba36b1f38c6052095152ca02958ff2fda7af211ff13e44f1294a0c4c7bf2a998fa5d0
 MISC metadata.xml 696 BLAKE2B 2b2762500174e5b8674161433cc5c862158dc1db4e057b4e92d3c7433e8c286a80111dd311bba04631f71d2a58817ed2c745f024da1a39b5622fafc57525e346 SHA512 a3fbaea3fa687472a671c7b209bcabaf8a3fcab86b53aa357aa776cc3b57a565eae933b50a6238dc73d46659ddd893ad1dbe9f312d828d05c26cf0945818d322
diff --git a/x11-misc/polybar/polybar-3.2.1.ebuild b/x11-misc/polybar/polybar-3.2.1.ebuild
new file mode 100644
index 000000000000..480c094886de
--- /dev/null
+++ b/x11-misc/polybar/polybar-3.2.1.ebuild
@@ -0,0 +1,67 @@
+# 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 python-single-r1
+
+XPP_VERSION="1.4.0"
+I3IPCPP_VERSION="0.7.1"
+
+DESCRIPTION="A fast and easy-to-use tool for creating status bars"
+HOMEPAGE="https://github.com/jaagr/polybar"
+SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/jaagr/xpp/archive/${XPP_VERSION}.tar.gz -> xpp-${XPP_VERSION}.tar.gz
+	https://github.com/jaagr/i3ipcpp/archive/v${I3IPCPP_VERSION}.tar.gz -> i3ipcpp-${I3IPCPP_VERSION}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="alsa curl i3wm ipc mpd network pulseaudio"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	x11-base/xcb-proto
+	x11-libs/cairo[xcb]
+	x11-libs/libxcb[xkb]
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	i3wm? ( dev-libs/jsoncpp )
+	mpd? ( media-libs/libmpdclient )
+	network? ( net-wireless/wireless-tools )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	rmdir "${S}"/lib/xpp || die
+	mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
+
+	rmdir "${S}"/lib/i3ipcpp || die
+	mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_VERSION "${S}"/lib/i3ipcpp || die
+
+	sed -i "s/.*cpp_error,.*/&\n\t  'eventstruct'   : lambda x, y: None,/" lib/xpp/generators/cpp_client.py || die "sed failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ALSA="$(usex alsa)"
+		-DENABLE_CURL="$(usex curl)"
+		-DENABLE_I3="$(usex i3wm)"
+		-DBUILD_IPC_MSG="$(usex ipc)"
+		-DENABLE_MPD="$(usex mpd)"
+		-DENABLE_NETWORK="$(usex network)"
+		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index 03af5648f9d5..1db031237345 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -7,9 +7,11 @@ DIST tint2-0.14.6.tar.gz 466533 BLAKE2B c7308771e8a5a7d49410d99779ee54fd19b7d5b7
 DIST tint2-15.3.tar.gz 500301 BLAKE2B b8b405f1c56c3de41f672dc02acef893b0650fadca9a4823c7b249661e8675e01c92c9c1588d32c2836596f34c4dbc1e5d2608cff3c75590d7eeac9e925eb874 SHA512 41ae8f8e3aac6fe55539c531889ec2883534072ad398f0693e4bfd39c80dd4c64d635a36e063f741fe89fd461f66f92adf6acdde553e0f8b169992d94dc0e344
 DIST tint2-16.1.tar.gz 534354 BLAKE2B 540287bd952ba8b54372d45055efe216dc4d9d192e33d6f83f2c734e97b9e350c7be0cb3e19d414f4e11c0bb7b505307899dea9c10ac382737a2507f7df4fdcc SHA512 c6319d5692d53e56c150906c32c794ee4237e06455efb68527b379b4ae00c48d996c63ea02ee6aefc70266335eb4cb08b4731556075c46d435b7861de6eefd3c
 DIST tint2-16.2.tar.gz 537236 BLAKE2B b8ff236f4c21465603c3cdf1e3d9f62e238cfbd05fbb7976e4f90ac054566eb433d8be78ee657421b94465dceeb8461ace202090b08585693f13003d401e4faf SHA512 0e267d59aef3d812ab41c1e5904e3e96162afd8d98c76dc697fe8c2815707f34a31e392f68260311bdc66fcb4c0b1766ad549ff30d4314e6ab2e2debf069cafe
+DIST tint2-16.6.tar.gz 546960 BLAKE2B 083e29d754c1faa9eff50dc480d18df99d64f44a2f88673f06e659d55de13c074eacf4614a57211d5b5aeec3a10f3d68471212d24a7280020b52fe91777d305d SHA512 f81770f330d3f2462292f726a6a90ac0182c518b2db7d79f098babe52863e5ceaf4293f975708f83fbc26735c79fdfefd110102ef0f4be45ae242b4f664d72b1
 EBUILD tint2-0.12.12.ebuild 1400 BLAKE2B 9f386182995036c6f99f279c461f26486d3ec05bb3f6fc4eb7e94f12c002f6a2404b3f408e2704f144d26949780dfc6c3686708a3a762479edc4ca5aa1cd3ed8 SHA512 97b0a093ba91d254201b1105524c5eb087d09589be1560f5adfd76da26b803da3efff44f3974e273d694086dc3f50693c6a5cae1798fd1e11be98d6942167d0d
 EBUILD tint2-0.14.6-r2.ebuild 1341 BLAKE2B 8a26bdde86b7c5c0b44e05c184c7f6f2994c1ba52884025032aa71058a6ea3a3f0a35ba0abe69429ba608dc389c28ba609d868bea58a6b4a6ad08981fedb1637 SHA512 a76155df865a0b6dd2c12709f42e2848b9330e51a0c55392c42caa76f017550a94343469b741cfbee375f527b711a8a158efdccf315f3917442f13fec91d19f7
 EBUILD tint2-15.3.ebuild 1273 BLAKE2B f481e61000569a5491f3d02a03fbf74d2e824ece425c38c6ebe2a9d342c53881ac6a53c02c962e783dd609d8cfa4d9ebbd34374f5e2226980c17fa92462a89c9 SHA512 661effd4bf12390e7fdcd08e363ae7d8dc8aa9d4388c65b7f0360d6f9529ac60223edfe0f993cf99edeffe7f002f8e0eab436c58261be7f77f9e933e17667c8e
 EBUILD tint2-16.1.ebuild 1273 BLAKE2B d5b94cf497e38af830142fb500bf3178d3143382e856fe9a08d31774e4dcaee0b396e5e1c0f669cdec34e632d23fc957a67c986b0255a6e3faf75f3bc2135320 SHA512 2ed8566ffaa82189d804d8a5ce891df27e805d3a3539c30fd832c8edf1a779b0e799747a23f9a3d74407453317f77d27c3432e22139c9e09257075f05bb43899
 EBUILD tint2-16.2.ebuild 1273 BLAKE2B d5b94cf497e38af830142fb500bf3178d3143382e856fe9a08d31774e4dcaee0b396e5e1c0f669cdec34e632d23fc957a67c986b0255a6e3faf75f3bc2135320 SHA512 2ed8566ffaa82189d804d8a5ce891df27e805d3a3539c30fd832c8edf1a779b0e799747a23f9a3d74407453317f77d27c3432e22139c9e09257075f05bb43899
+EBUILD tint2-16.6.ebuild 1273 BLAKE2B d5b94cf497e38af830142fb500bf3178d3143382e856fe9a08d31774e4dcaee0b396e5e1c0f669cdec34e632d23fc957a67c986b0255a6e3faf75f3bc2135320 SHA512 2ed8566ffaa82189d804d8a5ce891df27e805d3a3539c30fd832c8edf1a779b0e799747a23f9a3d74407453317f77d27c3432e22139c9e09257075f05bb43899
 MISC metadata.xml 789 BLAKE2B 95159a0de8a09e4381a7cccf494554faecd8ca1e20e3d175eeb1ef76015f7609a3fe6cbbc0208414b7b703d78339b0a8b643263766269e1e466506ee25a4cbe7 SHA512 e50c127a10ae89a7ec04c7b3a1d5dad3fd1ca89ac37b66378d8b24921d3ffe43ea4037182e20a624880be0eea527414e3727726e6799bbec4d46e2d3bdc934cf
diff --git a/x11-misc/tint2/tint2-16.6.ebuild b/x11-misc/tint2/tint2-16.6.ebuild
new file mode 100644
index 000000000000..f7cbd25ca6f4
--- /dev/null
+++ b/x11-misc/tint2/tint2-16.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils vcs-snapshot
+
+DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
+HOMEPAGE="https://gitlab.com/o9000/tint2"
+SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="battery svg startup-notification tint2conf"
+
+DEPEND="
+	dev-libs/glib:2
+	svg? ( gnome-base/librsvg:2 )
+	>=media-libs/imlib2-1.4.2[X,png]
+	x11-libs/cairo[X]
+	x11-libs/pango
+	tint2conf? ( x11-libs/gtk+:2 )
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXinerama
+	>=x11-libs/libXrandr-1.3
+	x11-libs/libXrender
+	startup-notification? ( x11-libs/startup-notification )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_BATTERY="$(usex battery)"
+		-DENABLE_TINT2CONF="$(usex tint2conf)"
+		-DENABLE_SN="$(usex startup-notification)"
+		-DENABLE_RSVG="$(usex svg)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 18810154b630..6d8ffceca29b 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -2,10 +2,12 @@ AUX xlockmore-5.46-freetype261.patch 587 BLAKE2B a5666fd2c06d23b388d20cc8fbb6b64
 AUX xlockmore-5.47-CXX.patch 613 BLAKE2B ace9eb868bcdf4fa7fda07d5a0dfc316f992fd176616c531aa71ff5d051169165f991dd8a586685b5a0b8e1a66b0da247a441fd7a56ecd24cc39bd58f2267e8b SHA512 4eef79a2b791401433ae0c6e55179975f88b74c4e57cd64ca81df48a232723e5edaccbd7045c9f67ba81ba159e70257d5e070ea59808f52430ac08539ea91087
 AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b87323ce9167e7a3e0a44ca2fca853b16e9c1ff59ff74b0bf50b3484e25722a3ee840b312f2f249644614aef55095bfcc SHA512 2de24cbacab2a54e7a41f4604625096030763ad6212ec30b34be2c2fc4035b44f146bfb9d0a34df9c9ce4fa96a0eb1c9c7701b512a917fdf3eb56a5195c8585e
 AUX xlockmore-5.55-soundpath.patch 877 BLAKE2B ede21934cdf23055c6177d6441bef5fb3b9cee4ee478d1aaa30a6a92ff357071a4e931af24afae81080d8eae03a012cf1cca29bcebe7540969d88385a0bafec2 SHA512 562eb7992972adad5b5f688b6f822453e878a79297e9517ce4920c2907bdc60e08f9d854a7bc4491fa740a3551474c432c59c1be6e2750504935f4209df4b9be
+AUX xlockmore-5.56-soundpath.patch 501 BLAKE2B 1d0197fb2a16f47560033f2143a53e3c7f20863fa809a22989b458235c196ee0d85e0c391d6b61ec169795ca65b36d180f8a5683604f8fd14bb4caee90bd96d5 SHA512 1f0768647b965322210a0640144d56e40dd95912998a5b7004071139c1e305741cb10bdd27c0297e957b2a78264c867a579f0a7f2af389d473fcef897126df97
+DIST ax_pthread.m4.xz 6356 BLAKE2B 784bfa3fcae2499230acba588cea5591f62229d721cac357012c5d19b0a506c2d77201145eb90cdb15217190926cdad09cf5897e49dc3644be41ccac30e60ee2 SHA512 04dddd91a98a4f544d065de1b70340e6835657015385959d98c3c5eedea175f58657db73b60011af181a8cf2ff5d48d533cedfa6020943d8b41770bdc4aae329
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
-DIST xlockmore-5.54.tar.xz 1647652 BLAKE2B 2d949adab766d0509cf6af7a44fdc25db58aa38973ceb00faf82bb6694a1a4848a6e88c93297ac8eb18ee5b8e0448e1d70853edf4585fb758445052c36ed6b0a SHA512 027a750d8fb9d17619441a8f76456614e0b91b4963a80810e24d4aff46a8c3217464347b0910c00ce54c25ab6678159dec3c3ea60ee61f7624015950590d7f5d
 DIST xlockmore-5.55.tar.xz 1650116 BLAKE2B 4c50f9a0f4f4c5d02c002363e75eef22b19f52cb05db305f013bb105d47f3981b00f65ee66937c9bb7d971772cda90e2565345fff25fb8c593cdeefa0cf10ca7 SHA512 b6d322bbfbf5710c0fb94da6ee894902fe6c2c87f949c80a27f7924c26a20ede5a3bc40a085c00d4a41dae450c862edaa4d50f716bf3041668d89c7c1d8b4902
+DIST xlockmore-5.56.tar.xz 1649808 BLAKE2B 82d56a3570bd1be52014503d7c0a36cf27f68aaf31fe4a7ed06159dc796dbd1410711a56fa8e72709499b1ceb3063b2acd9646ba38400669d3671d04e9fb5745 SHA512 1ae5cde5d0167897229e9cb8ebd15e26fdeadc9b0e2d221e6334980f23403385bf1adbd44a955b455e3ecdf8b02b18b0e06273d8dc566b17ac3692ee5ae44f4d
 EBUILD xlockmore-5.50.ebuild 2165 BLAKE2B feadf465ae112ad5d4b482a0a4fda8293eef90f2daf76076d37175182dfcd2491f7fde83af37298e35eedb65f7c27b3915e3f3ef60b4c3ec1ee6145dad125ee5 SHA512 982a26f33a14d5ccfee07f190cf4a4391c2f767b000e8ebdbe46a6f71650bb4beb9d1758fdf947f801b27bc3f331eac5c9e95d6cd779ebdb5d81e1cedf81c673
-EBUILD xlockmore-5.54.ebuild 2172 BLAKE2B f9adf509e391b0a2ecb2307aa495cfca563137018b6b3cb4154e14379a59547866df9a65bba07ccb40c25188f4477c076caf8dec8706e8b6f2086ee5116314cd SHA512 df476dffef2b870481f0f521d58e4d1fad11e57b0249d6949195a99f61213ed51d28f83637127e5d354cf21850f8d970e972270452581d2569795b9dabd800a0
 EBUILD xlockmore-5.55.ebuild 2258 BLAKE2B ce8dd6eadcd5cd3b30e9d7868f5ad3031df3d8c7bbbfca6f6c564fd9f6b2fd396f824f3845f68691516feabc1f8b4859d6a4d348fd7ef2d10a758fa6288fef23 SHA512 dea44c4c0da3706b6ee64997d5a0078bef7045ba365215f8bded41c3f8bfcd69027e3771fcc328aae73933a42dd8fcba8e4e5df1941a2a603d76d12af950d7c0
+EBUILD xlockmore-5.56.ebuild 2422 BLAKE2B 90a79533897d5e0cdab0d3b4fa4009894c50ee6b2f199078e38a9ff873da117dc9c0c5935435c5b640edf4d9c147512ab9e4a57fb70502b150782bc9ed3cfecc SHA512 6d88bf97b12a880203fe79d788db105685ab219c94ee5ccc33ff99d1120d39e3a8c7d5cd4cccddbfc507e13abe0710054e306c0442e5adee625bccf096526895
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/files/xlockmore-5.56-soundpath.patch b/x11-misc/xlockmore/files/xlockmore-5.56-soundpath.patch
new file mode 100644
index 000000000000..a5c9079e3aeb
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.56-soundpath.patch
@@ -0,0 +1,11 @@
+--- a/modes/Makefile.in
++++ b/modes/Makefile.in
+@@ -624,7 +624,7 @@
+ install-sound :
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	@NOPLAY@$(INSTALL_SCRIPT) $(ETCDIR)play.sh $(DESTDIR)$(bindir)
+-	$(top_srcdir)/mkinstalldirs $(SOUNDPATH)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(SOUNDPATH)
+ 	$(INSTALL_DATA) $(SOUNDDIR)complete.au $(DESTDIR)$(SOUNDPATH)
+ 	$(INSTALL_DATA) $(SOUNDDIR)identify-please.au $(DESTDIR)$(SOUNDPATH)
+ 	$(INSTALL_DATA) $(SOUNDDIR)not-programmed.au $(DESTDIR)$(SOUNDPATH)
diff --git a/x11-misc/xlockmore/xlockmore-5.54.ebuild b/x11-misc/xlockmore/xlockmore-5.54.ebuild
deleted file mode 100644
index f0e831cad9c0..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.54.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
-SRC_URI="http://www.sillycycle.com/xlock/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-RDEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( virtual/pam )
-	truetype? ( media-libs/freetype:2 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-flags -DFTGL213
-		else
-			myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	pamd_mimic_system xlock auth
-
-	if use pam; then
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}
diff --git a/x11-misc/xlockmore/xlockmore-5.56.ebuild b/x11-misc/xlockmore/xlockmore-5.56.ebuild
new file mode 100644
index 000000000000..7679ed6cc890
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.56.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://dev.gentoo.org/~jer/ax_pthread.m4.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( virtual/pam )
+	truetype? ( media-libs/freetype:2 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.47-CXX.patch
+	"${FILESDIR}"/${PN}-5.47-strip.patch
+	"${FILESDIR}"/${PN}-5.56-soundpath.patch
+)
+S=${WORKDIR}/${P/_alpha/ALPHA}
+
+src_unpack() {
+	unpack ${P/_alpha/ALPHA}.tar.xz
+	xz -cd ${DISTDIR}/ax_pthread.m4.xz > ${S}/ax_pthread.m4 || die
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use opengl && use truetype; then
+			myconf=( --with-ftgl )
+			append-flags -DFTGL213
+		else
+			myconf=( --without-ftgl )
+	fi
+
+	myconf+=(
+		$(use_enable pam)
+		$(use_enable xlockrc)
+		$(use_enable vtlock)
+		$(use_with crypt)
+		$(use_with debug editres)
+		$(use_with gtk gtk2)
+		$(use_with imagemagick magick)
+		$(use_with motif)
+		$(use_with nas)
+		$(use_with opengl mesa)
+		$(use_with opengl)
+		$(use_with truetype freetype)
+		$(use_with truetype ttf)
+		$(use_with xinerama)
+		--disable-mb
+		--enable-appdefaultdir=/usr/share/X11/app-defaults
+		--enable-syslog
+		--enable-vtlock
+		--without-esound
+		--without-gtk
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+	default
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	docinto html
+	dodoc docs/xlock.html
+}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index e3c9ef0ed8d0..4ea3aa2d5ad7 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index c8e52f69ca33..09fc8ac50310 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,9 +1,9 @@
 AUX enigmail-2.0.5-fix-missing-missingMdcError.patch 1059 BLAKE2B 70b247f23be20df0dc9b5edb77eb48f56a2538f53af50f29b11ef0ca5c0b196e80b7adb3f1687d6ee3a1246935cc0d299f4c2f74f5a6fab89be5620ade66da1d SHA512 fa7ec8a1390636af1380a9a25f4b8b8cf23c13f82fe5bd1ad555d4a88b5cbef28d89e8dc706d738a5ec54d1d4fc439f630aa660e91509efb7709e6b2ce3013ff
-DIST enigmail-1.9.9.tar.gz 1787556 BLAKE2B 729cf7e404b4cc5d964df476e627b476916cd6c834ce5f220a26738bc32eabbd9fd2c4c3cbaccef6e1d8c4b5b7313b54278a4170808f8b722443b338fda87b55 SHA512 39b37305362c88527d897ed95aa9d8457137d5f026359d19b838ab9df531c14099e157afdc8fefae78a6fa2ddded8dbfbeaf84eb91ac6cfbb05ae808731da2cb
 DIST enigmail-2.0.5.tar.gz 2534693 BLAKE2B ad5984b74df2bd1c563f89a23136d9c9742aa7ba94d5683b9046f93eb11c5f729231497e5bb6e8c002c03feb55f2e2a07b43063bc63de3c7c578ea5b4b136fd1 SHA512 9edf78f38dbdb73f16190cc6b08eb02dcc199c41026003d19ce302a48fb4d9a6be6e765bbb7a8ef7f1bc3eea1065182437850da23c3ef5b89d1d5c66c602480b
 DIST enigmail-2.0.7.tar.gz 2537431 BLAKE2B 44088c12afaf285a8a1d735e02b54998af14b9990f1ab75b9f20a63c3b6fcd5b115bad18601876bd00d6910fa6da5d37e41c4b9a34102f5c1f4157bc7929d3bd SHA512 37572dbc2d5df549c3e1d5bbb8a78ce41af66072eabf4d340d98656e89be6fa1bd68fc2591827ec13cb0e32333f2e54f16b08f28dca5d7b576f9c16701f6f960
-EBUILD enigmail-1.9.9.ebuild 1922 BLAKE2B 91c9d28229704a6fc1b529a3b9948c3b4b32e097a2f9ec4d44e9e036ad2b7615314c1cf14120e536304cfb43c3ce0d71a6e327f92992c4f79b51ad484ffad6dd SHA512 b2e8dd3b86c1aaf37954c067bdaae67217f7446317817af837f9a2affd4c886d0e3d3b81b10f402105cd54a4534449a86ebe69673024367a34467fea400b6cba
+DIST enigmail-2.0.8.tar.gz 2525691 BLAKE2B cd69efe72b661bb103837c987937e1cee64a5888795bda7126c59cf99a39c0245f505cdfd6538d54cec5dc3fc95c64bbeca3aebc4b0823249be4c0465d4d68a1 SHA512 9d2e95c2eae6ca22897eb8b2961964d96fd633e7d33a8c0c04a29b4cbc8585777598578abfb0484b96827ca165fe9c8b873e5e7f7cb3ba8cd0779ddc4f10e305
 EBUILD enigmail-2.0.5-r1.ebuild 2238 BLAKE2B 9516c87fd4eac167cddc7a56aeaedbe6b6246073f5ff0aa0fdaf8f3fdc4269145acc4047fd5a237bc920311900cd231022666e14c56fbc06add0e02d7d9df492 SHA512 f2a995dcc145b558ea642c7eaa05f6bc71bec1b5e20ef9d871357495c16c11da2b445c3cf3f57d1592bca3e414f27178c44f37258ca04560057cea47226efbef
 EBUILD enigmail-2.0.7.ebuild 2176 BLAKE2B 941c7f06bb44515c26c920ba15fe6c7babb041a01c84ac747c72c1bb3ec0e652a92a6277b16912724ef39250553ee7853f3d96883224b3ebb0552b2e38b56c76 SHA512 4fa175b4ad4412c7e3f18fcbb8d5dcb4cce5605dec07dd39e62e6ff1399d9f805d228ba9d0de083f66ac8802d0af8b2b5e6189e7baafc378cb418504fdfa6376
-EBUILD enigmail-9999.ebuild 2105 BLAKE2B 47053af959ddf2b745ad0aa620b8e1666905e5bb0ca60cb7fe8cfe02eb8160cbbc981940a78a0ddb0c01e1e7a557465f243eea15c44d6ff7e613f03695d58076 SHA512 4c7c4051d47d1692cd8eff3cd1d32027cbc6608257faf2fe437483df9676b70c320cb5546acd632142d8de0c612c6a6281d5eb6d151eeac494c7c1b359060a3e
+EBUILD enigmail-2.0.8.ebuild 2145 BLAKE2B fb0219dbaf4167de4e12bfc9a556b879b9eecfed12c4c4ec1f0d4135674afff9d5805f1350207c800508efca766afa7f1198001bf875c42077744555df1ac249 SHA512 c4e1beef4e1514fd107585a3c9b5bf3948e179500d5eb0b3af36b33e08294dfa756d831c6a22769980737f9f39903e745bec3bcfcdcc8b775522d17aa70e00cc
+EBUILD enigmail-9999.ebuild 2145 BLAKE2B fb0219dbaf4167de4e12bfc9a556b879b9eecfed12c4c4ec1f0d4135674afff9d5805f1350207c800508efca766afa7f1198001bf875c42077744555df1ac249 SHA512 c4e1beef4e1514fd107585a3c9b5bf3948e179500d5eb0b3af36b33e08294dfa756d831c6a22769980737f9f39903e745bec3bcfcdcc8b775522d17aa70e00cc
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-1.9.9.ebuild b/x11-plugins/enigmail/enigmail-1.9.9.ebuild
deleted file mode 100644
index 91af46035151..000000000000
--- a/x11-plugins/enigmail/enigmail-1.9.9.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="http://www.enigmail.net/"
-
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-3"
-IUSE=""
-SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
-
-RDEPEND="|| (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk(-)]
-				app-crypt/pinentry[qt4(-)]
-				app-crypt/pinentry[qt5(-)]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	)
-	!<mail-client/thunderbird-52.5.0
-	!<www-client/seamonkey-2.49.5.0_p0
-	"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake ipc public ui package lang
-	emake xpi
-
-}
-
-src_install() {
-	local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf)
-	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
-
-	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
-
-	# thunderbird
-	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-	doins build/"${emid}.xpi"
-
-	# seamonkey
-	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins build/"${emid}.xpi"
-}
-
-pkg_postinst() {
-	local peimpl=$(eselect --brief --colour=no pinentry show)
-	case "${peimpl}" in
-	*gtk*|*qt*) ;;
-	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-		ewarn "You may be prompted for your password in an inaccessible shell!!"
-		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-		;;
-	esac
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog ""
-		elog "Please restart thunderbird and/or seamonkey in order for them to use"
-		elog "the newly installed version of enigmail."
-	fi
-}
diff --git a/x11-plugins/enigmail/enigmail-2.0.8.ebuild b/x11-plugins/enigmail/enigmail-2.0.8.ebuild
new file mode 100644
index 000000000000..7f808de531ff
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-2.0.8.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
+HOMEPAGE="http://www.enigmail.net/"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-3"
+IUSE=""
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
+	S="${WORKDIR}/${P}"
+else
+	if [[ ${PV} = *_beta* ]] ; then
+		SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
+	else
+		SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
+		KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	fi
+	S="${WORKDIR}/${PN}"
+fi
+
+RDEPEND="|| (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk(-)]
+				app-crypt/pinentry[qt5(-)]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	)
+	!<mail-client/thunderbird-52.5.0
+	!<www-client/seamonkey-2.49.5.0_p0
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-arch/zip
+	dev-lang/perl
+	"
+
+src_compile() {
+	emake ipc public ui package lang stdlib
+	emake xpi
+
+}
+
+src_install() {
+	local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf)
+	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
+
+	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
+
+	# thunderbird
+	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+	doins build/"${emid}.xpi"
+
+	# seamonkey
+	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
+	doins build/"${emid}.xpi"
+}
+
+pkg_postinst() {
+	local peimpl=$(eselect --brief --colour=no pinentry show)
+	case "${peimpl}" in
+	*gtk*|*qt*) ;;
+	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+		ewarn "You may be prompted for your password in an inaccessible shell!!"
+		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+		;;
+	esac
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "the newly installed version of enigmail."
+	fi
+}
diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
index 66f465afa7c6..7f808de531ff 100644
--- a/x11-plugins/enigmail/enigmail-9999.ebuild
+++ b/x11-plugins/enigmail/enigmail-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
 inherit python-any-r1
@@ -30,12 +30,14 @@ RDEPEND="|| (
 		( >=app-crypt/gnupg-2.0
 			|| (
 				app-crypt/pinentry[gtk(-)]
-				app-crypt/pinentry[qt4(-)]
 				app-crypt/pinentry[qt5(-)]
 			)
 		)
 		=app-crypt/gnupg-1.4*
-	)"
+	)
+	!<mail-client/thunderbird-52.5.0
+	!<www-client/seamonkey-2.49.5.0_p0
+"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	app-arch/zip
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 168d725b8152..7b76ed8c653a 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 08f9db6bbc8e..ff0be39f6cb6 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,5 +1,5 @@
 AUX 0.90-without-icon-cache.patch 305 BLAKE2B 9160854ac4e681b91e3e780400ff6132257d27ddb7e29f9bc16733805c3cf1b8707dd4320bde8fd47636aa6e71161847cdcbb06759762674fcd81fa1717bf2d4 SHA512 fbe50c186f67610b084d3a02e7d398c2bca668c63107203af0b59f49fd0491efd4922824fd0a78263b433877d1736d187deb2ab9f29c243d913fc3908d3076ca
 AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381c6b66389e1ca8e82ebd961d970b84543133b098166008310fc035a591eb26e93c10fcc1bbb02ebc66752bb26145cbd SHA512 8944e27a6ab20f7f74c7dac9e2e93877a156ee5082c617dc7de84298bec303c7a0cf57fc1dd3cad4ae76ce2e15c50aacb8fe5587fe977727c10a6a3c48cca880
 DIST terminator-1.91.tar.gz 910536 BLAKE2B 887eef489dc3eb73f7ae8f6284104ee5e6a23b33bc8486b203f9b53c7de5a11a43fdc6a344b02f269c0d4ce71cfc82f0c8285440900870870a43cd10d99326b9 SHA512 6feee96cda08f913601d3b01e51632bed87712ddb5ce577df1daa8a5fe4e8dc39075d5e21f87b865d1f007c7e1070ee2c0c814540c9c7786f0f24fbee762a03d
-EBUILD terminator-1.91.ebuild 1322 BLAKE2B f4b693d558a151a74e6b6fadac14862ec2821fe70fe45861625082d254de009891ffcbb8176502875b335eeea81fcc612a665234e9346d784dedf4891853fdf7 SHA512 357fc8330f17e1bc5b45f0d3f627a5d3673ca325c7571d411a2f7c0ee948f9f656e565f5cedd43ead86e9207161d4b108d4641fe03d479ad3e1d2ad723d5bbf2
+EBUILD terminator-1.91.ebuild 1327 BLAKE2B 645a31806a4789664435cbbb84bdfc694ee4c3e3850422d2b2f2d6559b978a42d22283703f881d9829e4e5f9acde5b4d4c1d5a091a978b578aefa0feb48225e7 SHA512 fe954cc161f53bf81f30016b82daf63af850fab44a15b24f20a7e070cb1462a7cdb3b0560015d2889937fa0816ff36420580444756afe877528e5321416dd809
 MISC metadata.xml 806 BLAKE2B 00acbe3d15886807ce00ca6485a6581a8c95b170e409c48e436eb618b23fe9dac541ab1ce0ace5639ec9fc4cc2a3a23801cf869b84fc7b7f260881983cee63fa SHA512 85da667a4abbc7442e8bc92697f316e19ccb281f49d1985a31cefcb1154462c4cddfc2a380c01de4c40cd3b1ab8516850d6257720e182b77bc4b721ad4ddc99b
diff --git a/x11-terms/terminator/terminator-1.91.ebuild b/x11-terms/terminator/terminator-1.91.ebuild
index d37e37e14588..ee1a1f1e0218 100644
--- a/x11-terms/terminator/terminator-1.91.ebuild
+++ b/x11-terms/terminator/terminator-1.91.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/gtk3/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="dbus +libnotify"
 
 RDEPEND="
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index a080c52083ca..23802f8c3f82 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,5 +1,5 @@
 DIST terminology-1.1.0.tar.xz 4989512 BLAKE2B b2bcc22a63d25517aa4dd223b914a784d8c4c87ce9d971dff20b9f66b3ff0d2667babc053f3e1923d0bcaa5508902b824302420c0731173c96136d2071400f61 SHA512 ad4ecc6d51a6a124e90eb63d887d5f742500944747b469239366732587510717a227aa41a90089911cf1ac5b289228880619726ae95688de9a92972d554bf95d
 DIST terminology-1.2.1.tar.xz 4858528 BLAKE2B 953917ed9dac9d17048d19394e6d8b38fd1673bc618cd1ecb596eee7b889f973b5622ef9d3424bc9f94928f44129062a7a4f88cdb2af519b87aeb141661902bc SHA512 8485d38a5426ac0f32b3cb049170bfa015a9f648134973462d72412b291b160f05b6ccfb3ba47115740946c8d87160401d55672a6853027d0cc216bdc7cc659b
 EBUILD terminology-1.1.0.ebuild 600 BLAKE2B 8311f2356fcf22ddce03adfc341dea0a4e0c00ca112a6019c5335c68ebc5b14dfea5f7a77ef38a19f1e39fe7d76c6d348a0dfee9bdea7dfbdb34eedc49327e88 SHA512 c251bcfad8907496aead3efb018fb65c2beb7e220839ac1cf596033a6220c6d44cc3da6edcfa1f8dff75e3d1be6cb2ab6837b9ec60487e00d04fa8cb57fa4258
-EBUILD terminology-1.2.1.ebuild 700 BLAKE2B f0c11e7f43f92092af3c9b018e060dc571bda815d6c72cb4ee7b7768a22bbb54bee0cf6b74baac73b914cf338f2c96d2ae181edb2ab5e265827b348b9e41afb0 SHA512 084aae49a9b8c1a69c2df6064c5b9cb2b8a7f0e9fed8241d1166cae0e0479faa8ca29b5f24f822c9bcf256533a7fca24de112e7e3faa4afd3d9e1bb4b68e73e1
+EBUILD terminology-1.2.1.ebuild 707 BLAKE2B 5137b90ae4ea1ebe5d4c1cd0d6705db487b87fbe5c3645b5df72297a404946bd02ea8709a9e71d29bc626dded9636fe6ca8db08c686a0628767845a021df0c43 SHA512 8051c08e2225076cb0a6b7fa1755bbe60c4072530bc040e590cca68c24dac3a627bab7cc936d6e92700aedfe3d35a8ded52633c561d140824f63fc6f189d8701
 MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
diff --git a/x11-terms/terminology/terminology-1.2.1.ebuild b/x11-terms/terminology/terminology-1.2.1.ebuild
index dfc6458bbd59..e4552e734505 100644
--- a/x11-terms/terminology/terminology-1.2.1.ebuild
+++ b/x11-terms/terminology/terminology-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/efl-1.20.0[eet,fontconfig,opengl,X]"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 7cd555aab796..4c42f36c2b78 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index e669c2692e7f..e029b6606416 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,5 +1,5 @@
 AUX ctwm-4.0.1-m4.patch 600 BLAKE2B 119ca96ba88e694d5a8269c67869e3185d15701dd9c3af921243db12793c4e90b2832aab9eba1ac432619472f1b2103474866853ccfe89aefda0679bbb6bab35 SHA512 d90b490d5a39dd1caf8c59b6753a65e0aa2e38a911ceef9e5b84d0c4b246b44072499d1853c7137e28f858d1856d33fd510b57b0ebef75097f98ebb6455fac77
 DIST ctwm-4.0.1.tar.xz 656776 BLAKE2B 37d6011d04f8d64552a86608a4d3867e6e1b0135f45457886daee6be1ae23ca1e3079caa1a63befd1d17bcc640e40ba0f1ed92e0a0caf2c6182f6e282f012bf7 SHA512 8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6
-EBUILD ctwm-4.0.1-r1.ebuild 985 BLAKE2B 13b2205a3df47f0d5d56b93dbee0435c8ff2eb95fd35fe7a17aa5b47a5ccae33cf1634c1507acc49190129a1ce74cf160580f4c3bd127693df82d8cd0a9ddd07 SHA512 443b01fe7e9c9f3be41fc4e3f7f0684a99af0fe5d439c8a439dab9aae6f1f6c07977c8ef1574e5a5fecb4d35457aa5bac493df85341dd6edcabe8e510e572671
+EBUILD ctwm-4.0.1-r1.ebuild 984 BLAKE2B cba23544d81b5cc2eed545e11147302ec6cdc34d3da21e7ae1ba1795757eef3e213e5345a4bcd07a7cf725fb0401129e8eec968b63cf2dc9a2428ab6c80f2f98 SHA512 b5b2d3782bec877df729a6c516bd2c1c3bb852633d38796f14978e0321468cd691254408c9339ed712ed85f61b2622b5863064286c05bd45b6b2ea2ec2a956af
 EBUILD ctwm-4.0.1.ebuild 881 BLAKE2B d476155cb7a13721f3c7c31932a3172d3753bf9c6bb87d8c9e7399bbbf87fc517c2a2b9e4fa24b92352cb6cd5a879cc26e83de604edb16e5e505dc135b5b4700 SHA512 819b7e3d0fff0ae88b1d6f6a4e86fde3c0ddaf51919fa28dd49ca95966fcaf72c7a0d04b5b926a66e18dcdf69761f2ec3d26f1e724b9f322ba588472687a0400
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild b/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild
index dec0ce651696..b684a843fb93 100644
--- a/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 RDEPEND="
 	x11-libs/libICE
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 2f32a8b3fb80..3e10a8978c44 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 67b77cd786a7..69c7f56965a8 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -3,7 +3,9 @@ AUX xfce4-session-4.12.1-light-locker_support_to_xflock4.patch 569 BLAKE2B f05f0
 AUX xfce4-session-4.13.0-add-edit-autostart-segv.patch 2511 BLAKE2B 028e1b05cd830f6eec9e2668414e94e792569811eccc9bf9ccbec300d80fcab300e8039538e11fb371ca2c5cc7c8c3816267751aa32d1d843d5b0850a4dbea99 SHA512 96e4ee3fe66c02775efc2d3222e9c668c9f422a303e0bc5837e2fb1dba5e07d4fda2c420c37e35da73731597b922f995c1e30dd40dfcd903081d566fc5a569ea
 DIST xfce4-session-4.12.1.tar.bz2 1289284 BLAKE2B 00af274ac1160a413c9e2c8b308dfc84248f0078e8c294528614bb642988468f9dadaae906b4a8e2179d2beef0a48ebf5e2eedcb2ed3ad7ea73a8f7a9b90e224 SHA512 d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df
 DIST xfce4-session-4.13.0.tar.bz2 1314715 BLAKE2B 7ab5bf645feaf9862e9cc4f36f26cfd614e7c66aa32cdb41ded8b0067e3aa23a6897beb6c362685f84c5b2a0f3d91462ab3dc7fed5a15875eff49107719c6c1c SHA512 61f9a547b03eb109a1a0fc83feaac743ea2119360f2f7208e589feb3e8f1db016ffe85cf1c8e20633ec399f263dcbccd35c431bde6f6f1482658688096da5cb0
+DIST xfce4-session-4.13.1.tar.bz2 1322823 BLAKE2B e50cc2628a068bed39d2aa6344eab7676e6464c84e3cf11d79518f78db54ea01316bd098a541b6f0897f3decbed2eb37e55009d4bf89d460e136d7a44d31c26a SHA512 5845e3591919e23ca176199e81075a097ef9d65cbcf23b34d84afc649a307bfa8c6492e3a01855cacff9328da809725213ec1fa9d76024c0a0c25cce3c51da1b
 EBUILD xfce4-session-4.12.1-r1.ebuild 1918 BLAKE2B f031e4d584bb86a02542543db6289d235e355f54bdafbb4b14b43198d683449be3ef1fa09a8425af8c5642dba7c7b0a91cb401d8a4d84a9fe95303cc3ee42c8e SHA512 5248448b59df99255762ee61dda50b487cbfae77d01c5bc41ea7e04e2211df99190f4f544d77d38c0db86e25ca7a5c7582d1915053b8da33d70c9e0a2f2a242f
 EBUILD xfce4-session-4.12.1-r2.ebuild 1893 BLAKE2B 767bec90fd2e60d63c6d83c35104178505bdca2c4e79b342271cf73f6c299c32fbd3ad8d32ed61952a38757eed97f58e7916a197f6a21a4551ee69b459d726d0 SHA512 0e8a76a1d685b980aaaf7d837926dd22d6e8281f764744c5e9cb85fb06128876e8adf74bd127bf612a6dbd939c02e6e99240981d56cd80769b31ce84d6f84160
-EBUILD xfce4-session-4.13.0-r1.ebuild 1844 BLAKE2B 17b11f96ee1c96b40424ff00404cf60fac155d8ce365058de7e32ece7276dfec3e9e7f2ba682a85a9819bbf3c63506deb8fc657a0d312d208d4d5fc2b3944678 SHA512 49fee7228a301a1aca8c4249151d0286925ac99c4ebc7f15d468469debe5a7f44b1a3f0fb1ac206b3af5604182b4fde4b8d8c0fd8e66d223a379f1b1a7c0a8fd
+EBUILD xfce4-session-4.13.0-r1.ebuild 1820 BLAKE2B cf9018c5a77b4faf3d5b05725080d248d1d5f731fe3f469927511283ba0e0d345468f1e2296ee0d7b85eeb4f3465bec856cd0fda57abcf980c5706759d769b73 SHA512 de30ec68465bc12f9be4b6b54f44511d42c136e446a79e49fbea0eb7b8bb7fd0d75477d6aa5607d15cbfa397c68c24bb5fd40f953babe096aa94e147176dcad2
+EBUILD xfce4-session-4.13.1.ebuild 1776 BLAKE2B 954e327842b856fc5953a0cb0bf5715556b5cb0f7c758aabb58c0801879e989c153c1676a4cb2b8cc7403e681c340c9b126574f4f0dd885967e66adbab6475ca SHA512 2b73dab2044f0c9f3dbe3819bc4ec9a016e7c94edea87fb77cd6a654c62e4cfb2bd827af490bc356d54f1debf2977b02fd807d8de30a861e1b3edf2f96975b56
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-session/xfce4-session-4.13.0-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.13.0-r1.ebuild
index b615b4a2efab..c8b5b81004be 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.13.0-r1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.13.0-r1.ebuild
@@ -28,7 +28,6 @@ RDEPEND="${COMMON_DEPEND}
 	nls? ( x11-misc/xdg-user-dirs )
 	xscreensaver? ( || (
 		>=x11-misc/xscreensaver-5.26
-		x11-misc/light-locker
 		>=x11-misc/xlockmore-5.43
 		x11-misc/slock
 		x11-misc/alock[pam]
diff --git a/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild
new file mode 100644
index 000000000000..7819b1d88835
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="A session manager for the Xfce desktop environment"
+HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="nls policykit systemd +xscreensaver"
+
+COMMON_DEPEND="x11-apps/iceauth
+	>=x11-libs/gtk+-3.20:3=
+	x11-libs/libSM:=
+	x11-libs/libwnck:3=
+	x11-libs/libX11:=
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/libxfce4ui-4.12.1:=[gtk3(+)]
+	>=xfce-base/xfconf-4.12:=
+	policykit? ( >=sys-auth/polkit-0.102:= )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xrdb
+	nls? ( x11-misc/xdg-user-dirs )
+	xscreensaver? ( || (
+		>=x11-misc/xscreensaver-5.26
+		>=x11-misc/xlockmore-5.43
+		x11-misc/slock
+		x11-misc/alock[pam]
+	) )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="systemd? ( policykit )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
+# TODO: this patch needs updating for the new version, and finding
+# upstream bug.
+#	"${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
+)
+
+src_configure() {
+	local myconf=(
+		$(use_enable policykit polkit)
+		--with-xsession-prefix="${EPREFIX}"/usr
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	local sessiondir=/etc/X11/Sessions
+	echo startxfce4 > "${T}"/Xfce4 || die
+	exeinto ${sessiondir}
+	doexe "${T}"/Xfce4
+	dosym Xfce4 ${sessiondir}/Xfce
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 18e42c24be45..e23abd5e2aa5 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,6 +1,10 @@
 AUX xfwm4-4.13.0-ctrl-f1.patch 998 BLAKE2B 9124fb6d749875de12cdc4794e923c621a6dbd7d6ee01ccbdaa876a72f41ce1fa2f5dff1ab4b718aa400c46f5a0c65c9d193c413a6ca78d07e99a077ac683134 SHA512 266977cbbedb5656196276c9441922346d936f1cdebdcfb24253add1c4d643344e00046e5574a534a5b5b70ca13826797f6202700b4aac09e0281e5c518428ba
 DIST xfwm4-4.12.4.tar.bz2 1208874 BLAKE2B 60b584d71bc4696bae83897d80cd90d9c13233d1971c823eea6417c8020a0440dc0d648df4e11b27947915ca57130ea3bc7b588e902dc7db74945349ff9ac514 SHA512 a33530b08f094456c45ad7c627ba34d3772eaeacdc9f422a3a54a16194d494cb1d6798122398d917fb8bc970db7e1184d9dc8edefc365dacc86de22be397b43d
+DIST xfwm4-4.12.5.tar.bz2 1215450 BLAKE2B 3a156af589ec7391245edbedbc6e10ac9c746121f68e4bd0c64e30b9b0c11abfe13c1fb77321249edd4e5c8d3051f62f135093fabfd8ba215573d330fd3745c2 SHA512 b723638b9cd858beb75232a251471cfb2d01ddb412b536c3f0b432e1f894014e1ad51c77d208d5439ae8a8d970344d0146d5f9475106c1b66d22715af7af42d9
 DIST xfwm4-4.13.0.tar.bz2 1229878 BLAKE2B 9d7f3d6121a1d1522294a659204d391e120b971cbca00f53f0a0d37f256f2ad65dc6ac1cfd5355d78fa5bd811ed8f7d4013081a10470f18e3edb9fcc0395e218 SHA512 01c6cc31dc179ccb51f9881f64ee9e4e16320ab888381d0b203ca0b2a46097048c30eabe7083aaec869c80e8e358c287896d6a1965a36ed6f2f981c27cfb2dce
+DIST xfwm4-4.13.1.tar.bz2 1224120 BLAKE2B 983b12775ba8998598efb22a2a7ab6f539cb1c6074c3fbaa882b9627e5ad0ff3b96ed0d4352c31dd04451c37dd706404147b87bd899f6b6f1b38df0162b82a15 SHA512 2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320
 EBUILD xfwm4-4.12.4.ebuild 1526 BLAKE2B fb44b379be5c8e5420d2b58b8754f7accbe518442c48b707a36e10ce62220212ea5c6b005d5c3abe3082d24108689adbaac03cb412138983de73c308dcd2da78 SHA512 87d67c9e6ff47c4b785fcbc8e71007ed5af134552fec9616b41bc26a81b72428314999d9969ab261ddd88c1bef4184f78d17a4a9f06970c1ec4565089de1a390
+EBUILD xfwm4-4.12.5.ebuild 1558 BLAKE2B bb4409211fd13a1ce52189b284dff93313c14b7a83f7520c033d057c674a2aad60add8f98e40cbb5c9a2be15b1dec2f0e0080a100ffc78971ec98f2374a11763 SHA512 5af645ff4b16e4215405bfd567907e9063489ab9ecd2e12d4719f40517544b0aeca8c6334c33fad4535574f06a62443ac874215b39aa0988c8b24c79113b5be1
 EBUILD xfwm4-4.13.0-r1.ebuild 1752 BLAKE2B f35aca2c13b7104805d4bac0787c6b03b90bef02ca32bdf306f98bda1ec00d929b3066d8158b400cadb6e011cebd003ebe7c6a777fab0c9fc851a2f55db4a447 SHA512 62821ac7e4454357071cc1953e47d05b3f5d84b367e5d3856ddf726120e692b0e4161597c8046ae32732ae395b891064d66b2efabf497652f3b9adfda9786700
+EBUILD xfwm4-4.13.1.ebuild 1722 BLAKE2B 2e1113a5fdc7ad12266f1057b49b95a09d56d4d2eb12c6ff3665b49074781b65e9a2c5e7d9a2947e7a2c7f45238d630fba7fda1c976f551cd662f82102e28013 SHA512 788876e3fa69a3160d04febe1908558a444c83c699774c5a2685afb336a2b5f7323cf27392d25f02bf715fe7c84df0fca24cb2db04ea345d5f21348e2a9178f5
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/xfwm4-4.12.5.ebuild b/xfce-base/xfwm4/xfwm4-4.12.5.ebuild
new file mode 100644
index 000000000000..b1ef18f4ba3a
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.12.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Window manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="dri startup-notification +xcomposite"
+
+RDEPEND="dev-libs/dbus-glib:=
+	>=dev-libs/glib-2.20:=
+	>=x11-libs/gtk+-2.24:2=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/pango:=
+	>=x11-libs/libwnck-2.30:1=
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/libxfce4ui-4.11:=
+	>=xfce-base/xfconf-4.10:=
+	startup-notification? ( x11-libs/startup-notification:= )
+	xcomposite? (
+		x11-libs/libXcomposite:=
+		x11-libs/libXdamage:=
+		x11-libs/libXfixes:=
+		)"
+# libdrm: only headers are used
+# libICE/liBSM: not really used anywhere but checked by configure
+#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	x11-libs/libICE
+	x11-libs/libSM
+	xfce-base/exo
+	virtual/pkgconfig
+	dri? ( >=x11-libs/libdrm-2.4 )"
+
+DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable dri libdrm)
+		$(use_enable startup-notification)
+		--enable-xsync
+		--enable-render
+		--enable-randr
+		$(use_enable xcomposite compositor)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/xfce-base/xfwm4/xfwm4-4.13.1.ebuild b/xfce-base/xfwm4/xfwm4-4.13.1.ebuild
new file mode 100644
index 000000000000..6c5cc896faef
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.13.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="Window manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="opengl startup-notification +xcomposite xpresent"
+
+RDEPEND="dev-libs/dbus-glib:=
+	>=dev-libs/glib-2.20:=
+	>=x11-libs/gtk+-3.20:3=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/pango:=
+	>=x11-libs/libwnck-3.14:3=
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/xfconf-4.13:=
+	opengl? ( media-libs/libepoxy:=[X(+)] )
+	startup-notification? ( x11-libs/startup-notification:= )
+	xpresent? ( x11-libs/libXpresent )
+	xcomposite? (
+		x11-libs/libXcomposite:=
+		x11-libs/libXdamage:=
+		x11-libs/libXfixes:=
+		)"
+# libICE/libSM: not really used anywhere but checked by configure
+#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	x11-libs/libICE
+	x11-libs/libSM
+	xfce-base/exo
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable opengl epoxy)
+		$(use_enable startup-notification)
+		--enable-xsync
+		--enable-render
+		--enable-randr
+		$(use_enable xpresent)
+		$(use_enable xcomposite compositor)
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index e1f3a33dc16c..90b548d4d567 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index 4b74b6ecd9b6..f328d1d35fb6 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-notifyd-0.4.1.tar.bz2 524411 BLAKE2B f90c8241e484b256cfc1619f6bc9b1f5ad0f375fe3efdcadfe8f2acf740697f887a98044bcceb15a70cac9529cf9e1119192875682d0fb59355b4a10b3e479c1 SHA512 3dd12a8d27d950c2ffe7a4bc0eaa3b44f4a783273fc90d95304ec77450e88241ad39ca13366cb2a0c666ff6afb9ad58f6468e2fc38b8a87a2737614cfedadfae
 DIST xfce4-notifyd-0.4.2.tar.bz2 528521 BLAKE2B 8e59e26fcd453b65522b89c24d36857f6ac66c1b6e6a0ef0167b3f9f8dc4a087185d4b5b770b4e90e614e369ca147b924ad3f3ac0a1f3faf49c02b9e1ffd0a30 SHA512 1cabf478928cbcc13e9f03b2540470c5568bc665b196a8617a0e3b52ce4fe3bd9fdb5e199c4e52afe51c4edab8ba949c4551f65ce77c5fae7fddccd0086fb601
 EBUILD xfce4-notifyd-0.4.1.ebuild 862 BLAKE2B 11fd2c3532f8fb7070cc9dc1e990bd34bdcabc22d99f014660cbca2009ba7e8c031428515b87ea432b8d3995a670de791ee6ffa020ccd090e0dbc026111faa3c SHA512 ee548f2bb6b80404e68be14503efb473622e9a484007c2ae1c6fe8ce10b7ee29c38739031f4bb5757b26c9a7c051ae57c83cc8dbaa0f71e1f9bef2642f4e46f8
-EBUILD xfce4-notifyd-0.4.2.ebuild 827 BLAKE2B a8bc49924755f5fc6b9bdbf1ac413fdda656962103fd25436f45eb60ea75e3c9280822d8753e4a3eb0c3408ead94e20f3c9791f25457482ffe8c7ca9bb7d88b5 SHA512 2bd2808d5b25ceec62b3f209d16b8ba5d7e0d7dfd1c1359e0880e9415b865efe2edc041e1f3d9ae54a6535f42b758c7d157b5893c542793f7da2cf6063f6c193
+EBUILD xfce4-notifyd-0.4.2.ebuild 832 BLAKE2B b39a0c88e987abf03fbefe71288c1c8241882eae804a212f683c366484cb5b145c942de2d115c44188be6a501688f1663955394620e3496ecfd15e96aa5a0fc4 SHA512 b0eea25927bd67421f3176eb3af6e88d5f04a79c1f0f1e92fc7a5d4628168c5d748d5cb45a11f7cb10151edea6ba998c5fc3f0ebf2e65202dff6f5b70beefc2f
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild
index 17648282041e..2c5ce4cc2f31 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.42:2=